Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update to post-release (servlet 3.1/javaee) versions of javaee dependencies. WARNING: jetty-schemas from jetty-toolchain needs to be changed from SNAPSHOT to final release.

This commit is contained in:
Jan Bartel 2013-07-12 13:20:26 +10:00
parent 3add75f135
commit bd2add0ae9
37 changed files with 239 additions and 233 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/embedded/pom.xml
View File

@ -67,6 +67,10 @@
<artifactId>test-mock-resources</artifactId> <artifactId>test-mock-resources</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency>
<groupId>javax.transaction</groupId>
<artifactId>javax.transaction-api</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-proxy</artifactId> <artifactId>jetty-proxy</artifactId>

6
jetty-annotations/pom.xml
View File

@ -43,7 +43,7 @@
</goals> </goals>
<configuration> <configuration>
<instructions> <instructions>
<Import-Package>javax.servlet.*;version="2.6.0",*</Import-Package> <Import-Package>javax.servlet.*;version="[2.6.0,3.2)",*</Import-Package>
</instructions> </instructions>
</configuration> </configuration>
</execution> </execution>
@ -93,8 +93,8 @@
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty.orbit</groupId> <groupId>javax.annotation</groupId>
<artifactId>javax.annotation</artifactId> <artifactId>javax.annotation-api</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty.orbit</groupId> <groupId>org.eclipse.jetty.orbit</groupId>

2
jetty-deploy/pom.xml
View File

@ -25,7 +25,7 @@
</goals> </goals>
<configuration> <configuration>
<instructions> <instructions>
<Import-Package>org.eclipse.jetty.jmx.*;version="9.0";resolution:=optional,*</Import-Package> <Import-Package>org.eclipse.jetty.jmx.*;version="9.1";resolution:=optional,*</Import-Package>
<_nouses>true</_nouses> <_nouses>true</_nouses>
</instructions> </instructions>
</configuration> </configuration>

65
jetty-distribution/pom.xml
View File

@ -335,7 +335,7 @@
</configuration> </configuration>
</execution> </execution>
<execution> <execution>
<id>copy-orbit-servlet-api-deps</id> <id>copy-servlet-api-deps</id>
<phase>generate-resources</phase> <phase>generate-resources</phase>
<goals> <goals>
<goal>copy</goal> <goal>copy</goal>
@ -346,15 +346,18 @@
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId> <artifactId>javax.servlet-api</artifactId>
<version>3.1.0</version> <version>3.1.0</version>
<!--
<groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.servlet</artifactId>
<version>${orbit-servlet-api-version}</version>
-->
<overWrite>true</overWrite> <overWrite>true</overWrite>
<outputDirectory>${assembly-directory}/lib</outputDirectory> <outputDirectory>${assembly-directory}/lib</outputDirectory>
<destFileName>servlet-api-3.1.jar</destFileName> <destFileName>servlet-api-3.1.jar</destFileName>
</artifactItem> </artifactItem>
<artifactItem>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-schemas</artifactId>
<version>3.1-SNAPSHOT</version>
<overWrite>true</overWrite>
<outputDirectory>${assembly-directory}/lib</outputDirectory>
<destFileName>jetty-schemas-3.1.jar</destFileName>
</artifactItem>
</artifactItems> </artifactItems>
</configuration> </configuration>
</execution> </execution>
@ -385,47 +388,47 @@
</configuration> </configuration>
</execution> </execution>
<execution> <execution>
<id>copy-orbit-lib-annotations-deps</id> <id>copy-annotations-deps</id>
<phase>generate-resources</phase> <phase>generate-resources</phase>
<goals> <goals>
<goal>copy-dependencies</goal> <goal>copy-dependencies</goal>
</goals> </goals>
<configuration> <configuration>
<includeGroupIds>org.eclipse.jetty.orbit</includeGroupIds> <includeGroupIds>javax.annotation,org.eclipse.jetty.orbit</includeGroupIds>
<includeArtifactIds>javax.annotation,org.objectweb.asm</includeArtifactIds> <includeArtifactIds>javax.annotation-api,org.objectweb.asm</includeArtifactIds>
<includeTypes>jar</includeTypes> <includeTypes>jar</includeTypes>
<outputDirectory>${assembly-directory}/lib/annotations</outputDirectory> <outputDirectory>${assembly-directory}/lib/annotations</outputDirectory>
</configuration> </configuration>
</execution> </execution>
<execution> <execution>
<id>copy-orbit-lib-jta-deps</id> <id>copy-jta-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<includeGroupIds>javax.transaction</includeGroupIds>
<includeArtifactIds>javax.transaction-api</includeArtifactIds>
<includeTypes>jar</includeTypes>
<outputDirectory>${assembly-directory}/lib/jndi</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-jndi-deps</id>
<phase>generate-resources</phase> <phase>generate-resources</phase>
<goals> <goals>
<goal>copy-dependencies</goal> <goal>copy-dependencies</goal>
</goals> </goals>
<configuration> <configuration>
<includeGroupIds>org.eclipse.jetty.orbit</includeGroupIds> <includeGroupIds>org.eclipse.jetty.orbit</includeGroupIds>
<includeArtifactIds>javax.transaction</includeArtifactIds> <includeArtifactIds>javax.activation</includeArtifactIds>
<includeTypes>jar</includeTypes> <includeTypes>jar</includeTypes>
<outputDirectory>${assembly-directory}/lib/jndi</outputDirectory> <outputDirectory>${assembly-directory}/lib/jndi</outputDirectory>
</configuration> </configuration>
</execution> </execution>
<execution> <execution>
<id>copy-orbit-lib-jndi-deps</id> <id>copy-jsp-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<includeGroupIds>org.eclipse.jetty.orbit</includeGroupIds>
<includeArtifactIds>javax.mail.glassfish,javax.activation</includeArtifactIds>
<includeTypes>jar</includeTypes>
<outputDirectory>${assembly-directory}/lib/jndi</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-orbit-lib-jsp-deps</id>
<phase>generate-resources</phase> <phase>generate-resources</phase>
<goals> <goals>
<goal>copy-dependencies</goal> <goal>copy-dependencies</goal>
@ -493,8 +496,8 @@
<dependencies> <dependencies>
<!-- Orbit Deps --> <!-- Orbit Deps -->
<dependency> <dependency>
<groupId>org.eclipse.jetty.orbit</groupId> <groupId>javax.annotation</groupId>
<artifactId>javax.annotation</artifactId> <artifactId>javax.annotation-api</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty.orbit</groupId> <groupId>org.eclipse.jetty.orbit</groupId>
@ -505,12 +508,8 @@
<artifactId>javax.activation</artifactId> <artifactId>javax.activation</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty.orbit</groupId> <groupId>javax.transaction</groupId>
<artifactId>javax.mail.glassfish</artifactId> <artifactId>javax.transaction-api</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.transaction</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty.orbit</groupId> <groupId>org.eclipse.jetty.orbit</groupId>

