geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r780901 - in /geronimo/components/jaspi/trunk: geronimo-jaspi-openid/pom.xml geronimo-jaspi/pom.xml pom.xml
Date Tue, 02 Jun 2009 01:49:31 GMT
Author: djencks
Date: Tue Jun  2 01:49:30 2009
New Revision: 780901

URL: http://svn.apache.org/viewvc?rev=780901&view=rev
Log:
GERONIMO-4652 upgrade to genesis 2

Modified:
    geronimo/components/jaspi/trunk/geronimo-jaspi-openid/pom.xml
    geronimo/components/jaspi/trunk/geronimo-jaspi/pom.xml
    geronimo/components/jaspi/trunk/pom.xml

Modified: geronimo/components/jaspi/trunk/geronimo-jaspi-openid/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/components/jaspi/trunk/geronimo-jaspi-openid/pom.xml?rev=780901&r1=780900&r2=780901&view=diff
==============================================================================
--- geronimo/components/jaspi/trunk/geronimo-jaspi-openid/pom.xml (original)
+++ geronimo/components/jaspi/trunk/geronimo-jaspi-openid/pom.xml Tue Jun  2 01:49:30 2009
@@ -22,20 +22,32 @@
 
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.apache.geronimo.components</groupId>
-        <artifactId>geronimo-jaspi-parent</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <groupId>org.apache.geronimo.genesis.flava</groupId>
+        <artifactId>genesis-java5-flava</artifactId>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>geronimo-jaspi-openid</artifactId>
     <packaging>bundle</packaging>
     <name>geronimo-jaspi-openid</name>
-    <description>Geronimo openid JASPI module implementation openid4java.</description>
+    <description>Geronimo openid JASPI module implementation based on openid4java.</description>
 
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/components/jaspi/trunk/geronimo-jaspi-openid</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/components/jaspi/trunk/geronimo-jaspi-openid</developerConnection>
+        <url>http://svn.apache.org/viewvc/geronimo/components/jaspi/trunk/geronimo-jaspi-openid</url>
+    </scm>
+
+    <url>http://geronimo.apache.org/maven/${siteId}/${version}</url>
+    <properties>
+        <siteId>components/${artifactId}</siteId>
+    </properties>
+    
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jaspi_1.0_spec</artifactId>
+            <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.openid4java</groupId>
@@ -44,21 +56,52 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_3.0_spec</artifactId>
-            <version>1.0-EA-SNAPSHOT</version>
+            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <version>1.3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.components</groupId>
             <artifactId>geronimo-jaspi</artifactId>
-            <version>${version}</version>
+            <version>1.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
             <classifier>jdk15</classifier>
+            <version>5.8</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Export-Package>org.apache.geronimo.components.jaspi.modules.openid*;version=0.1</Export-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <repositories>
+        <!--  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>

Modified: geronimo/components/jaspi/trunk/geronimo-jaspi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/components/jaspi/trunk/geronimo-jaspi/pom.xml?rev=780901&r1=780900&r2=780901&view=diff
==============================================================================
--- geronimo/components/jaspi/trunk/geronimo-jaspi/pom.xml (original)
+++ geronimo/components/jaspi/trunk/geronimo-jaspi/pom.xml Tue Jun  2 01:49:30 2009
@@ -23,9 +23,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.components</groupId>
-        <artifactId>geronimo-jaspi-parent</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <groupId>org.apache.geronimo.genesis.flava</groupId>
+        <artifactId>genesis-java5-flava</artifactId>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.geronimo.components</groupId>
@@ -33,53 +33,105 @@
     <version>1.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>Geronimo JASPI implementation</name>
+
     <description>Geronimo JASPI implementation using jaxb/sxc for simple xml persistence.</description>
 
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/components/jaspi/trunk/geronimo-jaspi</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/components/jaspi/trunk/geronimo-jaspi</developerConnection>
+        <url>http://svn.apache.org/viewvc/geronimo/components/jaspi/trunk/geronimo-jaspi</url>
+    </scm>
+
+    <url>http://geronimo.apache.org/maven/${siteId}/${version}</url>
+    <properties>
+        <siteId>components/${artifactId}</siteId>
+    </properties>
+
     <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-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>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-stax-api_1.0_spec</artifactId>
