Author: veithen
Date: Thu Aug 28 18:04:41 2014
New Revision: 1621171
URL: http://svn.apache.org/r1621171
Log:
Remove the Java 1.5 profile (we don't support Java 1.5 builds anymore) and
promote the settings in the Java 1.6 profile so that they applied to Java > 1.6
as well. This should fix most of the build issues with Java 1.7.
Modified:
axis/axis2/java/core/trunk/modules/integration/pom.xml
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=1621171&r1=1621170&r2=1621171&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/integration/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/integration/pom.xml Thu Aug 28 18:04:41
2014
@@ -148,137 +148,6 @@
<scope>test</scope>
</dependency>
</dependencies>
- <profiles>
- <profile>
- <id>java15</id>
- <activation>
- <jdk>1.5</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <inherited>true</inherited>
- <configuration>
- <!-- The pertest forkMode is not ideal but seems
to be necessary
- because the test server doesn't shut down properly :-(
- Should be removed if possible -->
- <forkMode>pertest</forkMode>
- <argLine>-Xms256m -Xmx512m</argLine>
- <!-- Enable the next 2 lines if you want to attach
a debugger
- <argLine>-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5006</argLine>-->
- <includes>
- <include>**/*Test.java</include>
- </includes>
- <excludes>
- <exclude>**/*Abstract*.java</exclude>
- <exclude>**/*Util*.java</exclude>
- <exclude>**/*InteropStubTest.java</exclude>
-
<exclude>**/*ServiceGroupContextTest.java</exclude>
-
<exclude>**/*EchoRawSwAFileInputTest.java</exclude>
-
<exclude>**org/apache/axis2/soap12testing/soap12testsuite/*.java</exclude>
- <exclude>**/ScenarioST1Test.java</exclude>
- <exclude>**/samples/wsdl/perf2/*.java</exclude>
- </excludes>
- <systemProperties>
- <property>
- <name>build.repository</name>
- <value>./target/test-classes</value>
- </property>
- <!-- Prevent Mac OS X from showing an icon in
the dock during the test run -->
- <property>
- <name>java.awt.headless</name>
- <value>true</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>java16</id>
- <activation>
- <jdk>1.6</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <inherited>true</inherited>
- <configuration>
- <!-- The pertest forkMode is not ideal but seems
to be necessary
- because the test server doesn't shut down properly :-(
- Should be removed if possible -->
- <forkMode>pertest</forkMode>
- <argLine>-Xms256m -Xmx512m</argLine>
- <!-- Enable the next 2 lines if you want to attach
a debugger
- <argLine>-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5006</argLine>-->
- <includes>
- <include>**/*Test.java</include>
- </includes>
- <excludes>
- <exclude>**/*Abstract*.java</exclude>
- <exclude>**/*Util*.java</exclude>
- <exclude>**/*InteropStubTest.java</exclude>
-
<exclude>**/*ServiceGroupContextTest.java</exclude>
-
<exclude>**/*EchoRawSwAFileInputTest.java</exclude>
-
<exclude>**org/apache/axis2/soap12testing/soap12testsuite/*.java</exclude>
- <exclude>**/ScenarioST1Test.java</exclude>
- <exclude>**/samples/wsdl/perf2/*.java</exclude>
-
<exclude>**/ComplexDataTypesDocLitBareTest.java</exclude>
- <exclude>**/ComplexDataTypesTest.java</exclude>
- </excludes>
- <systemProperties>
- <property>
- <name>build.repository</name>
- <value>./target/test-classes</value>
- </property>
- <!-- Prevent Mac OS X from showing an icon in
the dock during the test run -->
- <property>
- <name>java.awt.headless</name>
- <value>true</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>enterprise</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>gen-enterprise-ts</id>
- <phase>generate-test-sources</phase>
- <configuration>
- <tasks unless="maven.test.skip">
- <!-- Set a property that can be picked
up from the ant build.xml's -->
- <property name="maven.class.path"
refid="maven.runtime.classpath" />
- <echo>Building enterprise
WSDLs...</echo>
- <property name="axis2.home"
value="${basedir}/target" />
- <property name="maven.junit.jvmargs"
value="" />
- <path id="maven.dependency.classpath">
- <path
refid="maven.compile.classpath" />
- </path>
- <ant antfile="itest-build.xml"
inheritall="true" inheritrefs="true" dir="." target="enterprise-wsdl-codegen" />
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
<url>http://axis.apache.org/axis2/java/core/</url>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/core/trunk/modules/integration</connection>
@@ -616,6 +485,45 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <inherited>true</inherited>
+ <configuration>
+ <!-- The pertest forkMode is not ideal but seems to be
necessary
+ because the test server doesn't shut down properly :-(
+ Should be removed if possible -->
+ <forkMode>pertest</forkMode>
+ <argLine>-Xms256m -Xmx512m</argLine>
+ <!-- Enable the next 2 lines if you want to attach a
debugger
+ <argLine>-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5006</argLine>-->
+ <includes>
+ <include>**/*Test.java</include>
+ </includes>
+ <excludes>
+ <exclude>**/*Abstract*.java</exclude>
+ <exclude>**/*Util*.java</exclude>
+ <exclude>**/*InteropStubTest.java</exclude>
+ <exclude>**/*ServiceGroupContextTest.java</exclude>
+ <exclude>**/*EchoRawSwAFileInputTest.java</exclude>
+
<exclude>**org/apache/axis2/soap12testing/soap12testsuite/*.java</exclude>
+ <exclude>**/ScenarioST1Test.java</exclude>
+ <exclude>**/samples/wsdl/perf2/*.java</exclude>
+
<exclude>**/ComplexDataTypesDocLitBareTest.java</exclude>
+ <exclude>**/ComplexDataTypesTest.java</exclude>
+ </excludes>
+ <systemProperties>
+ <property>
+ <name>build.repository</name>
+ <value>./target/test-classes</value>
+ </property>
+ <!-- Prevent Mac OS X from showing an icon in the dock
during the test run -->
+ <property>
+ <name>java.awt.headless</name>
+ <value>true</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
