This is an automated email from the ASF dual-hosted git repository.

dkulp pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 92a693d73bd530713b5ea1c368c45dc0c9ed0127
Author: Daniel Kulp <[email protected]>
AuthorDate: Tue Aug 18 13:04:09 2020 -0400

    Derby 10.15 is apparently not compatible with java8, use 10.14 on 8, 10.15 
on 9+ for testing
---
 parent/pom.xml                 | 5 ++++-
 rt/ws/rm/pom.xml               | 5 -----
 systests/uncategorized/pom.xml | 5 -----
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 2065b3b..df32dda 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -100,7 +100,7 @@
         <cxf.commons-lang3.version>3.11</cxf.commons-lang3.version>
         <cxf.commons-logging.version>1.2</cxf.commons-logging.version>
         <cxf.commons-text.version>1.9</cxf.commons-text.version>
-        <cxf.derby.version>10.15.2.0</cxf.derby.version>
+        <cxf.derby.version>10.14.2.0</cxf.derby.version>
         <cxf.dom4j.version>2.1.3</cxf.dom4j.version>
         <cxf.dropwizard3.version>3.2.6</cxf.dropwizard3.version>
         <cxf.dropwizard4.version>4.1.12.1</cxf.dropwizard4.version>
@@ -2265,6 +2265,9 @@
             <activation>
                 <jdk>[9,)</jdk>
             </activation>
+            <properties>
+                <cxf.derby.version>10.15.2.0</cxf.derby.version>
+            </properties>
             <build>
                 <plugins>
                     <plugin>
diff --git a/rt/ws/rm/pom.xml b/rt/ws/rm/pom.xml
index 7c0bbf6..9c9542c 100644
--- a/rt/ws/rm/pom.xml
+++ b/rt/ws/rm/pom.xml
@@ -128,11 +128,6 @@
         </dependency>
         <dependency>
             <groupId>org.apache.derby</groupId>
-            <artifactId>derbyshared</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.derby</groupId>
             <artifactId>derbytools</artifactId>
             <scope>test</scope>
         </dependency>
diff --git a/systests/uncategorized/pom.xml b/systests/uncategorized/pom.xml
index 8618e28..cc510de 100644
--- a/systests/uncategorized/pom.xml
+++ b/systests/uncategorized/pom.xml
@@ -259,11 +259,6 @@
         </dependency>
         <dependency>
             <groupId>org.apache.derby</groupId>
-            <artifactId>derbyshared</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.derby</groupId>
             <artifactId>derbytools</artifactId>
             <scope>test</scope>
         </dependency>

Reply via email to