Skip to content

Commit

Permalink
Require Java 11 for building
Browse files Browse the repository at this point in the history 
Drop Java8 profile (which makes cloud profile the only automatically
activated profile)
Build with JDK21 in addition

This closes #3108
  • Loading branch information
@kwin
kwin committed Nov 15, 2023
1 parent 519cda5 commit 2d3743b
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 57 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/maven.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macOS-latest, windows-latest]
jdk: [8, 11, 17]
jdk: [11, 17, 21]
include:
# lengthy build steps should only be performed on linux with Java 11 (CodeCov analysis, deployment)
- os: ubuntu-latest
Expand Down
12 changes: 0 additions & 12 deletions bundle/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,18 +88,6 @@
</systemPropertyVariables>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
<executions>
<execution>
<phase>test</phase>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
Expand Down
49 changes: 5 additions & 44 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,7 @@

<jacoco.version>0.8.7</jacoco.version>
<!-- affects both m-compiler-p and m-javadoc-p-->
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.release>8</maven.compiler.release>
<!-- for reproducible builds (https://maven.apache.org/guides/mini/guide-reproducible-builds.html), automatically adjusted during release -->
<project.build.outputTimestamp>1698267085</project.build.outputTimestamp>
</properties>
Expand Down Expand Up @@ -386,19 +385,6 @@ Service-Component: OSGI-INF/*.xml
<artifactId>license-maven-plugin</artifactId>
<version>2.0.0</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
<version>1.20</version>
<configuration>
<failOnError>false</failOnError>
<signature>
<groupId>org.codehaus.mojo.signature</groupId>
<artifactId>java18</artifactId>
<version>1.0</version>
</signature>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
Expand Down Expand Up @@ -459,7 +445,7 @@ Service-Component: OSGI-INF/*.xml
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
<id>enforce-maven</id>
<id>enforce-maven-and-java</id>
<goals>
<goal>enforce</goal>
</goals>
Expand All @@ -468,6 +454,9 @@ Service-Component: OSGI-INF/*.xml
<requireMavenVersion>
<version>3.5.4</version><!-- license-maven-plugin 2.0.0 requires 3.5.4 -->
</requireMavenVersion>
<requireJavaVersion>
<version>11</version>
</requireJavaVersion>
</rules>
</configuration>
</execution>
Expand Down Expand Up @@ -740,23 +729,6 @@ Service-Component: OSGI-INF/*.xml
</plugins>
</build>
</profile>
<!-- profile for settings when running on Java8 -->
<profile>
<id>java8</id>
<activation>
<jdk>1.8</jdk>
</activation>
<build>
<plugins>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<additionalJOption>-Xdoclint:none</additionalJOption>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>coverage</id>
<build>
Expand Down Expand Up @@ -799,17 +771,6 @@ Service-Component: OSGI-INF/*.xml
</executions>
</plugin>
</plugins>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
</profile>
<profile>
Expand Down

0 comments on commit 2d3743b

Please sign in to comment.