You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ri...@apache.org on 2010/08/20 19:41:54 UTC
svn commit: r987586 - in /geronimo/server/trunk: ./
framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/
framework/configs/karaf-framework/src/main/filtered-resources/etc/
plugins/openejb/openejb/src/main/history/
Author: rickmcguire
Date: Fri Aug 20 17:41:53 2010
New Revision: 987586
URL: http://svn.apache.org/viewvc?rev=987586&view=rev
Log:
update to latest spec versions
Modified:
geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java
geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties
geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml
geronimo/server/trunk/pom.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=987586&r1=987585&r2=987586&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 Aug 20 17:41:53 2010
@@ -652,6 +652,7 @@ public abstract class AbstractCarMojo
"org.osgi.service.url;version=1.0.0," +
"org.osgi.util.tracker;version=1.4.0," +
"javax.accessibility," +
+ "javax.annotation.processing," +
"javax.activity," +
"javax.crypto," +
"javax.crypto.interfaces," +
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=987586&r1=987585&r2=987586&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 Aug 20 17:41:53 2010
@@ -89,6 +89,7 @@ karaf.cm.dir=${karaf.base}/etc
jre-1.6=, \
javax.accessibility, \
javax.activity, \
+ javax.annotation.processing, \
javax.crypto, \
javax.crypto.interfaces, \
javax.crypto.spec, \
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=987586&r1=987585&r2=987586&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 Aug 20 17:41:53 2010
@@ -68,6 +68,11 @@
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
+ <artifactId>commons-dbcp-all</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
<artifactId>openejb-api</artifactId>
<type>jar</type>
</dependency>
Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=987586&r1=987585&r2=987586&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Fri Aug 20 17:41:53 2010
@@ -154,7 +154,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.1_spec</artifactId>
- <version>1.0</version>
+ <version>1.0.1</version>
</dependency>
<dependency>
@@ -231,7 +231,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jaxb_2.2_spec</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0.1</version>
</dependency>
<dependency>