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 2014/07/25 19:36:03 UTC
[1/5] git commit: More compiler plugin updates,
update archetypes for Java7
Repository: cxf
Updated Branches:
refs/heads/master 2004b1021 -> 51f433d54
More compiler plugin updates, update archetypes for Java7
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/d3e9295d
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d3e9295d
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d3e9295d
Branch: refs/heads/master
Commit: d3e9295d3acfe3c970a325bbbafdba83a0d6e83c
Parents: 2004b10
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Jul 25 12:51:44 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Jul 25 12:51:44 2014 -0400
----------------------------------------------------------------------
benchmark/performance/base/pom.xml | 6 +--
benchmark/performance/soap_http_doc_lit/pom.xml | 6 +--
.../main/resources/archetype-resources/pom.xml | 4 +-
.../main/resources/archetype-resources/pom.xml | 4 +-
.../main/resources/archetype-resources/pom.xml | 4 +-
systests/container-integration/grizzly/pom.xml | 46 --------------------
.../wsdl_maven/codegen/src/it/it-parent/pom.xml | 6 +--
7 files changed, 15 insertions(+), 61 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/d3e9295d/benchmark/performance/base/pom.xml
----------------------------------------------------------------------
diff --git a/benchmark/performance/base/pom.xml b/benchmark/performance/base/pom.xml
index 3bbc3b4..b28010e 100644
--- a/benchmark/performance/base/pom.xml
+++ b/benchmark/performance/base/pom.xml
@@ -27,7 +27,7 @@
<description>Apache CXF Benchmark Base</description>
<url>http://cxf.apache.org</url>
<properties>
- <cxf.version>2.7.1-SNAPSHOT</cxf.version>
+ <cxf.version>3.1.0-SNAPSHOT</cxf.version>
</properties>
<build>
<defaultGoal>install</defaultGoal>
@@ -37,8 +37,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>1.7</source>
+ <target>1.7</target>
</configuration>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/cxf/blob/d3e9295d/benchmark/performance/soap_http_doc_lit/pom.xml
----------------------------------------------------------------------
diff --git a/benchmark/performance/soap_http_doc_lit/pom.xml b/benchmark/performance/soap_http_doc_lit/pom.xml
index 153ef7f..7e15764 100644
--- a/benchmark/performance/soap_http_doc_lit/pom.xml
+++ b/benchmark/performance/soap_http_doc_lit/pom.xml
@@ -27,7 +27,7 @@
<description>Apache CXF Benchmark SOAP/HTTP/Doc/Lit</description>
<url>http://cxf.apache.org</url>
<properties>
- <cxf.version>2.7.1-SNAPSHOT</cxf.version>
+ <cxf.version>3.1.0-SNAPSHOT</cxf.version>
</properties>
<dependencies>
<dependency>
@@ -94,8 +94,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>1.7</source>
+ <target>1.7</target>
</configuration>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/cxf/blob/d3e9295d/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/pom.xml b/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/pom.xml
index 6282ebd..1cd1bf6 100644
--- a/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/pom.xml
+++ b/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/pom.xml
@@ -68,8 +68,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>1.7</source>
+ <target>1.7</target>
</configuration>
</plugin>
<plugin>
http://git-wip-us.apache.org/repos/asf/cxf/blob/d3e9295d/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/pom.xml b/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/pom.xml
index dafc4fc..babbd78 100644
--- a/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/pom.xml
+++ b/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/pom.xml
@@ -80,8 +80,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>1.7</source>
+ <target>1.7</target>
</configuration>
</plugin>
<plugin>
http://git-wip-us.apache.org/repos/asf/cxf/blob/d3e9295d/maven-plugins/archetypes/cxf-jaxws-wsdlfirst/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/maven-plugins/archetypes/cxf-jaxws-wsdlfirst/src/main/resources/archetype-resources/pom.xml b/maven-plugins/archetypes/cxf-jaxws-wsdlfirst/src/main/resources/archetype-resources/pom.xml
index 7c949a0..2553d1c 100644
--- a/maven-plugins/archetypes/cxf-jaxws-wsdlfirst/src/main/resources/archetype-resources/pom.xml
+++ b/maven-plugins/archetypes/cxf-jaxws-wsdlfirst/src/main/resources/archetype-resources/pom.xml
@@ -107,8 +107,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>1.7</source>
+ <target>1.7</target>
</configuration>
</plugin>
<plugin>
http://git-wip-us.apache.org/repos/asf/cxf/blob/d3e9295d/systests/container-integration/grizzly/pom.xml
----------------------------------------------------------------------
diff --git a/systests/container-integration/grizzly/pom.xml b/systests/container-integration/grizzly/pom.xml
index a207cb9..7fc2588 100644
--- a/systests/container-integration/grizzly/pom.xml
+++ b/systests/container-integration/grizzly/pom.xml
@@ -92,50 +92,4 @@
<artifactId>junit</artifactId>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>create-endorsed-dir</id>
- <phase>validate</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxws_2.2_spec</artifactId>
- <outputDirectory>${basedir}/target/endorsed</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>-Djava.endorsed.dirs=${basedir}/target/endorsed</argLine>
- </configuration>
- </plugin>
- </plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <compilerArguments>
- <endorseddirs>${basedir}/target/endorsed</endorseddirs>
- </compilerArguments>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
</project>
http://git-wip-us.apache.org/repos/asf/cxf/blob/d3e9295d/systests/wsdl_maven/codegen/src/it/it-parent/pom.xml
----------------------------------------------------------------------
diff --git a/systests/wsdl_maven/codegen/src/it/it-parent/pom.xml b/systests/wsdl_maven/codegen/src/it/it-parent/pom.xml
index cc1d108..5429578 100644
--- a/systests/wsdl_maven/codegen/src/it/it-parent/pom.xml
+++ b/systests/wsdl_maven/codegen/src/it/it-parent/pom.xml
@@ -37,10 +37,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.5.1</version>
+ <version>3.1</version>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>1.7</source>
+ <target>1.7</target>
</configuration>
</plugin>
</plugins>
[3/5] git commit: We don't use the geronimo stax-api either
Posted by dk...@apache.org.
We don't use the geronimo stax-api either
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/75c69b27
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/75c69b27
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/75c69b27
Branch: refs/heads/master
Commit: 75c69b27a7688dfac281d4acdcff3b0acc4c8bee
Parents: 92c4738
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Jul 25 12:58:02 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Jul 25 12:58:02 2014 -0400
----------------------------------------------------------------------
parent/pom.xml | 5 -----
1 file changed, 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/75c69b27/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 6a55059..1cae2de 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -809,11 +809,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-stax-api_1.0_spec</artifactId>
- <version>1.0.1</version>
- </dependency>
- <dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
<version>${cxf.jettison.version}</version>
[2/5] git commit: DOn't need jaxws-api anymore
Posted by dk...@apache.org.
DOn't need jaxws-api anymore
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/92c4738f
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/92c4738f
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/92c4738f
Branch: refs/heads/master
Commit: 92c4738f9e6b96fe0ce8586bb36b9c6444d6e225
Parents: d3e9295
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Jul 25 12:57:07 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Jul 25 12:57:07 2014 -0400
----------------------------------------------------------------------
distribution/manifest/pom.xml | 2 +-
distribution/src/main/release/lib/WHICH_JARS | 18 ++++++++----------
parent/pom.xml | 5 -----
systests/container-integration/grizzly/pom.xml | 5 -----
tools/wadlto/jaxrs/pom.xml | 4 ----
5 files changed, 9 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/92c4738f/distribution/manifest/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/manifest/pom.xml b/distribution/manifest/pom.xml
index 2f6043e..3e3085f 100644
--- a/distribution/manifest/pom.xml
+++ b/distribution/manifest/pom.xml
@@ -378,7 +378,7 @@
<!-- Add entries for the stuff that needs to be endorsed on Java6, but not on java5 -->
<!-- Stick both versions of jaxb xjc/impl on classpath to make it easier to flip back and forth -->
<Class-Path>
- cxf-${project.version}.jar endorsed/jaxb-api-${cxf.jaxb.version}.jar endorsed/geronimo-jaxws_2.2_spec-${cxf.specs.jaxws.api.version}.jar jaxb-impl-${cxf.jaxb.impl.version}.jar jaxb-core-${cxf.jaxb.core.version}.jar
+ cxf-${project.version}.jar endorsed/jaxb-api-${cxf.jaxb.version}.jar jaxb-impl-${cxf.jaxb.impl.version}.jar jaxb-core-${cxf.jaxb.core.version}.jar
</Class-Path>
</manifestEntries>
</archive>
http://git-wip-us.apache.org/repos/asf/cxf/blob/92c4738f/distribution/src/main/release/lib/WHICH_JARS
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/lib/WHICH_JARS b/distribution/src/main/release/lib/WHICH_JARS
index 09f308e..e079461 100755
--- a/distribution/src/main/release/lib/WHICH_JARS
+++ b/distribution/src/main/release/lib/WHICH_JARS
@@ -6,20 +6,19 @@ specific parts of CXF.
The 'manifest jar' is a jar containing only a MANIFEST.MF with a classpath
that calls in all the other jar.
-Jars marked with a [6] at the end are optional for Java 6 (update 4 or
-later is supported) as the functionality provided by those jars are
-provided in the JDK.
+Jars marked with a [7] at the end are optional for Java 7 as the
+functionality provided by those jars are provided in the JDK.
Some users may prefer to use axis2-saaj.jar rather than saaj-impl.jar. Both are
supported.
The following jars are required for all CXF usage:
- cxf-core.jar
-- geronimo-javamail.jar (Or the Sun equivalent) [6]
+- geronimo-javamail.jar (Or the Sun equivalent) [7]
(MAY be able to remove javamail if you don't use any MIME/MTOM/SAAJ type things)
-- jaxb-api.jar [6]
-- jaxb-core.jar [6]
-- jaxb-impl.jar (this is a [6] for normal runtime, but is required for
+- jaxb-api.jar [7]
+- jaxb-core.jar [7]
+- jaxb-impl.jar (this is a [7] for normal runtime, but is required for
tooling and the dynamic clients)
- xmlschema-core.jar
- woodstox-core-asl.jar
@@ -47,9 +46,8 @@ For Java2WSDL and WSDL2Java:
For JAX-WS support:
- neethi.jar
- wsdl4j.jar
-- geronimo-jaxws_2.2_spec-1.0.jar (Or the Sun equivalent) [6]
-- saaj-api.jar [6]
-- saaj-impl.jar [6]
+- saaj-api.jar [7]
+- saaj-impl.jar [7]
- asm.jar (semi-optional, helps with performance of wrapper types and is
required when adding JAXB annotations onto the SEI methods and
parameters.)
http://git-wip-us.apache.org/repos/asf/cxf/blob/92c4738f/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 101ab96..6a55059 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1406,11 +1406,6 @@
<version>1.0.1</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxws_2.2_spec</artifactId>
- <version>${cxf.specs.jaxws.api.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-broker</artifactId>
<version>${cxf.activemq.version}</version>
http://git-wip-us.apache.org/repos/asf/cxf/blob/92c4738f/systests/container-integration/grizzly/pom.xml
----------------------------------------------------------------------
diff --git a/systests/container-integration/grizzly/pom.xml b/systests/container-integration/grizzly/pom.xml
index 7fc2588..df9f1e3 100644
--- a/systests/container-integration/grizzly/pom.xml
+++ b/systests/container-integration/grizzly/pom.xml
@@ -55,11 +55,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxws_2.2_spec</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>com.sun.grizzly</groupId>
<artifactId>grizzly-http</artifactId>
<version>1.9.18</version>
http://git-wip-us.apache.org/repos/asf/cxf/blob/92c4738f/tools/wadlto/jaxrs/pom.xml
----------------------------------------------------------------------
diff --git a/tools/wadlto/jaxrs/pom.xml b/tools/wadlto/jaxrs/pom.xml
index 11434ac..3e09541 100644
--- a/tools/wadlto/jaxrs/pom.xml
+++ b/tools/wadlto/jaxrs/pom.xml
@@ -56,10 +56,6 @@
<artifactId>xml-resolver</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxws_2.2_spec</artifactId>
- </dependency>
- <dependency>
<groupId>org.jvnet.jaxb2_commons</groupId>
<artifactId>jaxb2-basics</artifactId>
<version>0.6.4</version>
[4/5] git commit: Don't need geronimo-activation
Posted by dk...@apache.org.
Don't need geronimo-activation
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/90312bc4
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/90312bc4
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/90312bc4
Branch: refs/heads/master
Commit: 90312bc48f6e564bcafdaaebc3cd596c966ee674
Parents: 75c69b2
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Jul 25 13:01:12 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Jul 25 13:01:12 2014 -0400
----------------------------------------------------------------------
parent/pom.xml | 5 -----
rt/management-web/pom.xml | 4 ----
2 files changed, 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/90312bc4/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 1cae2de..cddf6e2 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1377,11 +1377,6 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.1_spec</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
<version>1.0.1</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/cxf/blob/90312bc4/rt/management-web/pom.xml
----------------------------------------------------------------------
diff --git a/rt/management-web/pom.xml b/rt/management-web/pom.xml
index 9660f3e..8ec4883 100644
--- a/rt/management-web/pom.xml
+++ b/rt/management-web/pom.xml
@@ -126,10 +126,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.1_spec</artifactId>
- </dependency>
- <dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<version>${google.findbugs.version}</version>
[5/5] git commit: Don't need jaxb-api either
Posted by dk...@apache.org.
Don't need jaxb-api either
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/51f433d5
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/51f433d5
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/51f433d5
Branch: refs/heads/master
Commit: 51f433d54a1d11eac25c32b0dd69f12fef62c060
Parents: 90312bc
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Jul 25 13:12:54 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Jul 25 13:12:54 2014 -0400
----------------------------------------------------------------------
distribution/manifest/pom.xml | 2 +-
parent/pom.xml | 23 -----------------------
2 files changed, 1 insertion(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/51f433d5/distribution/manifest/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/manifest/pom.xml b/distribution/manifest/pom.xml
index 3e3085f..065f6a1 100644
--- a/distribution/manifest/pom.xml
+++ b/distribution/manifest/pom.xml
@@ -378,7 +378,7 @@
<!-- Add entries for the stuff that needs to be endorsed on Java6, but not on java5 -->
<!-- Stick both versions of jaxb xjc/impl on classpath to make it easier to flip back and forth -->
<Class-Path>
- cxf-${project.version}.jar endorsed/jaxb-api-${cxf.jaxb.version}.jar jaxb-impl-${cxf.jaxb.impl.version}.jar jaxb-core-${cxf.jaxb.core.version}.jar
+ cxf-${project.version}.jar {cxf.jaxb.version}.jar jaxb-impl-${cxf.jaxb.impl.version}.jar jaxb-core-${cxf.jaxb.core.version}.jar
</Class-Path>
</manifestEntries>
</archive>
http://git-wip-us.apache.org/repos/asf/cxf/blob/51f433d5/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index cddf6e2..99c4678 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -926,29 +926,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>${cxf.jaxb.version}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jsr173_api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.xml</groupId>
- <artifactId>jsr173</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.xml.stream</groupId>
- <artifactId>stax-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>${cxf.saaj.impl.groupId}</groupId>
<artifactId>${cxf.saaj.impl.artifactId}</artifactId>
<version>${cxf.saaj.impl.version}</version>