You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2020/08/18 17:50:47 UTC
[cxf] branch master updated (267b84c -> 92a693d)
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from 267b84c Extend jws version import range
new d2ec5b8 Upgrade hamcrest version
new 92a693d Derby 10.15 is apparently not compatible with java8, use 10.14 on 8, 10.15 on 9+ for testing
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
integration/spring-boot/autoconfigure/pom.xml | 5 +++++
parent/pom.xml | 13 +++++++++++--
rt/ws/rm/pom.xml | 5 -----
systests/cdi/base/pom.xml | 12 +++++++++++-
systests/rs-sse/rs-sse-base/pom.xml | 10 ++++++++++
systests/uncategorized/pom.xml | 5 -----
6 files changed, 37 insertions(+), 13 deletions(-)
[cxf] 02/02: Derby 10.15 is apparently not compatible with java8,
use 10.14 on 8, 10.15 on 9+ for testing
Posted by dk...@apache.org.
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 <dk...@apache.org>
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>
[cxf] 01/02: Upgrade hamcrest version
Posted by dk...@apache.org.
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 d2ec5b8a5e568e79e0c423c7c4d063a99283e65c
Author: Daniel Kulp <dk...@apache.org>
AuthorDate: Tue Aug 18 12:33:21 2020 -0400
Upgrade hamcrest version
---
integration/spring-boot/autoconfigure/pom.xml | 5 +++++
parent/pom.xml | 8 +++++++-
systests/cdi/base/pom.xml | 12 +++++++++++-
systests/rs-sse/rs-sse-base/pom.xml | 10 ++++++++++
4 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/integration/spring-boot/autoconfigure/pom.xml b/integration/spring-boot/autoconfigure/pom.xml
index 9ebd02e..e44ae6c 100644
--- a/integration/spring-boot/autoconfigure/pom.xml
+++ b/integration/spring-boot/autoconfigure/pom.xml
@@ -115,6 +115,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.springframework</groupId>
<artifactId>${cxf.spring.mock}</artifactId>
<scope>test</scope>
diff --git a/parent/pom.xml b/parent/pom.xml
index 27a52b5..2065b3b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -117,7 +117,7 @@
<cxf.geronimo.openapi.version>1.0.12</cxf.geronimo.openapi.version>
<cxf.glassfish.json.version>1.1.4</cxf.glassfish.json.version>
<cxf.guava.version>29.0-jre</cxf.guava.version>
- <cxf.hamcrest.version>1.3</cxf.hamcrest.version>
+ <cxf.hamcrest.version>2.2</cxf.hamcrest.version>
<cxf.hazelcast.version>3.12.7</cxf.hazelcast.version>
<cxf.hibernate.em.version>5.4.19.Final</cxf.hibernate.em.version>
<cxf.hibernate.validator.version>6.1.4.Final</cxf.hibernate.validator.version>
@@ -816,6 +816,12 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-core</artifactId>
+ <version>${cxf.hamcrest.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
<version>4.0.3</version>
diff --git a/systests/cdi/base/pom.xml b/systests/cdi/base/pom.xml
index eea04cf..9d5f34e 100644
--- a/systests/cdi/base/pom.xml
+++ b/systests/cdi/base/pom.xml
@@ -67,6 +67,16 @@
<scope>compile</scope>
</dependency>
<dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-core</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-library</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
</dependency>
@@ -87,4 +97,4 @@
<artifactId>jakarta.validation-api</artifactId>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/systests/rs-sse/rs-sse-base/pom.xml b/systests/rs-sse/rs-sse-base/pom.xml
index 017629b..5013775 100644
--- a/systests/rs-sse/rs-sse-base/pom.xml
+++ b/systests/rs-sse/rs-sse-base/pom.xml
@@ -41,6 +41,16 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-core</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
</dependency>