Integ: Derby 10.13.1.1 (javaee#22567)

lvcargnini · Aug 1, 2018 · c703477 · c703477
1 parent 1897313
commit c703477
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/appserver/distributions/glassfish/src/main/assembly/glassfish.xml b/appserver/distributions/glassfish/src/main/assembly/glassfish.xml
@@ -102,7 +102,7 @@
 
         <!-- javadb -->
         <fileSet>
-            <directory>${temp.dir}/derby-distribution/derby-distribution-${derby.version}-bin</directory>
+            <directory>${temp.dir}/derby/db-derby-${derby.version}-bin</directory>
             <excludes>
                 <exclude>demo/**</exclude>
                 <exclude>docs/**</exclude>

diff --git a/appserver/distributions/web/src/main/assembly/web.xml b/appserver/distributions/web/src/main/assembly/web.xml
@@ -71,7 +71,7 @@
 
         <!-- javadb -->
         <fileSet>
-            <directory>${temp.dir}/derby-distribution/derby-distribution-${derby.version}-bin</directory>
+            <directory>${temp.dir}/derby/db-derby-${derby.version}-bin</directory>
             <excludes>
                 <exclude>demo/**</exclude>
                 <exclude>docs/**</exclude>

diff --git a/appserver/extras/embedded/all/pom.xml b/appserver/extras/embedded/all/pom.xml
@@ -1599,7 +1599,7 @@
         <!-- derby -->
         <dependency>
             <groupId>org.glassfish.external</groupId>
-            <artifactId>derby-distribution</artifactId>
+            <artifactId>derby</artifactId>
             <version>${derby.version}</version>
             <type>zip</type>
             <optional>true</optional>

diff --git a/appserver/extras/embedded/web/pom.xml b/appserver/extras/embedded/web/pom.xml
@@ -1379,7 +1379,7 @@
     <!-- derby -->
     <dependency>
         <groupId>org.glassfish.external</groupId>
-        <artifactId>derby-distribution</artifactId>
+        <artifactId>derby</artifactId>
         <version>${derby.version}</version>
         <type>zip</type>
         <optional>true</optional>

diff --git a/appserver/featuresets/web/pom.xml b/appserver/featuresets/web/pom.xml
@@ -1894,7 +1894,7 @@
         <!-- derby -->
         <dependency>
             <groupId>org.glassfish.external</groupId>
-            <artifactId>derby-distribution</artifactId>
+            <artifactId>derby</artifactId>
             <type>zip</type>
             <exclusions>
                 <exclusion>

diff --git a/appserver/pom.xml b/appserver/pom.xml
@@ -982,7 +982,7 @@
             </dependency>
             <dependency>
                 <groupId>org.glassfish.external</groupId>
-                <artifactId>derby-distribution</artifactId>
+                <artifactId>derby</artifactId>
                 <version>${derby.version}</version>
                 <type>zip</type>
            </dependency>