Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/dependencies-update.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v4

- name: Set up JDK 17
- name: Set up JDK 25
uses: actions/setup-java@v4
with:
java-version: '17'
java-version: '25'
distribution: 'zulu'
cache: maven

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/maven-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ jobs:

steps:
- uses: actions/checkout@v4
- name: Set up JDK 17
- name: Set up JDK 25
uses: actions/setup-java@v4
with:
java-version: '17'
java-version: '25'
distribution: 'zulu'

- name: Build with Maven
Expand Down Expand Up @@ -56,10 +56,10 @@ jobs:
with:
fetch-depth: 0

- name: Set up JDK 17
- name: Set up JDK 25
uses: actions/setup-java@v4
with:
java-version: '17'
java-version: '25'
distribution: 'zulu'
server-id: github
settings-path: ${{ github.workspace }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/maven-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v4

- name: Set up JDK 17
- name: Set up JDK 25
uses: actions/setup-java@v4
with:
java-version: '17'
java-version: '25'
distribution: 'zulu'
settings-path: ${{ github.workspace }}

Expand Down
25 changes: 15 additions & 10 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.ecsp</groupId>
<artifactId>utils</artifactId>
<version>1.2-SNAPSHOT</version>
<version>1.2-java-25-SNAPSHOT</version>

<name>Utils</name>
<description>Utility library for ECSP project</description>
Expand All @@ -64,6 +64,11 @@
<name>Kaushal Arora</name>
<email>kaushal.arora@harman.com</email>
</developer>
<developer>
<id>ihussainbadshah</id>
<name>Hussain Badshah</name>
<email>hussain.badshah@harman.com</email>
</developer>
</developers>

<issueManagement>
Expand All @@ -77,25 +82,25 @@
</organization>

<properties>
<java.version>17</java.version>
<java.version>25</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!--Checkstyle plugin properties -->
<checkstyle.version>10.13.0</checkstyle.version>
<license-tool-plugin.version>1.1.0</license-tool-plugin.version>
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
<install-plugin.version>3.1.1</install-plugin.version>
<maven-gpg-plugin.version>3.1.0</maven-gpg-plugin.version>
<maven.checkstyle.version>3.3.1</maven.checkstyle.version>
<maven.checkstyle.version>3.6.0</maven.checkstyle.version>
<checkstyle.config.location>${project.basedir}/checkstyle.xml</checkstyle.config.location>
<checkstyle.suppressions.location>${project.basedir}/checkstyle-suppressions.xml
</checkstyle.suppressions.location>
<sonar.java.checkstyle.reportPaths>${project.build.directory}/checkstyle-result.xml
</sonar.java.checkstyle.reportPaths>
<entities.version>1.1.1</entities.version>
<entities.version>1.2-java-25-SNAPSHOT</entities.version>
<!-- Sonar plugin properties -->
<sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
<sonar.java.source>17</sonar.java.source>
<sonar.java.target>17</sonar.java.target>
<sonar.java.source>25</sonar.java.source>
<sonar.java.target>25</sonar.java.target>
<sonar.coverage.jacoco.xmlReportPaths>${project.build.directory}/site/jacoco-ut/jacoco.xml
</sonar.coverage.jacoco.xmlReportPaths>
<sonar.language>java</sonar.language>
Expand All @@ -104,10 +109,10 @@
<logback.version>1.5.5</logback.version>
<prometheus.client.version>0.6.0</prometheus.client.version>
<maven.surefire.version>2.18.1</maven.surefire.version>
<spring.version>6.1.14</spring.version>
<spring.version>7.0.3</spring.version>
<mockito.version>3.12.4</mockito.version>
<springboot.version>3.3.3</springboot.version>
<spring.boot.autoconfigure>3.3.3</spring.boot.autoconfigure>
<springboot.version>4.0.0-M2</springboot.version>
<spring.boot.autoconfigure>4.0.2</spring.boot.autoconfigure>
<snakeyaml.version>2.0</snakeyaml.version>
<sonar.coverage.exclusions>
src/main/java/org/eclipse/ecsp/utils/logger/IgniteCallerDataConverter.java,
Expand Down Expand Up @@ -330,7 +335,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.8</version>
<version>0.8.14</version>
<executions>
<!-- Prepares the property pointing to the JaCoCo runtime
agent which is passed as VM argument when Maven the Surefire plugin is executed. -->
Expand Down