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 2006/04/29 02:36:37 UTC
svn commit: r398046 - in /geronimo/specs/trunk:
geronimo-spec-j2ee-management/pom.xml geronimo-spec-j2ee/pom.xml
geronimo-spec-jaxr/pom.xml geronimo-spec-jms/pom.xml pom.xml
Author: gnodet
Date: Fri Apr 28 17:36:36 2006
New Revision: 398046
URL: http://svn.apache.org/viewcvs?rev=398046&view=rev
Log:
GERONIMO-1870: fix M2 dependencies scope in specs.
We will have to re-release all the specs, but those who have not changed will be with a 1.0.1 version
Modified:
geronimo/specs/trunk/geronimo-spec-j2ee-management/pom.xml
geronimo/specs/trunk/geronimo-spec-j2ee/pom.xml
geronimo/specs/trunk/geronimo-spec-jaxr/pom.xml
geronimo/specs/trunk/geronimo-spec-jms/pom.xml
geronimo/specs/trunk/pom.xml
Modified: geronimo/specs/trunk/geronimo-spec-j2ee-management/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/specs/trunk/geronimo-spec-j2ee-management/pom.xml?rev=398046&r1=398045&r2=398046&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-spec-j2ee-management/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-spec-j2ee-management/pom.xml Fri Apr 28 17:36:36 2006
@@ -20,9 +20,20 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-ejb_2.1_spec</artifactId>
</dependency>
- <dependency>
- <groupId>mx4j</groupId>
- <artifactId>mx4j</artifactId>
- </dependency>
</dependencies>
+
+ <profiles>
+ <profile>
+ <id>jdk1.4</id>
+ <activation>
+ <jdk>1.4</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
</project>
Modified: geronimo/specs/trunk/geronimo-spec-j2ee/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/specs/trunk/geronimo-spec-j2ee/pom.xml?rev=398046&r1=398045&r2=398046&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-spec-j2ee/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-spec-j2ee/pom.xml Fri Apr 28 17:36:36 2006
@@ -40,70 +40,87 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-ejb_2.1_spec</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jsp_2.0_spec</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-qname_1.1_spec</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-activation_1.0.2_spec</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-saaj_1.1_spec</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jaxr_1.0_spec</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-corba_2.3_spec</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.4_spec</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-javamail_1.3.1_spec</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-commonj_1.1_spec</artifactId>
+ <optional>true</optional>
</dependency>
</dependencies>
</project>
Modified: geronimo/specs/trunk/geronimo-spec-jaxr/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/specs/trunk/geronimo-spec-jaxr/pom.xml?rev=398046&r1=398045&r2=398046&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-spec-jaxr/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-spec-jaxr/pom.xml Fri Apr 28 17:36:36 2006
@@ -23,6 +23,7 @@
<dependency>
<groupId>scout</groupId>
<artifactId>scout</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
</project>
Modified: geronimo/specs/trunk/geronimo-spec-jms/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/specs/trunk/geronimo-spec-jms/pom.xml?rev=398046&r1=398045&r2=398046&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-spec-jms/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-spec-jms/pom.xml Fri Apr 28 17:36:36 2006
@@ -19,10 +19,12 @@
<dependency>
<groupId>mockobjects</groupId>
<artifactId>mockobjects-core</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>mockobjects</groupId>
<artifactId>mockobjects-jdk1.4-j2ee1.3</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
</project>
Modified: geronimo/specs/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/specs/trunk/pom.xml?rev=398046&r1=398045&r2=398046&view=diff
==============================================================================
--- geronimo/specs/trunk/pom.xml (original)
+++ geronimo/specs/trunk/pom.xml Fri Apr 28 17:36:36 2006
@@ -43,20 +43,20 @@
<geronimoSpecsCorbaVersion>1.0-SNAPSHOT</geronimoSpecsCorbaVersion>
<geronimoSpecsCorba30Version>1.1-SNAPSHOT</geronimoSpecsCorba30Version>
<geronimoSpecsCorba23Version>1.1-SNAPSHOT</geronimoSpecsCorba23Version>
- <geronimoSpecsEjbVersion>1.0</geronimoSpecsEjbVersion>
- <geronimoSpecsJ2eeConnectorVersion>1.0</geronimoSpecsJ2eeConnectorVersion>
- <geronimoSpecsJ2eeDeploymentVersion>1.0</geronimoSpecsJ2eeDeploymentVersion>
- <geronimoSpecsJ2eeJaccVersion>1.0</geronimoSpecsJ2eeJaccVersion>
- <geronimoSpecsJ2eeManagementVersion>1.0</geronimoSpecsJ2eeManagementVersion>
+ <geronimoSpecsEjbVersion>1.0.1-SNAPSHOT</geronimoSpecsEjbVersion>
+ <geronimoSpecsJ2eeConnectorVersion>1.0.1-SNAPSHOT</geronimoSpecsJ2eeConnectorVersion>
+ <geronimoSpecsJ2eeDeploymentVersion>1.0.1-SNAPSHOT</geronimoSpecsJ2eeDeploymentVersion>
+ <geronimoSpecsJ2eeJaccVersion>1.0.1-SNAPSHOT</geronimoSpecsJ2eeJaccVersion>
+ <geronimoSpecsJ2eeManagementVersion>1.0.1-SNAPSHOT</geronimoSpecsJ2eeManagementVersion>
<geronimoSpecsJavamailVersion>1.1-SNAPSHOT</geronimoSpecsJavamailVersion>
- <geronimoSpecsJaxrVersion>1.0</geronimoSpecsJaxrVersion>
- <geronimoSpecsJaxrpcVersion>1.0</geronimoSpecsJaxrpcVersion>
- <geronimoSpecsJmsVersion>1.0</geronimoSpecsJmsVersion>
- <geronimoSpecsJspVersion>1.0</geronimoSpecsJspVersion>
- <geronimoSpecsJtaVersion>1.0</geronimoSpecsJtaVersion>
- <geronimoSpecsQnameVersion>1.0</geronimoSpecsQnameVersion>
- <geronimoSpecsSaajVersion>1.0</geronimoSpecsSaajVersion>
- <geronimoSpecsServletVersion>1.0</geronimoSpecsServletVersion>
+ <geronimoSpecsJaxrVersion>1.0.1-SNAPSHOT</geronimoSpecsJaxrVersion>
+ <geronimoSpecsJaxrpcVersion>1.0.1-SNAPSHOT</geronimoSpecsJaxrpcVersion>
+ <geronimoSpecsJmsVersion>1.0.1-SNAPSHOT</geronimoSpecsJmsVersion>
+ <geronimoSpecsJspVersion>1.0.1-SNAPSHOT</geronimoSpecsJspVersion>
+ <geronimoSpecsJtaVersion>1.0.1-SNAPSHOT</geronimoSpecsJtaVersion>
+ <geronimoSpecsQnameVersion>1.0.1-SNAPSHOT</geronimoSpecsQnameVersion>
+ <geronimoSpecsSaajVersion>1.0.1-SNAPSHOT</geronimoSpecsSaajVersion>
+ <geronimoSpecsServletVersion>1.0.1-SNAPSHOT</geronimoSpecsServletVersion>
</properties>
<build>
@@ -105,23 +105,23 @@
<module>geronimo-spec-activation</module>
<module>geronimo-spec-commonj</module>
<module>geronimo-spec-corba</module>
- <!--<module>geronimo-spec-corba-3.0</module>-->
+ <module>geronimo-spec-corba-3.0</module>
<module>geronimo-spec-corba-2.3</module>
- <!--<module>geronimo-spec-ejb</module>-->
- <!--<module>geronimo-spec-j2ee-connector</module>-->
- <!--<module>geronimo-spec-j2ee-deployment</module>-->
- <!--<module>geronimo-spec-j2ee-jacc</module>-->
- <!--<module>geronimo-spec-j2ee-management</module>-->
+ <module>geronimo-spec-ejb</module>
+ <module>geronimo-spec-j2ee-connector</module>
+ <module>geronimo-spec-j2ee-deployment</module>
+ <module>geronimo-spec-j2ee-jacc</module>
+ <module>geronimo-spec-j2ee-management</module>
<module>geronimo-spec-j2ee</module>
<module>geronimo-spec-javamail</module>
- <!--<module>geronimo-spec-jaxr</module>-->
- <!--<module>geronimo-spec-jaxrpc</module>-->
- <!--<module>geronimo-spec-jms</module>-->
- <!--<module>geronimo-spec-jsp</module>-->
- <!--<module>geronimo-spec-jta</module>-->
- <!--<module>geronimo-spec-qname</module>-->
- <!--<module>geronimo-spec-saaj</module>-->
- <!--<module>geronimo-spec-servlet</module>-->
+ <module>geronimo-spec-jaxr</module>
+ <module>geronimo-spec-jaxrpc</module>
+ <module>geronimo-spec-jms</module>
+ <module>geronimo-spec-jsp</module>
+ <module>geronimo-spec-jta</module>
+ <module>geronimo-spec-qname</module>
+ <module>geronimo-spec-saaj</module>
+ <module>geronimo-spec-servlet</module>
</modules>
<dependencyManagement>
@@ -255,6 +255,7 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
+ <scope>test</scope>
</dependency>
</dependencies>