Author: veithen
Date: Thu Nov 8 19:11:55 2012
New Revision: 1407220
URL: http://svn.apache.org/viewvc?rev=1407220&view=rev
Log:
* Added a mechanism (based on the Animal Sniffer Maven Plugin) to enforce Java
API compatibility at the desired version level (1.4 or 1.5 depending on the
module).
* Dropped support for Java 1.3.
Modified:
axis/axis1/java/trunk/axis-rt-core/pom.xml
axis/axis1/java/trunk/axis-rt-transport-http-javanet/pom.xml
axis/axis1/java/trunk/interop-mock/pom.xml
axis/axis1/java/trunk/pom.xml
axis/axis1/java/trunk/src/site/apt/changelogs/1_4_1.apt
Modified: axis/axis1/java/trunk/axis-rt-core/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-rt-core/pom.xml?rev=1407220&r1=1407219&r2=1407220&view=diff
==============================================================================
--- axis/axis1/java/trunk/axis-rt-core/pom.xml (original)
+++ axis/axis1/java/trunk/axis-rt-core/pom.xml Thu Nov 8 19:11:55 2012
@@ -104,7 +104,6 @@
<plugin>
<groupId>org.codehaus.gmaven</groupId>
<artifactId>gmaven-plugin</artifactId>
- <version>1.2</version>
<executions>
<execution>
<id>generate-timestamp</id>
Modified: axis/axis1/java/trunk/axis-rt-transport-http-javanet/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-rt-transport-http-javanet/pom.xml?rev=1407220&r1=1407219&r2=1407220&view=diff
==============================================================================
--- axis/axis1/java/trunk/axis-rt-transport-http-javanet/pom.xml (original)
+++ axis/axis1/java/trunk/axis-rt-transport-http-javanet/pom.xml Thu Nov 8
19:11:55 2012
@@ -37,6 +37,9 @@
<url>${baseSiteUrl}/transports/http-javanet</url>
</site>
</distributionManagement>
+ <properties>
+ <javaVersion>1.5</javaVersion>
+ </properties>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
Modified: axis/axis1/java/trunk/interop-mock/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/interop-mock/pom.xml?rev=1407220&r1=1407219&r2=1407220&view=diff
==============================================================================
--- axis/axis1/java/trunk/interop-mock/pom.xml (original)
+++ axis/axis1/java/trunk/interop-mock/pom.xml Thu Nov 8 19:11:55 2012
@@ -28,6 +28,9 @@
<artifactId>interop-mock</artifactId>
<name>Interoperability mock services</name>
<packaging>war</packaging>
+ <properties>
+ <javaVersion>1.5</javaVersion>
+ </properties>
<dependencies>
<dependency>
<groupId>org.springframework</groupId>
@@ -73,14 +76,6 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <inherited>true</inherited>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<configuration>
Modified: axis/axis1/java/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/pom.xml?rev=1407220&r1=1407219&r2=1407220&view=diff
==============================================================================
--- axis/axis1/java/trunk/pom.xml (original)
+++ axis/axis1/java/trunk/pom.xml Thu Nov 8 19:11:55 2012
@@ -206,6 +206,11 @@
<artifactId>maven-war-plugin</artifactId>
<version>2.1.1</version>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.gmaven</groupId>
+ <artifactId>gmaven-plugin</artifactId>
+ <version>1.2</version>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
@@ -228,6 +233,59 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <inherited>true</inherited>
+ <configuration>
+ <source>${javaVersion}</source>
+ <target>${javaVersion}</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.gmaven</groupId>
+ <artifactId>gmaven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>select-java-signatures</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ <configuration>
+ <source>
+ javaVersion = project.properties['javaVersion']
+ if (javaVersion == '1.4') {
+ artifactId = 'java14-sun'
+ } else if (javaVersion == '1.5') {
+ artifactId = 'java15-sun'
+ }
+ project.properties['signatureArtifactId'] =
artifactId
+ project.properties['signatureVersion'] = '1.0'
+ </source>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>animal-sniffer-maven-plugin</artifactId>
+ <version>1.9</version>
+ <executions>
+ <execution>
+ <phase>verify</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ <configuration>
+ <signature>
+ <groupId>org.codehaus.mojo.signature</groupId>
+ <artifactId>${signatureArtifactId}</artifactId>
+ <version>${signatureVersion}</version>
+ </signature>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
<reporting>
@@ -268,6 +326,7 @@
</plugins>
</reporting>
<properties>
+ <javaVersion>1.4</javaVersion>
<baseUrl>http://axis.apache.org/axis/java</baseUrl>
<!-- Dummy site URL to be able to use site:stage -->
<baseSiteUrl>dav:http://localhost/sites/axis</baseSiteUrl>
Modified: axis/axis1/java/trunk/src/site/apt/changelogs/1_4_1.apt
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/src/site/apt/changelogs/1_4_1.apt?rev=1407220&r1=1407219&r2=1407220&view=diff
==============================================================================
--- axis/axis1/java/trunk/src/site/apt/changelogs/1_4_1.apt (original)
+++ axis/axis1/java/trunk/src/site/apt/changelogs/1_4_1.apt Thu Nov 8 19:11:55
2012
@@ -45,4 +45,6 @@ Changes from 1.4 final
{{{../maven/maven-wsdl2java-plugin/java-xml-type-mappings.html}plugin
documentation}} for more information.
* WSDL4J has been upgraded from 1.5.1 to 1.6.2.
+
+ * Support for Java 1.3 has been dropped.
