You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2009/06/02 03:51:46 UTC
svn commit: r780903 - in /geronimo/specs/trunk:
geronimo-activation_1.1_spec/ geronimo-annotation_1.0_spec/
geronimo-availability_0.4_spec/ geronimo-commonj_1.1_spec/
geronimo-concurrent_1.0_spec/ geronimo-ejb_3.0_spec/ geronimo-el_1.0_spec/
geronimo-i...
Author: djencks
Date: Tue Jun 2 01:51:45 2009
New Revision: 780903
URL: http://svn.apache.org/viewvc?rev=780903&view=rev
Log:
GERONIMO-4652 upgrade to genesis 2. jpa 2 spec not yet upgraded.... upgrades are commented out
Modified:
geronimo/specs/trunk/geronimo-activation_1.1_spec/pom.xml
geronimo/specs/trunk/geronimo-annotation_1.0_spec/pom.xml
geronimo/specs/trunk/geronimo-availability_0.4_spec/pom.xml
geronimo/specs/trunk/geronimo-commonj_1.1_spec/pom.xml
geronimo/specs/trunk/geronimo-concurrent_1.0_spec/pom.xml
geronimo/specs/trunk/geronimo-ejb_3.0_spec/pom.xml
geronimo/specs/trunk/geronimo-el_1.0_spec/pom.xml
geronimo/specs/trunk/geronimo-interceptor_3.0_spec/pom.xml
geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/pom.xml
geronimo/specs/trunk/geronimo-j2ee-management_1.1_spec/pom.xml
geronimo/specs/trunk/geronimo-jacc_1.1_spec/pom.xml
geronimo/specs/trunk/geronimo-jaspic_1.0_spec/pom.xml
geronimo/specs/trunk/geronimo-javamail_1.4_spec/pom.xml
geronimo/specs/trunk/geronimo-jaxb_2.0_spec/pom.xml
geronimo/specs/trunk/geronimo-jaxb_2.1_spec/pom.xml
geronimo/specs/trunk/geronimo-jaxr_1.0_spec/pom.xml
geronimo/specs/trunk/geronimo-jaxrpc_1.1_spec/pom.xml
geronimo/specs/trunk/geronimo-jaxws_2.1_spec/pom.xml
geronimo/specs/trunk/geronimo-jms_1.1_spec/pom.xml
geronimo/specs/trunk/geronimo-jpa_2.0_spec/pom.xml
geronimo/specs/trunk/geronimo-jsp_2.1_spec/pom.xml
geronimo/specs/trunk/geronimo-jta_1.1_spec/pom.xml
geronimo/specs/trunk/geronimo-saaj_1.3_spec/pom.xml
geronimo/specs/trunk/geronimo-servlet_2.5_spec/pom.xml
geronimo/specs/trunk/geronimo-servlet_3.0_spec/pom.xml
geronimo/specs/trunk/geronimo-validation_1.0_spec/pom.xml
geronimo/specs/trunk/geronimo-ws-metadata_2.0_spec/pom.xml
Modified: geronimo/specs/trunk/geronimo-activation_1.1_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-activation_1.1_spec/pom.xml?rev=780903&r1=780902&r2=780903&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-activation_1.1_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-activation_1.1_spec/pom.xml Tue Jun 2 01:51:45 2009
@@ -25,16 +25,20 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>specs-parent</artifactId>
- <version>1.6</version>
+ <groupId>org.apache.geronimo.genesis.flava</groupId>
+ <artifactId>genesis-java1.4-flava</artifactId>
+ <version>2.0-SNAPSHOT</version>
</parent>
+ <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-activation_1.1_spec</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>Activation 1.1</name>
<version>1.0.3-SNAPSHOT</version>
+ <description>Java Activation Spec API 1.1</description>
+ <!-- n.b. the tets will not pass on java 6 because the jdk contains an incompatible implementation -->
+
<url>http://geronimo.apache.org/maven/${siteId}/${version}</url>
<distributionManagement>
<site>
@@ -45,9 +49,6 @@
<properties>
<siteId>specs/${artifactId}</siteId>
-
- <geronimo.osgi.export.pkg>javax.activation*</geronimo.osgi.export.pkg>
- <geronimo.osgi.export.version>1.1</geronimo.osgi.export.version>
</properties>
<scm>
@@ -56,4 +57,27 @@
<url>http://svn.apache.org/viewcvs.cgi/geronimo/specs/trunk/geronimo-activation_1.1_spec/</url>
</scm>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>javax.activation*;version=1.1</Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: geronimo/specs/trunk/geronimo-annotation_1.0_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-annotation_1.0_spec/pom.xml?rev=780903&r1=780902&r2=780903&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-annotation_1.0_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-annotation_1.0_spec/pom.xml Tue Jun 2 01:51:45 2009
@@ -25,15 +25,17 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>specs-parent</artifactId>
- <version>1.6</version>
+ <groupId>org.apache.geronimo.genesis.flava</groupId>
+ <artifactId>genesis-java5-flava</artifactId>
+ <version>2.0-SNAPSHOT</version>
</parent>
+ <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.0_spec</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>Annotation 1.0</name>
<version>1.1.2-SNAPSHOT</version>
+ <description>Annotation spec 1.0 API</description>
<url>http://geronimo.apache.org/maven/${siteId}/${version}</url>
<distributionManagement>
@@ -45,9 +47,6 @@
<properties>
<siteId>specs/${artifactId}</siteId>
-
- <geronimo.osgi.export.pkg>javax.annotation*</geronimo.osgi.export.pkg>
- <geronimo.osgi.export.version>1.0</geronimo.osgi.export.version>
</properties>
<scm>
@@ -56,4 +55,18 @@
<url>http://svn.apache.org/viewcvs.cgi/geronimo/specs/trunk/geronimo-annotation_1.0_spec/</url>
</scm>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>javax.annotation*;version=1.0</Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: geronimo/specs/trunk/geronimo-availability_0.4_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-availability_0.4_spec/pom.xml?rev=780903&r1=780902&r2=780903&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-availability_0.4_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-availability_0.4_spec/pom.xml Tue Jun 2 01:51:45 2009
@@ -25,16 +25,19 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>specs-parent</artifactId>
- <version>1.6</version>
+ <groupId>org.apache.geronimo.genesis.flava</groupId>
+ <artifactId>genesis-java5-flava</artifactId>
+ <version>2.0-SNAPSHOT</version>
</parent>
+ <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-availability_0.4_spec</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>Availability Management for Java 0.4</name>
<version>1.0-SNAPSHOT</version>
+ <description>Availability JSR ??? API</description>
+
<url>http://geronimo.apache.org/maven/${siteId}/${version}</url>
<distributionManagement>
<site>
@@ -45,8 +48,6 @@
<properties>
<siteId>specs/${artifactId}</siteId>
-
- <geronimo.osgi.export.version>0.4</geronimo.osgi.export.version>
</properties>
<scm>
@@ -55,4 +56,18 @@
<url>http://svn.apache.org/viewcvs.cgi/geronimo/specs/trunk/geronimo-availability_0.4_spec/</url>
</scm>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>javax.availability.management*;version=0.4</Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: geronimo/specs/trunk/geronimo-commonj_1.1_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-commonj_1.1_spec/pom.xml?rev=780903&r1=780902&r2=780903&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-commonj_1.1_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-commonj_1.1_spec/pom.xml Tue Jun 2 01:51:45 2009
@@ -25,16 +25,19 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>specs-parent</artifactId>
- <version>1.6</version>
+ <groupId>org.apache.geronimo.genesis.flava</groupId>
+ <artifactId>genesis-java1.4-flava</artifactId>
+ <version>2.0-SNAPSHOT</version>
</parent>
+ <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-commonj_1.1_spec</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>Commonj 1.1</name>
<version>1.1.0-SNAPSHOT</version>
+ <description>CommonJ API version 1.1</description>
+
<url>http://geronimo.apache.org/maven/${siteId}/${version}</url>
<distributionManagement>
<site>
@@ -45,8 +48,6 @@
<properties>
<siteId>specs/${artifactId}</siteId>
-
- <geronimo.osgi.export>java.commonj.timers;version="1.1",java.commonj.work;version="1.1"</geronimo.osgi.export>
</properties>
<scm>
@@ -55,4 +56,19 @@
<url>http://svn.apache.org/viewcvs.cgi/geronimo/specs/trunk/geronimo-commonj_1.1_spec/</url>
</scm>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <!-- TODO import and export of java packages cannot be specified. Is this really a java spec rather than javax?? -->
+ <Export-Package>java.commonj*;version=1.1</Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: geronimo/specs/trunk/geronimo-concurrent_1.0_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-concurrent_1.0_spec/pom.xml?rev=780903&r1=780902&r2=780903&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-concurrent_1.0_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-concurrent_1.0_spec/pom.xml Tue Jun 2 01:51:45 2009
@@ -25,15 +25,19 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>specs-parent</artifactId>
- <version>1.6</version>
+ <groupId>org.apache.geronimo.genesis.flava</groupId>
+ <artifactId>genesis-java5-flava</artifactId>
+ <version>2.0-SNAPSHOT</version>
</parent>
+ <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-concurrent_1.0_spec</artifactId>
<name>Apache Geronimo Concurrency Utilities for Java EE API</name>
+ <packaging>bundle</packaging>
<version>1.1-EA-SNAPSHOT</version>
+ <description>Java EE Concurrency API</description>
+
<url>http://geronimo.apache.org/maven/${siteId}/${version}</url>
<distributionManagement>
<site>
@@ -55,4 +59,18 @@
<url>http://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-concurrent_1.0_spec/</url>
</scm>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>javax.util.concurrent*;version=1.0</Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: geronimo/specs/trunk/geronimo-ejb_3.0_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-ejb_3.0_spec/pom.xml?rev=780903&r1=780902&r2=780903&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-ejb_3.0_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-ejb_3.0_spec/pom.xml Tue Jun 2 01:51:45 2009
@@ -25,15 +25,17 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>specs-parent</artifactId>
- <version>1.6</version>
+ <groupId>org.apache.geronimo.genesis.flava</groupId>
+ <artifactId>genesis-java5-flava</artifactId>
+ <version>2.0-SNAPSHOT</version>
</parent>
+ <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-ejb_3.0_spec</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>EJB 3.0</name>
<version>1.0.2-SNAPSHOT</version>
+ <description>EJB 3.0 API</description>
<url>http://geronimo.apache.org/maven/${siteId}/${version}</url>
<distributionManagement>
@@ -45,9 +47,6 @@
<properties>
<siteId>specs/${artifactId}</siteId>
-
- <geronimo.osgi.export.pkg>javax.ejb*</geronimo.osgi.export.pkg>
- <geronimo.osgi.export.version>3.0</geronimo.osgi.export.version>
</properties>
<dependencies>
@@ -79,4 +78,19 @@
<url>http://svn.apache.org/viewcvs.cgi/geronimo/specs/trunk/geronimo-ejb_3.0_spec/</url>
</scm>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <!-- TODO how about javax.xml.rpc.handler which is in this jar?? -->
+ <Export-Package>javax.ejb*;version=3.0</Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: geronimo/specs/trunk/geronimo-el_1.0_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-el_1.0_spec/pom.xml?rev=780903&r1=780902&r2=780903&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-el_1.0_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-el_1.0_spec/pom.xml Tue Jun 2 01:51:45 2009
@@ -25,15 +25,17 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>specs-parent</artifactId>
- <version>1.6</version>
+ <groupId>org.apache.geronimo.genesis.flava</groupId>
+ <artifactId>genesis-java5-flava</artifactId>
+ <version>2.0-SNAPSHOT</version>
</parent>
+ <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-el_1.0_spec</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>Expression Language 1.0</name>
<version>1.0.2-SNAPSHOT</version>
+ <description>Expression Languague API 1.0</description>
<url>http://geronimo.apache.org/maven/${siteId}/${version}</url>
<distributionManagement>
@@ -45,9 +47,6 @@
<properties>
<siteId>specs/${artifactId}</siteId>
-
- <geronimo.osgi.export.pkg>javax.el*</geronimo.osgi.export.pkg>
- <geronimo.osgi.export.version>1.0</geronimo.osgi.export.version>
</properties>
<scm>
@@ -56,4 +55,18 @@
<url>http://svn.apache.org/viewcvs.cgi/geronimo/specs/trunk/geronimo-el_1.0_spec/</url>
</scm>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>javax.el*;version=1.0</Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: geronimo/specs/trunk/geronimo-interceptor_3.0_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-interceptor_3.0_spec/pom.xml?rev=780903&r1=780902&r2=780903&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-interceptor_3.0_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-interceptor_3.0_spec/pom.xml Tue Jun 2 01:51:45 2009
@@ -25,15 +25,17 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>specs-parent</artifactId>
- <version>1.6</version>
+ <groupId>org.apache.geronimo.genesis.flava</groupId>
+ <artifactId>genesis-java5-flava</artifactId>
+ <version>2.0-SNAPSHOT</version>
</parent>
+ <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-interceptor_3.0_spec</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>Interceptor 3.0</name>
<version>1.0.2-SNAPSHOT</version>
+ <description>Interceptor API 3.0</description>
<url>http://geronimo.apache.org/maven/${siteId}/${version}</url>
<distributionManagement>
@@ -45,8 +47,6 @@
<properties>
<siteId>specs/${artifactId}</siteId>
-
- <geronimo.osgi.export.version>3.0</geronimo.osgi.export.version>
</properties>
<scm>
@@ -55,4 +55,18 @@
<url>http://svn.apache.org/viewcvs.cgi/geronimo/specs/trunk/geronimo-interceptor_3.0_spec/</url>
</scm>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>javax.interceptor*;version=3.0</Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/pom.xml?rev=780903&r1=780902&r2=780903&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/pom.xml Tue Jun 2 01:51:45 2009
@@ -25,15 +25,17 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>specs-parent</artifactId>
- <version>1.6</version>
+ <groupId>org.apache.geronimo.genesis.flava</groupId>
+ <artifactId>genesis-java5-flava</artifactId>
+ <version>2.0-SNAPSHOT</version>
</parent>
+ <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-connector_1.6_spec</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>J2EE Connector 1.6</name>
<version>1.0-EA-SNAPSHOT</version>
+ <description>Java 2 Connector Architecture API</description>
<url>http://geronimo.apache.org/maven/${siteId}/${version}</url>
<distributionManagement>
@@ -45,11 +47,14 @@
<properties>
<siteId>specs/${artifactId}</siteId>
-
- <geronimo.osgi.export.pkg>javax.resource*</geronimo.osgi.export.pkg>
- <geronimo.osgi.export.version>1.6</geronimo.osgi.export.version>
</properties>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/</url>
+ </scm>
+
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -57,12 +62,26 @@
<version>1.1.1</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/</url>
- </scm>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>javax.resource*;version=1.6</Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: geronimo/specs/trunk/geronimo-j2ee-management_1.1_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-management_1.1_spec/pom.xml?rev=780903&r1=780902&r2=780903&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-management_1.1_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-j2ee-management_1.1_spec/pom.xml Tue Jun 2 01:51:45 2009
@@ -25,16 +25,19 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>specs-parent</artifactId>
- <version>1.6</version>
+ <groupId>org.apache.geronimo.genesis.flava</groupId>
+ <artifactId>genesis-java1.4-flava</artifactId>
+ <version>2.0-SNAPSHOT</version>
</parent>
+ <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>J2EE Management 1.1</name>
<version>1.0.2-SNAPSHOT</version>
+ <description>Java EE Management API JSR-77</description>
+
<url>http://geronimo.apache.org/maven/${siteId}/${version}</url>
<distributionManagement>
<site>
@@ -45,12 +48,14 @@
<properties>
<siteId>specs/${artifactId}</siteId>
-
- <geronimo.osgi.export.pkg>javax.management.j2ee*</geronimo.osgi.export.pkg>
- <geronimo.osgi.export.version>1.1</geronimo.osgi.export.version>
- <geronimo.osgi.import.pkg>javax.ejb*;resolution:=optional,*</geronimo.osgi.import.pkg>
</properties>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-j2ee-management_1.1_spec/</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-j2ee-management_1.1_spec/</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/geronimo/specs/trunk/geronimo-j2ee-management_1.1_spec/</url>
+ </scm>
+
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -58,12 +63,27 @@
<version>1.0.1</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-j2ee-management_1.1_spec/</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-j2ee-management_1.1_spec/</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/geronimo/specs/trunk/geronimo-j2ee-management_1.1_spec/</url>
- </scm>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>javax.management.j2ee*;version=1.1</Export-Package>
+ <Import-Package>javax.ejb*;resolution:=optional;version=2.1,*</Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: geronimo/specs/trunk/geronimo-jacc_1.1_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jacc_1.1_spec/pom.xml?rev=780903&r1=780902&r2=780903&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jacc_1.1_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jacc_1.1_spec/pom.xml Tue Jun 2 01:51:45 2009
@@ -25,16 +25,19 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>specs-parent</artifactId>
- <version>1.6</version>
+ <groupId>org.apache.geronimo.genesis.flava</groupId>
+ <artifactId>genesis-java5-flava</artifactId>
+ <version>2.0-SNAPSHOT</version>
</parent>
+ <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jacc_1.1_spec</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>J2EE JACC 1.1</name>
<version>1.0.2-SNAPSHOT</version>
+ <description>Java Access Control for Containers 1.1 API</description>
+
<url>http://geronimo.apache.org/maven/${siteId}/${version}</url>
<distributionManagement>
<site>
@@ -45,11 +48,14 @@
<properties>
<siteId>specs/${artifactId}</siteId>
-
- <geronimo.osgi.export.pkg>javax.security.jacc*</geronimo.osgi.export.pkg>
- <geronimo.osgi.export.version>1.1</geronimo.osgi.export.version>
</properties>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-jacc_1.1_spec/</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-jacc_1.1_spec/</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/geronimo/specs/trunk/geronimo-jacc_1.1_spec/</url>
+ </scm>
+
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -57,12 +63,27 @@
<version>1.2</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
-
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-jacc_1.1_spec/</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-jacc_1.1_spec/</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/geronimo/specs/trunk/geronimo-jacc_1.1_spec/</url>
- </scm>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>javax.security.jacc*;version=1.1</Export-Package>
+ <Import-Package>javax.servlet*;resolution:=optional;version=2.5,*</Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: geronimo/specs/trunk/geronimo-jaspic_1.0_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaspic_1.0_spec/pom.xml?rev=780903&r1=780902&r2=780903&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaspic_1.0_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jaspic_1.0_spec/pom.xml Tue Jun 2 01:51:45 2009
@@ -20,7 +20,8 @@
<!-- $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">
+<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>
@@ -36,7 +37,7 @@
<name>Java Authentication SPI for Containers</name>
<version>1.0-SNAPSHOT</version>
- <description>The JASPIC (JSR-196) api</description>
+ <description>Java Authentication Service Provider Interface for Containers (JSR-196) api</description>
<url>http://geronimo.apache.org/maven/${siteId}/${version}</url>
<distributionManagement>
@@ -48,9 +49,6 @@
<properties>
<siteId>specs/${artifactId}</siteId>
-
- <geronimo.osgi.export.pkg>javax.security.auth.message*</geronimo.osgi.export.pkg>
- <geronimo.osgi.export.version>1.0</geronimo.osgi.export.version>
</properties>
<scm>
@@ -60,18 +58,17 @@
</scm>
<build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Export-Package>javax.security.auth.message*;version=1.0</Export-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
-
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>javax.security.auth.message*;version=1.0</Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
Modified: geronimo/specs/trunk/geronimo-javamail_1.4_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-javamail_1.4_spec/pom.xml?rev=780903&r1=780902&r2=780903&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-javamail_1.4_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-javamail_1.4_spec/pom.xml Tue Jun 2 01:51:45 2009
@@ -25,11 +25,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>specs-parent</artifactId>
- <version>1.6</version>
+ <groupId>org.apache.geronimo.genesis.flava</groupId>
+ <artifactId>genesis-java1.4-flava</artifactId>
+ <version>2.0-SNAPSHOT</version>
</parent>
+ <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-javamail_1.4_spec</artifactId>
<packaging>bundle</packaging>
<name>JavaMail 1.4</name>
@@ -47,9 +48,8 @@
<properties>
<siteId>specs/${artifactId}</siteId>
- <geronimo.osgi.export.pkg>javax.mail*</geronimo.osgi.export.pkg>
+ <!-- ??? -->
<geronimo.osgi.private.pkg>org.apache.geronimo.mail*</geronimo.osgi.private.pkg>
- <geronimo.osgi.export.version>1.4</geronimo.osgi.export.version>
<geronimo.osgi.resources>src/main/resources/,META-INF/LICENSE.txt=LICENSE.txt,META-INF/NOTICE.txt=NOTICE.txt</geronimo.osgi.resources>
</properties>
@@ -66,5 +66,26 @@
<version>1.0.2</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>javax.mail*;version=1.4</Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: geronimo/specs/trunk/geronimo-jaxb_2.0_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaxb_2.0_spec/pom.xml?rev=780903&r1=780902&r2=780903&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxb_2.0_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jaxb_2.0_spec/pom.xml Tue Jun 2 01:51:45 2009
@@ -22,14 +22,17 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>specs-parent</artifactId>
- <version>1.6</version>
+ <groupId>org.apache.geronimo.genesis.flava</groupId>
+ <artifactId>genesis-java5-flava</artifactId>
+ <version>2.0-SNAPSHOT</version>
</parent>
+ <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jaxb_2.0_spec</artifactId>
- <packaging>jar</packaging>
+ <name>Apache JAXB 2.0 Spec</name>
+ <packaging>bundle</packaging>
<version>1.0-SNAPSHOT</version>
+ <description>Java API for XML binding 2.0 API</description>
<url>http://geronimo.apache.org/maven/${siteId}/${version}</url>
<distributionManagement>
@@ -41,9 +44,6 @@
<properties>
<siteId>specs/${artifactId}</siteId>
-
- <geronimo.osgi.export.pkg>javax.xml.bind*</geronimo.osgi.export.pkg>
- <geronimo.osgi.export.version>2.0</geronimo.osgi.export.version>
</properties>
<dependencies>
@@ -67,4 +67,18 @@
<url>http://svn.apache.org/viewcvs.cgi/geronimo/specs/trunk/geronimo-jaxb_2.0_spec/</url>
</scm>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>javax.xml.bind*;version=2.0</Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: geronimo/specs/trunk/geronimo-jaxb_2.1_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaxb_2.1_spec/pom.xml?rev=780903&r1=780902&r2=780903&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxb_2.1_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jaxb_2.1_spec/pom.xml Tue Jun 2 01:51:45 2009
@@ -22,14 +22,17 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>specs-parent</artifactId>
- <version>1.6</version>
+ <groupId>org.apache.geronimo.genesis.flava</groupId>
+ <artifactId>genesis-java5-flava</artifactId>
+ <version>2.0-SNAPSHOT</version>
</parent>
+ <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jaxb_2.1_spec</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<version>1.0-SNAPSHOT</version>
+ <name>Apache JAXB 2.0 Spec</name>
+ <description>Java API for XML binding 2.0 API</description>
<url>http://geronimo.apache.org/maven/${siteId}/${version}</url>
<distributionManagement>
@@ -41,9 +44,6 @@
<properties>
<siteId>specs/${artifactId}</siteId>
-
- <geronimo.osgi.export.pkg>javax.xml.bind*</geronimo.osgi.export.pkg>
- <geronimo.osgi.export.version>2.1</geronimo.osgi.export.version>
</properties>
<dependencies>
@@ -67,4 +67,18 @@
<url>http://svn.apache.org/viewcvs.cgi/geronimo/specs/trunk/geronimo-jaxb_2.1_spec/</url>
</scm>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>javax.xml.bind*;version=2.1</Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: geronimo/specs/trunk/geronimo-jaxr_1.0_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaxr_1.0_spec/pom.xml?rev=780903&r1=780902&r2=780903&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxr_1.0_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jaxr_1.0_spec/pom.xml Tue Jun 2 01:51:45 2009
@@ -25,15 +25,17 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>specs-parent</artifactId>
- <version>1.6</version>
+ <groupId>org.apache.geronimo.genesis.flava</groupId>
+ <artifactId>genesis-java1.4-flava</artifactId>
+ <version>2.0-SNAPSHOT</version>
</parent>
+ <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jaxr_1.0_spec</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>JAXR 1.0</name>
<version>2.0.1-SNAPSHOT</version>
+ <description>Java API for XML Registry 1.0</description>
<url>http://geronimo.apache.org/maven/${siteId}/${version}</url>
<distributionManagement>
@@ -45,9 +47,6 @@
<properties>
<siteId>specs/${artifactId}</siteId>
-
- <geronimo.osgi.export.pkg>javax.xml.registry*</geronimo.osgi.export.pkg>
- <geronimo.osgi.export.version>1.1</geronimo.osgi.export.version>
</properties>
<dependencies>
@@ -59,6 +58,13 @@
</dependency>
<dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>scout</groupId>
<artifactId>scout</artifactId>
<version>0.5</version>
@@ -72,4 +78,19 @@
<url>http://svn.apache.org/viewcvs.cgi/geronimo/specs/trunk/geronimo-jaxr_1.0_spec/</url>
</scm>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>javax.xml.registry*;version=1.0</Export-Package>
+ <Import-Package>javax.activation;version=1.1,*</Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: geronimo/specs/trunk/geronimo-jaxrpc_1.1_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaxrpc_1.1_spec/pom.xml?rev=780903&r1=780902&r2=780903&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxrpc_1.1_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jaxrpc_1.1_spec/pom.xml Tue Jun 2 01:51:45 2009
@@ -25,15 +25,17 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>specs-parent</artifactId>
- <version>1.6</version>
+ <groupId>org.apache.geronimo.genesis.flava</groupId>
+ <artifactId>genesis-java1.4-flava</artifactId>
+ <version>2.0-SNAPSHOT</version>
</parent>
+ <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>JAXRPC 1.1</name>
<version>2.0.1-SNAPSHOT</version>
+ <description>Java API for XML Remote Procedure Call 1.1 API</description>
<url>http://geronimo.apache.org/maven/${siteId}/${version}</url>
<distributionManagement>
@@ -45,9 +47,6 @@
<properties>
<siteId>specs/${artifactId}</siteId>
-
- <geronimo.osgi.export.pkg>javax.xml.rpc*</geronimo.osgi.export.pkg>
- <geronimo.osgi.export.version>1.1</geronimo.osgi.export.version>
</properties>
<dependencies>
@@ -72,4 +71,18 @@
<url>http://svn.apache.org/viewcvs.cgi/geronimo/specs/trunk/geronimo-jaxrpc_1.1_spec/</url>
</scm>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>javax.xml.rpc*;version=1.1</Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: geronimo/specs/trunk/geronimo-jaxws_2.1_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaxws_2.1_spec/pom.xml?rev=780903&r1=780902&r2=780903&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxws_2.1_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jaxws_2.1_spec/pom.xml Tue Jun 2 01:51:45 2009
@@ -25,15 +25,17 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>specs-parent</artifactId>
- <version>1.6</version>
+ <groupId>org.apache.geronimo.genesis.flava</groupId>
+ <artifactId>genesis-java5-flava</artifactId>
+ <version>2.0-SNAPSHOT</version>
</parent>
+ <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jaxws_2.1_spec</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>Apache Geronimo JAX-WS 2.1 API</name>
<version>1.0.1-SNAPSHOT</version>
+ <description>Java API for XML Web Services 2.1</description>
<url>http://geronimo.apache.org/maven/${siteId}/${version}</url>
<distributionManagement>
@@ -45,9 +47,6 @@
<properties>
<siteId>specs/${artifactId}</siteId>
-
- <geronimo.osgi.export.pkg>javax.xml.ws*</geronimo.osgi.export.pkg>
- <geronimo.osgi.export.version>2.1</geronimo.osgi.export.version>
</properties>
<scm>
@@ -56,61 +55,45 @@
<url>https://svn.apache.org/viewcvs.cgi/geronimo/specs/trunk/geronimo-jaxws_2.1_spec/</url>
</scm>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-saaj_1.3_spec</artifactId>
- <version>1.0.0</version>
- </dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.1</version>
- <exclusions>
- <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.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.1_spec</artifactId>
- <version>1.0.2</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-saaj_1.3_spec</artifactId>
+ <version>1.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxb_2.1_spec</artifactId>
+ <version>1.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ <version>1.0.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-activation_1.1_spec</artifactId>
+ <version>1.0.2</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>javax.xml.ws*;version=2.1</Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: geronimo/specs/trunk/geronimo-jms_1.1_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jms_1.1_spec/pom.xml?rev=780903&r1=780902&r2=780903&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jms_1.1_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jms_1.1_spec/pom.xml Tue Jun 2 01:51:45 2009
@@ -25,15 +25,17 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>specs-parent</artifactId>
- <version>1.6</version>
+ <groupId>org.apache.geronimo.genesis.flava</groupId>
+ <artifactId>genesis-java1.4-flava</artifactId>
+ <version>2.0-SNAPSHOT</version>
</parent>
+ <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>JMS 1.1</name>
<version>1.1.2-SNAPSHOT</version>
+ <description>Java Message Service 1.1 API</description>
<url>http://geronimo.apache.org/maven/${siteId}/${version}</url>
<distributionManagement>
@@ -45,13 +47,17 @@
<properties>
<siteId>specs/${artifactId}</siteId>
-
- <geronimo.osgi.export.pkg>javax.jms*</geronimo.osgi.export.pkg>
- <geronimo.osgi.export.version>1.1</geronimo.osgi.export.version>
</properties>
<dependencies>
<dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>mockobjects</groupId>
<artifactId>mockobjects-core</artifactId>
<version>0.09</version>
@@ -72,4 +78,18 @@
<url>http://svn.apache.org/viewcvs.cgi/geronimo/specs/trunk/geronimo-jms_1.1_spec/</url>
</scm>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>javax.jms*;version=1.1</Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/pom.xml?rev=780903&r1=780902&r2=780903&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/pom.xml Tue Jun 2 01:51:45 2009
@@ -30,8 +30,15 @@
<version>1.6</version>
</parent>
+ <!--<parent>-->
+ <!--<groupId>org.apache.geronimo.genesis.flava</groupId>-->
+ <!--<artifactId>genesis-java5-flava</artifactId>-->
+ <!--<version>2.0-SNAPSHOT</version>-->
+ <!--</parent>-->
+ <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_2.0_spec</artifactId>
<packaging>jar</packaging>
+ <!--<packaging>bundle</packaging>-->
<name>Apache Geronimo JSR-317 JPA 2.0 EARLY ACCESS Spec API</name>
<version>1.0-EA2-SNAPSHOT</version>
@@ -56,5 +63,19 @@
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-jpa_2.0_spec/</developerConnection>
<url>http://svn.apache.org/viewcvs.cgi/geronimo/specs/trunk/geronimo-jpa_2.0_spec/</url>
</scm>
-
+<!--
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>javax.persistence*;version=2.0</Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+-->
</project>
Modified: geronimo/specs/trunk/geronimo-jsp_2.1_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jsp_2.1_spec/pom.xml?rev=780903&r1=780902&r2=780903&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jsp_2.1_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jsp_2.1_spec/pom.xml Tue Jun 2 01:51:45 2009
@@ -25,15 +25,17 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>specs-parent</artifactId>
- <version>1.6</version>
+ <groupId>org.apache.geronimo.genesis.flava</groupId>
+ <artifactId>genesis-java5-flava</artifactId>
+ <version>2.0-SNAPSHOT</version>
</parent>
+ <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jsp_2.1_spec</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>JSP 2.1</name>
<version>1.0.2-SNAPSHOT</version>
+ <description>Java Server Pages 2.1 API</description>
<url>http://geronimo.apache.org/maven/${siteId}/${version}</url>
<distributionManagement>
@@ -45,9 +47,6 @@
<properties>
<siteId>specs/${artifactId}</siteId>
-
- <geronimo.osgi.export.pkg>javax.servlet.jsp*</geronimo.osgi.export.pkg>
- <geronimo.osgi.export.version>2.1</geronimo.osgi.export.version>
</properties>
<dependencies>
@@ -71,4 +70,18 @@
<url>http://svn.apache.org/viewcvs.cgi/geronimo/specs/trunk/geronimo-jsp_2.1_spec/</url>
</scm>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>javax.servlet.jsp*;version=2.1</Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: geronimo/specs/trunk/geronimo-jta_1.1_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jta_1.1_spec/pom.xml?rev=780903&r1=780902&r2=780903&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jta_1.1_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jta_1.1_spec/pom.xml Tue Jun 2 01:51:45 2009
@@ -25,15 +25,17 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>specs-parent</artifactId>
- <version>1.6</version>
+ <groupId>org.apache.geronimo.genesis.flava</groupId>
+ <artifactId>genesis-java1.4-flava</artifactId>
+ <version>2.0-SNAPSHOT</version>
</parent>
+ <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>JTA 1.1</name>
<version>1.1.2-SNAPSHOT</version>
+ <description>Java Transaction Architecture 1.1 API</description>
<url>http://geronimo.apache.org/maven/${siteId}/${version}</url>
<distributionManagement>
@@ -45,9 +47,6 @@
<properties>
<siteId>specs/${artifactId}</siteId>
-
- <geronimo.osgi.export.pkg>javax.transaction*</geronimo.osgi.export.pkg>
- <geronimo.osgi.export.version>1.1</geronimo.osgi.export.version>
</properties>
<scm>
@@ -56,4 +55,18 @@
<url>http://svn.apache.org/viewcvs.cgi/geronimo/specs/trunk/geronimo-jta_1.1_spec/</url>
</scm>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>javax.transaction*;version=1.1</Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: geronimo/specs/trunk/geronimo-saaj_1.3_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-saaj_1.3_spec/pom.xml?rev=780903&r1=780902&r2=780903&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-saaj_1.3_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-saaj_1.3_spec/pom.xml Tue Jun 2 01:51:45 2009
@@ -25,15 +25,17 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>specs-parent</artifactId>
- <version>1.6</version>
+ <groupId>org.apache.geronimo.genesis.flava</groupId>
+ <artifactId>genesis-java1.4-flava</artifactId>
+ <version>2.0-SNAPSHOT</version>
</parent>
+ <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-saaj_1.3_spec</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>SAAJ 1.3</name>
<version>1.0.2-SNAPSHOT</version>
+ <description>SOAP AA for Java 1.3</description>
<url>http://geronimo.apache.org/maven/${siteId}/${version}</url>
<distributionManagement>
@@ -45,9 +47,6 @@
<properties>
<siteId>specs/${artifactId}</siteId>
-
- <geronimo.osgi.export.pkg>javax.xml.soap*</geronimo.osgi.export.pkg>
- <geronimo.osgi.export.version>1.3</geronimo.osgi.export.version>
</properties>
<dependencies>
@@ -65,4 +64,18 @@
<url>http://svn.apache.org/viewcvs.cgi/geronimo/specs/trunk/geronimo-saaj_1.3_spec/</url>
</scm>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>javax.xml.soap*;version=1.3</Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: geronimo/specs/trunk/geronimo-servlet_2.5_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-servlet_2.5_spec/pom.xml?rev=780903&r1=780902&r2=780903&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_2.5_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-servlet_2.5_spec/pom.xml Tue Jun 2 01:51:45 2009
@@ -25,17 +25,17 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>specs-parent</artifactId>
- <version>1.6</version>
+ <groupId>org.apache.geronimo.genesis.flava</groupId>
+ <artifactId>genesis-java1.4-flava</artifactId>
+ <version>2.0-SNAPSHOT</version>
</parent>
+ <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.5_spec</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>Servlet 2.5</name>
<version>1.3-SNAPSHOT</version>
-
- <description>Servlet 2.5 Specification</description>
+ <description>Servlet 2.5 API</description>
<url>http://geronimo.apache.org/maven/${siteId}/${version}</url>
<distributionManagement>
@@ -47,9 +47,6 @@
<properties>
<siteId>specs/${artifactId}</siteId>
-
- <geronimo.osgi.export.pkg>javax.servlet*</geronimo.osgi.export.pkg>
- <geronimo.osgi.export.version>2.5</geronimo.osgi.export.version>
</properties>
<scm>
@@ -58,4 +55,18 @@
<url>http://svn.apache.org/viewcvs.cgi/geronimo/specs/trunk/geronimo-servlet_2.5_spec/</url>
</scm>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>javax.servlet*;version=2.5</Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: geronimo/specs/trunk/geronimo-servlet_3.0_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-servlet_3.0_spec/pom.xml?rev=780903&r1=780902&r2=780903&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_3.0_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-servlet_3.0_spec/pom.xml Tue Jun 2 01:51:45 2009
@@ -25,38 +25,30 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>specs-parent</artifactId>
- <version>1.6</version>
+ <groupId>org.apache.geronimo.genesis.flava</groupId>
+ <artifactId>genesis-java5-flava</artifactId>
+ <version>2.0-SNAPSHOT</version>
</parent>
+ <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_3.0_spec</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>Servlet 3.0 Early Access</name>
<version>1.0-EA-SNAPSHOT</version>
- <description>Servlet 3.0 (early access) Specification</description>
+ <description>Servlet 3.0 (early access) API</description>
<url>http://geronimo.apache.org/maven/${siteId}/${version}</url>
-<!-- remove distributionManagement when we upgrade genesis -->
+
<distributionManagement>
<site>
<id>geronimo-website</id>
<url>${staging.siteURL}/${siteId}/${version}</url>
</site>
- <snapshotRepository>
- <id>apache.snapshots</id>
- <name>Apache Development Snapshot Repository</name>
- <url>scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
- <uniqueVersion>false</uniqueVersion>
- </snapshotRepository>
</distributionManagement>
<properties>
<siteId>specs/${artifactId}</siteId>
-
- <geronimo.osgi.export.pkg>javax.servlet*</geronimo.osgi.export.pkg>
- <geronimo.osgi.export.version>3.0</geronimo.osgi.export.version>
</properties>
<scm>
@@ -65,4 +57,18 @@
<url>http://svn.apache.org/viewcvs.cgi/geronimo/specs/trunk/geronimo-servlet_3.0_spec/</url>
</scm>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>javax.servlet*;version=3.0</Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: geronimo/specs/trunk/geronimo-validation_1.0_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-validation_1.0_spec/pom.xml?rev=780903&r1=780902&r2=780903&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-validation_1.0_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-validation_1.0_spec/pom.xml Tue Jun 2 01:51:45 2009
@@ -25,17 +25,17 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>specs-parent</artifactId>
- <version>1.6</version>
+ <groupId>org.apache.geronimo.genesis.flava</groupId>
+ <artifactId>genesis-java5-flava</artifactId>
+ <version>2.0-SNAPSHOT</version>
</parent>
+ <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-validation_1.0_spec</artifactId>
<version>1.0-SNAPSHOT</version>
- <packaging>jar</packaging>
- <name>Apache Geronimo JSR-303 Bean Validation Spec API</name>
-
- <description>Implementation of JSR-303 Bean Validation Spec API</description>
+ <packaging>bundle</packaging>
+ <name>Bean Validation Spec API</name>
+ <description>Bean Validation Spec API 1.0 JSR-303</description>
<url>http://geronimo.apache.org/maven/${siteId}/${version}</url>
<distributionManagement>
@@ -47,8 +47,6 @@
<properties>
<siteId>specs/${artifactId}</siteId>
- <geronimo.osgi.export.pkg>javax.validation*</geronimo.osgi.export.pkg>
- <geronimo.osgi.export.version>1.0</geronimo.osgi.export.version>
</properties>
<scm>
@@ -57,4 +55,18 @@
<url>http://svn.apache.org/viewcvs.cgi/geronimo/specs/trunk/geronimo-validation_1.0_spec/</url>
</scm>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>javax.validation*;version=1.0</Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: geronimo/specs/trunk/geronimo-ws-metadata_2.0_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-ws-metadata_2.0_spec/pom.xml?rev=780903&r1=780902&r2=780903&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-ws-metadata_2.0_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-ws-metadata_2.0_spec/pom.xml Tue Jun 2 01:51:45 2009
@@ -25,15 +25,17 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>specs-parent</artifactId>
- <version>1.6</version>
+ <groupId>org.apache.geronimo.genesis.flava</groupId>
+ <artifactId>genesis-java5-flava</artifactId>
+ <version>2.0-SNAPSHOT</version>
</parent>
+ <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>Web Services Metadata 2.0</name>
<version>1.1.3-SNAPSHOT</version>
+ <description>Web Services Metadata 2.0 API</description>
<url>http://geronimo.apache.org/maven/${siteId}/${version}</url>
<distributionManagement>
@@ -56,4 +58,18 @@
<url>http://svn.apache.org/viewcvs.cgi/geronimo/specs/trunk/geronimo-ws-metadata_2.0_spec/</url>
</scm>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>javax.jws*;version=2.0</Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>