2
jetty-http/pom.xml
View File

@ -37,7 +37,7 @@
</goals> </goals>
<configuration> <configuration>
<instructions> <instructions>
<Import-Package>javax.servlet.*;version="2.6.0",javax.net.*,*</Import-Package> <Import-Package>javax.servlet.*;version="[2.6.0,3.2)",javax.net.*,*</Import-Package>
</instructions> </instructions>
</configuration> </configuration>
</execution> </execution>

5
jetty-jaas/pom.xml
View File

@ -13,9 +13,6 @@
</properties> </properties>
<build> <build>
<plugins> <plugins>
<!--
COMMENTED OUT UNTIL CORRECT CONFIG IS FOUND FOR Export uses clauses
-->
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId> <artifactId>maven-bundle-plugin</artifactId>
@ -29,7 +26,7 @@
<instructions> <instructions>
<_versionpolicy> </_versionpolicy> <_versionpolicy> </_versionpolicy>
<Import-Package>javax.sql.*,javax.security.*,javax.naming.*, <Import-Package>javax.sql.*,javax.security.*,javax.naming.*,
javax.servlet.*;version="2.6.0", javax.servlet.*;version="[2.6.0,3.2)",
*</Import-Package> *</Import-Package>
</instructions> </instructions>
</configuration> </configuration>

2
jetty-jaspi/pom.xml
View File

@ -25,7 +25,7 @@
</goals> </goals>
<configuration> <configuration>
<instructions> <instructions>
<Import-Package>javax.servlet.*;version="2.6.0",*</Import-Package> <Import-Package>javax.servlet.*;version="[2.6.0,3.2)",*</Import-Package>
<Export-Package>org.eclipse.jetty.security.jaspi.*;version="${parsedVersion.osgiVersion}"</Export-Package> <Export-Package>org.eclipse.jetty.security.jaspi.*;version="${parsedVersion.osgiVersion}"</Export-Package>
</instructions> </instructions>
</configuration> </configuration>

16
jetty-jndi/pom.xml
View File

