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 2013/06/11 16:17:55 UTC
svn commit: r1491808 - in /geronimo/specs/trunk: ./
geronimo-activation_1.1_spec/
geronimo-concurrent_1.0_spec/src/main/java/javax/util/concurrent/
geronimo-ejb_3.0_spec/ geronimo-ejb_3.1_spec/
geronimo-j2ee-connector_1.6_spec/ geronimo-jacc_1.1_spec/ ...
Author: gawor
Date: Tue Jun 11 14:17:54 2013
New Revision: 1491808
URL: http://svn.apache.org/r1491808
Log:
enable specs to build with java 7 and add servlet 3.1 to the build list
Modified:
geronimo/specs/trunk/geronimo-activation_1.1_spec/pom.xml
geronimo/specs/trunk/geronimo-concurrent_1.0_spec/src/main/java/javax/util/concurrent/ManagedTaskListener.java
geronimo/specs/trunk/geronimo-ejb_3.0_spec/pom.xml
geronimo/specs/trunk/geronimo-ejb_3.1_spec/pom.xml
geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/pom.xml
geronimo/specs/trunk/geronimo-jacc_1.1_spec/pom.xml
geronimo/specs/trunk/geronimo-jacc_1.4_spec/pom.xml
geronimo/specs/trunk/geronimo-javaee-deployment_1.1MR3_spec/pom.xml
geronimo/specs/trunk/geronimo-jaxrpc_1.1_spec/pom.xml
geronimo/specs/trunk/geronimo-jsp_2.1_spec/pom.xml
geronimo/specs/trunk/geronimo-jsp_2.2_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-servlet_3.1_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=1491808&r1=1491807&r2=1491808&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 11 14:17:54 2013
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.geronimo.genesis</groupId>
<artifactId>genesis-java5-flava</artifactId>
- <version>2.0</version>
+ <version>2.1</version>
</parent>
<groupId>org.apache.geronimo.specs</groupId>
Modified: geronimo/specs/trunk/geronimo-concurrent_1.0_spec/src/main/java/javax/util/concurrent/ManagedTaskListener.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-concurrent_1.0_spec/src/main/java/javax/util/concurrent/ManagedTaskListener.java?rev=1491808&r1=1491807&r2=1491808&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-concurrent_1.0_spec/src/main/java/javax/util/concurrent/ManagedTaskListener.java (original)
+++ geronimo/specs/trunk/geronimo-concurrent_1.0_spec/src/main/java/javax/util/concurrent/ManagedTaskListener.java Tue Jun 11 14:17:54 2013
@@ -94,7 +94,7 @@ public interface ManagedTaskListener
void taskSubmitted(Future<?> future, ManagedExecutorService executor);
/**
- * Called when a tasks Future has been cancelled anytime
+ * Called when a task's Future has been cancelled anytime
* during the life of a task. This method may be called after taskDone().
*
* The <code>Future.isCancelled()</code> method returns false if the task was aborted
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=1491808&r1=1491807&r2=1491808&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 11 14:17:54 2013
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.geronimo.genesis</groupId>
<artifactId>genesis-java5-flava</artifactId>
- <version>2.0</version>
+ <version>2.1</version>
</parent>
<groupId>org.apache.geronimo.specs</groupId>
Modified: geronimo/specs/trunk/geronimo-ejb_3.1_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-ejb_3.1_spec/pom.xml?rev=1491808&r1=1491807&r2=1491808&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-ejb_3.1_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-ejb_3.1_spec/pom.xml Tue Jun 11 14:17:54 2013
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.geronimo.genesis</groupId>
<artifactId>genesis-java5-flava</artifactId>
- <version>2.0</version>
+ <version>2.1</version>
</parent>
<groupId>org.apache.geronimo.specs</groupId>
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=1491808&r1=1491807&r2=1491808&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 11 14:17:54 2013
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.geronimo.genesis</groupId>
<artifactId>genesis-java5-flava</artifactId>
- <version>2.0</version>
+ <version>2.1</version>
</parent>
<groupId>org.apache.geronimo.specs</groupId>
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=1491808&r1=1491807&r2=1491808&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 11 14:17:54 2013
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.geronimo.genesis</groupId>
<artifactId>genesis-java5-flava</artifactId>
- <version>2.0</version>
+ <version>2.1</version>
</parent>
<groupId>org.apache.geronimo.specs</groupId>
Modified: geronimo/specs/trunk/geronimo-jacc_1.4_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jacc_1.4_spec/pom.xml?rev=1491808&r1=1491807&r2=1491808&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jacc_1.4_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jacc_1.4_spec/pom.xml Tue Jun 11 14:17:54 2013
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.geronimo.genesis</groupId>
<artifactId>genesis-java5-flava</artifactId>
- <version>2.0</version>
+ <version>2.1</version>
</parent>
<groupId>org.apache.geronimo.specs</groupId>
Modified: geronimo/specs/trunk/geronimo-javaee-deployment_1.1MR3_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-javaee-deployment_1.1MR3_spec/pom.xml?rev=1491808&r1=1491807&r2=1491808&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-javaee-deployment_1.1MR3_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-javaee-deployment_1.1MR3_spec/pom.xml Tue Jun 11 14:17:54 2013
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.geronimo.genesis</groupId>
<artifactId>genesis-java1.4-flava</artifactId>
- <version>2.0</version>
+ <version>2.1</version>
</parent>
<groupId>org.apache.geronimo.specs</groupId>
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=1491808&r1=1491807&r2=1491808&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 11 14:17:54 2013
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.geronimo.genesis</groupId>
<artifactId>genesis-java5-flava</artifactId>
- <version>2.0</version>
+ <version>2.1</version>
</parent>
<groupId>org.apache.geronimo.specs</groupId>
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=1491808&r1=1491807&r2=1491808&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 11 14:17:54 2013
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.geronimo.genesis</groupId>
<artifactId>genesis-java5-flava</artifactId>
- <version>2.0</version>
+ <version>2.1</version>
</parent>
<groupId>org.apache.geronimo.specs</groupId>
Modified: geronimo/specs/trunk/geronimo-jsp_2.2_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jsp_2.2_spec/pom.xml?rev=1491808&r1=1491807&r2=1491808&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jsp_2.2_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jsp_2.2_spec/pom.xml Tue Jun 11 14:17:54 2013
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.geronimo.genesis</groupId>
<artifactId>genesis-java5-flava</artifactId>
- <version>2.0</version>
+ <version>2.1</version>
</parent>
<groupId>org.apache.geronimo.specs</groupId>
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=1491808&r1=1491807&r2=1491808&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 11 14:17:54 2013
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.geronimo.genesis</groupId>
<artifactId>genesis-java1.4-flava</artifactId>
- <version>2.0</version>
+ <version>2.1</version>
</parent>
<groupId>org.apache.geronimo.specs</groupId>
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=1491808&r1=1491807&r2=1491808&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 11 14:17:54 2013
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.geronimo.genesis</groupId>
<artifactId>genesis-java5-flava</artifactId>
- <version>2.0</version>
+ <version>2.1</version>
</parent>
<groupId>org.apache.geronimo.specs</groupId>
Modified: geronimo/specs/trunk/geronimo-servlet_3.1_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-servlet_3.1_spec/pom.xml?rev=1491808&r1=1491807&r2=1491808&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_3.1_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-servlet_3.1_spec/pom.xml Tue Jun 11 14:17:54 2013
@@ -26,8 +26,8 @@
<parent>
<groupId>org.apache.geronimo.genesis</groupId>
- <artifactId>genesis-java5-flava</artifactId>
- <version>2.1</version>
+ <artifactId>genesis-java7-flava</artifactId>
+ <version>2.2-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo.specs</groupId>
@@ -57,6 +57,24 @@
<url>http://svn.apache.org/viewcvs.cgi/geronimo/specs/trunk/geronimo-servlet_3.1_spec/</url>
</scm>
+ <!-- Added temporarily for genesis-java7-flava SNAPSHOT dependency -->
+ <repositories>
+ <repository>
+ <id>apache.snapshots</id>
+ <name>Apache Snapshots Repository</name>
+ <url>http://repository.apache.org/snapshots</url>
+ <layout>default</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>daily</updatePolicy>
+ <checksumPolicy>ignore</checksumPolicy>
+ </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </repository>
+ </repositories>
+
<build>
<plugins>
<plugin>
Modified: geronimo/specs/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/pom.xml?rev=1491808&r1=1491807&r2=1491808&view=diff
==============================================================================
--- geronimo/specs/trunk/pom.xml (original)
+++ geronimo/specs/trunk/pom.xml Tue Jun 11 14:17:54 2013
@@ -86,6 +86,7 @@
<module>geronimo-saaj_1.3_spec</module>
<module>geronimo-servlet_2.5_spec</module>
<module>geronimo-servlet_3.0_spec</module>
+ <module>geronimo-servlet_3.1_spec</module>
<module>geronimo-stax-api_1.0_spec</module>
<module>geronimo-stax-api_1.2_spec</module>
<module>geronimo-validation_1.0_spec</module>