Skip to content

Commit

Permalink
Fixes jetty#487 - JDK 9 build compatibility.
Browse files Browse the repository at this point in the history 
Fixes jetty#306 - Merge jetty-parent into jetty-project.

- Removed jetty.parent dependency, moving all relevant sections to
jetty.project's pom.xml.
- Introduced profiles for JDK 8 only modules and configuration, and
for JDK 9 only modules and configurations.
- Major cleanup of pom.xml files.
- All Maven Plugin now declared in alphabetical order in
pluginManagement section of jetty.project's pom.xml.
  • Loading branch information
@sbordet
sbordet committed Jun 6, 2016
1 parent 85b3459 commit a8f25b5
Show file tree
Hide file tree
Showing 32 changed files with 962 additions and 842 deletions.
27 changes: 2 additions & 25 deletions apache-jsp/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<configuration>
<instructions>
<Bundle-Description>Jetty-specific ServletContainerInitializer for Jasper</Bundle-Description>
<Export-Package>org.eclipse.jetty.apache.jsp.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}",
<Export-Package>org.eclipse.jetty.apache.jsp.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}",
org.eclipse.jetty.jsp.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"
</Export-Package>
<Require-Capability>osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)"</Require-Capability>
Expand All @@ -30,29 +30,6 @@
</instructions>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
<id>artifact-jar</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
<execution>
<id>test-jar</id>
<goals>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
<configuration>
<archive>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
</archive>
</configuration>
</plugin>
</plugins>
</build>

Expand All @@ -67,7 +44,7 @@
<artifactId>jetty-server</artifactId>
<version>${project.version}</version>
</dependency>

<!-- Schemas -->
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
Expand Down
3 changes: 1 addition & 2 deletions examples/async-rest/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
<groupId>org.eclipse.jetty.examples</groupId>
<artifactId>examples-parent</artifactId>
<version>9.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.jetty</groupId>
<artifactId>example-async-rest</artifactId>
Expand Down
1 change: 0 additions & 1 deletion examples/embedded/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
<groupId>org.eclipse.jetty.examples</groupId>
<artifactId>examples-parent</artifactId>
<version>9.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.jetty</groupId>
Expand Down
3 changes: 1 addition & 2 deletions examples/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
<version>9.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.eclipse.jetty.examples</groupId>
<artifactId>examples-parent</artifactId>
Expand All @@ -25,7 +24,7 @@
</build>
<modules>
<!--
- The async-rest and embedded are examples that have historical locations,
- The async-rest and embedded are examples that have historical locations,
- new ones should appear nested under o.e.jetty.examples groupId
-->
<module>async-rest</module>
Expand Down
2 changes: 1 addition & 1 deletion header-template.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
http://www.opensource.org/licenses/apache2.0.php

You may elect to redistribute this code under either of these licenses.
========================================================================
========================================================================
1 change: 0 additions & 1 deletion jetty-alpn/jetty-alpn-server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.7</version>
<executions>
<execution>
<id>parse-version</id>
Expand Down
1 change: 0 additions & 1 deletion jetty-cdi/test-cdi-webapp/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.5.3</version>
<executions>
<execution>
<id>with-weld</id>
Expand Down
17 changes: 0 additions & 17 deletions jetty-documentation/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,12 @@
<name>Jetty :: Documentation</name>
<packaging>pom</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<asciidoctor.version>1.5.3</asciidoctor.version>
<html.directory>${project.build.directory}/current</html.directory>
</properties>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>3.0.1</version>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>2.6</version>
<executions>
<execution>
<id>copy-assets</id>
Expand All @@ -52,7 +40,6 @@
<plugin>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctor-maven-plugin</artifactId>
<version>${asciidoctor.version}</version>
<executions>
<execution>
<id>output-html</id>
Expand Down Expand Up @@ -83,7 +70,6 @@
<plugin>
<groupId>com.agilejava.docbkx</groupId>
<artifactId>docbkx-maven-plugin</artifactId>
<version>2.0.14</version>
<executions>
<execution>
<id>html</id>
Expand Down Expand Up @@ -132,7 +118,6 @@
<dependency>
<groupId>net.sf.docbook</groupId>
<artifactId>docbook-xml</artifactId>
<!--version>5.0-all</version-->
<version>5.1b4-all</version>
<classifier>resources</classifier>
<type>zip</type>
Expand All @@ -154,7 +139,6 @@
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.6</version>
<configuration>
<descriptors>
<descriptor>src/main/assembly/html.xml</descriptor>
Expand Down Expand Up @@ -210,7 +194,6 @@
<plugin>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctor-maven-plugin</artifactId>
<version>${asciidoctor.version}</version>
<dependencies>
<dependency>
<groupId>org.asciidoctor</groupId>
Expand Down
75 changes: 42 additions & 33 deletions jetty-http2/http2-alpn-tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,40 +14,49 @@
<bundle-symbolic-name>${project.groupId}.alpn.tests</bundle-symbolic-name>
</properties>

