diff options
| author | Joakim Erdfelt | 2015-04-08 22:10:43 +0000 |
|---|---|---|
| committer | Joakim Erdfelt | 2015-04-08 22:10:53 +0000 |
| commit | 60d790cbf8015c6cf98743606fdffed3f77dd463 (patch) | |
| tree | f5431738ccce8df12c0da25ea5d43700062818f2 | |
| parent | 08051ba7ddd82c539c82fc0add332164a8ac51ba (diff) | |
| download | org.eclipse.jetty.project-60d790cbf8015c6cf98743606fdffed3f77dd463.tar.gz org.eclipse.jetty.project-60d790cbf8015c6cf98743606fdffed3f77dd463.tar.xz org.eclipse.jetty.project-60d790cbf8015c6cf98743606fdffed3f77dd463.zip | |
Marking java8 specifics excluded when compiling with java7
| -rw-r--r-- | jetty-server/pom.xml | 33 | ||||
| -rw-r--r-- | jetty-util/pom.xml | 25 |
2 files changed, 58 insertions, 0 deletions
diff --git a/jetty-server/pom.xml b/jetty-server/pom.xml index 6068b90d30..378f27ac18 100644 --- a/jetty-server/pom.xml +++ b/jetty-server/pom.xml @@ -54,6 +54,39 @@ </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 08fba94cec..93704de487 100644 --- a/jetty-util/pom.xml +++ b/jetty-util/pom.xml @@ -40,6 +40,31 @@ </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> |