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 2010/08/12 20:01:29 UTC
svn commit: r984880 - in /cxf/trunk/distribution: manifest/pom.xml pom.xml
Author: dkulp
Date: Thu Aug 12 18:01:29 2010
New Revision: 984880
URL: http://svn.apache.org/viewvc?rev=984880&view=rev
Log:
fix some java6 distribution building issues
Modified:
cxf/trunk/distribution/manifest/pom.xml
cxf/trunk/distribution/pom.xml
Modified: cxf/trunk/distribution/manifest/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/manifest/pom.xml?rev=984880&r1=984879&r2=984880&view=diff
==============================================================================
--- cxf/trunk/distribution/manifest/pom.xml (original)
+++ cxf/trunk/distribution/manifest/pom.xml Thu Aug 12 18:01:29 2010
@@ -36,6 +36,10 @@
<properties>
<maven.test.skip>true</maven.test.skip>
<cxf.version>${project.version}</cxf.version>
+
+ <jaxb.version>${jaxb22.version}</jaxb.version>
+ <jaxb.impl.version>${jaxb22.impl.version}</jaxb.impl.version>
+ <jaxb.xjc.version>${jaxb22.impl.version}</jaxb.xjc.version>
</properties>
<dependencies>
@@ -310,17 +314,4 @@
</plugin>
</plugins>
</build>
- <profiles>
- <profile>
- <id>jdk15</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <properties>
- <jaxb.version>${jaxb22.version}</jaxb.version>
- <jaxb.impl.version>${jaxb22.impl.version}</jaxb.impl.version>
- <jaxb.xjc.version>${jaxb22.impl.version}</jaxb.xjc.version>
- </properties>
- </profile>
- </profiles>
</project>
Modified: cxf/trunk/distribution/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/pom.xml?rev=984880&r1=984879&r2=984880&view=diff
==============================================================================
--- cxf/trunk/distribution/pom.xml (original)
+++ cxf/trunk/distribution/pom.xml Thu Aug 12 18:01:29 2010
@@ -36,6 +36,10 @@
<maven.test.skip>true</maven.test.skip>
<cxf.version>${project.version}</cxf.version>
<checkstyle.extension>-corba</checkstyle.extension>
+
+ <jaxb.version>${jaxb22.version}</jaxb.version>
+ <jaxb.impl.version>${jaxb22.impl.version}</jaxb.impl.version>
+ <jaxb.xjc.version>${jaxb22.impl.version}</jaxb.xjc.version>
</properties>
<modules>
@@ -456,17 +460,6 @@
<profiles>
<profile>
- <id>jdk15</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <properties>
- <jaxb.version>${jaxb22.version}</jaxb.version>
- <jaxb.impl.version>${jaxb22.impl.version}</jaxb.impl.version>
- <jaxb.xjc.version>${jaxb22.impl.version}</jaxb.xjc.version>
- </properties>
- </profile>
- <profile>
<!-- build the samples as well to make sure they really do build -->
<id>everything</id>
<modules>