<build>
<plugins>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>copy</id>
<phase>generate-resources</phase>
<goals>
<goal>copy</goal>
</goals>
<profiles>
<profile>
<id>jdk8</id>
<activation>
<jdk>[1.8,1.9)</jdk>
</activation>
<build>
<plugins>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>copy</id>
<phase>generate-resources</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.mortbay.jetty.alpn</groupId>
<artifactId>alpn-boot</artifactId>
<version>${alpn.version}</version>
<type>jar</type>
<overWrite>false</overWrite>
<outputDirectory>${project.build.directory}/alpn</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.mortbay.jetty.alpn</groupId>
<artifactId>alpn-boot</artifactId>
<version>${alpn.version}</version>
<type>jar</type>
<overWrite>false</overWrite>
<outputDirectory>${project.build.directory}/alpn</outputDirectory>
</artifactItem>
</artifactItems>
<argLine>-Xbootclasspath/p:${project.build.directory}/alpn/alpn-boot-${alpn.version}.jar
</argLine>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>-Xbootclasspath/p:${project.build.directory}/alpn/alpn-boot-${alpn.version}.jar</argLine>
</configuration>
</plugin>
</plugins>
</build>
</plugin>
</plugins>
</build>
</profile>
</profiles>

<dependencies>
<dependency>
Expand Down Expand Up @@ -85,5 +94,5 @@
<scope>test</scope>
</dependency>
</dependencies>

</project>
73 changes: 41 additions & 32 deletions jetty-http2/http2-http-client-transport/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,40 +14,49 @@
<bundle-symbolic-name>${project.groupId}.client.http</bundle-symbolic-name>
</properties>

<build>
<plugins>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>copy</id>
<phase>generate-resources</phase>
<goals>
<goal>copy</goal>
</goals>
<profiles>
<profile>
<id>jdk8</id>
<activation>
<jdk>[1.8,1.9)</jdk>
</activation>
<build>
<plugins>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>copy</id>
<phase>generate-resources</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.mortbay.jetty.alpn</groupId>
<artifactId>alpn-boot</artifactId>
<version>${alpn.version}</version>
<type>jar</type>
<overWrite>false</overWrite>
<outputDirectory>${project.build.directory}/alpn</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.mortbay.jetty.alpn</groupId>
<artifactId>alpn-boot</artifactId>
<version>${alpn.version}</version>
<type>jar</type>
<overWrite>false</overWrite>
<outputDirectory>${project.build.directory}/alpn</outputDirectory>
</artifactItem>
</artifactItems>
<argLine>-Xbootclasspath/p:${project.build.directory}/alpn/alpn-boot-${alpn.version}.jar
</argLine>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>-Xbootclasspath/p:${project.build.directory}/alpn/alpn-boot-${alpn.version}.jar</argLine>
</configuration>
</plugin>
</plugins>
</build>
</plugin>
</plugins>
</build>
</profile>
</profiles>

<dependencies>
<dependency>
Expand Down
17 changes: 0 additions & 17 deletions jetty-infinispan/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,23 +32,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
<id>artifact-jar</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
<configuration>
<archive>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
</archive>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
Expand Down
23 changes: 0 additions & 23 deletions jetty-osgi/jetty-osgi-boot-jsp/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,29 +46,6 @@

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
<id>artifact-jar</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
<execution>
<id>test-jar</id>
<goals>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
<configuration>
<archive>
<manifestFile>target/classes/META-INF/MANIFEST.MF</manifestFile>
</archive>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
Expand Down
Loading

0 comments on commit a8f25b5

Please sign in to comment.