Skip to content

Commit

Permalink
Merge pull request #454 from axonivy/java21
Browse files Browse the repository at this point in the history
XIVY-13665 Update to Java 21
  • Loading branch information
alexsuter authored Jul 11, 2024
2 parents 2ba41f8 + a5af7ae commit a9871ec
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .classpath
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</attributes>
</classpathentry>
<classpathentry kind="src" path="src/site"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
<attributes>
<attribute name="module" value="true"/>
<attribute name="maven.pomderived" value="true"/>
Expand Down
6 changes: 3 additions & 3 deletions .settings/org.eclipse.jdt.core.prefs
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
org.eclipse.jdt.core.compiler.compliance=17
org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
org.eclipse.jdt.core.compiler.compliance=21
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.release=enabled
org.eclipse.jdt.core.compiler.source=17
org.eclipse.jdt.core.compiler.source=21
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM maven:3.8.6-eclipse-temurin-17
FROM maven:3.9.8-eclipse-temurin-21

RUN addgroup --gid 1000 build && adduser --uid 1000 --gid 1000 --disabled-password --gecos "" build && \
curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg && \
Expand Down
4 changes: 3 additions & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,9 @@ def collectBuildArtifacts() {
recordIssues tools: [mavenConsole()], qualityGates: [[threshold: 1, type: 'TOTAL']], filters: [
excludeType('site-maven-plugin:site'),
excludeType('sonar-maven-plugin:sonar'),
excludeType('maven-surefire-plugin:test')
excludeType('maven-surefire-plugin:test'),
// printed to console by test. was since ever the case but they are now real maven warnings
excludeMessage('.*Uncaught exception in thread Thread.*'),
]
recordIssues tools: [eclipse()], qualityGates: [[threshold: 1, type: 'TOTAL']]
}
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
</organization>

<properties>
<java.version>17</java.version>
<java.version>21</java.version>
<maven.version>3.6.3</maven.version>
<!-- version should match ivy Engine sfl4j version! And version in EngineClassLoaderFactory.SLF4J_VERSION -->
<slf4j.version>2.0.13</slf4j.version>
Expand Down Expand Up @@ -212,7 +212,7 @@
<!-- Makes MOJO declaration trough Annotation possible. -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>3.6.4</version>
<version>3.13.1</version>
<configuration>
<!-- see http://jira.codehaus.org/browse/MNG-5346 -->
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
Expand Down Expand Up @@ -490,7 +490,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>3.6.4</version>
<version>3.13.1</version>
<configuration>
<requirements>
<others>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ch/ivyteam/ivy/maven/IarPackagingMojo.java
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public static interface Defaults {
* declarations.
*
* From the 'target' directory only 'classes' and 'src_hd' are included by default.
* See {@link Defaults#TARGET_INCLUDES}.
* See {@link ch.ivyteam.ivy.maven.IarPackagingMojo.Defaults#TARGET_INCLUDES}.
*
* <pre>
* <code>&lt;iarFileSets&gt;
Expand Down

0 comments on commit a9871ec

Please sign in to comment.