You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2010/04/09 18:14:25 UTC
svn commit: r932483 - in /geronimo/server/trunk:
framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/
framework/buildsupport/geronimo-osgi-plugin/src/main/resources/
framework/configs/j2ee-security/src/main/histor...
Author: gawor
Date: Fri Apr 9 16:14:24 2010
New Revision: 932483
URL: http://svn.apache.org/viewvc?rev=932483&view=rev
Log:
more spec updates
Modified:
geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java
geronimo/server/trunk/framework/buildsupport/geronimo-osgi-plugin/src/main/resources/Geronimo-1.6.profile
geronimo/server/trunk/framework/configs/j2ee-security/src/main/history/dependencies.xml
geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties
geronimo/server/trunk/framework/configs/rmi-naming/src/main/history/dependencies.xml
geronimo/server/trunk/framework/modules/geronimo-management/pom.xml
geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/activemq/activemq-broker/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/activemq/geronimo-activemq-blueprint/pom.xml
geronimo/server/trunk/plugins/activemq/geronimo-activemq/pom.xml
geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/myfaces/geronimo-myfaces/pom.xml
geronimo/server/trunk/plugins/myfaces/myfaces/pom.xml
geronimo/server/trunk/plugins/myfaces/myfaces/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/openjpa2/geronimo-openjpa2/pom.xml
geronimo/server/trunk/plugins/openjpa2/openjpa2/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/wab/web-extender/src/main/history/dependencies.xml
Modified: geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java?rev=932483&r1=932482&r2=932483&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java (original)
+++ geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java Fri Apr 9 16:14:24 2010
@@ -645,8 +645,6 @@ public abstract class AbstractCarMojo
"org.osgi.util.tracker;version=1.4.0," +
"javax.accessibility," +
"javax.activity," +
- "javax.annotation;version=1.0," +
- "javax.annotation.processing;version=1.0," +
"javax.crypto," +
"javax.crypto.interfaces," +
"javax.crypto.spec," +
Modified: geronimo/server/trunk/framework/buildsupport/geronimo-osgi-plugin/src/main/resources/Geronimo-1.6.profile
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/geronimo-osgi-plugin/src/main/resources/Geronimo-1.6.profile?rev=932483&r1=932482&r2=932483&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/geronimo-osgi-plugin/src/main/resources/Geronimo-1.6.profile (original)
+++ geronimo/server/trunk/framework/buildsupport/geronimo-osgi-plugin/src/main/resources/Geronimo-1.6.profile Fri Apr 9 16:14:24 2010
@@ -1,9 +1,6 @@
org.osgi.framework.system.packages = \
javax.accessibility, \
- javax.activation;version=1.1, \
javax.activity, \
- javax.annotation;version=1.0, \
- javax.annotation.processing;version=1.0, \
javax.crypto, \
javax.crypto.interfaces, \
javax.crypto.spec, \
@@ -89,7 +86,6 @@ org.osgi.framework.system.packages = \
javax.xml.datatype, \
javax.xml.namespace;version=1.0, \
javax.xml.parsers, \
- javax.xml.soap;version=1.3, \
javax.xml.transform, \
javax.xml.transform.dom, \
javax.xml.transform.sax, \
Modified: geronimo/server/trunk/framework/configs/j2ee-security/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/j2ee-security/src/main/history/dependencies.xml?rev=932483&r1=932482&r2=932483&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/j2ee-security/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/j2ee-security/src/main/history/dependencies.xml Fri Apr 9 16:14:24 2010
@@ -36,9 +36,4 @@
<artifactId>geronimo-jaspic_1.0_spec</artifactId>
<type>jar</type>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-saaj_1.3_spec</artifactId>
- <type>jar</type>
- </dependency>
</plugin-artifact>
Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties?rev=932483&r1=932482&r2=932483&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties (original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties Fri Apr 9 16:14:24 2010
@@ -81,8 +81,6 @@ karaf.cm.dir=${karaf.base}/etc
jre-1.6=, \
javax.accessibility, \
javax.activity, \
- javax.annotation;version=1.0, \
- javax.annotation.processing;version=1.0, \
javax.crypto, \
javax.crypto.interfaces, \
javax.crypto.spec, \
Modified: geronimo/server/trunk/framework/configs/rmi-naming/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/rmi-naming/src/main/history/dependencies.xml?rev=932483&r1=932482&r2=932483&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/rmi-naming/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/rmi-naming/src/main/history/dependencies.xml Fri Apr 9 16:14:24 2010
@@ -68,6 +68,11 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-saaj_1.3_spec</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_3.0_spec</artifactId>
<type>jar</type>
</dependency>
Modified: geronimo/server/trunk/framework/modules/geronimo-management/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-management/pom.xml?rev=932483&r1=932482&r2=932483&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-management/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-management/pom.xml Fri Apr 9 16:14:24 2010
@@ -52,6 +52,12 @@
<!-- needed by geronimo-jaxrpc_1.1_spec -->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-saaj_1.3_spec</artifactId>
+ </dependency>
+
+ <!-- needed by geronimo-jaxrpc_1.1_spec -->
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_3.0_spec</artifactId>
</dependency>
Modified: geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/src/main/history/dependencies.xml?rev=932483&r1=932482&r2=932483&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/src/main/history/dependencies.xml Fri Apr 9 16:14:24 2010
@@ -63,6 +63,11 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.1_spec</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
<type>jar</type>
</dependency>
Modified: geronimo/server/trunk/plugins/activemq/activemq-broker/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-broker/src/main/history/dependencies.xml?rev=932483&r1=932482&r2=932483&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-broker/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-broker/src/main/history/dependencies.xml Fri Apr 9 16:14:24 2010
@@ -53,6 +53,11 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.1_spec</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
<type>jar</type>
</dependency>
Modified: geronimo/server/trunk/plugins/activemq/geronimo-activemq-blueprint/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/geronimo-activemq-blueprint/pom.xml?rev=932483&r1=932482&r2=932483&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/geronimo-activemq-blueprint/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/geronimo-activemq-blueprint/pom.xml Fri Apr 9 16:14:24 2010
@@ -53,6 +53,11 @@
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.1_spec</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-core</artifactId>
<exclusions>
Modified: geronimo/server/trunk/plugins/activemq/geronimo-activemq/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/geronimo-activemq/pom.xml?rev=932483&r1=932482&r2=932483&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/geronimo-activemq/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/geronimo-activemq/pom.xml Fri Apr 9 16:14:24 2010
@@ -53,6 +53,11 @@
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.1_spec</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-core</artifactId>
<exclusions>
Modified: geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml?rev=932483&r1=932482&r2=932483&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml Fri Apr 9 16:14:24 2010
@@ -138,11 +138,6 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-saaj_1.3_spec</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
<type>jar</type>
</dependency>
Modified: geronimo/server/trunk/plugins/myfaces/geronimo-myfaces/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/myfaces/geronimo-myfaces/pom.xml?rev=932483&r1=932482&r2=932483&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/myfaces/geronimo-myfaces/pom.xml (original)
+++ geronimo/server/trunk/plugins/myfaces/geronimo-myfaces/pom.xml Fri Apr 9 16:14:24 2010
@@ -50,6 +50,32 @@
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-validation_1.0_spec</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>jstl</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jsp_2.2_spec</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-el_2.2_spec</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.1_spec</artifactId>
+ </dependency>
+
</dependencies>
</project>
Modified: geronimo/server/trunk/plugins/myfaces/myfaces/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/myfaces/myfaces/pom.xml?rev=932483&r1=932482&r2=932483&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/myfaces/myfaces/pom.xml (original)
+++ geronimo/server/trunk/plugins/myfaces/myfaces/pom.xml Fri Apr 9 16:14:24 2010
@@ -61,25 +61,10 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-el_2.2_spec</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_3.0_spec</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jsp_2.2_spec</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>jstl</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-myfaces</artifactId>
<version>${version}</version>
@@ -87,11 +72,6 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-impl</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
</dependency>
@@ -101,11 +81,6 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-validation_1.0_spec</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.apache.geronimo.bundles</groupId>
<artifactId>commons-digester</artifactId>
</dependency>
Modified: geronimo/server/trunk/plugins/myfaces/myfaces/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/myfaces/myfaces/src/main/history/dependencies.xml?rev=932483&r1=932482&r2=932483&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/myfaces/myfaces/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/myfaces/myfaces/src/main/history/dependencies.xml Fri Apr 9 16:14:24 2010
@@ -43,6 +43,11 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.1_spec</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-validation_1.0_spec</artifactId>
<type>jar</type>
</dependency>
Modified: geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml?rev=932483&r1=932482&r2=932483&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml Fri Apr 9 16:14:24 2010
@@ -48,11 +48,6 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.1_spec</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-interceptor_1.1_spec</artifactId>
<type>jar</type>
</dependency>
Modified: geronimo/server/trunk/plugins/openjpa2/geronimo-openjpa2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa2/geronimo-openjpa2/pom.xml?rev=932483&r1=932482&r2=932483&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa2/geronimo-openjpa2/pom.xml (original)
+++ geronimo/server/trunk/plugins/openjpa2/geronimo-openjpa2/pom.xml Fri Apr 9 16:14:24 2010
@@ -49,6 +49,12 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_2.0_spec</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.1_spec</artifactId>
+ </dependency>
+
</dependencies>
</project>
Modified: geronimo/server/trunk/plugins/openjpa2/openjpa2/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa2/openjpa2/src/main/history/dependencies.xml?rev=932483&r1=932482&r2=932483&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa2/openjpa2/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/openjpa2/openjpa2/src/main/history/dependencies.xml Fri Apr 9 16:14:24 2010
@@ -63,6 +63,11 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.1_spec</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-ejb_3.1_spec</artifactId>
<type>jar</type>
</dependency>
Modified: geronimo/server/trunk/plugins/wab/web-extender/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/wab/web-extender/src/main/history/dependencies.xml?rev=932483&r1=932482&r2=932483&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/wab/web-extender/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/wab/web-extender/src/main/history/dependencies.xml Fri Apr 9 16:14:24 2010
@@ -127,11 +127,6 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-saaj_1.3_spec</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>
<type>jar</type>