Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'pom.xml')
-rw-r--r--pom.xml448
1 files changed, 148 insertions, 300 deletions
diff --git a/pom.xml b/pom.xml
index f2e2c6edf4..b23e0c1181 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,23 +3,22 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-parent</artifactId>
- <version>23</version>
+ <version>25</version>
</parent>
<artifactId>jetty-project</artifactId>
- <version>9.2.14-SNAPSHOT</version>
+ <version>9.3.4-SNAPSHOT</version>
<name>Jetty :: Project</name>
<url>http://www.eclipse.org/jetty</url>
<packaging>pom</packaging>
<properties>
<jetty.url>http://www.eclipse.org/jetty</jetty.url>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <build-support-version>1.1</build-support-version>
+ <build-support-version>1.4</build-support-version>
<slf4j-version>1.6.6</slf4j-version>
<jetty-test-policy-version>1.2</jetty-test-policy-version>
- <npn.api.version>1.1.1.v20141010</npn.api.version>
<alpn.api.version>1.1.2.v20150522</alpn.api.version>
+ <jsp.version>8.0.23.M1</jsp.version>
<!-- default values are unsupported, but required to be defined for reactor sanity reasons -->
- <npn.version>undefined</npn.version>
<alpn.version>undefined</alpn.version>
</properties>
<scm>
@@ -33,9 +32,12 @@
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>3.3</version>
<configuration>
- <source>1.7</source>
- <target>1.7</target>
+ <source>1.8</source>
+ <target>1.8</target>
+ <testSource>1.8</testSource>
+ <testTarget>1.8</testTarget>
<verbose>false</verbose>
</configuration>
</plugin>
@@ -135,8 +137,8 @@
<message>[ERROR] OLD MAVEN [${maven.version}] in use, Jetty ${project.version} requires Maven 3.0.0 or newer</message>
</requireMavenVersion>
<requireJavaVersion>
- <version>[1.7.0-40,)</version>
- <message>[ERROR] OLD JDK [${java.version}] in use. Jetty ${project.version} requires JDK 1.7.0_40 or newer</message>
+ <version>[1.8.0,)</version>
+ <message>[ERROR] OLD JDK [${java.version}] in use. Jetty ${project.version} requires JDK 1.8.0 or newer</message>
</requireJavaVersion>
<versionTxtRule implementation="org.eclipse.jetty.toolchain.enforcer.rules.VersionTxtRule" />
<versionOsgiRule implementation="org.eclipse.jetty.toolchain.enforcer.rules.RequireOsgiCompatibleVersionRule" />
@@ -187,7 +189,7 @@
</execution>
</executions>
<configuration>
- <targetJdk>1.7</targetJdk>
+ <targetJdk>1.8</targetJdk>
<rulesets>
<ruleset>jetty/pmd_logging_ruleset.xml</ruleset>
</rulesets>
@@ -224,6 +226,8 @@
<exclude>jetty-policy/src/main/java/org/eclipse/jetty/policy/loader/DefaultPolicyLoader.java</exclude>
<exclude>jetty-policy/src/main/java/org/eclipse/jetty/policy/loader/PolicyFileScanner.java</exclude>
<exclude>jetty-ant/**</exclude>
+ <exclude>jetty-infinispan/**</exclude>
+ <exclude>tests/test-sessions/test-infinispan-sessions/**</exclude>
</excludes>
</configuration>
<executions>
@@ -236,6 +240,28 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
+
</plugins>
<pluginManagement>
<plugins>
@@ -268,7 +294,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.17</version>
+ <version>2.18.1</version>
<configuration>
<argLine>-showversion -Xmx1g -Xms1g -XX:+PrintGCDetails</argLine>
<failIfNoTests>false</failIfNoTests>
@@ -292,15 +318,20 @@
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<configuration>
+ <supportedProjectTypes>
+ <supportedProjectType>jar</supportedProjectType>
+ <supportedProjectType>maven-plugin</supportedProjectType>
+ </supportedProjectTypes>
<instructions>
<Bundle-SymbolicName>${bundle-symbolic-name}</Bundle-SymbolicName>
- <Bundle-RequiredExecutionEnvironment>JavaSE-1.7</Bundle-RequiredExecutionEnvironment>
+ <Bundle-Description>Jetty module for ${project.name}</Bundle-Description>
+ <Bundle-RequiredExecutionEnvironment>JavaSE-1.8</Bundle-RequiredExecutionEnvironment>
<Bundle-DocURL>${jetty.url}</Bundle-DocURL>
<Bundle-Vendor>Eclipse Jetty Project</Bundle-Vendor>
<Bundle-Classpath>.</Bundle-Classpath>
<Export-Package>${bundle-symbolic-name}.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"</Export-Package>
- <Bundle-Copyright>Copyright (c) 2008-2014 Mort Bay Consulting Pty. Ltd.</Bundle-Copyright>
- <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
+ <Bundle-Copyright>Copyright (c) 2008-2015 Mort Bay Consulting Pty. Ltd.</Bundle-Copyright>
+ <Import-Package>javax.servlet*;version="[2.6.0,3.2)",javax.transaction*;version="[1.1,1.3)",org.eclipse.jetty*;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))",*</Import-Package>
</instructions>
</configuration>
</plugin>
@@ -342,10 +373,10 @@
<detectJavaApiLink>true</detectJavaApiLink>
<excludePackageNames>com.acme.*;org.slf4j.*;org.mortbay.*</excludePackageNames>
<links>
- <link>http://docs.oracle.com/javase/7/docs/api/</link>
+ <link>http://docs.oracle.com/javase/8/docs/api/</link>
<link>http://docs.oracle.com/javaee/7/api/</link>
+ <link>http://junit.org/javadoc/latest/</link>
<link>http://download.eclipse.org/jetty/stable-9/apidocs/</link>
- <link>http://junit.sourceforge.net/javadoc/</link>
</links>
<tags>
<tag>
@@ -353,6 +384,56 @@
<placement>X</placement>
<head />
</tag>
+ <tag>
+ <name>phase</name>
+ <placement>t</placement>
+ <head>Phase:</head>
+ </tag>
+ <tag>
+ <name>goal</name>
+ <placement>t</placement>
+ <head>Goal:</head>
+ </tag>
+ <tag>
+ <name>description</name>
+ <placement>a</placement>
+ <head>Description:</head>
+ </tag>
+ <tag>
+ <name>parameter</name>
+ <placement>f</placement>
+ <head>Parameter:</head>
+ </tag>
+ <tag>
+ <name>required</name>
+ <placement>f</placement>
+ <head>Required:</head>
+ </tag>
+ <tag>
+ <name>readonly</name>
+ <placement>f</placement>
+ <head>Read-Only:</head>
+ </tag>
+ <tag>
+ <name>execute</name>
+ <placement>X</placement>
+ <head />
+ </tag>
+ <tag>
+ <name>requiresDependencyResolution</name>
+ <placement>X</placement>
+ <head />
+ </tag>
+ <tag>
+ <name>requiresProject</name>
+ <placement>X</placement>
+ <head />
+ </tag>
+ <tag>
+ <name>threadSafe</name>
+ <placement>X</placement>
+ <head />
+ </tag>
</tags>
<header>
<![CDATA[
@@ -373,7 +454,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
- <version>2.7.1</version>
+ <version>3.4</version>
</plugin>
</plugins>
</pluginManagement>
@@ -414,34 +495,23 @@
</plugin>
</plugins>
</reporting>
- <repositories>
- <repository>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <id>sonatype-snapshots</id>
- <name>Sonatype Jetty Snapshots</name>
- <url>https://oss.sonatype.org/content/groups/jetty</url>
- </repository>
- </repositories>
<modules>
<module>jetty-ant</module>
<module>jetty-util</module>
<module>jetty-jmx</module>
<module>jetty-io</module>
<module>jetty-http</module>
+ <module>jetty-http2</module>
<module>jetty-continuation</module>
<module>jetty-server</module>
<module>jetty-xml</module>
<module>jetty-security</module>
<module>jetty-servlet</module>
<module>jetty-webapp</module>
- <module>jetty-spdy</module>
<module>jetty-fcgi</module>
<module>jetty-websocket</module>
<module>jetty-servlets</module>
<module>jetty-util-ajax</module>
- <module>jetty-jsp</module>
<module>apache-jsp</module>
<module>apache-jstl</module>
<module>jetty-maven-plugin</module>
@@ -459,6 +529,7 @@
<module>jetty-jaspi</module>
<module>jetty-rewrite</module>
<module>jetty-nosql</module>
+ <module>jetty-infinispan</module>
<module>tests</module>
<module>examples</module>
<module>jetty-quickstart</module>
@@ -516,40 +587,9 @@
</dependency>
<dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>javax.servlet.jsp-api</artifactId>
- <version>2.3.1</version>
- </dependency>
-
- <dependency>
- <groupId>org.glassfish.web</groupId>
- <artifactId>javax.servlet.jsp</artifactId>
- <version>2.3.2</version>
- </dependency>
-
- <dependency>
- <groupId>org.eclipse.jetty.toolchain</groupId>
- <artifactId>jetty-jsp-jdt</artifactId>
- <version>2.3.3</version>
- </dependency>
-
-
- <dependency>
- <groupId>javax.el</groupId>
- <artifactId>javax.el-api</artifactId>
- <version>3.0.0</version>
- </dependency>
-
- <dependency>
- <groupId>org.glassfish</groupId>
- <artifactId>javax.el</artifactId>
- <version>3.0.0</version>
- </dependency>
-
- <dependency>
<groupId>org.mortbay.jasper</groupId>
<artifactId>apache-jsp</artifactId>
- <version>8.0.9.M3</version>
+ <version>${jsp.version}</version>
</dependency>
<dependency>
@@ -566,30 +606,6 @@
<!-- JSTL Impl -->
<dependency>
- <groupId>org.glassfish.web</groupId>
- <artifactId>javax.servlet.jsp.jstl</artifactId>
- <version>1.2.2</version>
- <exclusions>
- <exclusion>
- <groupId>javax.servlet.jsp.jstl</groupId>
- <artifactId>jstl-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
<groupId>org.apache.taglibs</groupId>
<artifactId>taglibs-standard-impl</artifactId>
<version>1.2.1</version>
@@ -597,22 +613,6 @@
<!-- JSTL API -->
<dependency>
- <groupId>org.eclipse.jetty.orbit</groupId>
- <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>
<groupId>org.apache.taglibs</groupId>
<artifactId>taglibs-standard-spec</artifactId>
<version>1.2.1</version>
@@ -649,7 +649,7 @@
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-test-helper</artifactId>
- <version>3.0</version>
+ <version>3.1</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
@@ -710,10 +710,50 @@
-->
<profiles>
<profile>
+ <id>config</id>
+ <activation>
+ <file>
+ <exists>src/main/config</exists>
+ </file>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptorRefs>
+ <descriptorRef>config</descriptorRef>
+ </descriptorRefs>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
<id>eclipse-release</id>
<modules>
<module>aggregates/jetty-all</module>
</modules>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.8</source>
+ <target>1.8</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</profile>
<profile>
<id>ci</id>
@@ -785,40 +825,17 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <excludePackageNames>com.acme</excludePackageNames>
- <links>
- <link>http://docs.oracle.com/javase/7/docs/api/</link>
- <link>http://docs.oracle.com/javaee/6/api</link>
- <link>http://junit.sourceforge.net/javadoc/</link>
- </links>
- <tags>
- <tag>
- <name>org.apache.xbean.XBean</name>
- <placement>X</placement>
- <head />
- </tag>
- </tags>
- <header>
- <![CDATA[
- <script type="text/javascript">
- var _gaq = _gaq || [];
- _gaq.push(['_setAccount', 'UA-1149868-7']);
- _gaq.push(['_trackPageview']);
- (function() {
- var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
- ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
- var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
- })();
- </script>
- ]]>
- </header>
- </configuration>
</plugin>
</plugins>
</build>
</profile>
<profile>
+ <id>compact3</id>
+ <modules>
+ <module>aggregates/jetty-all-compact3</module>
+ </modules>
+ </profile>
+ <profile>
<id>api-change</id>
<build>
<plugins>
@@ -844,175 +861,6 @@
</build>
</profile>
<profile>
- <id>7u40</id>
- <activation>
- <property>
- <name>java.version</name>
- <value>1.7.0_40</value>
- </property>
- </activation>
- <properties>
- <npn.version>1.1.6.v20130911</npn.version>
- <alpn.version>7.1.0.v20141016</alpn.version>
- </properties>
- </profile>
- <profile>
- <id>7u45</id>
- <activation>
- <property>
- <name>java.version</name>
- <value>1.7.0_45</value>
- </property>
- </activation>
- <properties>
- <npn.version>1.1.6.v20130911</npn.version>
- <alpn.version>7.1.0.v20141016</alpn.version>
- </properties>
- </profile>
- <profile>
- <id>7u51</id>
- <activation>
- <property>
- <name>java.version</name>
- <value>1.7.0_51</value>
- </property>
- </activation>
- <properties>
- <npn.version>1.1.6.v20130911</npn.version>
- <alpn.version>7.1.0.v20141016</alpn.version>
- </properties>
- </profile>
- <profile>
- <id>7u55</id>
- <activation>
- <property>
- <name>java.version</name>
- <value>1.7.0_55</value>
- </property>
- </activation>
- <properties>
- <npn.version>1.1.8.v20141013</npn.version>
- <alpn.version>7.1.0.v20141016</alpn.version>
- </properties>
- </profile>
- <profile>
- <id>7u60</id>
- <activation>
- <property>
- <name>java.version</name>
- <value>1.7.0_60</value>
- </property>
- </activation>
- <properties>
- <npn.version>1.1.8.v20141013</npn.version>
- <alpn.version>7.1.0.v20141016</alpn.version>
- </properties>
- </profile>
- <profile>
- <id>7u65</id>
- <activation>
- <property>
- <name>java.version</name>
- <value>1.7.0_65</value>
- </property>
- </activation>
- <properties>
- <npn.version>1.1.8.v20141013</npn.version>
- <alpn.version>7.1.0.v20141016</alpn.version>
- </properties>
- </profile>
- <profile>
- <id>7u67</id>
- <activation>
- <property>
- <name>java.version</name>
- <value>1.7.0_67</value>
- </property>
- </activation>
- <properties>
- <npn.version>1.1.8.v20141013</npn.version>
- <alpn.version>7.1.0.v20141016</alpn.version>
- </properties>
- </profile>
- <profile>
- <id>7u71</id>
- <activation>
- <property>
- <name>java.version</name>
- <value>1.7.0_71</value>
- </property>
- </activation>
- <properties>
- <npn.version>1.1.9.v20141016</npn.version>
- <alpn.version>7.1.2.v20141202</alpn.version>
- </properties>
- </profile>
- <profile>
- <id>7u72</id>
- <activation>
- <property>
- <name>java.version</name>
- <value>1.7.0_72</value>
- </property>
- </activation>
- <properties>
- <npn.version>1.1.9.v20141016</npn.version>
- <alpn.version>7.1.2.v20141202</alpn.version>
- </properties>
- </profile>
- <profile>
- <id>7u75</id>
- <activation>
- <property>
- <name>java.version</name>
- <value>1.7.0_75</value>
- </property>
- </activation>
- <properties>
- <npn.version>1.1.10.v20150130</npn.version>
- <alpn.version>7.1.3.v20150130</alpn.version>
- </properties>
- </profile>
- <profile>
- <id>7u76</id>
- <activation>
- <property>
- <name>java.version</name>
- <value>1.7.0_76</value>
- </property>
- </activation>
- <properties>
- <npn.version>1.1.10.v20150130</npn.version>
- <alpn.version>7.1.3.v20150130</alpn.version>
- </properties>
- </profile>
- <profile>
- <id>7u79</id>
- <activation>
- <property>
- <name>java.version</name>
- <value>1.7.0_79</value>
- </property>
- </activation>
- <properties>
- <npn.version>1.1.10.v20150130</npn.version>
- <alpn.version>7.1.3.v20150130</alpn.version>
- </properties>
- </profile>
- <profile>
- <id>7u80</id>
- <activation>
- <property>
- <name>java.version</name>
- <value>1.7.0_80</value>
- </property>
- </activation>
- <properties>
- <npn.version>1.1.11.v20150415</npn.version>
- <alpn.version>7.1.3.v20150130</alpn.version>
- </properties>
- </profile>
- <profile>
<id>8u00</id>
<activation>
<property>

Back to the top