diff options
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 35 |
1 files changed, 21 insertions, 14 deletions
@@ -7,27 +7,29 @@ </parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>7.4.3-SNAPSHOT</version> + <version>8.0.0.RC0-SNAPSHOT</version> <name>Jetty :: Project</name> <url>${jetty.url}</url> <packaging>pom</packaging> <properties> <javax-activation-version>1.1</javax-activation-version> <javax-mail-version>1.4.1</javax-mail-version> - <javax-servlet-jsp-version>2.1.v20100127</javax-servlet-jsp-version> <javax-transaction-version>1.1.1</javax-transaction-version> <jetty.url>http://www.eclipse.org/jetty</jetty.url> <junit-version>4.8.1</junit-version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <slf4j-version>1.5.11</slf4j-version> + <servlet.spec.groupId>org.mortbay.jetty</servlet.spec.groupId> + <servlet.spec.artifactId>servlet-api</servlet.spec.artifactId> + <servlet.spec.version>3.0.20100224</servlet.spec.version> <build-support-version>1.0</build-support-version> <jetty.test.helper>1.5</jetty.test.helper> <jetty.test.policy>1.2</jetty.test.policy> </properties> <scm> - <connection>scm:svn:http://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/tags/jetty-7.4.2-SNAPSHOT</connection> - <developerConnection>scm:svn:svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/tags/jetty-7.4.2-SNAPSHOT</developerConnection> - <url>http://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/tags/jetty-7.4.2-SNAPSHOT</url> + <connection>scm:svn:http://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/branches/jetty-8</connection> + <developerConnection>scm:svn:svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/branches/jetty-8</developerConnection> + <url>http://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/branches/jetty-8</url> </scm> <build> <defaultGoal>install</defaultGoal> @@ -35,8 +37,8 @@ <plugin> <artifactId>maven-compiler-plugin</artifactId> <configuration> - <source>1.5</source> - <target>1.5</target> + <source>1.6</source> + <target>1.6</target> <verbose>false</verbose> </configuration> </plugin> @@ -308,7 +310,6 @@ <module>jetty-servlet</module> <module>jetty-webapp</module> <module>jetty-servlets</module> - <module>jetty-jsp-2.1</module> <module>jetty-deploy</module> <module>jetty-ajp</module> <module>jetty-jndi</module> @@ -319,20 +320,22 @@ <module>jetty-start</module> <module>jetty-nested</module> <module>jetty-overlay-deployer</module> + <module>jetty-osgi</module> <module>test-continuation</module> <module>test-continuation-jetty6</module> <module>test-jetty-servlet</module> <module>test-jetty-webapp</module> <module>test-jetty-nested</module> <module>example-jetty-embedded</module> + <module>example-async-rest</module> <module>tests</module> </modules> <dependencyManagement> <dependencies> <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.5</version> + <groupId>${servlet.spec.groupId}</groupId> + <artifactId>${servlet.spec.artifactId}</artifactId> + <version>${servlet.spec.version}</version> </dependency> <dependency> <groupId>org.apache.maven</groupId> @@ -417,10 +420,14 @@ --> <id>osgi</id> <activation> - <activeByDefault>true</activeByDefault> + + <activeByDefault>false</activeByDefault> + <!-- + <activeByDefault>true</activeByDefault> <file> <exists>${basedir}/pom.xml</exists> </file> + --> </activation> <modules> <module>jetty-osgi</module> @@ -524,8 +531,8 @@ <configuration> <excludePackageNames>com.acme</excludePackageNames> <links> - <link>http://java.sun.com/j2se/1.5.0/docs/api</link> - <link>http://java.sun.com/javaee/5/docs/api</link> + <link>http://java.sun.com/javase/6/docs/api/</link> + <link>http://java.sun.com/javaee/6/docs/api</link> <link>http://junit.sourceforge.net/javadoc/</link> </links> <tags> |