Skip to content

Commit

Permalink
Bump parent POM from 1.76 to 1.77 (#444)
Browse files Browse the repository at this point in the history
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  • Loading branch information
dependabot[bot] committed Jun 24, 2022
1 parent c949b49 commit b99cd5e
Show file tree
Hide file tree
Showing 2 changed files with 105 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ buildPlugin(useContainerAgent: true, configurations: [
[ platform: 'linux', jdk: '8' ],
[ platform: 'linux', jdk: '11' ],
[ platform: 'windows', jdk: '11' ],
[ platform: 'linux', jdk: '17', jenkins: '2.354' ],
[ platform: 'linux', jdk: '17', jenkins: '2.356' ],
])
105 changes: 104 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ THE SOFTWARE.
<parent>
<groupId>org.jenkins-ci</groupId>
<artifactId>jenkins</artifactId>
<version>1.76</version>
<version>1.77</version>
<relativePath />
</parent>

Expand Down Expand Up @@ -217,6 +217,25 @@ THE SOFTWARE.
</pluginRepositories>
<build>
<plugins>
<!-- TODO When the minimum Jenkins baseline is bumped past 2.357, this can be deleted. -->
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
<id>display-info</id>
<configuration>
<rules>
<requireJavaVersion>
<version>[1.8.0,]</version>
</requireJavaVersion>
<enforceBytecodeVersion>
<maxJdkVersion>1.8</maxJdkVersion>
</enforceBytecodeVersion>
</rules>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
Expand Down Expand Up @@ -321,13 +340,33 @@ THE SOFTWARE.
<profiles>
<profile>
<id>jdk-9-and-above</id>
<!-- TODO When the minimum Jenkins baseline is bumped past 2.357, this can be lifted out of the profile. -->
<activation>
<jdk>[9,)</jdk>
</activation>
<properties>
<jenkins.insaneHook>--patch-module=java.base=${project.build.outputDirectory}/netbeans/harness/modules/ext/org-netbeans-insane-hook.jar --add-exports=java.base/org.netbeans.insane.hook=ALL-UNNAMED</jenkins.insaneHook>
</properties>
<!-- TODO When the minimum Jenkins baseline is bumped past 2.357, this can be deleted. -->
<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<release>8</release>
<testRelease>8</testRelease>
</configuration>
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<release>8</release>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<!-- TODO When the minimum Jenkins baseline is bumped past 2.357, this can be deleted. -->
<profile>
<id>jdk-8-and-below</id>
<activation>
Expand All @@ -336,6 +375,28 @@ THE SOFTWARE.
<properties>
<jenkins.insaneHook>-Xbootclasspath/p:${project.build.outputDirectory}/netbeans/harness/modules/ext/org-netbeans-insane-hook.jar</jenkins.insaneHook>
</properties>
<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.8</source>
<target>1.8</target>
<testSource>1.8</testSource>
<testTarget>1.8</testTarget>
<release combine.self="override" />
<testRelease combine.self="override" />
</configuration>
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<source>1.8</source>
<release combine.self="override" />
</configuration>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>skip-tests-on-release</id>
Expand Down Expand Up @@ -385,6 +446,48 @@ THE SOFTWARE.
</plugins>
</build>
</profile>
<!--
Our Jenkinsfile has a Java 17 branch that tests a recent weekly release for two reasons:

1. We want to test on all versions of Java, but only recent weeklies support Java 17.

2. Testing against a recent weekly release ensures that the test harness can be compiled
against the latest core APIs.

When we are testing against a recent weekly that requires Java 11, the bytecode version
check naturally fails. To work around this, we relax the bytecode version check
when we are executing the Java 17 branch in the CI environment.

TODO When the minimum Jenkins baseline is bumped past 2.357, this can be deleted.
-->
<profile>
<id>test-recent-cores-on-ci</id>
<activation>
<jdk>17</jdk>
<property>
<name>env.CI</name>
</property>
</activation>
<build>
<plugins>
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
<id>display-info</id>
<configuration>
<rules>
<enforceBytecodeVersion>
<maxJdkVersion>11</maxJdkVersion>
</enforceBytecodeVersion>
</rules>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>

</project>

0 comments on commit b99cd5e

Please sign in to comment.