@ -67,20 +67,8 @@
<dependency> <dependency>
<groupId>org.eclipse.jetty.orbit</groupId> <groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.mail.glassfish</artifactId> <artifactId>javax.mail.glassfish</artifactId>
<version>1.4.1.v201005082020</version>
<scope>provided</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<profiles>
<profile>
<id>below-jdk1.6</id>
<activation>
<jdk>(,1.6)</jdk>
</activation>
<dependencies>
<dependency>
<groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.activation</artifactId>
</dependency>
</dependencies>
</profile>
</profiles>
</project> </project>

52
jetty-jsp/pom.xml
View File

@ -13,6 +13,18 @@
</build> </build>
<dependencies> <dependencies>
<!-- Schemas -->
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-schemas</artifactId>
</dependency>
<!-- servlet api -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
<!-- JSP Api --> <!-- JSP Api -->
<dependency> <dependency>
<groupId>javax.servlet.jsp</groupId> <groupId>javax.servlet.jsp</groupId>
@ -28,32 +40,20 @@
<dependency> <dependency>
<groupId>org.eclipse.jetty.orbit</groupId> <groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.servlet.jsp.jstl</artifactId> <artifactId>javax.servlet.jsp.jstl</artifactId>
<version>1.2.0.v201105211821</version>
<exclusions>
<exclusion>
<groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.servlet</artifactId>
</exclusion>
<exclusion>
<groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.servlet.jsp</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<!-- JSTL Impl --> <!-- JSTL Impl -->
<dependency> <dependency>
<groupId>org.eclipse.jetty.orbit</groupId> <groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>org.apache.taglibs.standard.glassfish</artifactId> <artifactId>org.apache.taglibs.standard.glassfish</artifactId>
<version>1.2.0.v201112081803</version>
<exclusions>
<exclusion>
<groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.servlet</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<!-- EL Api --> <!-- EL Api -->
<!-- Not needed as glassfish impl jars contain also the api classes
<dependency>
<groupId>javax.el</groupId>
<artifactId>javax.el-api</artifactId>
</dependency>
-->
<!-- EL Impl --> <!-- EL Impl -->
<dependency> <dependency>
@ -62,26 +62,10 @@
</dependency> </dependency>
<dependency>
<groupId>javax.el</groupId>
<artifactId>javax.el-api</artifactId>
</dependency>
<!-- Eclipse Java Compiler (for JSP Compilation) --> <!-- Eclipse Java Compiler (for JSP Compilation) -->
<dependency> <dependency>
<groupId>org.eclipse.jetty.orbit</groupId> <groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>org.eclipse.jdt.core</artifactId> <artifactId>org.eclipse.jdt.core</artifactId>
<version>3.8.2.v20130121</version>
<exclusions>
<exclusion>
<groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.servlet</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

10
jetty-maven-plugin/pom.xml
View File

@ -120,6 +120,16 @@
<artifactId>jetty-jsp</artifactId> <artifactId>jetty-jsp</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.activation</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>javax.transaction</groupId>
<artifactId>javax.transaction-api</artifactId>
<scope>compile</scope>
</dependency>
</dependencies> </dependencies>
<reporting> <reporting>
<plugins> <plugins>

2
jetty-nosql/pom.xml
View File

@ -29,7 +29,7 @@
<artifactId>maven-bundle-plugin</artifactId> <artifactId>maven-bundle-plugin</artifactId>
<configuration> <configuration>
<instructions> <instructions>
<Import-Package>javax.servlet.*;version="2.6.0",org.eclipse.jetty.server.session.jmx;version="9.0.0";resolution:=optional,,org.eclipse.jetty.*;version="9.0",*</Import-Package> <Import-Package>javax.servlet.*;version="[2.6.0,3.2)",org.eclipse.jetty.server.session.jmx;version="9.1";resolution:=optional,,org.eclipse.jetty.*;version="9.1",*</Import-Package>
</instructions> </instructions>
</configuration> </configuration>
<extensions>true</extensions> <extensions>true</extensions>

2
jetty-osgi/jetty-osgi-boot-jsp/pom.xml
View File

@ -93,7 +93,7 @@
com.sun.el.parser;resolution:=optional, com.sun.el.parser;resolution:=optional,
com.sun.el.util;resolution:=optional, com.sun.el.util;resolution:=optional,
javax.el;version="[3.0,3.1)";resolution:=optional, javax.el;version="[3.0,3.1)";resolution:=optional,
javax.servlet;version="(2.6.0,3.2)", javax.servlet;version="[2.6.0,3.2)",
javax.servlet.jsp;version="2.3", javax.servlet.jsp;version="2.3",
javax.servlet.jsp.el;version="2.3", javax.servlet.jsp.el;version="2.3",
javax.servlet.jsp.jstl.core;version="1.2.0";resolution:=optional, javax.servlet.jsp.jstl.core;version="1.2.0";resolution:=optional,

