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/11/05 13:49:33 UTC
svn commit: r1538974 - in /myfaces/tobago/trunk: ./ tobago-core/
tobago-extension/ tobago-extension/tobago-sandbox/
tobago-theme/tobago-theme-charlotteville/
tobago-theme/tobago-theme-richmond/ tobago-theme/tobago-theme-scarborough/
tobago-theme/tobago...
Author: lofwyr
Date: Tue Nov 5 12:49:32 2013
New Revision: 1538974
URL: http://svn.apache.org/r1538974
Log:
cleaning up dependencies: servlet+jsp
Modified:
myfaces/tobago/trunk/pom.xml
myfaces/tobago/trunk/tobago-core/pom.xml
myfaces/tobago/trunk/tobago-extension/pom.xml
myfaces/tobago/trunk/tobago-extension/tobago-sandbox/pom.xml
myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/pom.xml
myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/pom.xml
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/pom.xml
myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/pom.xml
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/pom.xml
myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/pom.xml
myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/pom.xml
Modified: myfaces/tobago/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/pom.xml?rev=1538974&r1=1538973&r2=1538974&view=diff
==============================================================================
--- myfaces/tobago/trunk/pom.xml (original)
+++ myfaces/tobago/trunk/pom.xml Tue Nov 5 12:49:32 2013
@@ -565,13 +565,11 @@
<dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
@@ -1570,20 +1568,6 @@
<version>${myfaces21.version}</version>
<optional>true</optional>
</dependency>
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.1</version>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <optional>true</optional>
- <scope>provided</scope>
- </dependency>
</dependencies>
</dependencyManagement>
</profile>
@@ -1613,20 +1597,6 @@
<version>${myfaces22.version}</version>
<optional>true</optional>
</dependency>
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.1</version>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <optional>true</optional>
- <scope>provided</scope>
- </dependency>
</dependencies>
</dependencyManagement>
</profile>
@@ -1656,20 +1626,6 @@
<version>${mojarra20.version}</version>
<optional>true</optional>
</dependency>
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.1</version>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <optional>true</optional>
- <scope>provided</scope>
- </dependency>
</dependencies>
</dependencyManagement>
</profile>
@@ -1699,20 +1655,6 @@
<version>${mojarra21.version}</version>
<optional>true</optional>
</dependency>
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.1</version>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <optional>true</optional>
- <scope>provided</scope>
- </dependency>
</dependencies>
</dependencyManagement>
</profile>
@@ -1742,20 +1684,6 @@
<version>${mojarra22.version}</version>
<optional>true</optional>
</dependency>
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.1</version>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <optional>true</optional>
- <scope>provided</scope>
- </dependency>
</dependencies>
</dependencyManagement>
</profile>
Modified: myfaces/tobago/trunk/tobago-core/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/pom.xml?rev=1538974&r1=1538973&r2=1538974&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-core/pom.xml Tue Nov 5 12:49:32 2013
@@ -194,14 +194,6 @@
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
</dependency>
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
<dependency>
<groupId>maven-taglib</groupId>
Modified: myfaces/tobago/trunk/tobago-extension/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/pom.xml?rev=1538974&r1=1538973&r2=1538974&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-extension/pom.xml Tue Nov 5 12:49:32 2013
@@ -39,14 +39,6 @@
<artifactId>myfaces-api</artifactId>
<optional>true</optional>
</dependency>
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</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=1538974&r1=1538973&r2=1538974&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-sandbox/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-sandbox/pom.xml Tue Nov 5 12:49:32 2013
@@ -232,14 +232,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
- <dependency>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
</dependency>
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/pom.xml?rev=1538974&r1=1538973&r2=1538974&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/pom.xml Tue Nov 5 12:49:32 2013
@@ -63,9 +63,5 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
</dependencies>
</project>
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/pom.xml?rev=1538974&r1=1538973&r2=1538974&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/pom.xml Tue Nov 5 12:49:32 2013
@@ -65,9 +65,5 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</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=1538974&r1=1538973&r2=1538974&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/pom.xml Tue Nov 5 12:49:32 2013
@@ -137,10 +137,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
- <dependency>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
</dependency>
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/pom.xml?rev=1538974&r1=1538973&r2=1538974&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/pom.xml Tue Nov 5 12:49:32 2013
@@ -43,10 +43,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
</dependencies>
<build>
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/pom.xml?rev=1538974&r1=1538973&r2=1538974&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/pom.xml Tue Nov 5 12:49:32 2013
@@ -164,10 +164,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.myfaces.test</groupId>
<artifactId>myfaces-test20</artifactId>
<version>${myfaces-test20.version}</version>
Modified: myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/pom.xml?rev=1538974&r1=1538973&r2=1538974&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/pom.xml Tue Nov 5 12:49:32 2013
@@ -26,13 +26,6 @@
<packaging>jar</packaging>
<name>Tobago Tool Annotation</name>
- <dependencies>
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- </dependency>
- </dependencies>
-
<profiles>
<!-- Apples JDK (until 1.6) has not a tools.jar -->
<profile>
Modified: myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/pom.xml?rev=1538974&r1=1538973&r2=1538974&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/pom.xml Tue Nov 5 12:49:32 2013
@@ -49,10 +49,6 @@
<artifactId>myfaces-api</artifactId>
</dependency>
<dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-tool-annotation</artifactId>
<version>${project.version}</version>