-        </dependency>
-
-        <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
+            <version>5.8</version>
             <classifier>jdk15</classifier>
             <scope>test</scope>
         </dependency>
@@ -90,54 +142,94 @@
         <plugins>
 
             <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-jar-plugin</artifactId>
-              <executions>
-                <execution>
-                  <goals>
-                    <goal>jar</goal>
-                    <goal>test-jar</goal>
-                  </goals>
-                </execution>
-              </executions>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>jar</goal>
+                            <goal>test-jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Export-Package>org.apache.geronimo.components.jaspi*;version=1.0</Export-Package>
+                    </instructions>
+                </configuration>
             </plugin>
-            <!--<plugin>-->
-                <!--<groupId>com.envoisolutions.sxc</groupId>-->
-                <!--<artifactId>sxc-jaxb-maven-plugin</artifactId>-->
-                <!--<version>0.8-SNAPSHOT</version>-->
-                <!--<executions>-->
-                    <!--<execution>-->
-                        <!--<configuration>-->
-                            <!--<classes>-->
-                                <!--<class>org.apache.geronimo.components.jaspi.model</class>-->
-                            <!--</classes>-->
-                        <!--</configuration>-->
-                        <!--<goals>-->
-                            <!--<goal>generate</goal>-->
-                        <!--</goals>-->
-                    <!--</execution>-->
-                <!--</executions>-->
-            <!--</plugin>-->
-
-            <!--<plugin>-->
-                <!--<groupId>org.jvnet.jaxb2.maven2</groupId>-->
-                <!--<artifactId>maven-jaxb2-plugin</artifactId>-->
-                <!--<version>0.5</version>-->
-                <!--<executions>-->
-                    <!--<execution>-->
-                        <!--<goals>-->
-                            <!--<goal>generate</goal>-->
-                        <!--</goals>-->
-                    <!--</execution>-->
-                <!--</executions>-->
-                <!--<configuration>-->
-                    <!--<schemaDirectory>src/main/xsd</schemaDirectory>-->
-                    <!--<packageName>org.apache.geronimo.components.jaspi.model</packageName>-->
-                    <!--<extension>true</extension>-->
-                <!--</configuration>-->
-            <!--</plugin>-->
-        </plugins>
+         </plugins>
     </build>
 
+    <profiles>
+        <profile>
+            <id>jaxb-generate</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.jvnet.jaxb2.maven2</groupId>
+                        <artifactId>maven-jaxb2-plugin</artifactId>
+                        <version>0.5</version>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>generate</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <schemaDirectory>src/main/xsd</schemaDirectory>
+                            <packageName>org.apache.geronimo.components.jaspi.model</packageName>
+                            <extension>true</extension>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>sxc-generate</id>
+            <build>
+                <plugins>
+
+                    <plugin>
+                        <groupId>com.envoisolutions.sxc</groupId>
+                        <artifactId>sxc-jaxb-maven-plugin</artifactId>
+                        <version>0.8-SNAPSHOT</version>
+                        <executions>
+                            <execution>
+                                <configuration>
+                                    <classes>
+                                        <class>org.apache.geronimo.components.jaspi.model</class>
+                                    </classes>
+                                </configuration>
+                                <goals>
+                                    <goal>generate</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </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>
 

Modified: geronimo/components/jaspi/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/components/jaspi/trunk/pom.xml?rev=780901&r1=780900&r2=780901&view=diff
==============================================================================
--- geronimo/components/jaspi/trunk/pom.xml (original)
+++ geronimo/components/jaspi/trunk/pom.xml Tue Jun  2 01:49:30 2009
@@ -23,9 +23,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.genesis.config</groupId>
-        <artifactId>project-config</artifactId>
-        <version>1.4</version>
+        <groupId>org.apache.geronimo.genesis.flava</groupId>
+        <artifactId>genesis-java5-flava</artifactId>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.geronimo.components</groupId>
@@ -40,19 +40,6 @@
         <url>http://svn.apache.org/viewvc/geronimo/components/jaspi/trunk</url>
     </scm>
 