4
jetty-osgi/test-jetty-osgi-context/pom.xml
View File

@ -86,8 +86,8 @@
compilation time. --> compilation time. -->
<_nouses>true</_nouses> <_nouses>true</_nouses>
<Import-Package> <Import-Package>
javax.servlet;version="2.6.0", javax.servlet;version="[2.6.0,3.2)",
javax.servlet.resources;version="2.6.0", javax.servlet.resources;version="[2.6.0,3.2)",
org.osgi.framework, org.osgi.framework,
org.osgi.service.cm;version="1.2.0", org.osgi.service.cm;version="1.2.0",
org.osgi.service.packageadmin, org.osgi.service.packageadmin,

4
jetty-overlay-deployer/pom.xml
View File

@ -49,8 +49,8 @@
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty.orbit</groupId> <groupId>javax.transaction</groupId>
<artifactId>javax.transaction</artifactId> <artifactId>javax.transaction-api</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>

9
jetty-plus/pom.xml
View File

@ -14,9 +14,6 @@
</properties> </properties>
<build> <build>
<plugins> <plugins>
<!--
COMMENTED OUT UNTIL CORRECT CONFIG IS FOUND FOR Export uses clauses
-->
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId> <artifactId>maven-bundle-plugin</artifactId>
@ -30,7 +27,7 @@
<instructions> <instructions>
<_versionpolicy> </_versionpolicy> <_versionpolicy> </_versionpolicy>
<Import-Package>javax.sql.*,javax.security.*,javax.naming.*, <Import-Package>javax.sql.*,javax.security.*,javax.naming.*,
javax.servlet.*;version="2.6.0",javax.transaction.*;version="[1.1,1.2)", javax.servlet.*;version="[2.6.0,3.2)",javax.transaction.*;version="[1.1,1.3)",
*</Import-Package> *</Import-Package>
</instructions> </instructions>
</configuration> </configuration>
@ -91,8 +88,8 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty.orbit</groupId> <groupId>javax.transaction</groupId>
<artifactId>javax.transaction</artifactId> <artifactId>javax.transaction-api</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>

2
jetty-proxy/pom.xml
View File

@ -25,7 +25,7 @@
</goals> </goals>
<configuration> <configuration>
<instructions> <instructions>
<Import-Package>javax.servlet.*;version="2.6.0",*</Import-Package> <Import-Package>javax.servlet.*;version="[2.6.0,3.2)",*</Import-Package>
</instructions> </instructions>
</configuration> </configuration>
</execution> </execution>

2
jetty-rewrite/pom.xml
View File

@ -25,7 +25,7 @@
</goals> </goals>
<configuration> <configuration>
<instructions> <instructions>
<Import-Package>javax.servlet.*;version="2.6.0",*</Import-Package> <Import-Package>javax.servlet.*;version="[2.6.0,3.2)",*</Import-Package>
</instructions> </instructions>
</configuration> </configuration>
</execution> </execution>

2
jetty-security/pom.xml
View File

@ -25,7 +25,7 @@
</goals> </goals>
<configuration> <configuration>
<instructions> <instructions>
<Import-Package>javax.servlet.*;version="2.6.0",javax.security.cert,*</Import-Package> <Import-Package>javax.servlet.*;version="[2.6.0,3.2)",javax.security.cert,*</Import-Package>
</instructions> </instructions>
</configuration> </configuration>

2
jetty-server/pom.xml
View File

@ -26,7 +26,7 @@
</goals> </goals>
<configuration> <configuration>
<instructions> <instructions>
<Import-Package>javax.servlet.*;version="2.6.0",org.eclipse.jetty.jmx.*;version="9.0";resolution:=optional,*</Import-Package> <Import-Package>javax.servlet.*;version="[2.6.0,3.2)",org.eclipse.jetty.jmx.*;version="9.1";resolution:=optional,*</Import-Package>
<_nouses>true</_nouses> <_nouses>true</_nouses>
</instructions> </instructions>
</configuration> </configuration>

2
jetty-servlet/pom.xml
View File

@ -26,7 +26,7 @@
</goals> </goals>
<configuration> <configuration>
<instructions> <instructions>
<Import-Package>javax.servlet.*;version="2.6.0",org.eclipse.jetty.jmx.*;version="9.0";resolution:=optional,*</Import-Package> <Import-Package>javax.servlet.*;version="[2.6.0,3.2)",org.eclipse.jetty.jmx.*;version="9.1";resolution:=optional,*</Import-Package>
<_nouses>true</_nouses> <_nouses>true</_nouses>
</instructions> </instructions>
</configuration> </configuration>

