diff -ur ws-commons-axiom-1.2.12/modules/axiom-api/pom.xml ws-commons-axiom-1.2.12.new/modules/axiom-api/pom.xml
--- ws-commons-axiom-1.2.12/modules/axiom-api/pom.xml 2011-07-02 09:31:58.000000000 -0400
+++ ws-commons-axiom-1.2.12.new/modules/axiom-api/pom.xml 2012-02-15 13:47:36.111429199 -0500
@@ -39,14 +39,6 @@
<url>http://ws.apache.org/axiom/</url>
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.1_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javamail_1.4_spec</artifactId>
- </dependency>
- <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
@@ -55,8 +47,12 @@
<artifactId>jaxen</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -114,87 +110,6 @@
</testResources>
<plugins>
<plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>gmaven-plugin</artifactId>
- <version>1.2</version>
- <executions>
- <execution>
- <phase>generate-test-resources</phase>
- <goals>
- <goal>execute</goal>
- </goals>
- <configuration>
- <source>
- <!-- This generates a list of the files in src/test/resources/conformance.
- This is useful when loading these files from the classpath. -->
- <![CDATA[
- def filelist = new File(project.build.directory, "generated-test-resources/conformance/filelist");
- filelist.parentFile.mkdirs();
- filelist.delete();
- new File(project.basedir, "src/test/resources/conformance").eachFile({
- if (it.file) {
- filelist.append("$it.name\n");
- }
- })
- ]]>
- </source>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-parsers</id>
- <phase>generate-test-resources</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- <version>3.2.7</version>
- </artifactItem>
- <artifactItem>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- <version>3.2.8</version>
- </artifactItem>
- <artifactItem>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- <version>3.2.9</version>
- </artifactItem>
- <artifactItem>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>woodstox-core-asl</artifactId>
- <version>4.0.8</version>
- </artifactItem>
- <artifactItem>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>woodstox-core-asl</artifactId>
- <version>4.1.0</version>
- </artifactItem>
- <artifactItem>
- <groupId>com.sun.xml.stream</groupId>
- <artifactId>sjsxp</artifactId>
- <version>1.0.1</version>
- </artifactItem>
- <artifactItem>
- <groupId>stax</groupId>
- <artifactId>stax</artifactId>
- <version>1.2.0</version>
- </artifactItem>
- </artifactItems>
- <outputDirectory>${project.build.directory}/parsers</outputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<includes>
@@ -220,10 +135,6 @@
</instructions>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- </plugin>
<!--
Attach a JAR with the test classes so that we can reuse them in
other modules (see
diff -ur ws-commons-axiom-1.2.12/modules/axiom-dom/pom.xml ws-commons-axiom-1.2.12.new/modules/axiom-dom/pom.xml
--- ws-commons-axiom-1.2.12/modules/axiom-dom/pom.xml 2011-07-02 09:31:58.000000000 -0400
+++ ws-commons-axiom-1.2.12.new/modules/axiom-dom/pom.xml 2012-02-15 13:51:04.028411190 -0500
@@ -44,12 +44,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.1_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</dependency>
<dependency>
<groupId>${stax.impl.groupid}</groupId>
@@ -68,8 +64,8 @@
<artifactId>commons-logging</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -129,10 +125,6 @@
</instructions>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- </plugin>
<!-- Attach a JAR with the test classes so that we can reuse them in other modules
(see http://maven.apache.org/guides/mini/guide-attached-tests.html). -->
<plugin>
diff -ur ws-commons-axiom-1.2.12/modules/axiom-impl/pom.xml ws-commons-axiom-1.2.12.new/modules/axiom-impl/pom.xml
--- ws-commons-axiom-1.2.12/modules/axiom-impl/pom.xml 2011-07-02 09:31:58.000000000 -0400
+++ ws-commons-axiom-1.2.12.new/modules/axiom-impl/pom.xml 2012-02-15 13:49:50.559417302 -0500
@@ -44,12 +44,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.1_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</dependency>
<dependency>
<groupId>${stax.impl.groupid}</groupId>
@@ -68,8 +64,8 @@
<artifactId>xmlunit</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -123,10 +119,6 @@
</instructions>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- </plugin>
<!-- Attach a JAR with the test classes so that we can reuse them in other modules
(see http://maven.apache.org/guides/mini/guide-attached-tests.html). -->
<plugin>
diff -ur ws-commons-axiom-1.2.12/modules/axiom-parent/pom.xml ws-commons-axiom-1.2.12.new/modules/axiom-parent/pom.xml
--- ws-commons-axiom-1.2.12/modules/axiom-parent/pom.xml 2011-07-02 09:31:58.000000000 -0400
+++ ws-commons-axiom-1.2.12.new/modules/axiom-parent/pom.xml 2012-02-15 13:42:42.489456738 -0500
@@ -334,11 +334,6 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.1_spec</artifactId>
- <version>1.0.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-javamail_1.4_spec</artifactId>
<version>1.6</version>
</dependency>
@@ -438,8 +433,8 @@
</distributionManagement>
<properties>
<stax.impl.groupid>org.codehaus.woodstox</stax.impl.groupid>
- <stax.impl.artifact>wstx-asl</stax.impl.artifact>
- <stax.impl.version>3.2.9</stax.impl.version>
+ <stax.impl.artifact>woodstox-core-asl</stax.impl.artifact>
+ <stax.impl.version>4.1.2</stax.impl.version>
<failIfNoTests>false</failIfNoTests>
<!--
<stax.impl.groupid>com.sun.xml.stream</stax.impl.groupid>
diff -ur ws-commons-axiom-1.2.12/pom.xml ws-commons-axiom-1.2.12.new/pom.xml
--- ws-commons-axiom-1.2.12/pom.xml 2011-07-02 09:31:58.000000000 -0400
+++ ws-commons-axiom-1.2.12.new/pom.xml 2012-02-15 13:58:58.486367284 -0500
@@ -263,27 +263,6 @@
</pluginManagement>
<plugins>
<plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>gmaven-plugin</artifactId>
- <version>1.2</version>
- <executions>
- <execution>
- <id>generate-timestamp</id>
- <phase>initialize</phase>
- <goals>
- <goal>execute</goal>
- </goals>
- <configuration>
- <source>
- import java.util.Date
- import java.text.MessageFormat
- project.properties['build_date'] = MessageFormat.format("{0,date,MMMMM dd, yyyy}", new Date())
- </source>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.7</version>
@@ -340,95 +319,6 @@
</configuration>
</plugin>
<plugin>
- <groupId>com.agilejava.docbkx</groupId>
- <artifactId>docbkx-maven-plugin</artifactId>
- <version>2.0.8</version>
- <inherited>false</inherited>
- <executions>
- <execution>
- <id>userguide-html</id>
- <goals>
- <goal>generate-html</goal>
- </goals>
- <phase>pre-site</phase>
- <configuration>
- <includes>userguide.xml</includes>
- <chunkedOutput>true</chunkedOutput>
- <targetDirectory>target/site/userguide</targetDirectory>
- <htmlCustomization>src/docbkx/xsl/html.xsl</htmlCustomization>
- <postProcess>
- <copy todir="target/site/userguide/images">
- <fileset dir="src/docbkx/images">
- <include name="**/*.jpg" />
- <include name="**/*.png" />
- </fileset>
- </copy>
- </postProcess>
- </configuration>
- </execution>
- <execution>
- <id>devguide-html</id>
- <goals>
- <goal>generate-html</goal>
- </goals>
- <phase>pre-site</phase>
- <configuration>
- <includes>devguide.xml</includes>
- <chunkedOutput>true</chunkedOutput>
- <targetDirectory>target/site/devguide</targetDirectory>
- <htmlCustomization>src/docbkx/xsl/html.xsl</htmlCustomization>
- <postProcess>
- <copy todir="target/site/devguide/images">
- <fileset dir="src/docbkx/images">
- <include name="**/*.jpg" />
- <include name="**/*.png" />
- </fileset>
- </copy>
- </postProcess>
- </configuration>
- </execution>
- <execution>
- <id>userguide-pdf</id>
- <goals>
- <goal>generate-pdf</goal>
- </goals>
- <phase>compile</phase>
- <configuration>
- <includes>userguide.xml</includes>
- <foCustomization>${basedir}/src/docbkx/xsl/fo.xsl</foCustomization>
- </configuration>
- </execution>
- <execution>
- <id>devguide-pdf</id>
- <goals>
- <goal>generate-pdf</goal>
- </goals>
- <phase>compile</phase>
- <configuration>
- <includes>devguide.xml</includes>
- <foCustomization>${basedir}/src/docbkx/xsl/fo.xsl</foCustomization>
- </configuration>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>org.docbook</groupId>
- <artifactId>docbook-xml</artifactId>
- <version>4.4</version>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
- <configuration>
- <admonGraphics>true</admonGraphics>
- <entities>
- <entity>
- <name>version</name>
- <value>${project.version}</value>
- </entity>
- </entities>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.5</version>
@@ -457,32 +347,6 @@
</executions>
</plugin>
<plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <executions>
- <execution>
- <phase>verify</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <excludes>
- <!-- RAT doesn't recognize this one as notes file -->
- <exclude>RELEASE-NOTE.txt</exclude>
- <!-- SVG files are not edited by hand, so license headers would be lost anyway -->
- <exclude>**/*.svg</exclude>
- <!-- License file from Jaxen (see LEGAL-74 & WSCOMMONS-545) -->
- <exclude>legal/jaxen-LICENSE.txt</exclude>
- <!-- Files used by various developer tools -->
- <exclude>*.sonarj</exclude>
- <!-- File generated by maven-release-plugin -->
- <exclude>release.properties</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.2-beta-5</version>
@@ -545,15 +409,9 @@
</distributionManagement>
<modules>
<module>modules/axiom-parent</module>
- <module>modules/axiom-testutils</module>
- <module>modules/axiom-jaxen-testsuite</module>
<module>modules/axiom-api</module>
- <module>modules/axiom-testsuite</module>
<module>modules/axiom-impl</module>
<module>modules/axiom-dom</module>
<module>modules/axiom-c14n</module>
- <module>modules/axiom-tests</module>
- <module>modules/axiom-osgi</module>
- <module>modules/axiom-integration</module>
</modules>
</project>
