You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gump.apache.org by bo...@apache.org on 2010/06/25 08:59:55 UTC
svn commit: r957822 - /gump/metadata/project/
Author: bodewig
Date: Fri Jun 25 06:59:54 2010
New Revision: 957822
URL: http://svn.apache.org/viewvc?rev=957822&view=rev
Log:
take javax.servlet out of the mix for mvn based projects, allow the projects to choose which API to implement - it's not as if the Servlet API was looking for backwards compatibility
Modified:
gump/metadata/project/cargo.xml
gump/metadata/project/commons-proper.xml
gump/metadata/project/commons-sandbox.xml
gump/metadata/project/db-torque.xml
gump/metadata/project/excalibur.xml
gump/metadata/project/groovy.xml
gump/metadata/project/hudson.xml
gump/metadata/project/jakarta-bsf3.xml
gump/metadata/project/jakarta-cactus.xml
gump/metadata/project/jetty.xml
gump/metadata/project/portals-bridges.xml
gump/metadata/project/portals-pluto-trunk.xml
gump/metadata/project/quartz.xml
gump/metadata/project/tomcat-taglibs.xml
gump/metadata/project/tomcat-tc6.xml
gump/metadata/project/ws-axis2.xml
gump/metadata/project/ws-xmlrpc.xml
Modified: gump/metadata/project/cargo.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/cargo.xml?rev=957822&r1=957821&r2=957822&view=diff
==============================================================================
--- gump/metadata/project/cargo.xml (original)
+++ gump/metadata/project/cargo.xml Fri Jun 25 06:59:54 2010
@@ -50,7 +50,6 @@
<option project="jaf"/>
<option project="jakarta-oro"/>
<option project="javax.mail"/>
- <option project="javax.servlet"/>
<option project="jdom"/>
<option project="jetty"/>
<option project="jmock"/>
Modified: gump/metadata/project/commons-proper.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/commons-proper.xml?rev=957822&r1=957821&r2=957822&view=diff
==============================================================================
--- gump/metadata/project/commons-proper.xml (original)
+++ gump/metadata/project/commons-proper.xml Fri Jun 25 06:59:54 2010
@@ -418,7 +418,6 @@
<option project="commons-logging"/>
<option project="jaf"/>
- <option project="javax.servlet"/>
<work nested="target/classes"/>
<home nested="email/target"/>
@@ -503,7 +502,6 @@
<!-- downloaded by mvn -->
<option project="velocity-engine"/>
- <option project="javax.servlet"/>
</project>
<project name="commons-jci-test">
Modified: gump/metadata/project/commons-sandbox.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/commons-sandbox.xml?rev=957822&r1=957821&r2=957822&view=diff
==============================================================================
--- gump/metadata/project/commons-sandbox.xml (original)
+++ gump/metadata/project/commons-sandbox.xml Fri Jun 25 06:59:54 2010
@@ -89,7 +89,6 @@
<depend project="commons-discovery"/>
<depend project="commons-logging"/>
<depend project="xml-xerces"/>
- <option project="javax.servlet"/>
<depend project="junit"/>
<depend project="maven-cobertura-plugin"/>
<home nested="id/target"/>
Modified: gump/metadata/project/db-torque.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/db-torque.xml?rev=957822&r1=957821&r2=957822&view=diff
==============================================================================
--- gump/metadata/project/db-torque.xml (original)
+++ gump/metadata/project/db-torque.xml Fri Jun 25 06:59:54 2010
@@ -55,7 +55,6 @@
<option project="fulcrum/fulcrum-testcontainer"/>
<option project="fulcrum/fulcrum-yaafi"/>
<option project="jakarta-turbine-jcs"/>
- <option project="javax.servlet"/>
<option project="jdbc"/>
<option project="jdom"/>
<option project="jmock"/>
Modified: gump/metadata/project/excalibur.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/excalibur.xml?rev=957822&r1=957821&r2=957822&view=diff
==============================================================================
--- gump/metadata/project/excalibur.xml (original)
+++ gump/metadata/project/excalibur.xml Fri Jun 25 06:59:54 2010
@@ -765,7 +765,6 @@
<depend project="excalibur-lifecycle-api"/>
<depend project="excalibur-lifecycle-impl"/>
<depend project="avalon-logkit"/>
- <depend project="javax.servlet"/>
<depend project="qdox"/>
<home nested="fortress/examples"/>
Modified: gump/metadata/project/groovy.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/groovy.xml?rev=957822&r1=957821&r2=957822&view=diff
==============================================================================
--- gump/metadata/project/groovy.xml (original)
+++ gump/metadata/project/groovy.xml Fri Jun 25 06:59:54 2010
@@ -43,8 +43,6 @@
<option project="ivy"/>
<option project="jakarta-bsf"/>
<option project="jakarta-regexp"/>
- <option project="javax.servlet"/>
- <option project="javax.servlet.jsp-in-servlet"/>
<option project="jarjar"/>
<option project="jmock"/>
<option project="junit"/>
Modified: gump/metadata/project/hudson.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/hudson.xml?rev=957822&r1=957821&r2=957822&view=diff
==============================================================================
--- gump/metadata/project/hudson.xml (original)
+++ gump/metadata/project/hudson.xml Fri Jun 25 06:59:54 2010
@@ -65,7 +65,6 @@
</mvn>
<depend project="hudson-remoting"/>
<depend project="hudson-cli"/>
- <option project="javax.servlet" />
<option project="xpp3" />
<!-- jar name="hudson/main/war/target/hudson.war" id="hudson"/ -->
<jar name="hudson/main/core/target/hudson-core-*[0-9T].jar" id="hudson-core" />
@@ -87,7 +86,6 @@
<mvn separateLocalRepository="hudson" basedir="hudson/plugins/email-ext">
</mvn>
<depend project="hudson-core"/>
- <option project="javax.servlet" />
<option project="javamail" />
<option project="jmock" />
<!-- use my email for testing the build -->
Modified: gump/metadata/project/jakarta-bsf3.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/jakarta-bsf3.xml?rev=957822&r1=957821&r2=957822&view=diff
==============================================================================
--- gump/metadata/project/jakarta-bsf3.xml (original)
+++ gump/metadata/project/jakarta-bsf3.xml Fri Jun 25 06:59:54 2010
@@ -55,7 +55,6 @@
<option project="commons-lang-2.x"/>
<option project="groovy"/>
<option project="jakarta-oro"/>
- <option project="javax.servlet"/>
<option project="jetty"/>
<option project="junit"/>
<option project="jython"/>
Modified: gump/metadata/project/jakarta-cactus.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/jakarta-cactus.xml?rev=957822&r1=957821&r2=957822&view=diff
==============================================================================
--- gump/metadata/project/jakarta-cactus.xml (original)
+++ gump/metadata/project/jakarta-cactus.xml Fri Jun 25 06:59:54 2010
@@ -51,7 +51,6 @@
<option project="commons-validator"/>
<option project="httpunit"/>
<option project="jakarta-oro"/>
- <option project="javax.servlet"/>
<option project="jetty"/>
<option project="junit"/>
<option project="logging-log4j-12"/>
Modified: gump/metadata/project/jetty.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/jetty.xml?rev=957822&r1=957821&r2=957822&view=diff
==============================================================================
--- gump/metadata/project/jetty.xml (original)
+++ gump/metadata/project/jetty.xml Fri Jun 25 06:59:54 2010
@@ -360,7 +360,6 @@
<!-- dependencies defined inside parent POM -->
<option project="jaf"/>
<option project="javamail"/>
- <option project="javax.servlet"/>
<option project="junit"/>
<option project="slf4j"/>
</project>
@@ -379,7 +378,6 @@
<!-- dependencies defined inside parent POM -->
<option project="jaf"/>
<option project="javamail"/>
- <option project="javax.servlet"/>
<option project="junit"/>
<option project="slf4j"/>
</project>
Modified: gump/metadata/project/portals-bridges.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/portals-bridges.xml?rev=957822&r1=957821&r2=957822&view=diff
==============================================================================
--- gump/metadata/project/portals-bridges.xml (original)
+++ gump/metadata/project/portals-bridges.xml Fri Jun 25 06:59:54 2010
@@ -37,8 +37,6 @@
<jar name="bridges-common/trunk/target/portals-bridges-common-*[0-9T].jar"/>
- <option project="javax.servlet"/>
-
<!-- enough to have most of maven's dependencies around -->
<option project="velocity-engine"/>
</project>
@@ -50,7 +48,6 @@
<mvn basedir="bridges-velocity/trunk" goal="install"/>
<jar name="bridges-velocity/trunk/target/portals-bridges-velocity-*[0-9T].jar"/>
- <option project="javax.servlet"/>
<option project="portals-bridges-common"/>
<option project="velocity-engine"/>
<option project="velocity-tools"/>
Modified: gump/metadata/project/portals-pluto-trunk.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/portals-pluto-trunk.xml?rev=957822&r1=957821&r2=957822&view=diff
==============================================================================
--- gump/metadata/project/portals-pluto-trunk.xml (original)
+++ gump/metadata/project/portals-pluto-trunk.xml Fri Jun 25 06:59:54 2010
@@ -31,9 +31,7 @@
<property name="maven.test.skip.exec" value="true"/>
</mvn>
- <option project="javax.servlet" />
<option project="slf4j" />
- <option project="javax.servlet.jsp-in-servlet" />
<option project="ant" />
<option project="junit" />
<option project="stax" />
Modified: gump/metadata/project/quartz.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/quartz.xml?rev=957822&r1=957821&r2=957822&view=diff
==============================================================================
--- gump/metadata/project/quartz.xml (original)
+++ gump/metadata/project/quartz.xml Fri Jun 25 06:59:54 2010
@@ -42,7 +42,6 @@
<option project="excalibur-framework-api"/>
<option project="jakarta-oro"/>
<option project="javax.jms"/>
- <option project="javax.servlet"/>
<option project="javax.transaction.jta"/>
<option project="junit"/>
<option project="logging-log4j-12"/>
Modified: gump/metadata/project/tomcat-taglibs.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/tomcat-taglibs.xml?rev=957822&r1=957821&r2=957822&view=diff
==============================================================================
--- gump/metadata/project/tomcat-taglibs.xml (original)
+++ gump/metadata/project/tomcat-taglibs.xml Fri Jun 25 06:59:54 2010
@@ -47,9 +47,6 @@
<depend project="xalan"/>
<depend project="xml-apis"/>
<depend project="xml-xerces"/>
- <depend project="javax.servlet" />
- <depend project="javax.servlet.jsp" />
- <depend project="javax.el" />
<jar name="standard/spec/target/taglibs-standard-spec-1.2-SNAPSHOT.jar" id="jstl" />
<jar name="standard/impl/target/taglibs-standard-impl-1.2-SNAPSHOT.jar" id="standard" />
<nag to="dev@tomcat.apache.org" from="Gump <bayard@tomcat.apache.org>"/>
Modified: gump/metadata/project/tomcat-tc6.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/tomcat-tc6.xml?rev=957822&r1=957821&r2=957822&view=diff
==============================================================================
--- gump/metadata/project/tomcat-tc6.xml (original)
+++ gump/metadata/project/tomcat-tc6.xml Fri Jun 25 06:59:54 2010
@@ -65,31 +65,21 @@
from="Bill Barker <billbarker@apache.org>" />
</project>
- <project name="javax.servlet" groupId="javax.servlet">
+ <project name="javax.servlet" groupId="gump.javax.servlet">
<package name="javax.servlet"/>
<depend project="tomcat-tc6"/>
<home nested="output/build" />
<jar name="lib/servlet-api.jar" id="servlet-api" />
</project>
- <project name="javax.servlet.jsp" groupId="javax.servlet.jsp">
+ <project name="javax.servlet.jsp" groupId="gump.javax.servlet.jsp">
<package name="javax.servlet.jsp"/>
<depend project="tomcat-tc6"/>
<home nested="output/build" />
<jar name="lib/jsp-api.jar" id="jsp-api" />
</project>
- <!--
- some version of the JSP API ended up using groupId
- javax.servlet instead of javax.servlet.jsp in the mvn repo
- -->
- <project name="javax.servlet.jsp-in-servlet" groupId="javax.servlet">
- <depend project="tomcat-tc6"/>
- <home nested="output/build" />
- <jar name="lib/jsp-api.jar" id="jsp-api" />
- </project>
-
- <project name="javax.el" groupId="javax.el">
+ <project name="javax.el" groupId="gump.javax.el">
<package name="javax.el"/>
<home nested="output/build" />
<depend project="tomcat-tc6"/>
Modified: gump/metadata/project/ws-axis2.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/ws-axis2.xml?rev=957822&r1=957821&r2=957822&view=diff
==============================================================================
--- gump/metadata/project/ws-axis2.xml (original)
+++ gump/metadata/project/ws-axis2.xml Fri Jun 25 06:59:54 2010
@@ -36,7 +36,6 @@
<option project="annogen" runtime="true"/>
<option project="commons-httpclient" runtime="true"/>
<option project="concurrent" runtime="true"/>
- <option project="javax.servlet"/>
<option project="jaf"/>
<option project="javamail"/>
<option project="jaxen"/>
Modified: gump/metadata/project/ws-xmlrpc.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/ws-xmlrpc.xml?rev=957822&r1=957821&r2=957822&view=diff
==============================================================================
--- gump/metadata/project/ws-xmlrpc.xml (original)
+++ gump/metadata/project/ws-xmlrpc.xml Fri Jun 25 06:59:54 2010
@@ -30,7 +30,6 @@
<option project="xml-xerces"/>
<option project="commons-httpclient-2.0-branch"/>
<option project="ant" inherit="runtime"/>
- <option project="javax.servlet"/>
<option project="jsse"/>
<option project="ws-commons-util"/>
<!-- option project="fesi"/ -->