2
jetty-servlets/pom.xml
View File

@ -26,7 +26,7 @@
</goals> </goals>
<configuration> <configuration>
<instructions> <instructions>
<Import-Package>javax.servlet.*;version="2.6.0",*</Import-Package> <Import-Package>javax.servlet.*;version="[2.6.0,3.2)",*</Import-Package>
</instructions> </instructions>
</configuration> </configuration>
</execution> </execution>

2
jetty-spdy/pom.xml
View File

@ -176,7 +176,7 @@
</goals> </goals>
<configuration> <configuration>
<instructions> <instructions>
<Export-Package>org.eclipse.jetty.spdy.*;version="9.0"</Export-Package> <Export-Package>org.eclipse.jetty.spdy.*;version="9.1"</Export-Package>
<Import-Package>org.eclipse.jetty.*;version="[9.0,10.0)",*</Import-Package> <Import-Package>org.eclipse.jetty.*;version="[9.0,10.0)",*</Import-Package>
<_nouses>true</_nouses> <_nouses>true</_nouses>
</instructions> </instructions>

2
jetty-spdy/spdy-client/pom.xml
View File

@ -58,7 +58,7 @@
</goals> </goals>
<configuration> <configuration>
<instructions> <instructions>
<Export-Package>org.eclipse.jetty.spdy.client;version="9.0"</Export-Package> <Export-Package>org.eclipse.jetty.spdy.client;version="9.1"</Export-Package>
<Import-Package>!org.eclipse.jetty.npn,org.eclipse.jetty.*;version="[9.0,10.0)",*</Import-Package> <Import-Package>!org.eclipse.jetty.npn,org.eclipse.jetty.*;version="[9.0,10.0)",*</Import-Package>
</instructions> </instructions>
</configuration> </configuration>

4
jetty-spdy/spdy-http-server/pom.xml
View File

@ -74,8 +74,8 @@
</goals> </goals>
<configuration> <configuration>
<instructions> <instructions>
<Export-Package>org.eclipse.jetty.spdy.server.http;version="9.0", <Export-Package>org.eclipse.jetty.spdy.server.http;version="9.1",
org.eclipse.jetty.spdy.server.proxy;version="9.0" org.eclipse.jetty.spdy.server.proxy;version="9.1"
</Export-Package> </Export-Package>
<Import-Package>!org.eclipse.jetty.npn,org.eclipse.jetty.*;version="[9.0,10.0)",* <Import-Package>!org.eclipse.jetty.npn,org.eclipse.jetty.*;version="[9.0,10.0)",*
</Import-Package> </Import-Package>

2
jetty-spdy/spdy-server/pom.xml
View File

@ -58,7 +58,7 @@
</goals> </goals>
<configuration> <configuration>
<instructions> <instructions>
<Export-Package>org.eclipse.jetty.spdy.server;version="9.0"</Export-Package> <Export-Package>org.eclipse.jetty.spdy.server;version="9.1"</Export-Package>
<Import-Package>org.eclipse.jetty.npn,org.eclipse.jetty.*;version="[9.0,10.0)",*</Import-Package> <Import-Package>org.eclipse.jetty.npn,org.eclipse.jetty.*;version="[9.0,10.0)",*</Import-Package>
<_nouses>true</_nouses> <_nouses>true</_nouses>
</instructions> </instructions>

1
jetty-start/src/main/resources/org/eclipse/jetty/start/start.config
View File

@ -93,6 +93,7 @@ $(jetty.home)/lib/jetty-xml-$(version).jar ! available org.eclipse.jetty.xml.X
[Server,All,server,default] [Server,All,server,default]
$(jetty.home)/lib/servlet-api-3.1.jar ! available javax.servlet.ServletContext $(jetty.home)/lib/servlet-api-3.1.jar ! available javax.servlet.ServletContext
$(jetty.home)/lib/jetty-schemas-3.1.jar
$(jetty.home)/lib/jetty-http-$(version).jar ! available org.eclipse.jetty.http.HttpParser $(jetty.home)/lib/jetty-http-$(version).jar ! available org.eclipse.jetty.http.HttpParser
$(jetty.home)/lib/jetty-continuation-$(version).jar ! available org.eclipse.jetty.continuation.Continuation $(jetty.home)/lib/jetty-continuation-$(version).jar ! available org.eclipse.jetty.continuation.Continuation
$(jetty.home)/lib/jetty-server-$(version).jar ! available org.eclipse.jetty.server.Server $(jetty.home)/lib/jetty-server-$(version).jar ! available org.eclipse.jetty.server.Server

