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 <[email protected]> Authored: Fri Jul 25 12:51:44 2014 -0400 Committer: Daniel Kulp <[email protected]> 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>
