Integ: dbschema RELEASE712, schema2beans RELEASE82 (#22369)

javaee · Dec 7, 2017 · cc77df3 · cc77df3
1 parent e38c352
commit cc77df3
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 380 deletions.
diff --git a/appserver/load-balancer/admin/pom.xml b/appserver/load-balancer/admin/pom.xml
@@ -128,7 +128,7 @@
         </dependency>
         <dependency>
             <groupId>org.glassfish.external</groupId>
-            <artifactId>schema2beans-repackaged</artifactId>
+            <artifactId>schema2beans</artifactId>
         </dependency>
         <dependency>
             <groupId>org.glassfish.main.security</groupId>

diff --git a/appserver/packager/external/dbschema/pom.xml b/appserver/packager/external/dbschema/pom.xml
diff --git a/appserver/packager/external/schema2beans/pom.xml b/appserver/packager/external/schema2beans/pom.xml
diff --git a/appserver/packager/glassfish-cmp/pom.xml b/appserver/packager/glassfish-cmp/pom.xml
@@ -128,7 +128,7 @@
         </dependency>
         <dependency>
             <groupId>org.glassfish.external</groupId>
-            <artifactId>dbschema-repackaged</artifactId>
+            <artifactId>dbschema</artifactId>
         </dependency>
         <dependency>
             <groupId>org.glassfish.external</groupId>

diff --git a/appserver/packager/glassfish-common-web/pom.xml b/appserver/packager/glassfish-common-web/pom.xml
@@ -191,7 +191,7 @@
         <!-- schema2beans - both CMP and LB admin now depend on it -->
         <dependency>
             <groupId>org.glassfish.external</groupId>
-            <artifactId>schema2beans-repackaged</artifactId>
+            <artifactId>schema2beans</artifactId>
         </dependency>          
         <dependency>
             <groupId>org.glassfish.main.extras</groupId>