Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

$%^$&# jetty-runner packages taglibs, jstl and a couple of other dependencies that result in duplicates

This commit is contained in:
Andrew Phillips 2012-05-01 19:03:37 -07:00
parent 09e8ff1d8e
commit 2110145f49
2 changed files with 82 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
demos/tweetstore/heroku-tweetstore/pom.xml
View File

@ -67,6 +67,24 @@
<artifactId>jetty-runner</artifactId>
<version>7.5.4.v20111024</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-plus</artifactId>
</exclusion>
<exclusion>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-jndi</artifactId>
</exclusion>
<exclusion>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jsp-2.1-glassfish</artifactId>
</exclusion>
<exclusion>
<groupId>javax.transaction</groupId>
<artifactId>jta</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>

65
demos/tweetstore/pom.xml
View File

@ -229,7 +229,7 @@
</packages>
</exception>
<exception>
<!-- javax.servlet is included in the appengine-tools-sdk -->
<!-- javax.servlet is included in the appengine-tools-sdk, with Tomcat and Jetty -->
<conflictingDependencies>
<dependency>
<groupId>javax.servlet</groupId>
@ -249,6 +249,12 @@
<version>6.0.32</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-runner</artifactId>
<version>7.5.4.v20111024</version>
<scope>test</scope>
</dependency>
</conflictingDependencies>
<packages>
<package>javax.servlet</package>
@ -259,13 +265,22 @@
<resource>javax/servlet/resources/datatypes.dtd</resource>
<resource>javax/servlet/resources/j2ee_1_4.xsd</resource>
<resource>javax/servlet/resources/j2ee_web_services_client_1_1.xsd</resource>
<resource>javax/servlet/resources/javaee_5.xsd</resource>
<resource>javax/servlet/resources/javaee_web_services_client_1_2.xsd</resource>
<resource>javax/servlet/resources/jsp_2_0.xsd</resource>
<resource>javax/servlet/resources/jsp_2_1.xsd</resource>
<resource>javax/servlet/resources/web-app_2_2.dtd</resource>
<resource>javax/servlet/resources/web-app_2_3.dtd</resource>
<resource>javax/servlet/resources/web-app_2_4.xsd</resource>
<resource>javax/servlet/resources/web-app_2_5.xsd</resource>
<resource>javax/servlet/resources/xml.xsd</resource>
<resource>javax/servlet/LocalStrings.properties</resource>
<resource>javax/servlet/LocalStrings_fr.properties</resource>
<resource>javax/servlet/LocalStrings_ja.properties</resource>
<resource>javax/servlet/http/LocalStrings.properties</resource>
<resource>javax/servlet/http/LocalStrings_es.properties</resource>
<resource>javax/servlet/http/LocalStrings_fr.properties</resource>
<resource>javax/servlet/http/LocalStrings_ja.properties</resource>
</resources>
</exception>
<exception>
@ -289,6 +304,54 @@
<class>org.apache.PeriodicEventListener</class>
</classes>
</exception>
<exception>
<!-- Jetty Runner includes taglibs and jstl -->
<conflictingDependencies>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
<version>1.1.2</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>taglibs</groupId>
<artifactId>standard</artifactId>
<version>1.1.2</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-runner</artifactId>
<version>7.5.4.v20111024</version>
<scope>test</scope>
</dependency>
</conflictingDependencies>
<packages>
<package>javax.servlet.jsp.jstl</package>
<package>org.apache.taglibs</package>
</packages>
<resources>
<resource>META-INF/c-1_0-rt.tld</resource>
<resource>META-INF/c-1_0.tld</resource>
<resource>META-INF/c.tld</resource>
<resource>META-INF/fmt-1_0-rt.tld</resource>
<resource>META-INF/fmt-1_0.tld</resource>
<resource>META-INF/fmt.tld</resource>
<resource>META-INF/fn.tld</resource>
<resource>META-INF/permittedTaglibs.tld</resource>
<resource>META-INF/scriptfree.tld</resource>
<resource>META-INF/sql-1_0-rt.tld</resource>
<resource>META-INF/sql-1_0.tld</resource>
<resource>META-INF/sql.tld</resource>
<resource>META-INF/x-1_0-rt.tld</resource>
<resource>META-INF/x-1_0.tld</resource>
<resource>META-INF/x.tld</resource>
<resource>org/apache/taglibs/standard/lang/jstl/Resources.properties</resource>
<resource>org/apache/taglibs/standard/lang/jstl/Resources_ja.properties</resource>
<resource>org/apache/taglibs/standard/resources/Resources.properties</resource>
<resource>org/apache/taglibs/standard/resources/Resources_ja.properties</resource>
</resources>
</exception>
</exceptions>
</configuration>
</plugin>