2
jetty-util-ajax/pom.xml
View File

@ -25,7 +25,7 @@
</goals> </goals>
<configuration> <configuration>
<instructions> <instructions>
<Import-Package>javax.servlet.*;version="2.6.0",org.slf4j;version="[1.5,2.0)";resolution:=optional,org.slf4j.impl;version="[1.5,2.0)";resolution:=optional,*</Import-Package> <Import-Package>javax.servlet.*;version="[2.6.0,3.2)",org.slf4j;version="[1.5,2.0)";resolution:=optional,org.slf4j.impl;version="[1.5,2.0)";resolution:=optional,*</Import-Package>
</instructions> </instructions>
</configuration> </configuration>
</execution> </execution>

2
jetty-util/pom.xml
View File

@ -25,7 +25,7 @@
</goals> </goals>
<configuration> <configuration>
<instructions> <instructions>
<Import-Package>javax.servlet.*;version="2.6.0",org.slf4j;version="[1.5,2.0)";resolution:=optional,org.slf4j.impl;version="[1.5,2.0)";resolution:=optional,*</Import-Package> <Import-Package>javax.servlet.*;version="[2.6.0,3.2)",org.slf4j;version="[1.5,2.0)";resolution:=optional,org.slf4j.impl;version="[1.5,2.0)";resolution:=optional,*</Import-Package>
</instructions> </instructions>
</configuration> </configuration>
</execution> </execution>

2
jetty-webapp/pom.xml
View File

@ -55,7 +55,7 @@
</goals> </goals>
<configuration> <configuration>
<instructions> <instructions>
<Import-Package>javax.servlet.*;version="2.6.0",*</Import-Package> <Import-Package>javax.servlet.*;version="[2.6.0,3.2]",*</Import-Package>
</instructions> </instructions>
</configuration> </configuration>
</execution> </execution>

2
jetty-websocket/pom.xml
View File

@ -43,7 +43,7 @@
</goals> </goals>
<configuration> <configuration>
<instructions> <instructions>
<Export-Package>${bundle-symbolic-name}.*;version="9.0"</Export-Package> <Export-Package>${bundle-symbolic-name}.*;version="9.1"</Export-Package>
<Import-Package>javax.servlet.*;version="[3.0,4.0)",org.eclipse.jetty.*;version="[9.0,10.0)",*</Import-Package> <Import-Package>javax.servlet.*;version="[3.0,4.0)",org.eclipse.jetty.*;version="[9.0,10.0)",*</Import-Package>
<_nouses>true</_nouses> <_nouses>true</_nouses>
</instructions> </instructions>

107
pom.xml
View File

