Author: veithen
Date: Sun Jun 13 08:43:47 2010
New Revision: 954184
URL: http://svn.apache.org/viewvc?rev=954184&view=rev
Log:
Axiom now requires Java 1.5. See discussion on the dev list.
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/pom.xml
webservices/commons/trunk/modules/axiom/modules/axiom-dom/pom.xml
webservices/commons/trunk/modules/axiom/modules/axiom-parent/pom.xml
webservices/commons/trunk/modules/axiom/modules/axiom-parser-tests/pom.xml
webservices/commons/trunk/modules/axiom/pom.xml
webservices/commons/trunk/modules/axiom/src/site/apt/index.apt
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-api/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/pom.xml?rev=954184&r1=954183&r2=954184&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-api/pom.xml (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-api/pom.xml Sun Jun
13 08:43:47 2010
@@ -48,10 +48,6 @@
<artifactId>jaxen</artifactId>
</dependency>
<dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-stax-api_1.0_spec</artifactId>
</dependency>
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-dom/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/pom.xml?rev=954184&r1=954183&r2=954184&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-dom/pom.xml (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-dom/pom.xml Sun Jun
13 08:43:47 2010
@@ -94,6 +94,12 @@
<version>1.4</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.9.1</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<plugins>
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-parent/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-parent/pom.xml?rev=954184&r1=954183&r2=954184&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-parent/pom.xml
(original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-parent/pom.xml Sun
Jun 13 08:43:47 2010
@@ -362,11 +362,6 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <version>1.3.04</version>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-stax-api_1.0_spec</artifactId>
<version>1.0.1</version>
@@ -432,6 +427,14 @@
<groupId>xerces</groupId>
<artifactId>xmlParserAPIs</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-parser-tests/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-parser-tests/pom.xml?rev=954184&r1=954183&r2=954184&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-parser-tests/pom.xml
(original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-parser-tests/pom.xml
Sun Jun 13 08:43:47 2010
@@ -96,6 +96,11 @@
<version>1.4</version>
</dependency>
<dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.9.1</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-stax-api_1.0_spec</artifactId>
<scope>compile</scope>
Modified: webservices/commons/trunk/modules/axiom/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/pom.xml?rev=954184&r1=954183&r2=954184&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/pom.xml (original)
+++ webservices/commons/trunk/modules/axiom/pom.xml Sun Jun 13 08:43:47 2010
@@ -229,24 +229,6 @@
</scm>
<profiles>
<profile>
- <id>jdk15</id>
- <activation>
- <jdk>1.5</jdk>
- </activation>
- <modules>
- <module>modules/axiom-integration</module>
- </modules>
- </profile>
- <profile>
- <id>jdk16</id>
- <activation>
- <jdk>1.6</jdk>
- </activation>
- <modules>
- <module>modules/axiom-integration</module>
- </modules>
- </profile>
- <profile>
<id>release</id>
<activation>
<property>
@@ -689,5 +671,6 @@
<module>modules/axiom-tests</module>
<module>modules/axiom-osgi</module>
<module>modules/axiom-parser-tests</module>
+ <module>modules/axiom-integration</module>
</modules>
</project>
Modified: webservices/commons/trunk/modules/axiom/src/site/apt/index.apt
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/src/site/apt/index.apt?rev=954184&r1=954183&r2=954184&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/src/site/apt/index.apt (original)
+++ webservices/commons/trunk/modules/axiom/src/site/apt/index.apt Sun Jun 13
08:43:47 2010
@@ -58,6 +58,10 @@ Latest Release
\[{{{http://ws.apache.org/commons/axiom/download.cgi}Download Axiom 1.2.9}}\]
+ Note: Starting with release 1.2.9, Axiom requires Java 1.5. While the API is
+ still compatible with Java 1.4, Axiom relies on classes from the Java 1.5
+ runtime environment. Some of its dependencies also require Java 1.5.
+
What's New in This Release
* Improved interoperability with StAX implementations other than Woodstox.
