You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by gn...@apache.org on 2008/01/31 21:28:22 UTC
svn commit: r617231 - in /geronimo/specs/trunk: ./
geronimo-activation_1.1_spec/ geronimo-annotation_1.0_spec/
geronimo-ejb_3.0_spec/ geronimo-el_1.0_spec/ geronimo-interceptor_3.0_spec/
geronimo-j2ee-connector_1.5_spec/ geronimo-j2ee-management_1.1_sp...
Author: gnodet
Date: Thu Jan 31 12:28:17 2008
New Revision: 617231
URL: http://svn.apache.org/viewvc?rev=617231&view=rev
Log:
Rework specs
Added:
geronimo/specs/trunk/geronimo-activation_1.1_spec/
- copied from r617208, geronimo/specs/tags/geronimo-activation_1.1_spec-1.0.1/
geronimo/specs/trunk/geronimo-servlet_2.5_spec/
- copied from r617205, geronimo/specs/tags/geronimo-servlet_2.5_spec-1.1.1/
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-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.5_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-jaxr_1.0_spec/pom.xml
geronimo/specs/trunk/geronimo-jaxrpc_1.1_spec/pom.xml
geronimo/specs/trunk/geronimo-jms_1.1_spec/pom.xml
geronimo/specs/trunk/geronimo-jpa_3.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-ws-metadata_2.0_spec/pom.xml
geronimo/specs/trunk/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=617231&r1=617208&r2=617231&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-activation_1.1_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-activation_1.1_spec/pom.xml Thu Jan 31 12:28:17 2008
@@ -27,24 +27,18 @@
<parent>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>specs</artifactId>
- <version>1.3</version>
+ <version>1.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>geronimo-activation_1.1_spec</artifactId>
<packaging>bundle</packaging>
<name>Activation 1.1</name>
- <version>1.0.1</version>
+ <version>1.0.2-SNAPSHOT</version>
<properties>
<geronimo.osgi.export.pkg>javax.activation*</geronimo.osgi.export.pkg>
<geronimo.osgi.export.version>1.1</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>
- <scm>
- <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-activation_1.1_spec-1.0.1</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-activation_1.1_spec-1.0.1</developerConnection>
- <url>https://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-activation_1.1_spec-1.0.1</url>
- </scm>
</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=617231&r1=617230&r2=617231&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-annotation_1.0_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-annotation_1.0_spec/pom.xml Thu Jan 31 12:28:17 2008
@@ -27,48 +27,18 @@
<parent>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>specs</artifactId>
- <version>1.3</version>
+ <version>1.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>geronimo-annotation_1.0_spec</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Annotation 1.0</name>
- <version>1.1.2-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
<properties>
<geronimo.osgi.export.pkg>javax.annotation*</geronimo.osgi.export.pkg>
<geronimo.osgi.export.version>1.0</geronimo.osgi.export.version>
</properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-idea-plugin</artifactId>
- <configuration>
- <jdkName>1.5</jdkName>
- <linkModules>true</linkModules>
- </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=617231&r1=617230&r2=617231&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-ejb_3.0_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-ejb_3.0_spec/pom.xml Thu Jan 31 12:28:17 2008
@@ -27,14 +27,14 @@
<parent>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>specs</artifactId>
- <version>1.3</version>
+ <version>1.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>geronimo-ejb_3.0_spec</artifactId>
<packaging>bundle</packaging>
<name>EJB 3.0</name>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<properties>
<geronimo.osgi.export.pkg>javax.ejb*,javax.xml.rpc.handler*</geronimo.osgi.export.pkg>
@@ -45,52 +45,23 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
- <version>1.1.1</version>
+ <version>1.1.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-interceptor_3.0_spec</artifactId>
- <version>1.0.1</version>
+ <version>1.0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.0_spec</artifactId>
- <version>1.1.1</version>
+ <version>1.1.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-idea-plugin</artifactId>
- <configuration>
- <jdkName>1.5</jdkName>
- <linkModules>true</linkModules>
- </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=617231&r1=617230&r2=617231&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-el_1.0_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-el_1.0_spec/pom.xml Thu Jan 31 12:28:17 2008
@@ -27,54 +27,18 @@
<parent>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>specs</artifactId>
- <version>1.3</version>
+ <version>1.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>geronimo-el_1.0_spec</artifactId>
<packaging>bundle</packaging>
<name>Expression Language 1.0</name>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<properties>
<geronimo.osgi.export.pkg>javax.el*</geronimo.osgi.export.pkg>
<geronimo.osgi.export.version>1.0</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>
- <scm>
- <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-el_1.0_spec</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-el_1.0_spec</developerConnection>
- <url>https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-el_1.0_spec</url>
- </scm>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-idea-plugin</artifactId>
- <configuration>
- <jdkName>1.5</jdkName>
- <linkModules>true</linkModules>
- </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=617231&r1=617230&r2=617231&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-interceptor_3.0_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-interceptor_3.0_spec/pom.xml Thu Jan 31 12:28:17 2008
@@ -27,46 +27,17 @@
<parent>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>specs</artifactId>
- <version>1.3</version>
+ <version>1.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>geronimo-interceptor_3.0_spec</artifactId>
<packaging>bundle</packaging>
<name>Interceptor 3.0</name>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<properties>
<geronimo.osgi.export.version>3.0</geronimo.osgi.export.version>
</properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-idea-plugin</artifactId>
- <configuration>
- <jdkName>1.5</jdkName>
- <linkModules>true</linkModules>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
Modified: geronimo/specs/trunk/geronimo-j2ee-connector_1.5_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.5_spec/pom.xml?rev=617231&r1=617230&r2=617231&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.5_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.5_spec/pom.xml Thu Jan 31 12:28:17 2008
@@ -27,40 +27,27 @@
<parent>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>specs</artifactId>
- <version>1.3</version>
+ <version>1.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
<packaging>bundle</packaging>
<name>J2EE Connector 1.5</name>
- <version>2.1-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
+
+ <properties>
+ <geronimo.osgi.export.pkg>javax.resource*</geronimo.osgi.export.pkg>
+ <geronimo.osgi.export.version>1.5</geronimo.osgi.export.version>
+ </properties>
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
- <version>1.1.1</version>
+ <version>1.1.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <verbose>true</verbose>
- <source>1.5</source>
- <target>1.5</target>
- <compilerVersion>1.5</compilerVersion>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <properties>
- <geronimo.osgi.export.pkg>javax.resource*</geronimo.osgi.export.pkg>
- <geronimo.osgi.export.version>1.5</geronimo.osgi.export.version>
- </properties>
</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=617231&r1=617230&r2=617231&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 Thu Jan 31 12:28:17 2008
@@ -27,14 +27,14 @@
<parent>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>specs</artifactId>
- <version>1.3</version>
+ <version>1.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
<packaging>bundle</packaging>
<name>J2EE Management 1.1</name>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<properties>
<geronimo.osgi.export.pkg>javax.management.j2ee*</geronimo.osgi.export.pkg>
@@ -42,40 +42,13 @@
<geronimo.osgi.import.pkg>javax.ejb*;resolution:=optional,*</geronimo.osgi.import.pkg>
</properties>
- <scm>
- <connection>scm:svn:https://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>https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-j2ee-management_1.1_spec</url>
- </scm>
-
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-ejb_3.0_spec</artifactId>
- <version>1.0.1</version>
+ <version>1.0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-idea-plugin</artifactId>
- <configuration>
- <jdkName>1.5</jdkName>
- <linkModules>true</linkModules>
- </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=617231&r1=617230&r2=617231&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jacc_1.1_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jacc_1.1_spec/pom.xml Thu Jan 31 12:28:17 2008
@@ -27,60 +27,26 @@
<parent>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>specs</artifactId>
- <version>1.3</version>
+ <version>1.4-SNAPSHOT</version>
</parent>
<artifactId>geronimo-jacc_1.1_spec</artifactId>
<packaging>bundle</packaging>
<name>J2EE JACC 1.1</name>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<properties>
<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:https://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>https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-jacc_1.1_spec</url>
- </scm>
-
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.5_spec</artifactId>
- <version>1.1.1</version>
+ <version>1.1.2-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-idea-plugin</artifactId>
- <configuration>
- <jdkName>1.5</jdkName>
- <linkModules>true</linkModules>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.1</version>
- <configuration>
- <source>1.5</source>
- </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=617231&r1=617230&r2=617231&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxr_1.0_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jaxr_1.0_spec/pom.xml Thu Jan 31 12:28:17 2008
@@ -27,14 +27,14 @@
<parent>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>specs</artifactId>
- <version>1.3</version>
+ <version>1.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>geronimo-jaxr_1.0_spec</artifactId>
<packaging>bundle</packaging>
<name>JAXR 1.0</name>
- <version>2.1-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<properties>
<geronimo.osgi.export.pkg>javax.xml.registry*</geronimo.osgi.export.pkg>
@@ -45,7 +45,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-activation_1.1_spec</artifactId>
- <version>1.0.1</version>
+ <version>1.0.2-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -57,10 +57,4 @@
</dependency>
</dependencies>
-
- <scm>
- <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-jaxr_1.0_spec</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-jaxr_1.0_spec</developerConnection>
- <url>https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-jaxr_1.0_spec</url>
- </scm>
</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=617231&r1=617230&r2=617231&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxrpc_1.1_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jaxrpc_1.1_spec/pom.xml Thu Jan 31 12:28:17 2008
@@ -27,14 +27,14 @@
<parent>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>specs</artifactId>
- <version>1.3</version>
+ <version>1.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
<packaging>bundle</packaging>
<name>JAXRPC 1.1</name>
- <version>2.1-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<properties>
<geronimo.osgi.export.pkg>javax.xml.rpc*</geronimo.osgi.export.pkg>
@@ -45,22 +45,16 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-saaj_1.3_spec</artifactId>
- <version>1.0</version>
+ <version>1.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.5_spec</artifactId>
- <version>1.1.1</version>
+ <version>1.1.2-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
-
- <scm>
- <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-jaxrpc_1.1_spec</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-jaxrpc_1.1_spec</developerConnection>
- <url>https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-jaxrpc_1.1_spec</url>
- </scm>
</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=617231&r1=617230&r2=617231&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jms_1.1_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jms_1.1_spec/pom.xml Thu Jan 31 12:28:17 2008
@@ -27,14 +27,14 @@
<parent>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>specs</artifactId>
- <version>1.3</version>
+ <version>1.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>geronimo-jms_1.1_spec</artifactId>
<packaging>bundle</packaging>
<name>JMS 1.1</name>
- <version>1.1.2-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
<properties>
<geronimo.osgi.export.pkg>javax.jms*</geronimo.osgi.export.pkg>
@@ -57,9 +57,4 @@
</dependency>
</dependencies>
- <scm>
- <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-jms_1.1_spec</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-jms_1.1_spec</developerConnection>
- <url>https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-jms_1.1_spec</url>
- </scm>
</project>
Modified: geronimo/specs/trunk/geronimo-jpa_3.0_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_3.0_spec/pom.xml?rev=617231&r1=617230&r2=617231&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_3.0_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jpa_3.0_spec/pom.xml Thu Jan 31 12:28:17 2008
@@ -27,47 +27,18 @@
<parent>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>specs</artifactId>
- <version>1.3</version>
+ <version>1.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>geronimo-jpa_3.0_spec</artifactId>
<packaging>bundle</packaging>
<name>JPA 1.0</name>
- <version>1.1.2-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
<properties>
<geronimo.osgi.export.pkg>javax.persistence*</geronimo.osgi.export.pkg>
<geronimo.osgi.export.version>3.0</geronimo.osgi.export.version>
</properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-idea-plugin</artifactId>
- <configuration>
- <jdkName>1.5</jdkName>
- <linkModules>true</linkModules>
- </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=617231&r1=617230&r2=617231&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jsp_2.1_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jsp_2.1_spec/pom.xml Thu Jan 31 12:28:17 2008
@@ -27,70 +27,36 @@
<parent>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>specs</artifactId>
- <version>1.3</version>
+ <version>1.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>geronimo-jsp_2.1_spec</artifactId>
<packaging>bundle</packaging>
<name>JSP 2.1</name>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<properties>
<geronimo.osgi.export.pkg>javax.servlet.jsp*</geronimo.osgi.export.pkg>
<geronimo.osgi.export.version>2.1</geronimo.osgi.export.version>
</properties>
- <scm>
- <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-jsp_2.1_spec</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/trunk/tags/geronimo-jsp_2.1_spec</developerConnection>
- <url>https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-jsp_2.1_spec</url>
- </scm>
-
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.5_spec</artifactId>
- <version>1.1.1</version>
+ <version>1.1.2-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-el_1.0_spec</artifactId>
- <version>1.0.1</version>
+ <version>1.0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-idea-plugin</artifactId>
- <configuration>
- <jdkName>1.5</jdkName>
- <linkModules>true</linkModules>
- </configuration>
- </plugin>
- </plugins>
-
<resources>
<resource>
<targetPath>javax/servlet/jsp/resources</targetPath>
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=617231&r1=617230&r2=617231&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jta_1.1_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jta_1.1_spec/pom.xml Thu Jan 31 12:28:17 2008
@@ -27,14 +27,14 @@
<parent>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>specs</artifactId>
- <version>1.3</version>
+ <version>1.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>geronimo-jta_1.1_spec</artifactId>
<packaging>bundle</packaging>
<name>JTA 1.1</name>
- <version>1.1.2-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
<properties>
<geronimo.osgi.export.pkg>javax.transaction*</geronimo.osgi.export.pkg>
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=617231&r1=617230&r2=617231&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-saaj_1.3_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-saaj_1.3_spec/pom.xml Thu Jan 31 12:28:17 2008
@@ -27,14 +27,14 @@
<parent>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>specs</artifactId>
- <version>1.3</version>
+ <version>1.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>geronimo-saaj_1.3_spec</artifactId>
<packaging>bundle</packaging>
<name>SAAJ 1.3</name>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
<properties>
<geronimo.osgi.export.pkg>javax.xml.soap*</geronimo.osgi.export.pkg>
@@ -45,14 +45,9 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-activation_1.1_spec</artifactId>
- <version>1.0.1</version>
+ <version>1.0.2-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
- <scm>
- <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-saaj_1.3_spec</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-saaj_1.3_spec</developerConnection>
- <url>https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-saaj_1.3_spec</url>
- </scm>
</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=617231&r1=617205&r2=617231&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_2.5_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-servlet_2.5_spec/pom.xml Thu Jan 31 12:28:17 2008
@@ -27,29 +27,21 @@
<parent>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>specs</artifactId>
- <version>1.3</version>
+ <version>1.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>geronimo-servlet_2.5_spec</artifactId>
<packaging>bundle</packaging>
<name>Servlet 2.5</name>
- <version>1.1.1</version>
+ <version>1.1.2-SNAPSHOT</version>
<description>Servlet 2.5 Specification</description>
<properties>
<geronimo.osgi.export.pkg>javax.servlet*</geronimo.osgi.export.pkg>
<geronimo.osgi.export.version>2.5</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>
-
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-servlet_2.5_spec-1.1.1</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/repos/asf/geronimo/specs/tags/geronimo-servlet_2.5_spec-1.1.1</developerConnection>
- <url>http://svn.apache.org/viewvc/geronimo/repos/asf/geronimo/specs/tags/geronimo-servlet_2.5_spec-1.1.1</url>
- </scm>
-
<build>
<resources>
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=617231&r1=617230&r2=617231&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 Thu Jan 31 12:28:17 2008
@@ -27,53 +27,18 @@
<parent>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>specs</artifactId>
- <version>1.3</version>
+ <version>1.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
<packaging>bundle</packaging>
<name>Web Services Metadata 2.0</name>
- <version>1.1.3-SNAPSHOT</version>
+ <version>1.1.2-SNAPSHOT</version>
<properties>
<geronimo.osgi.export.pkg>javax.jws*</geronimo.osgi.export.pkg>
<geronimo.osgi.export.version>2.0</geronimo.osgi.export.version>
</properties>
- <scm>
- <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-ws-metadata_2.0_spec</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-ws-metadata_2.0_spec</developerConnection>
- <url>https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-ws-metadata_2.0_spec</url>
- </scm>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-idea-plugin</artifactId>
- <configuration>
- <jdkName>1.5</jdkName>
- <linkModules>true</linkModules>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
Modified: geronimo/specs/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/pom.xml?rev=617231&r1=617230&r2=617231&view=diff
==============================================================================
--- geronimo/specs/trunk/pom.xml (original)
+++ geronimo/specs/trunk/pom.xml Thu Jan 31 12:28:17 2008
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.geronimo.genesis.config</groupId>
<artifactId>project-config</artifactId>
- <version>1.1</version>
+ <version>1.2</version>
</parent>
<groupId>org.apache.geronimo.specs</groupId>
@@ -70,7 +70,6 @@
<geronimo.osgi.export.version>${project.version}</geronimo.osgi.export.version>
<geronimo.osgi.import>!META-INF*,${geronimo.osgi.import.pkg}</geronimo.osgi.import>
<geronimo.osgi.symbolic.name>${groupId}.${artifactId}</geronimo.osgi.symbolic.name>
- <geronimo.osgi.resources>META-INF/LICENSE.txt=LICENSE.txt,META-INF/NOTICE.txt=NOTICE.txt</geronimo.osgi.resources>
</properties>
<build>
@@ -93,8 +92,37 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.4</source>
- <target>1.4</target>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+
+ <!-- We want to package up license resources in the JARs produced -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <version>1.0-beta-2</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <resourceBundles>
+ <resourceBundle>org.apache:apache-jar-resource-bundle:1.0</resourceBundle>
+ </resourceBundles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.3</version>
+ <inherited>true</inherited>
+ <configuration>
+ <source>1.5</source>
</configuration>
</plugin>
@@ -102,7 +130,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-idea-plugin</artifactId>
<configuration>
- <jdkName>1.4</jdkName>
+ <jdkName>1.5</jdkName>
<linkModules>true</linkModules>
</configuration>
</plugin>
@@ -118,7 +146,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.0.0</version>
+ <version>1.2.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -129,71 +157,142 @@
<Private-Package>${geronimo.osgi.private.pkg}</Private-Package>
<Implementation-Title>Apache Geronimo</Implementation-Title>
<Implementation-Version>${project.version}</Implementation-Version>
- <Include-Resource>${geronimo.osgi.resources}</Include-Resource>
</instructions>
</configuration>
+ <executions>
+ <execution>
+ <id>bundle-manifest</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
-
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <id>deploy</id>
+
+ <build>
+ <defaultGoal>
+ deploy
+ </defaultGoal>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>2.2</version>
+ </plugin>
+
+ <!-- We want the sources JAR published with the release -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.0.4</version>
+ <inherited>true</inherited>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <!-- We want the JavaDoc JAR published with the release -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.3</version>
+ <inherited>true</inherited>
+ <configuration>
+ <source>1.5</source>
+ </configuration>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <!-- We want to deploy the artifact to a staging location for perusal -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>2.3</version>
+ <inherited>true</inherited>
+ <configuration>
+ <updateReleaseInfo>true</updateReleaseInfo>
+ <altDeploymentRepository>${deploy.repository}</altDeploymentRepository>
+ </configuration>
+ </plugin>
+
+ <!-- We want to deploy the site to a staging location for perusal -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>2.0-beta-6</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>stage-deploy</goal>
+ </goals>
+ <configuration>
+ <stagingSiteURL>${deploy.siteURL}</stagingSiteURL>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <!-- We want to sign the artifact, the POM, and all attached artifacts -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>1.0-alpha-4</version>
+ <configuration>
+ <passphrase>${gpg.passphrase}</passphrase>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
<modules>
- <module>geronimo-commonj_1.1_spec</module>
- <module>geronimo-jaspi_1.0_spec</module>
- <module>geronimo-jaxr_1.0_spec</module>
- <module>geronimo-jaxrpc_1.1_spec</module>
+ <module>geronimo-activation_1.1_spec</module>
+ <module>geronimo-annotation_1.0_spec</module>
+ <module>geronimo-ejb_3.0_spec</module>
+ <module>geronimo-el_1.0_spec</module>
+ <module>geronimo-interceptor_3.0_spec</module>
<module>geronimo-j2ee-connector_1.5_spec</module>
<module>geronimo-j2ee-management_1.1_spec</module>
+ <module>geronimo-jacc_1.1_spec</module>
+ <module>geronimo-jaxr_1.0_spec</module>
+ <module>geronimo-jaxrpc_1.1_spec</module>
<module>geronimo-jms_1.1_spec</module>
+ <module>geronimo-jpa_3.0_spec</module>
+ <module>geronimo-jsp_2.1_spec</module>
<module>geronimo-jta_1.1_spec</module>
<module>geronimo-saaj_1.3_spec</module>
+ <module>geronimo-servlet_2.5_spec</module>
+ <module>geronimo-ws-metadata_2.0_spec</module>
</modules>
-
- <profiles>
- <!--
- NOTE: Some modules require JDK 1.5 to build, only enable them if our
- JVM supports that version.
- -->
- <profile>
- <id>jdk1.5</id>
-
- <activation>
- <jdk>1.5</jdk>
- </activation>
-
- <modules>
- <module>geronimo-annotation_1.0_spec</module>
- <module>geronimo-ejb_3.0_spec</module>
- <module>geronimo-el_1.0_spec</module>
- <module>geronimo-jacc_1.1_spec</module>
- <module>geronimo-jpa_3.0_spec</module>
- <module>geronimo-jsp_2.1_spec</module>
- <module>geronimo-interceptor_3.0_spec</module>
- <module>geronimo-ws-metadata_2.0_spec</module>
- </modules>
- </profile>
- </profiles>
-
- <repositories>
- <!--
- NOTE: The default repositories are picked up by Genesis, but need to
- specify where Genesis lives to pick it up + any additional repositories.
- -->
- <repository>
- <id>apache-snapshots</id>
- <name>Apache Snapshots Repository</name>
- <url>http://people.apache.org/repo/m2-snapshot-repository</url>
- <layout>default</layout>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>daily</updatePolicy>
- <checksumPolicy>ignore</checksumPolicy>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- </repositories>
<distributionManagement>
<!--