@ -12,7 +12,6 @@
<packaging>pom</packaging> <packaging>pom</packaging>
<properties> <properties>
<jetty.url>http://www.eclipse.org/jetty</jetty.url> <jetty.url>http://www.eclipse.org/jetty</jetty.url>
<orbit-servlet-api-version>3.0.0.v201112011016</orbit-servlet-api-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<build-support-version>1.1</build-support-version> <build-support-version>1.1</build-support-version>
<slf4j-version>1.6.1</slf4j-version> <slf4j-version>1.6.1</slf4j-version>
@ -137,39 +136,6 @@
</rules> </rules>
</configuration> </configuration>
</execution> </execution>
<execution>
<id>enforce-orbit-deps</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<!-- Banned Dependencies (should use Orbit based versions now) -->
<bannedDependencies>
<excludes>
<!--
<exclude>javax.servlet</exclude>
<exclude>javax.servlet.jsp</exclude>
-->
<exclude>org.apache.geronimo.specs</exclude>
<exclude>javax.mail</exclude>
<exclude>javax.activation</exclude>
</excludes>
<!-- allowed combinations -->
<includes>
<include>org.apache.geronimo.specs:geronimo-atinject_1.0_spec:jar:*</include>
<include>javax.net.websocket:*:*:*</include>
<include>javax.websocket:*:*:*</include>
<include>javax.servlet:*:*:*:provided</include>
<include>javax.servlet.jsp:*:*:*:provided</include>
</includes>
<searchTransitive>true</searchTransitive>
<message>This dependency is banned, use the ORBIT provided dependency instead.</message>
</bannedDependencies>
</rules>
<fail>true</fail>
</configuration>
</execution>
<execution> <execution>
<id>ban-junit.jar</id> <id>ban-junit.jar</id>
<goals> <goals>
@ -466,33 +432,17 @@
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId> <artifactId>javax.servlet-api</artifactId>
<version>3.1.0</version> <version>3.1.0</version>
<!-- Orbit Deps -->
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty.orbit</groupId> <groupId>javax.annotation</groupId>
<artifactId>javax.annotation</artifactId> <artifactId>javax.annotation-api</artifactId>
<version>1.1.0.v201108011116</version> <version>1.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty.orbit</groupId> <groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>org.objectweb.asm</artifactId> <artifactId>org.objectweb.asm</artifactId>
<version>3.1.0.v200803061910</version> <version>3.1.0.v200803061910</version>
</dependency> </dependency>
<dependency>
<groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.activation</artifactId>
<version>1.1.0.v201105071233</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.mail.glassfish</artifactId>
<version>1.4.1.v201005082020</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.transaction</artifactId>
<version>1.1.1.v201105210645</version>
</dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty.orbit</groupId> <groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.security.auth.message</artifactId> <artifactId>javax.security.auth.message</artifactId>
@ -500,6 +450,12 @@
</dependency> </dependency>
<!-- JSP Deps --> <!-- JSP Deps -->
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-schemas</artifactId>
<version>3.1-SNAPSHOT</version>
</dependency>
<dependency> <dependency>
<groupId>javax.servlet.jsp</groupId> <groupId>javax.servlet.jsp</groupId>
<artifactId>javax.servlet.jsp-api</artifactId> <artifactId>javax.servlet.jsp-api</artifactId>
@ -527,16 +483,17 @@
<dependency> <dependency>
<groupId>org.eclipse.jetty.orbit</groupId> <groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.servlet.jsp.jstl</artifactId> <artifactId>org.eclipse.jdt.core</artifactId>
<version>1.2.0.v201105211821</version> <version>3.8.2.v20130121</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>org.eclipse.jetty.orbit</groupId> <groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.servlet.jsp</artifactId> <artifactId>javax.servlet</artifactId>
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<!-- JSTL Impl -->
<dependency> <dependency>
<groupId>org.eclipse.jetty.orbit</groupId> <groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>org.apache.taglibs.standard.glassfish</artifactId> <artifactId>org.apache.taglibs.standard.glassfish</artifactId>
@ -544,17 +501,49 @@
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>org.eclipse.jetty.orbit</groupId> <groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.servlet.jsp</artifactId> <artifactId>javax.servlet</artifactId>
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty.orbit</groupId> <groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>org.eclipse.jdt.core</artifactId> <artifactId>javax.servlet.jsp.jstl</artifactId>
<version>3.7.1</version> <version>1.2.0.v201105211821</version>
<exclusions>
<exclusion>
<groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.servlet</artifactId>
</exclusion>
<exclusion>
<groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.servlet.jsp</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency>
<groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.activation</artifactId>
<version>1.1.0.v201105071233</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.mail.glassfish</artifactId>
<version>1.4.1.v201005082020</version>
</dependency>
<dependency>
<groupId>javax.transaction</groupId>
<artifactId>javax.transaction-api</artifactId>
<version>1.2</version>
<scope>provided</scope>
</dependency>
<!-- Old Deps --> <!-- Old Deps -->
<dependency> <dependency>
<groupId>org.apache.maven</groupId> <groupId>org.apache.maven</groupId>

7
tests/test-webapps/test-jetty-webapp/pom.xml
View File

@ -98,7 +98,7 @@
<configuration> <configuration>
<instructions> <instructions>
<Bundle-SymbolicName>org.eclipse.jetty.test-jetty-webapp</Bundle-SymbolicName> <Bundle-SymbolicName>org.eclipse.jetty.test-jetty-webapp</Bundle-SymbolicName>
<Import-Package>javax.servlet.jsp.*;version="2.2.0",javax.servlet.*;version="[2.6,3.0)",org.eclipse.jetty.*;version="9.0",*</Import-Package> <Import-Package>javax.servlet.jsp.*;version="[2.2.0, 3.0)",javax.servlet.*;version="[2.6,3.2)",org.eclipse.jetty.*;version="9.1",*</Import-Package>
<Export-Package>!com.acme*</Export-Package> <Export-Package>!com.acme*</Export-Package>
<!-- the test webapp is configured via a jetty xml file <!-- the test webapp is configured via a jetty xml file
in order to add the security handler. --> in order to add the security handler. -->
@ -192,11 +192,6 @@
<artifactId>jetty-servlets</artifactId> <artifactId>jetty-servlets</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-continuation</artifactId>
<version>${project.version}</version>
</dependency>
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId> <artifactId>javax.servlet-api</artifactId>

45
tests/test-webapps/test-jndi-webapp/pom.xml
View File

