Build under Java 1.8
+ Enforcer setup to JDK 1.8+
+ Java7 profiles removed (for now)
+ Main compile phase source/test is 1.7
+ Test compile phase source/test is 1.8
diff --git a/jetty-server/pom.xml b/jetty-server/pom.xml
index 8390913..6068b90 100644
--- a/jetty-server/pom.xml
+++ b/jetty-server/pom.xml
@@ -15,15 +15,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <!-- this SHOULD be 1.8 (for test cases) -->
- <source>1.7</source>
- <target>1.7</target>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
@@ -63,39 +54,6 @@
</plugin>
</plugins>
</build>
- <profiles>
- <profile>
- <id>java7-only-jetty-server</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- <jdk>1.7</jdk>
- </activation>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <testExcludes>
- <testExclude>org/eclipse/jetty/server/ssl/SslConnectionFactoryTest.java</testExclude>
- </testExcludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>org/eclipse/jetty/server/ssl/SslConnectionFactoryTest.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- </profile>
- </profiles>
<dependencies>
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
diff --git a/jetty-util/pom.xml b/jetty-util/pom.xml
index 0663d51..08fba94 100644
--- a/jetty-util/pom.xml
+++ b/jetty-util/pom.xml
@@ -15,15 +15,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <!-- this SHOULD be 1.8 -->
- <source>1.7</source>
- <target>1.7</target>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
@@ -49,31 +40,6 @@
</plugin>
</plugins>
</build>
- <profiles>
- <profile>
- <id>java7-only-jetty-util</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- <jdk>1.7</jdk>
- </activation>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>org/eclipse/jetty/util/ssl/ExtendedSslContextFactory.java</exclude>
- <exclude>org/eclipse/jetty/util/ssl/SniX509ExtendedKeyManager.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- </profile>
- </profiles>
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
diff --git a/pom.xml b/pom.xml
index bc1359a..a6c850f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,10 +32,12 @@
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.2</version>
+ <version>3.3</version>
<configuration>
<source>1.7</source>
<target>1.7</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" />
