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

[JENKINS-68568] Require Java 11 or newer #478

Merged
merged 15 commits into from Nov 30, 2022
Merged

[JENKINS-68568] Require Java 11 or newer #478

Changes from 9 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
2994d46
Drop support for Java 8
basil Dec 19, 2021
66a06cf
Merge branch 'master' of https://github.com/jenkinsci/plugin-pom into…
basil Jan 31, 2022
1d974e4
Merge remote-tracking branch 'origin/master' into java11
basil Feb 13, 2022
3325bb8
Merge branch 'master' of https://github.com/jenkinsci/plugin-pom into…
basil Feb 17, 2022
5fd0346
Merge branch 'master' of https://github.com/jenkinsci/plugin-pom into…
basil Mar 1, 2022
d2b4d19
Merge remote-tracking branch 'origin/master' into java11
basil Mar 13, 2022
67b1354
Merge remote-tracking branch 'origin/master' into java11
basil Mar 30, 2022
cfec633
Remove unneeded profile
basil Mar 30, 2022
22d4b09
Merge branch 'master' of https://github.com/jenkinsci/plugin-pom into…
basil Mar 31, 2022
95cd21e
Merge remote-tracking branch 'origin/master' into java11
basil May 14, 2022
81c99a7
Merge remote-tracking branch 'origin/master' into java11
basil Nov 30, 2022
570a766
Update baseline
basil Nov 30, 2022
6efda40
Update README
basil Nov 30, 2022
089f4fb
Improve capitalization and phrasing
basil Nov 30, 2022
7469a13
Update BOM version
basil Nov 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
71 changes: 6 additions & 65 deletions pom.xml
View file
Open in desktop
Expand Up @@ -58,10 +58,10 @@
<project.build.outputEncoding>UTF-8</project.build.outputEncoding>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.testSource>1.8</maven.compiler.testSource>
<maven.compiler.testTarget>1.8</maven.compiler.testTarget>
<maven.compiler.release>11</maven.compiler.source>
<maven.compiler.testRelease>11</maven.compiler.target>
<!-- Work around openjdk/jdk11u-dev#919. TODO When we upgrade to OpenJDK 11.0.16, this should be deleted. -->
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

openjdk/jdk11u-dev#919 FTR

<maven.compiler.forceJavacCompilerUse>true</maven.compiler.forceJavacCompilerUse>
<!-- Generate metadata for reflection on method parameters -->
<maven.compiler.parameters>true</maven.compiler.parameters>

Expand Down Expand Up @@ -114,7 +114,6 @@

<mockito.version>4.4.0</mockito.version>
<access-modifier-checker.version>1.27</access-modifier-checker.version>
<animal.sniffer.version>1.21</animal.sniffer.version>

<!-- To opt in to @Restricted(Beta.class) APIs, set to true: -->
<useBeta>false</useBeta>
Expand Down Expand Up @@ -174,17 +173,6 @@
<artifactId>junit</artifactId>
<version>4.13.2</version>
</dependency>
<dependency>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-annotations</artifactId>
<version>${animal.sniffer.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.mojo.signature</groupId>
<artifactId>java18</artifactId>
<version>1.0</version>
<type>signature</type>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
Expand Down Expand Up @@ -243,14 +231,6 @@
<optional>true</optional>
</dependency>

<!-- for JRE requirement check annotation -->
<dependency>
<!-- no need to have this at runtime -->
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-annotations</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
<!-- to avoid https://www.slf4j.org/codes.html#release warning -->
<!-- TODO this would be better as a managed version of [0] -->
Expand Down Expand Up @@ -429,11 +409,6 @@
<artifactId>maven-hpi-plugin</artifactId>
<version>${hpi-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
<version>${animal.sniffer.version}</version>
</plugin>
<plugin>
<groupId>org.jvnet.localizer</groupId>
<artifactId>localizer-maven-plugin</artifactId>
Expand Down Expand Up @@ -522,7 +497,7 @@
</requirePluginVersions>
-->
<enforceBytecodeVersion>
<maxJdkVersion>1.8</maxJdkVersion>
<maxJdkVersion>11</maxJdkVersion>
<ignoredScopes>
<ignoredScope>test</ignoredScope>
</ignoredScopes>
Expand Down Expand Up @@ -703,26 +678,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
<configuration>
<signature>
<groupId>org.codehaus.mojo.signature</groupId>
<artifactId>java18</artifactId>
</signature>
</configuration>
<executions>
<execution>
<id>check</id>
<goals>
<goal>check</goal>
</goals>
<phase>test</phase>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-eclipse-plugin</artifactId>
</plugin>
<plugin>
Expand All @@ -734,7 +689,7 @@
<webApp>
<contextPath>/jenkins</contextPath>
</webApp>
<minimumJavaVersion>1.8</minimumJavaVersion>
<minimumJavaVersion>11</minimumJavaVersion>
<systemProperties>
<hudson.Main.development>${hudson.Main.development}</hudson.Main.development>
</systemProperties>
Expand Down Expand Up @@ -939,19 +894,6 @@
</build>

<profiles>
<profile>
<id>jdk-above-9</id>
<activation>
<jdk>[1.9,)</jdk>
</activation>
<properties>
<maven.compiler.release>8</maven.compiler.release>
<maven.compiler.testRelease>8</maven.compiler.testRelease>
<animal.sniffer.skip>true</animal.sniffer.skip>
<!-- Work around openjdk/jdk11u-dev#919. TODO When we upgrade to OpenJDK 11.0.16, this should be deleted. -->
<maven.compiler.forceJavacCompilerUse>true</maven.compiler.forceJavacCompilerUse>
</properties>
</profile>
<profile>
<id>jenkins-release</id>
<properties>
Expand Down Expand Up @@ -1501,7 +1443,6 @@
<spotbugs.skip>true</spotbugs.skip>
<enforcer.skip>true</enforcer.skip>
<access-modifier-checker.skip>true</access-modifier-checker.skip>
<animal.sniffer.skip>true</animal.sniffer.skip>
<invoker.skip>true</invoker.skip>
</properties>
</profile>
Expand Down