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 2016/01/27 20:56:30 UTC
svn commit: r1727168 - in /myfaces/tobago/trunk: ./ tobago-core/
tobago-example/ tobago-example/tobago-example-addressbook-cdi/
tobago-example/tobago-example-addressbook/
tobago-example/tobago-example-blank/ tobago-example/tobago-example-demo/
tobago-e...
Author: lofwyr
Date: Wed Jan 27 19:56:30 2016
New Revision: 1727168
URL: http://svn.apache.org/viewvc?rev=1727168&view=rev
Log:
TOBAGO-1527: Clean up pom.xml dependencies and modules
Modified:
myfaces/tobago/trunk/pom.xml
myfaces/tobago/trunk/tobago-core/pom.xml
myfaces/tobago/trunk/tobago-example/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-blank/pom.xml
myfaces/tobago/trunk/tobago-example/tobago-example-demo/pom.xml
myfaces/tobago/trunk/tobago-example/tobago-example-portlet/pom.xml
myfaces/tobago/trunk/tobago-example/tobago-example-sandbox/pom.xml
myfaces/tobago/trunk/tobago-extension/tobago-sandbox/pom.xml
myfaces/tobago/trunk/tobago-extension/tobago-security/pom.xml
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/pom.xml
Modified: myfaces/tobago/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/pom.xml?rev=1727168&r1=1727167&r2=1727168&view=diff
==============================================================================
--- myfaces/tobago/trunk/pom.xml (original)
+++ myfaces/tobago/trunk/pom.xml Wed Jan 27 19:56:30 2016
@@ -485,14 +485,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>taglibs</groupId>
- <artifactId>standard</artifactId>
- <version>1.1.2</version>
- </dependency>
- <dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <version>1.0</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-el_2.2_spec</artifactId>
+ <version>1.0.4</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: myfaces/tobago/trunk/tobago-core/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/pom.xml?rev=1727168&r1=1727167&r2=1727168&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-core/pom.xml Wed Jan 27 19:56:30 2016
@@ -138,8 +138,8 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-el_2.2_spec</artifactId>
</dependency>
<dependency>
Modified: myfaces/tobago/trunk/tobago-example/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/pom.xml?rev=1727168&r1=1727167&r2=1727168&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-example/pom.xml Wed Jan 27 19:56:30 2016
@@ -85,6 +85,16 @@
</pluginManagement>
</build>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.glassfish.web</groupId>
+ <artifactId>javax.el</artifactId>
+ <version>2.2.6</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<dependencies>
<dependency>
<groupId>org.apache.myfaces.tobago</groupId>
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=1727168&r1=1727167&r2=1727168&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 Jan 27 19:56:30 2016
@@ -315,22 +315,6 @@
<version>1.0</version>
<scope>provided</scope>
</dependency>
-<!--
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- <exclusions>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>taglibs</groupId>
- <artifactId>standard</artifactId>
- </dependency>
--->
<!-- DeltaSpike -->
<dependency>
@@ -392,16 +376,8 @@
<!-- for JSF 2.0 and Bean Validation (JSR-303) -->
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <version>2.2</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
<groupId>org.glassfish.web</groupId>
- <artifactId>el-impl</artifactId>
- <version>2.2</version>
+ <artifactId>javax.el</artifactId>
</dependency>
</dependencies>
@@ -424,16 +400,8 @@
<!-- for JSF 2.0 and Bean Validation (JSR-303) -->
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <version>2.2</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
<groupId>org.glassfish.web</groupId>
- <artifactId>el-impl</artifactId>
- <version>2.2</version>
+ <artifactId>javax.el</artifactId>
</dependency>
</dependencies>
@@ -456,16 +424,8 @@
<!-- for JSF 2.0 and Bean Validation (JSR-303) -->
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <version>2.2</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
<groupId>org.glassfish.web</groupId>
- <artifactId>el-impl</artifactId>
- <version>2.2</version>
+ <artifactId>javax.el</artifactId>
</dependency>
</dependencies>
@@ -488,16 +448,8 @@
<!-- for JSF 2.0 and Bean Validation (JSR-303) -->
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <version>2.2</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
<groupId>org.glassfish.web</groupId>
- <artifactId>el-impl</artifactId>
- <version>2.2</version>
+ <artifactId>javax.el</artifactId>
</dependency>
</dependencies>
@@ -520,16 +472,8 @@
<!-- for JSF 2.0 and Bean Validation (JSR-303) -->
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <version>2.2</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
<groupId>org.glassfish.web</groupId>
- <artifactId>el-impl</artifactId>
- <version>2.2</version>
+ <artifactId>javax.el</artifactId>
</dependency>
</dependencies>
@@ -552,16 +496,8 @@
<!-- for JSF 2.0 and Bean Validation (JSR-303) -->
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <version>2.2</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
<groupId>org.glassfish.web</groupId>
- <artifactId>el-impl</artifactId>
- <version>2.2</version>
+ <artifactId>javax.el</artifactId>
</dependency>
</dependencies>
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=1727168&r1=1727167&r2=1727168&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/pom.xml Wed Jan 27 19:56:30 2016
@@ -211,13 +211,14 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring-aop</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>${spring.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>aopalliance</groupId>
+ <artifactId>aopalliance</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
@@ -229,15 +230,11 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>taglibs</groupId>
- <artifactId>standard</artifactId>
- </dependency>
</dependencies>
<properties>
<openjpa.version>1.0.4</openjpa.version>
- <spring.version>3.2.13.RELEASE</spring.version>
+ <spring.version>3.2.16.RELEASE</spring.version>
</properties>
</project>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-blank/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-blank/pom.xml?rev=1727168&r1=1727167&r2=1727168&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-blank/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-blank/pom.xml Wed Jan 27 19:56:30 2016
@@ -51,9 +51,5 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>taglibs</groupId>
- <artifactId>standard</artifactId>
- </dependency>
</dependencies>
</project>
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=1727168&r1=1727167&r2=1727168&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/pom.xml Wed Jan 27 19:56:30 2016
@@ -29,7 +29,7 @@
<properties>
<openwebbeans.version>1.1.7</openwebbeans.version>
- <deltaspike.version>1.3.0</deltaspike.version>
+ <deltaspike.version>1.5.2</deltaspike.version>
</properties>
<build>
<finalName>tobago-example-demo</finalName>
@@ -258,15 +258,8 @@
<!-- for JSF 2.0 and Bean Validation (JSR-303) -->
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <version>2.2</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
<groupId>org.glassfish.web</groupId>
- <artifactId>el-impl</artifactId>
- <version>2.2</version>
+ <artifactId>javax.el</artifactId>
</dependency>
</dependencies>
@@ -323,16 +316,8 @@
<!-- for JSF 2.0 and Bean Validation (JSR-303) -->
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <version>2.2</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
<groupId>org.glassfish.web</groupId>
- <artifactId>el-impl</artifactId>
- <version>2.2</version>
+ <artifactId>javax.el</artifactId>
</dependency>
</dependencies>
@@ -389,16 +374,8 @@
<!-- for JSF 2.0 and Bean Validation (JSR-303) -->
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <version>2.2</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
<groupId>org.glassfish.web</groupId>
- <artifactId>el-impl</artifactId>
- <version>2.2</version>
+ <artifactId>javax.el</artifactId>
</dependency>
</dependencies>
@@ -455,16 +432,8 @@
<!-- for JSF 2.0 and Bean Validation (JSR-303) -->
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <version>2.2</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
<groupId>org.glassfish.web</groupId>
- <artifactId>el-impl</artifactId>
- <version>2.2</version>
+ <artifactId>javax.el</artifactId>
</dependency>
</dependencies>
@@ -521,16 +490,8 @@
<!-- for JSF 2.0 and Bean Validation (JSR-303) -->
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <version>2.2</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
<groupId>org.glassfish.web</groupId>
- <artifactId>el-impl</artifactId>
- <version>2.2</version>
+ <artifactId>javax.el</artifactId>
</dependency>
</dependencies>
@@ -587,16 +548,8 @@
<!-- for JSF 2.0 and Bean Validation (JSR-303) -->
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <version>2.2</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
<groupId>org.glassfish.web</groupId>
- <artifactId>el-impl</artifactId>
- <version>2.2</version>
+ <artifactId>javax.el</artifactId>
</dependency>
</dependencies>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-portlet/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-portlet/pom.xml?rev=1727168&r1=1727167&r2=1727168&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-portlet/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-portlet/pom.xml Wed Jan 27 19:56:30 2016
@@ -30,15 +30,8 @@
<!-- for JSF 2.0 and Bean Validation (JSR-303) -->
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <version>2.2</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
<groupId>org.glassfish.web</groupId>
- <artifactId>el-impl</artifactId>
- <version>2.2</version>
+ <artifactId>javax.el</artifactId>
</dependency>
</dependencies>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-sandbox/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-sandbox/pom.xml?rev=1727168&r1=1727167&r2=1727168&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-sandbox/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-sandbox/pom.xml Wed Jan 27 19:56:30 2016
@@ -59,9 +59,5 @@
<artifactId>el-ri</artifactId>
<version>1.0</version>
</dependency>
- <dependency>
- <groupId>taglibs</groupId>
- <artifactId>standard</artifactId>
- </dependency>
</dependencies>
</project>
Modified: myfaces/tobago/trunk/tobago-extension/tobago-sandbox/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-sandbox/pom.xml?rev=1727168&r1=1727167&r2=1727168&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-sandbox/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-sandbox/pom.xml Wed Jan 27 19:56:30 2016
@@ -231,8 +231,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-el_2.2_spec</artifactId>
</dependency>
<dependency>
<groupId>fop</groupId>
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=1727168&r1=1727167&r2=1727168&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-security/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-security/pom.xml Wed Jan 27 19:56:30 2016
@@ -37,8 +37,8 @@
<artifactId>geronimo-annotation_1.0_spec</artifactId>
</dependency>
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-el_2.2_spec</artifactId>
</dependency>
</dependencies>
</project>
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/pom.xml?rev=1727168&r1=1727167&r2=1727168&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/pom.xml Wed Jan 27 19:56:30 2016
@@ -137,8 +137,8 @@
</exclusions>
</dependency>
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-el_2.2_spec</artifactId>
</dependency>
<dependency>
<groupId>rhino</groupId>