You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2013/02/06 14:56:35 UTC
svn commit: r1442964 - in /myfaces/tobago/trunk: ./
tobago-example/tobago-example-addressbook-cdi/
tobago-example/tobago-example-addressbook/
tobago-example/tobago-example-demo/ tobago-example/tobago-example-security/
tobago-extension/tobago-security/
Author: lofwyr
Date: Wed Feb 6 13:56:35 2013
New Revision: 1442964
URL: http://svn.apache.org/viewvc?rev=1442964&view=rev
Log:
clean up annotation dependencies
Modified:
myfaces/tobago/trunk/pom.xml
myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/pom.xml
myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/pom.xml
myfaces/tobago/trunk/tobago-example/tobago-example-demo/pom.xml
myfaces/tobago/trunk/tobago-example/tobago-example-security/pom.xml
myfaces/tobago/trunk/tobago-extension/tobago-security/pom.xml
Modified: myfaces/tobago/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/pom.xml?rev=1442964&r1=1442963&r2=1442964&view=diff
==============================================================================
--- myfaces/tobago/trunk/pom.xml (original)
+++ myfaces/tobago/trunk/pom.xml Wed Feb 6 13:56:35 2013
@@ -528,6 +528,12 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
+ <version>1.1.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>net.sf.retrotranslator</groupId>
<artifactId>retrotranslator-runtime</artifactId>
<optional>true</optional>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/pom.xml?rev=1442964&r1=1442963&r2=1442964&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/pom.xml Wed Feb 6 13:56:35 2013
@@ -150,10 +150,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.1_spec</artifactId>
- <version>1.0.1</version>
- <!-- XXX websphere-provided -->
- <scope>provided</scope>
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
</dependency>
<dependency>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/pom.xml?rev=1442964&r1=1442963&r2=1442964&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/pom.xml Wed Feb 6 13:56:35 2013
@@ -215,6 +215,12 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
+ <!-- compile or provided depends on the used server -->
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>compile</scope>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/pom.xml?rev=1442964&r1=1442963&r2=1442964&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/pom.xml Wed Feb 6 13:56:35 2013
@@ -288,8 +288,9 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.1_spec</artifactId>
- <version>1.0.1</version>
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
+ <!-- compile or provided depends on the used server -->
+ <scope>compile</scope>
</dependency>
<dependency>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-security/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-security/pom.xml?rev=1442964&r1=1442963&r2=1442964&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-security/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-security/pom.xml Wed Feb 6 13:56:35 2013
@@ -53,6 +53,12 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
+ <!-- compile or provided depends on the used server -->
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>runtime</scope>
Modified: myfaces/tobago/trunk/tobago-extension/tobago-security/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-security/pom.xml?rev=1442964&r1=1442963&r2=1442964&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-security/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-security/pom.xml Wed Feb 6 13:56:35 2013
@@ -35,8 +35,6 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.0_spec</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.el</groupId>