-    <properties>
-        <!--
-        NOTE: Project version, to be used instead of ${pom.version} since that
-              value magically changes when using SNAPSHOT versions.
-
-              This value *must* be kept in sync with the value of the <version>
-              element, and it will need to be changed manually before a release,
-              as the maven-release-plugin will not update this value.
-        -->
-        <version>1.0-SNAPSHOT</version>
-
-    </properties>
-
     <modules>
         <module>geronimo-jaspi</module>
         <module>geronimo-jaspi-openid</module>
@@ -67,15 +54,27 @@
             </dependency>
 
             <dependency>
-                <groupId>org.apache.xbean</groupId>
-                <artifactId>xbean-reflect</artifactId>
-                <version>3.4.3</version>
+                <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.4.3</version>
+                <version>3.6-SNAPSHOT</version>
             </dependency>
 
             <dependency>
@@ -131,35 +130,11 @@
             </dependency>
 
             <dependency>
-                <groupId>javax.xml.bind</groupId>
-                <artifactId>jaxb-api</artifactId>
-                <version>2.1</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>javax.xml.bind</groupId>
-                        <artifactId>jsr173_api</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>javax.xml.stream</groupId>
-                        <artifactId>stax-api</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>javax.activation</groupId>
-                        <artifactId>activation</artifactId>
-                    </exclusion>
-                </exclusions>
-            </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.testng</groupId>
                 <artifactId>testng</artifactId>
                 <version>5.8</version>
                 <classifier>jdk15</classifier>
+                <scope>test</scope>
             </dependency>
 
 
@@ -171,31 +146,7 @@
             <plugins>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-enforcer-plugin</artifactId>
-                    <version>1.0-alpha-3</version>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.4.2</version>
-                    <configuration>
-                        <redirectTestOutputToFile>true</redirectTestOutputToFile>
-                    </configuration>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-install-plugin</artifactId>
-                    <version>2.2</version>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-jar-plugin</artifactId>
-                    <version>2.1</version>
-                    <configuration>
-                    </configuration>
                     <executions>
                         <execution>
                             <goals>
@@ -205,79 +156,8 @@
                         </execution>
                     </executions>
                 </plugin>
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>ianal-maven-plugin</artifactId>
-                    <version>1.0-alpha-1</version>
-                </plugin>
             </plugins>
         </pluginManagement>
-
-        <plugins>
-
-            <!--<plugin>-->
-            <!--<groupId>com.envoisolutions.sxc</groupId>-->
-            <!--<artifactId>sxc-jaxb-maven-plugin</artifactId>-->
-            <!--<version>0.8-SNAPSHOT</version>-->
-            <!--<executions>-->
-            <!--<execution>-->
-            <!--<configuration>-->
-            <!--<classes>-->
-            <!--<class>org.apache.geronimo.components.jaspi.model</class>-->
-            <!--</classes>-->
-            <!--</configuration>-->
-            <!--<goals>-->
-            <!--<goal>generate</goal>-->
-            <!--</goals>-->
-            <!--</execution>-->
-            <!--</executions>-->
-            <!--</plugin>-->
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>ianal-maven-plugin</artifactId>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.geronimo.genesis.plugins</groupId>
-                <artifactId>tools-maven-plugin</artifactId>
-
-                <executions>
-
-                    <execution>
-                        <id>verify-legal-files</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>verify-legal-files</goal>
-                        </goals>
-                        <configuration>
-                            <strict>true</strict>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.0</version>
-                <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <version>2.0.0</version>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Bundle-DocURL>http://geronimo.apache.org</Bundle-DocURL>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
     </build>
 
     <repositories>



Mime
View raw message