Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Drop JDK 8 profiles in 3.1 #5563

Merged
merged 1 commit into from
Mar 15, 2024
Merged

Drop JDK 8 profiles in 3.1 #5563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 10 additions & 25 deletions ext/wadl-doclet/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright (c) 2012, 2023 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2012, 2024 Oracle and/or its affiliates. All rights reserved.

This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
Expand Down Expand Up @@ -35,36 +35,21 @@

<properties>
<java.sourceDirectory>${project.basedir}/src/main/java</java.sourceDirectory>
<java8_11.build.outputDirectory>${project.basedir}/target</java8_11.build.outputDirectory>
<java8_11.sourceDirectory>${project.basedir}/src/main/java8_11</java8_11.sourceDirectory>
<java11.build.outputDirectory>${project.basedir}/target</java11.build.outputDirectory>
<java11.sourceDirectory>${project.basedir}/src/main/java8_11</java11.sourceDirectory>
<java12.build.outputDirectory>${project.basedir}/target-java12</java12.build.outputDirectory>
<java12.sourceDirectory>${project.basedir}/src/main/java12</java12.sourceDirectory>
</properties>


<profiles>
<profile>
<id>jdk1.8</id>
<id>jdk11</id>
<activation>
<jdk>1.8</jdk>
</activation>
<dependencies>
<dependency>
<groupId>com.sun</groupId>
<artifactId>tools</artifactId>
<version>1.8.0</version>
<scope>system</scope>
<systemPath>${java.home}/../lib/tools.jar</systemPath>
</dependency>
</dependencies>
</profile>
<profile>
<id>jdk1.8_11</id>
<activation>
<jdk>[1.8,12)</jdk>
<jdk>[11,12)</jdk>
</activation>
<build>
<directory>${java8_11.build.outputDirectory}</directory>
<directory>${java11.build.outputDirectory}</directory>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Expand All @@ -78,7 +63,7 @@
<configuration>
<sources>
<source>${java.sourceDirectory}</source>
<source>${java8_11.sourceDirectory}</source>
<source>${java11.sourceDirectory}</source>
</sources>
</configuration>
</execution>
Expand Down Expand Up @@ -124,7 +109,7 @@
<!-- ${java12.build.outputDirectory} does not work here -->
<exists>target-java12/classes/org/glassfish/jersey/wadl/doclet/ResourceDoclet.class</exists>
</file>
<jdk>[1.8,12)</jdk>
<jdk>[11,12)</jdk>
</activation>
<build>
<plugins>
Expand All @@ -151,7 +136,7 @@
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${java8_11.build.outputDirectory}/classes/META-INF/versions/12</outputDirectory>
<outputDirectory>${java11.build.outputDirectory}/classes/META-INF/versions/12</outputDirectory>
<resources>
<resource>
<directory>${java12.build.outputDirectory}/classes</directory>
Expand All @@ -170,7 +155,7 @@
<phase>package</phase>
<configuration>
<target>
<property name="sources-jar" value="${java8_11.build.outputDirectory}/${project.artifactId}-${project.version}-sources.jar"/>
<property name="sources-jar" value="${java11.build.outputDirectory}/${project.artifactId}-${project.version}-sources.jar"/>
<echo>sources-jar: ${sources-jar}</echo>
<zip destfile="${sources-jar}" update="true">
<zipfileset dir="${java12.sourceDirectory}" prefix="META-INF/versions/12"/>
Expand Down
3 changes: 2 additions & 1 deletion media/multipart/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright (c) 2012, 2023 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2012, 2024 Oracle and/or its affiliates. All rights reserved.

This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
Expand Down Expand Up @@ -111,6 +111,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<inherited>true</inherited>
<configuration>
<testExcludes>
<testExclude>org/glassfish/jersey/media/multipart/internal/MultiPartHeaderModificationTest.java</testExclude>
Expand Down
112 changes: 32 additions & 80 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,18 +313,13 @@
<version>${compiler.mvn.plugin.version}</version>
<inherited>true</inherited>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
<compilerArguments>
<!--<Werror />-->
<!-- TODO work towards eliminating all warnings in order to be able to enable the -Xlint option -->
<!--Xlint/-->
</compilerArguments>
<showWarnings>false</showWarnings>
<fork>false</fork>
<excludes>
<exclude>module-info.java</exclude>
</excludes>
</configuration>
</plugin>
<plugin>
Expand Down Expand Up @@ -820,6 +815,38 @@
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<inherited>true</inherited>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
</configuration>
<executions>
<!-- when module.info
<execution>
<id>default-compile</id>
<configuration>
compile everything to ensure module-info contains right entries
<release>11</release>
</configuration>
</execution>
-->
<execution>
<id>base-compile</id>
<goals>
<goal>compile</goal>
</goals>
<!-- recompile everything for target VM except the module-info.java -->
<configuration>
<excludes>
<exclude>module-info.java</exclude>
</excludes>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</pluginManagement>
<plugins>
Expand Down Expand Up @@ -917,81 +944,6 @@
</build>

<profiles>
<profile>
<id>jdk8</id>
<activation>
<jdk>1.8</jdk>
</activation>
<properties>
<checkstyle.version>9.3</checkstyle.version>
<istack.mvn.plugin.version>3.0.9</istack.mvn.plugin.version>
</properties>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<inherited>true</inherited>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
<excludes>
<exclude>module-info.java</exclude>
</excludes>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
</profile>
<profile>
<id>jdk11+</id>
<!--
JDK 9 & 10 is unsupported (as well as <release>9</release>)
module-info for java.xml.bind is taken from JDK (lib/ct.sym/9-modules)
and it depends on java.activation which clashes with javax.activation
-->
<activation>
<jdk>[11,)</jdk>
</activation>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<inherited>true</inherited>
<executions>
<!-- when module.info
<execution>
<id>default-compile</id>
<configuration>
compile everything to ensure module-info contains right entries
<release>11</release>
</configuration>
</execution>
-->
<execution>
<id>base-compile</id>
<goals>
<goal>compile</goal>
</goals>
<!-- recompile everything for target VM except the module-info.java -->
<configuration>
<excludes>
<exclude>module-info.java</exclude>
</excludes>
<source>1.8</source>
<target>1.8</target>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</pluginManagement>
</build>
</profile>
<profile>
<!-- Use it with release-perform goal to skip another test run. -->
<id>testsSkip</id>
Expand Down
Loading