@ -61,35 +61,20 @@
<overWrite>true</overWrite> <overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/lib/jndi</outputDirectory> <outputDirectory>${project.build.directory}/lib/jndi</outputDirectory>
</artifactItem> </artifactItem>
<artifactItem>
<groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.mail.glassfish</artifactId>
<version>1.4.1.v201005082020</version>
<type>jar</type>
<includes>**</includes>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/lib/jndi</outputDirectory>
</artifactItem>
</artifactItems> </artifactItems>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<id>copy-transaction-properties</id>
<phase>process-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/resources</outputDirectory>
<resources>
<resource>
<directory>src/main/config/resources</directory>
<includes>
<include>**/transactions.properties</include>
</includes>
<filtering>true</filtering>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId> <artifactId>maven-assembly-plugin</artifactId>
@ -134,15 +119,19 @@
<artifactId>test-mock-resources</artifactId> <artifactId>test-mock-resources</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.mail.glassfish</artifactId>
<version>1.4.1.v201005082020</version>
</dependency>
</dependencies> </dependencies>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.eclipse.jetty.orbit</groupId> <groupId>javax.transaction</groupId>
<artifactId>javax.transaction</artifactId> <artifactId>javax.transaction-api</artifactId>
<version>1.1.1.v201105210645</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -153,8 +142,8 @@
<dependency> <dependency>
<groupId>org.eclipse.jetty.orbit</groupId> <groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.mail.glassfish</artifactId> <artifactId>javax.mail.glassfish</artifactId>
<scope>provided</scope>
<version>1.4.1.v201005082020</version> <version>1.4.1.v201005082020</version>
<scope>provided</scope>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

17
tests/test-webapps/test-mock-resources/pom.xml
View File

@ -22,21 +22,26 @@
</build> </build>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.eclipse.jetty.orbit</groupId> <groupId>javax.transaction</groupId>
<artifactId>javax.transaction</artifactId> <artifactId>javax.transaction-api</artifactId>
<version>1.1.1.v201105210645</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId> <artifactId>javax.servlet-api</artifactId>
</dependency> </dependency>
<!-- <!--
<dependency> <dependency>
<groupId>org.eclipse.jetty.orbit</groupId> <groupId>javax.mail</groupId>
<artifactId>javax.servlet</artifactId> <artifactId>javax.mail-api</artifactId>
</dependency> </dependency>
--> -->
<dependency>
<groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.mail.glassfish</artifactId>
<version>1.4.1.v201005082020</version>
<scope>provided</scope>
</dependency>
</dependencies> </dependencies>
</project> </project>

55
tests/test-webapps/test-mock-resources/src/main/java/com/acme/MockTransport.java Normal file
View File

@ -0,0 +1,55 @@
//
// ========================================================================
// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd.
// ------------------------------------------------------------------------
// All rights reserved. This program and the accompanying materials
// are made available under the terms of the Eclipse Public License v1.0
// and Apache License v2.0 which accompanies this distribution.
//
// The Eclipse Public License is available at
// http://www.eclipse.org/legal/epl-v10.html
//
// The Apache License v2.0 is available at
// http://www.opensource.org/licenses/apache2.0.php
//
// You may elect to redistribute this code under either of these licenses.
// ========================================================================
//
package com.acme;
import javax.mail.Address;
import javax.mail.Message;
import javax.mail.MessagingException;
import javax.mail.Session;
import javax.mail.Transport;
import javax.mail.URLName;
/**
* MockTransport
*
*
*/
public class MockTransport extends Transport
{
/**
* @param session
* @param urlname
*/
public MockTransport(Session session, URLName urlname)
{
super(session, urlname);
}
/**
* @see javax.mail.Transport#sendMessage(javax.mail.Message, javax.mail.Address[])
*/
@Override
public void sendMessage(Message arg0, Address[] arg1) throws MessagingException
{
System.err.println ("Sending message");
}
}

1
tests/test-webapps/test-mock-resources/src/main/resources/META-INF/javaxmail.providers Normal file
View File

@ -0,0 +1 @@
protocol=smtp; type=transport; class=com.acme.MockTransport; vendor=Acme Tests;

8
tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
View File

@ -140,14 +140,6 @@
<artifactId>javax.servlet-api</artifactId> <artifactId>javax.servlet-api</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<!--
<dependency>
<groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.servlet</artifactId>
<scope>provided</scope>
</dependency>
-->
<dependency> <dependency>
<groupId>org.eclipse.jetty.orbit</groupId> <groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.annotation</artifactId> <artifactId>javax.annotation</artifactId>