You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jl...@apache.org on 2019/08/20 13:11:22 UTC
[tomee] branch master updated: Attempt to fix all CXF and web
services issues + scala cleanup
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/master by this push:
new 74c24d0 Attempt to fix all CXF and web services issues + scala cleanup
74c24d0 is described below
commit 74c24d07a662331ea3bf7a962c31d9b6f6776560
Author: Jean-Louis Monteiro <je...@gmail.com>
AuthorDate: Tue Aug 20 15:11:10 2019 +0200
Attempt to fix all CXF and web services issues + scala cleanup
---
examples/pom.xml | 17 -------
examples/scala-basic/pom.xml | 12 -----
.../simple-webservice-without-interface/pom.xml | 2 +-
examples/simple-webservice/pom.xml | 2 +-
examples/webservice-attachments/pom.xml | 37 ++++++++++----
examples/webservice-attachments/test.jks | Bin 0 -> 2435 bytes
examples/webservice-handlerchain/pom.xml | 2 +-
examples/webservice-holder/pom.xml | 2 +-
examples/webservice-inheritance/pom.xml | 2 +-
examples/webservice-security/pom.xml | 2 +-
.../create-keystores.xml | 8 +++
examples/webservice-ssl-client-cert/pom.xml | 2 +-
examples/webservice-ws-security/pom.xml | 54 ++++++++++++---------
pom.xml | 6 +++
server/openejb-cxf/pom.xml | 39 +++------------
server/openejb-webservices/pom.xml | 17 +------
16 files changed, 86 insertions(+), 118 deletions(-)
diff --git a/examples/pom.xml b/examples/pom.xml
index adf1c76..cac2ca7 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -250,22 +250,5 @@
</plugins>
</build>
</profile>
- <profile>
- <id>java9</id>
- <activation>
- <jdk>9</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration> <!-- requires saaj-impl 1.4 but cxf is not yet ready -->
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
</project>
diff --git a/examples/scala-basic/pom.xml b/examples/scala-basic/pom.xml
index e28365a..8582617 100644
--- a/examples/scala-basic/pom.xml
+++ b/examples/scala-basic/pom.xml
@@ -164,16 +164,4 @@
</snapshotRepository>
</distributionManagement>
- <profiles>
- <profile>
- <id>java9</id>
- <activation>
- <jdk>9</jdk>
- </activation>
- <properties>
- <scala.version>2.12</scala.version>
- <scala.full-version>${scala.version}.2</scala.full-version>
- </properties>
- </profile>
- </profiles>
</project>
diff --git a/examples/simple-webservice-without-interface/pom.xml b/examples/simple-webservice-without-interface/pom.xml
index 27f7d15..f2fff3d 100644
--- a/examples/simple-webservice-without-interface/pom.xml
+++ b/examples/simple-webservice-without-interface/pom.xml
@@ -77,7 +77,7 @@
<dependency>
<groupId>com.sun.xml.parsers</groupId>
<artifactId>jaxp-ri</artifactId>
- <version>1.4.2</version>
+ <version>1.4.5</version>
<scope>test</scope>
</dependency>
diff --git a/examples/simple-webservice/pom.xml b/examples/simple-webservice/pom.xml
index c1a4420..1ace590 100644
--- a/examples/simple-webservice/pom.xml
+++ b/examples/simple-webservice/pom.xml
@@ -77,7 +77,7 @@
<dependency>
<groupId>com.sun.xml.parsers</groupId>
<artifactId>jaxp-ri</artifactId>
- <version>1.4.2</version>
+ <version>1.4.5</version>
<scope>test</scope>
</dependency>
diff --git a/examples/webservice-attachments/pom.xml b/examples/webservice-attachments/pom.xml
index 4245f7f..a7e16c4 100644
--- a/examples/webservice-attachments/pom.xml
+++ b/examples/webservice-attachments/pom.xml
@@ -56,20 +56,15 @@
<artifactId>javaee-api</artifactId>
<version>[8.0,)</version>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</version>
- <scope>test</scope>
- </dependency>
+
<!--
The <scope>test</scope> guarantees that non of your runtime
code is dependent on any OpenEJB classes.
-->
<dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>openejb-cxf</artifactId>
- <version>8.0.0-SNAPSHOT</version>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.12</version>
<scope>test</scope>
</dependency>
<!-- This is required on IBM JDKs (and potentially others) because saaj-impl depends
@@ -77,7 +72,29 @@
<dependency>
<groupId>com.sun.xml.parsers</groupId>
<artifactId>jaxp-ri</artifactId>
- <version>1.4.2</version>
+ <version>1.4.5</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.messaging.saaj</groupId>
+ <artifactId>saaj-impl</artifactId>
+ <version>1.5.1</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.xml.soap</groupId>
+ <artifactId>javax.xml.soap-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomee</groupId>
+ <artifactId>openejb-cxf</artifactId>
+ <version>8.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/examples/webservice-attachments/test.jks b/examples/webservice-attachments/test.jks
new file mode 100644
index 0000000..9db0167
Binary files /dev/null and b/examples/webservice-attachments/test.jks differ
diff --git a/examples/webservice-handlerchain/pom.xml b/examples/webservice-handlerchain/pom.xml
index e293a64..6294799 100644
--- a/examples/webservice-handlerchain/pom.xml
+++ b/examples/webservice-handlerchain/pom.xml
@@ -77,7 +77,7 @@
<dependency>
<groupId>com.sun.xml.parsers</groupId>
<artifactId>jaxp-ri</artifactId>
- <version>1.4.2</version>
+ <version>1.4.5</version>
<scope>test</scope>
</dependency>
diff --git a/examples/webservice-holder/pom.xml b/examples/webservice-holder/pom.xml
index 6f7e4b1..2c5f60f 100644
--- a/examples/webservice-holder/pom.xml
+++ b/examples/webservice-holder/pom.xml
@@ -77,7 +77,7 @@
<dependency>
<groupId>com.sun.xml.parsers</groupId>
<artifactId>jaxp-ri</artifactId>
- <version>1.4.2</version>
+ <version>1.4.5</version>
<scope>test</scope>
</dependency>
diff --git a/examples/webservice-inheritance/pom.xml b/examples/webservice-inheritance/pom.xml
index 4fb3779..0f1b577 100644
--- a/examples/webservice-inheritance/pom.xml
+++ b/examples/webservice-inheritance/pom.xml
@@ -77,7 +77,7 @@
<dependency>
<groupId>com.sun.xml.parsers</groupId>
<artifactId>jaxp-ri</artifactId>
- <version>1.4.2</version>
+ <version>1.4.5</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/examples/webservice-security/pom.xml b/examples/webservice-security/pom.xml
index a64bedd..95c02a8 100644
--- a/examples/webservice-security/pom.xml
+++ b/examples/webservice-security/pom.xml
@@ -77,7 +77,7 @@
<dependency>
<groupId>com.sun.xml.parsers</groupId>
<artifactId>jaxp-ri</artifactId>
- <version>1.4.2</version>
+ <version>1.4.5</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/examples/webservice-ssl-client-cert/create-keystores.xml b/examples/webservice-ssl-client-cert/create-keystores.xml
index 03c054d..08c415e 100644
--- a/examples/webservice-ssl-client-cert/create-keystores.xml
+++ b/examples/webservice-ssl-client-cert/create-keystores.xml
@@ -125,6 +125,7 @@
<echo message="generate server keys"/>
<java classname="${is.sun.jdk}" fork="true">
<arg line="-genkey"/>
+ <arg line="-storetype JKS"/>
<arg line="-alias ${server.alias}"/>
<arg line="-keypass ${server.keypass}"/>
<arg line="-keystore ${server.keystore}"/>
@@ -134,6 +135,7 @@
</java>
<java classname="${is.sun.jdk}" fork="true">
<arg line="-selfcert"/>
+ <arg line="-storetype JKS"/>
<arg line="-alias ${server.alias}"/>
<arg line="-keystore ${server.keystore}"/>
<arg line="-storepass ${server.storepass}"/>
@@ -141,6 +143,7 @@
</java>
<java classname="${is.sun.jdk}" fork="true">
<arg line="-export"/>
+ <arg line="-storetype JKS"/>
<arg line="-alias ${server.alias}"/>
<arg line="-file ${server.file}"/>
<arg line="-keystore ${server.keystore}"/>
@@ -151,6 +154,7 @@
<java classname="${is.sun.jdk}" fork="true">
<arg line="-genkey"/>
+ <arg line="-storetype JKS"/>
<arg line="-alias ${client.alias}"/>
<arg line="-keypass ${client.keypass}"/>
<arg line="-keystore ${client.keystore}"/>
@@ -160,6 +164,7 @@
</java>
<java classname="${is.sun.jdk}" fork="true">
<arg line="-selfcert"/>
+ <arg line="-storetype JKS"/>
<arg line="-alias ${client.alias}"/>
<arg line="-keystore ${client.keystore}"/>
<arg line="-storepass ${client.storepass}"/>
@@ -167,6 +172,7 @@
</java>
<java classname="${is.sun.jdk}" fork="true">
<arg line="-export"/>
+ <arg line="-storetype JKS"/>
<arg line="-alias ${client.alias}"/>
<arg line="-file ${client.file}"/>
<arg line="-keystore ${client.keystore}"/>
@@ -176,6 +182,7 @@
<echo message="import client/server public keys in client/server keystores"/>
<java classname="${is.sun.jdk}" fork="true">
<arg line="-import"/>
+ <arg line="-storetype JKS"/>
<arg line="-alias ${server.alias}"/>
<arg line="-file ${server.file}"/>
<arg line="-keystore ${client.keystore}"/>
@@ -184,6 +191,7 @@
</java>
<java classname="${is.sun.jdk}" fork="true">
<arg line="-import"/>
+ <arg line="-storetype JKS"/>
<arg line="-alias ${client.alias}"/>
<arg line="-file ${client.file}"/>
<arg line="-keystore ${server.keystore}"/>
diff --git a/examples/webservice-ssl-client-cert/pom.xml b/examples/webservice-ssl-client-cert/pom.xml
index 3fd656a..15257da 100644
--- a/examples/webservice-ssl-client-cert/pom.xml
+++ b/examples/webservice-ssl-client-cert/pom.xml
@@ -114,7 +114,7 @@
<dependency>
<groupId>com.sun.xml.parsers</groupId>
<artifactId>jaxp-ri</artifactId>
- <version>1.4.2</version>
+ <version>1.4.5</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/examples/webservice-ws-security/pom.xml b/examples/webservice-ws-security/pom.xml
index 744e8a9..2519790 100644
--- a/examples/webservice-ws-security/pom.xml
+++ b/examples/webservice-ws-security/pom.xml
@@ -42,23 +42,48 @@
<artifactId>javaee-api</artifactId>
<version>[8.0,)</version>
</dependency>
+
+ <!--
+ The <scope>test</scope> guarantees that non of your runtime
+ code is dependent on any OpenEJB classes.
+ -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
-
- <!--
- The <scope>test</scope> guarantees that non of your runtime
- code is dependent on any OpenEJB classes.
- -->
+ <!-- This is required on IBM JDKs (and potentially others) because saaj-impl depends
+ on Sun's internal copy of Xerces. See OPENEJB-1126. -->
+ <dependency>
+ <groupId>com.sun.xml.parsers</groupId>
+ <artifactId>jaxp-ri</artifactId>
+ <version>1.4.5</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.messaging.saaj</groupId>
+ <artifactId>saaj-impl</artifactId>
+ <version>1.5.1</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.xml.soap</groupId>
+ <artifactId>javax.xml.soap-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>openejb-cxf</artifactId>
<version>8.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
+
</dependencies>
<build>
<defaultGoal>install</defaultGoal>
@@ -141,23 +166,4 @@
</snapshotRepository>
</distributionManagement>
- <profiles>
- <profile>
- <id>java9</id>
- <activation>
- <jdk>9</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration> <!-- requires saaj-impl 1.4 but cxf is not yet ready -->
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/pom.xml b/pom.xml
index 9b985ed..dcc3874 100644
--- a/pom.xml
+++ b/pom.xml
@@ -150,6 +150,12 @@
<plexus-utils.version>3.0.10</plexus-utils.version>
<!--
+ Old CXF versions were only compatible with 1.3.x. But JDK 9+ requires 1.4.x and higher
+ We used to have some weird exclusions to not run test, but we should try to upgrade to 1.4.x anyway
+ -->
+ <saaj-impl.version>1.5.1</saaj-impl.version>
+
+ <!--
- http://docs.codehaus.org/display/MAVENUSER/POM+Element+for+Source+File+Encoding
-->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/server/openejb-cxf/pom.xml b/server/openejb-cxf/pom.xml
index 73a5676..0ec13c7 100644
--- a/server/openejb-cxf/pom.xml
+++ b/server/openejb-cxf/pom.xml
@@ -208,45 +208,20 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>com.sun.xml.messaging.saaj</groupId>
+ <artifactId>saaj-impl</artifactId>
+ <version>${saaj-impl.version}</version>
+ </dependency>
<!-- This is required on IBM JDKs (and potentially others) because saaj-impl depends
on Sun's internal copy of Xerces. See OPENEJB-1126. -->
<dependency>
<groupId>com.sun.xml.parsers</groupId>
<artifactId>jaxp-ri</artifactId>
- <version>1.4.2</version>
+ <version>1.4.5</version>
<scope>test</scope>
</dependency>
</dependencies>
- <profiles>
- <profile>
- <id>default-build</id>
- <activation>
- <jdk>[1.7,1.9)</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>com.sun.xml.messaging.saaj</groupId>
- <artifactId>saaj-impl</artifactId>
- <version>1.3.23</version>
- <!-- not yet supported by wss4j/cxf but needed for java 9, when supported we just upgrade since target=1.7 so fine for the main build
- <version>1.4.0-b03</version>
- -->
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>java-9</id>
- <activation>
- <jdk>9</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>com.sun.xml.messaging.saaj</groupId>
- <artifactId>saaj-impl</artifactId>
- <version>1.4.0-b03</version>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
+
</project>
diff --git a/server/openejb-webservices/pom.xml b/server/openejb-webservices/pom.xml
index b44d0d8..bec069d 100644
--- a/server/openejb-webservices/pom.xml
+++ b/server/openejb-webservices/pom.xml
@@ -87,21 +87,6 @@
<artifactId>axis</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>com.sun.xml.messaging.saaj</groupId>
- <artifactId>saaj-impl</artifactId>
- <version>1.4.0-b03</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.xml.soap</groupId>
- <artifactId>javax.xml.soap-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
+ @@@@
</dependencies>
</project>