Merge pull request #1761 from cherylking/bumpDerbyDep101710

Update derby dependency and affected test cases
OpenLiberty · Nov 28, 2023 · d95f046 · d95f046
2 parents 21fd74f + 7125784
commit d95f046
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/liberty-maven-plugin/src/it/appsdirectory-notset-configured-it/pom.xml b/liberty-maven-plugin/src/it/appsdirectory-notset-configured-it/pom.xml
@@ -34,7 +34,7 @@
     <dependency>
         <groupId>org.apache.derby</groupId>
         <artifactId>derby</artifactId>
-        <version>10.15.2.0</version>
+        <version>10.17.1.0</version>
         <scope>provided</scope>
     </dependency>
   </dependencies>
@@ -99,7 +99,7 @@
             <dependency>
                 <groupId>org.apache.derby</groupId>
                 <artifactId>derbyclient</artifactId>
-                <version>10.15.2.0</version>
+                <version>10.17.1.0</version>
             </dependency>
           </copyDependencies>
 

diff --git a/...et-configured-it/src/test/java/net/wasdev/wlp/maven/test/app/DefaultAppDirectoryTest.java b/...et-configured-it/src/test/java/net/wasdev/wlp/maven/test/app/DefaultAppDirectoryTest.java
@@ -87,19 +87,19 @@ public void testCopyDependenciesFilesExist() throws Exception {
         Assert.assertFalse(f.getCanonicalFile() + " exists", f.exists());
 
         // This was not defined in the dependencies and should not be copied.
-        f = new File("liberty/usr/shared/resources/derbytools-10.15.2.0.jar");
+        f = new File("liberty/usr/shared/resources/derbytools-10.17.1.0.jar");
         Assert.assertFalse(f.getCanonicalFile() + " exists", f.exists());
 
         // This was not defined in the dependencies and should be copied because the full GAV coordinate was specified.
-        f = new File("liberty/usr/shared/resources/derbyclient-10.15.2.0.jar");
+        f = new File("liberty/usr/shared/resources/derbyclient-10.17.1.0.jar");
         Assert.assertTrue(f.getCanonicalFile() + " doesn't exist", f.exists());
 
         // This was SCOPE_PROVIDED and should be copied.
-        f = new File("liberty/usr/shared/resources/derby-10.15.2.0.jar");
+        f = new File("liberty/usr/shared/resources/derby-10.17.1.0.jar");
         Assert.assertTrue(f.getCanonicalFile() + " doesn't exist", f.exists());
 
         // This is a transitive dependency of org.apache.derby:derby and should be copied.
-        f = new File("liberty/usr/shared/resources/derbyshared-10.15.2.0.jar");
+        f = new File("liberty/usr/shared/resources/derbyshared-10.17.1.0.jar");
         Assert.assertTrue(f.getCanonicalFile() + " doesn't exist", f.exists());
 
    }

diff --git a/liberty-maven-plugin/src/it/appsdirectory-notset-notconfigured-it/pom.xml b/liberty-maven-plugin/src/it/appsdirectory-notset-notconfigured-it/pom.xml
@@ -22,12 +22,12 @@
     <dependency>
         <groupId>org.apache.derby</groupId>
         <artifactId>derby</artifactId>
-        <version>10.15.2.0</version>
+        <version>10.17.1.0</version>
     </dependency>
     <dependency>
         <groupId>org.apache.derby</groupId>
         <artifactId>derbyclient</artifactId>
-        <version>10.15.2.0</version>
+        <version>10.17.1.0</version>
     </dependency>
     <dependency>
         <groupId>commons-logging</groupId>
@@ -104,7 +104,7 @@
                 <dependency>
                     <groupId>org.apache.derby</groupId>
                     <artifactId>derbywar</artifactId>
-                    <version>10.15.2.0</version>
+                    <version>10.17.1.0</version>
                     <type>war</type>
                 </dependency>
             </dependencyGroup>

diff --git a/...notconfigured-it/src/test/java/net/wasdev/wlp/maven/test/app/DefaultAppDirectoryTest.java b/...notconfigured-it/src/test/java/net/wasdev/wlp/maven/test/app/DefaultAppDirectoryTest.java
@@ -102,7 +102,7 @@ public void testCopyDependenciesFilesExist() throws Exception {
         Assert.assertTrue(f.getCanonicalFile() + " doesn't exist", f.exists());
 
         // The next dependency specified the full GAV plus type `war`. The default location was used.
-        f = new File("liberty/usr/servers/test/lib/global/derbywar-10.15.2.0.war");
+        f = new File("liberty/usr/servers/test/lib/global/derbywar-10.17.1.0.war");
         Assert.assertTrue(f.getCanonicalFile() + " doesn't exist", f.exists());
    }
 }
diff --git a/liberty-maven-plugin/src/it/preserve-usr-dir-it/pom.xml b/liberty-maven-plugin/src/it/preserve-usr-dir-it/pom.xml
@@ -58,7 +58,7 @@
                         <artifactItem>
                             <groupId>org.apache.derby</groupId>
                             <artifactId>derby</artifactId>
-                            <version>10.13.1.1</version>
+                            <version>10.17.1.0</version>
                             <outputDirectory>${project.build.directory}/liberty/wlp/usr/shared/resources</outputDirectory>
                         </artifactItem>
                     </artifactItems>

diff --git a/...serve-usr-dir-it/src/test/java/net/wasdev/wlp/maven/test/CheckSharedResourceExistsIT.java b/...serve-usr-dir-it/src/test/java/net/wasdev/wlp/maven/test/CheckSharedResourceExistsIT.java
@@ -7,7 +7,7 @@
 
 public class CheckSharedResourceExistsIT {
 
-    public final String DERBY_RESOURCE = "target/liberty/wlp/usr/shared/resources/derby-10.13.1.1.jar";
+    public final String DERBY_RESOURCE = "target/liberty/wlp/usr/shared/resources/derby-10.17.1.0.jar";
 
     @Test
     public void testDerbyExists() throws Exception {