You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2016/01/24 15:43:19 UTC
svn commit: r1726494 - in /axis/axis2/java/core/trunk/modules: fastinfoset/
integration/ jaxbri/ jaxws-integration/ jaxws/ metadata/ osgi/ saaj/
samples/dynamicclient/server/ samples/java_first_jaxws/
samples/jaxws-addressbook/ samples/jaxws-calculator...
Author: veithen
Date: Sun Jan 24 14:43:19 2016
New Revision: 1726494
URL: http://svn.apache.org/viewvc?rev=1726494&view=rev
Log:
Inherit compiler settings from the parent POM where possible.
Modified:
axis/axis2/java/core/trunk/modules/fastinfoset/pom.xml
axis/axis2/java/core/trunk/modules/integration/pom.xml
axis/axis2/java/core/trunk/modules/jaxbri/pom.xml
axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml
axis/axis2/java/core/trunk/modules/jaxws/pom.xml
axis/axis2/java/core/trunk/modules/metadata/pom.xml
axis/axis2/java/core/trunk/modules/osgi/pom.xml
axis/axis2/java/core/trunk/modules/saaj/pom.xml
axis/axis2/java/core/trunk/modules/samples/dynamicclient/server/pom.xml
axis/axis2/java/core/trunk/modules/samples/java_first_jaxws/pom.xml
axis/axis2/java/core/trunk/modules/samples/jaxws-addressbook/pom.xml
axis/axis2/java/core/trunk/modules/samples/jaxws-calculator/pom.xml
axis/axis2/java/core/trunk/modules/samples/jaxws-interop/pom.xml
axis/axis2/java/core/trunk/modules/samples/jaxws-samples/pom.xml
axis/axis2/java/core/trunk/modules/samples/jaxws-version/pom.xml
axis/axis2/java/core/trunk/modules/samples/transport/https-sample/pom.xml
axis/axis2/java/core/trunk/modules/samples/transport/jms-sample/pom.xml
axis/axis2/java/core/trunk/modules/samples/version/pom.xml
axis/axis2/java/core/trunk/modules/tool/axis2-idea-plugin/pom.xml
Modified: axis/axis2/java/core/trunk/modules/fastinfoset/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/fastinfoset/pom.xml?rev=1726494&r1=1726493&r2=1726494&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/fastinfoset/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/fastinfoset/pom.xml Sun Jan 24 14:43:19 2016
@@ -170,14 +170,6 @@
</executions>
</plugin>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <inherited>true</inherited>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-repo-maven-plugin</artifactId>
<executions>
Modified: axis/axis2/java/core/trunk/modules/integration/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/integration/pom.xml?rev=1726494&r1=1726493&r2=1726494&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/integration/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/integration/pom.xml Sun Jan 24 14:43:19 2016
@@ -196,8 +196,6 @@
<artifactId>maven-compiler-plugin</artifactId>
<inherited>true</inherited>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
<!-- There is a lot of generated code to compile; use fork mode
to avoid out of memory issues: -->
<fork>true</fork>
Modified: axis/axis2/java/core/trunk/modules/jaxbri/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxbri/pom.xml?rev=1726494&r1=1726493&r2=1726494&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/jaxbri/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/jaxbri/pom.xml Sun Jan 24 14:43:19 2016
@@ -103,14 +103,6 @@
</executions>
</plugin>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <inherited>true</inherited>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
Modified: axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml?rev=1726494&r1=1726493&r2=1726494&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml Sun Jan 24 14:43:19 2016
@@ -178,9 +178,6 @@
<compilerArgument>
-Xbootclasspath/p:${basedir}/../jaxws-api/target/classes${path.separator}${basedir}/../jws-api/target/classes
</compilerArgument>
- <compilerVersion>1.5</compilerVersion>
- <source>1.5</source>
- <target>1.5</target>
</configuration>
</plugin>
<plugin>
Modified: axis/axis2/java/core/trunk/modules/jaxws/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/pom.xml?rev=1726494&r1=1726493&r2=1726494&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/jaxws/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/jaxws/pom.xml Sun Jan 24 14:43:19 2016
@@ -223,10 +223,6 @@
<compilerArgument>
-Xbootclasspath/p:${project.build.directory}/endorsed/geronimo-jaxws_2.2_spec.jar${path.separator}${basedir}/../jaxws-api/target/classes${path.separator}${basedir}/../jws-api/target/classes
</compilerArgument>
- <compilerVersion>1.5</compilerVersion>
- <source>1.5</source>
- <target>1.5</target>
-
</configuration>
</plugin>
<plugin>
Modified: axis/axis2/java/core/trunk/modules/metadata/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/metadata/pom.xml?rev=1726494&r1=1726493&r2=1726494&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/metadata/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/metadata/pom.xml Sun Jan 24 14:43:19 2016
@@ -187,9 +187,6 @@
<compilerArgument>
-Xbootclasspath/p:${project.build.directory}/endorsed/geronimo-jaxws_2.2_spec.jar
</compilerArgument>
- <compilerVersion>1.5</compilerVersion>
- <source>1.5</source>
- <target>1.5</target>
</configuration>
</plugin>
<plugin>
Modified: axis/axis2/java/core/trunk/modules/osgi/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/osgi/pom.xml?rev=1726494&r1=1726493&r2=1726494&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/osgi/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/osgi/pom.xml Sun Jan 24 14:43:19 2016
@@ -163,13 +163,6 @@
</instructions>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
</plugins>
</build>
Modified: axis/axis2/java/core/trunk/modules/saaj/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/saaj/pom.xml?rev=1726494&r1=1726493&r2=1726494&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/saaj/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/saaj/pom.xml Sun Jan 24 14:43:19 2016
@@ -146,14 +146,6 @@
</executions>
</plugin>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <inherited>true</inherited>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
Modified: axis/axis2/java/core/trunk/modules/samples/dynamicclient/server/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/samples/dynamicclient/server/pom.xml?rev=1726494&r1=1726493&r2=1726494&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/samples/dynamicclient/server/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/samples/dynamicclient/server/pom.xml Sun Jan 24 14:43:19 2016
@@ -50,16 +50,6 @@
</dependencies>
<build>
<plugins>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
-
<plugin>
<groupId>org.apache.axis2</groupId>
<artifactId>simple-server-maven-plugin</artifactId>
Modified: axis/axis2/java/core/trunk/modules/samples/java_first_jaxws/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/samples/java_first_jaxws/pom.xml?rev=1726494&r1=1726493&r2=1726494&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/samples/java_first_jaxws/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/samples/java_first_jaxws/pom.xml Sun Jan 24 14:43:19 2016
@@ -100,15 +100,6 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <compilerVersion>1.5</compilerVersion>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>2.1.1</version>
Modified: axis/axis2/java/core/trunk/modules/samples/jaxws-addressbook/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/samples/jaxws-addressbook/pom.xml?rev=1726494&r1=1726493&r2=1726494&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/samples/jaxws-addressbook/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/samples/jaxws-addressbook/pom.xml Sun Jan 24 14:43:19 2016
@@ -106,15 +106,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
</plugins>
</build>
<dependencies>
Modified: axis/axis2/java/core/trunk/modules/samples/jaxws-calculator/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/samples/jaxws-calculator/pom.xml?rev=1726494&r1=1726493&r2=1726494&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/samples/jaxws-calculator/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/samples/jaxws-calculator/pom.xml Sun Jan 24 14:43:19 2016
@@ -54,15 +54,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
</plugins>
</build>
<dependencies>
Modified: axis/axis2/java/core/trunk/modules/samples/jaxws-interop/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/samples/jaxws-interop/pom.xml?rev=1726494&r1=1726493&r2=1726494&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/samples/jaxws-interop/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/samples/jaxws-interop/pom.xml Sun Jan 24 14:43:19 2016
@@ -34,17 +34,6 @@
<directory>resources</directory>
</resource>
</resources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
</build>
<dependencies>
<dependency>
Modified: axis/axis2/java/core/trunk/modules/samples/jaxws-samples/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/samples/jaxws-samples/pom.xml?rev=1726494&r1=1726493&r2=1726494&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/samples/jaxws-samples/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/samples/jaxws-samples/pom.xml Sun Jan 24 14:43:19 2016
@@ -104,15 +104,6 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <compilerVersion>1.5</compilerVersion>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.2</version>
<executions>
Modified: axis/axis2/java/core/trunk/modules/samples/jaxws-version/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/samples/jaxws-version/pom.xml?rev=1726494&r1=1726493&r2=1726494&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/samples/jaxws-version/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/samples/jaxws-version/pom.xml Sun Jan 24 14:43:19 2016
@@ -34,16 +34,6 @@
<directory>resources</directory>
</resource>
</resources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
</build>
<dependencies>
<dependency>
Modified: axis/axis2/java/core/trunk/modules/samples/transport/https-sample/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/samples/transport/https-sample/pom.xml?rev=1726494&r1=1726493&r2=1726494&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/samples/transport/https-sample/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/samples/transport/https-sample/pom.xml Sun Jan 24 14:43:19 2016
@@ -21,18 +21,6 @@
<artifactId>https-sample</artifactId>
<packaging>pom</packaging>
<name>Apache Axis2 Transport-HTTPS sample</name>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
<dependencies>
<dependency>
<groupId>org.apache.axis2</groupId>
Modified: axis/axis2/java/core/trunk/modules/samples/transport/jms-sample/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/samples/transport/jms-sample/pom.xml?rev=1726494&r1=1726493&r2=1726494&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/samples/transport/jms-sample/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/samples/transport/jms-sample/pom.xml Sun Jan 24 14:43:19 2016
@@ -21,18 +21,6 @@
<artifactId>jms-sample</artifactId>
<packaging>pom</packaging>
<name>Apache Axis2 Transport-JMS sample</name>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
<dependencies>
<dependency>
<groupId>org.apache.axis2</groupId>
Modified: axis/axis2/java/core/trunk/modules/samples/version/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/samples/version/pom.xml?rev=1726494&r1=1726493&r2=1726494&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/samples/version/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/samples/version/pom.xml Sun Jan 24 14:43:19 2016
@@ -53,14 +53,6 @@
</executions>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.4</source>
- <target>1.4</target>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-aar-maven-plugin</artifactId>
<extensions>true</extensions>
Modified: axis/axis2/java/core/trunk/modules/tool/axis2-idea-plugin/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-idea-plugin/pom.xml?rev=1726494&r1=1726493&r2=1726494&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/tool/axis2-idea-plugin/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/tool/axis2-idea-plugin/pom.xml Sun Jan 24 14:43:19 2016
@@ -152,14 +152,6 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>