update to released versions, remove unneeded non-parent pom
git-svn-id: https://svn.apache.org/repos/asf/geronimo/components/jaspi/trunk@786616 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/geronimo-jaspi-openid/pom.xml b/geronimo-jaspi-openid/pom.xml
index 3b10200..6e82a41 100644
--- a/geronimo-jaspi-openid/pom.xml
+++ b/geronimo-jaspi-openid/pom.xml
@@ -22,14 +22,16 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.genesis.flava</groupId>
+ <groupId>org.apache.geronimo.genesis</groupId>
<artifactId>genesis-java5-flava</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0</version>
</parent>
+ <groupId>org.apache.geronimo.components</groupId>
<artifactId>geronimo-jaspi-openid</artifactId>
<packaging>bundle</packaging>
<name>geronimo-jaspi-openid</name>
+
<description>Geronimo openid JASPI module implementation based on openid4java.</description>
<scm>
@@ -46,8 +48,8 @@
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaspi_1.0_spec</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <artifactId>geronimo-jaspic_1.0_spec</artifactId>
+ <version>1.0</version>
</dependency>
<dependency>
<groupId>org.openid4java</groupId>
diff --git a/geronimo-jaspi/pom.xml b/geronimo-jaspi/pom.xml
index 3067a96..a27a4b8 100644
--- a/geronimo-jaspi/pom.xml
+++ b/geronimo-jaspi/pom.xml
@@ -23,9 +23,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.genesis.flava</groupId>
+ <groupId>org.apache.geronimo.genesis</groupId>
<artifactId>genesis-java5-flava</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0</version>
</parent>
<groupId>org.apache.geronimo.components</groupId>
@@ -50,8 +50,8 @@
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaspi_1.0_spec</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <artifactId>geronimo-jaspic_1.0_spec</artifactId>
+ <version>1.0</version>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
deleted file mode 100644
index 732ad27..0000000
--- a/pom.xml
+++ /dev/null
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.genesis.flava</groupId>
- <artifactId>genesis-java5-flava</artifactId>
- <version>2.0-SNAPSHOT</version>
- </parent>
-
- <groupId>org.apache.geronimo.components</groupId>
- <artifactId>geronimo-jaspi-parent</artifactId>
- <version>1.0-SNAPSHOT</version>
- <packaging>pom</packaging>
- <name>Geronimo JASPI implementation</name>
-
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/components/jaspi/trunk</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/components/jaspi/trunk</developerConnection>
- <url>http://svn.apache.org/viewvc/geronimo/components/jaspi/trunk</url>
- </scm>
-
- <modules>
- <module>geronimo-jaspi</module>
- <module>geronimo-jaspi-openid</module>
- </modules>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaspi_1.0_spec</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.5_spec</artifactId>
- <version>1.3-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxb_2.1_spec</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-stax-api_1.0_spec</artifactId>
- <version>1.0.1</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-reflect</artifactId>
- <version>3.6-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>com.envoisolutions.sxc</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>
- </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>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</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>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-xjc</artifactId>
- <version>2.1.7</version>
- </dependency>
-
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>5.8</version>
- <classifier>jdk15</classifier>
- <scope>test</scope>
- </dependency>
-
-
- </dependencies>
- </dependencyManagement>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <!-- Build *test.jar files for modules -->
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
- <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>
- <!-- repo for openid dependencies -->
- <repository>
- <id>alchim.sourceforce</id>
- <url>http://alchim.sourceforge.net/download/snapshots/</url>
- <layout>default</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- </repositories>
-
-</project>
-
