clean up pom, dependencies
git-svn-id: https://svn.apache.org/repos/asf/geronimo/components/jaspi/trunk@941523 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/geronimo-jaspi/pom.xml b/geronimo-jaspi/pom.xml
index 435f63e..cef1b06 100644
--- a/geronimo-jaspi/pom.xml
+++ b/geronimo-jaspi/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.geronimo.genesis</groupId>
- <artifactId>genesis-java5-flava</artifactId>
+ <artifactId>genesis-java6-flava</artifactId>
<version>2.0</version>
<relativePath/>
</parent>
@@ -43,16 +43,16 @@
<url>http://svn.apache.org/viewvc/geronimo/components/jaspi/trunk/geronimo-jaspi</url>
</scm>
- <url>http://geronimo.apache.org/maven/${siteId}/${version}</url>
+ <url>http://geronimo.apache.org/maven/${siteId}/${project.version}</url>
<properties>
- <siteId>components/${artifactId}</siteId>
+ <siteId>components/${project.artifactId}</siteId>
</properties>
<distributionManagement>
<site>
<id>geronimo-website</id>
- <url>${staging.siteURL}/${siteId}/${version}</url>
+ <url>${staging.siteURL}/${siteId}/${project.version}</url>
</site>
</distributionManagement>
@@ -72,14 +72,14 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxb_2.1_spec</artifactId>
+ <artifactId>geronimo-jaxb_2.2_spec</artifactId>
<version>1.0</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-stax-api_1.0_spec</artifactId>
- <version>1.0.1</version>
+ <artifactId>geronimo-stax-api_1.2_spec</artifactId>
+ <version>1.0</version>
</dependency>
<dependency>
@@ -89,58 +89,28 @@
</dependency>
<dependency>
- <groupId>com.envoisolutions.sxc</groupId>
+ <groupId>org.apache.geronimo.bundles</groupId>
<artifactId>sxc-jaxb</artifactId>
<!--<version>0.8-SNAPSHOT</version>-->
- <version>0.7.2</version>
- <exclusions>
- <exclusion>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- </exclusion>
- </exclusions>
+ <version>0.7.2_1</version>
</dependency>
<dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- <version>3.2.1</version>
- <exclusions>
- <exclusion>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>woodstox</artifactId>
+ <version>3.2.9_1</version>
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
+ <groupId>org.apache.geronimo.bundles</groupId>
<artifactId>jaxb-impl</artifactId>
- <version>2.1.7</version>
- <exclusions>
- <exclusion>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.xml</groupId>
- <artifactId>jsr173</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jsr173_api</artifactId>
- </exclusion>
- </exclusions>
+ <version>2.2_1</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-xjc</artifactId>
- <version>2.1.7</version>
+ <version>2.2</version>
<scope>provided</scope>
</dependency>
@@ -176,6 +146,9 @@
<instructions>
<Export-Package>org.apache.geronimo.components.jaspi*;version=1.0</Export-Package>
<Export-SPI-Provider>org.apache.geronimo.components.jaspi.AuthConfigFactoryImpl</Export-SPI-Provider>
+ <_versionpolicy-impl>[$(version;==;$(@)),$(version;=+;$(@)))</_versionpolicy-impl>
+ <_versionpolicy-uses>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy-uses>
+ <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
</instructions>
</configuration>
</plugin>
@@ -234,19 +207,5 @@
</profile>
</profiles>
- <repositories>
- <!-- repo for jaxb dependencies -->
- <repository>
- <id>java.net</id>
- <url>http://download.java.net/maven/1/</url>
- <layout>legacy</layout>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- </repositories>
</project>
