Commit 3cbc5fc

committed

Merge branch 'jdk25' into 'main'

Move to JDK 25 See merge request weblogic-cloud/weblogic-monitoring-exporter!303

2 parents ffd5e2e + 5e354e5 commit 3cbc5fcCopy full SHA for 3cbc5fc

File tree

+10

-10

lines changed

+10

-10

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,10 +22,10 @@ jobs:`
`22`	`22`	`with:`
`23`	`23`	`fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis`
`24`	`24`	`- name: Set up JDK`
`25`		`- uses: actions/setup-java@v5`
	`25`	`+ uses: oracle-actions/setup-java@v1`
`26`	`26`	`with:`
`27`		`- distribution: 'oracle'`
`28`		`- java-version: 21`
	`27`	`+ website: oracle.com`
	`28`	`+ release: 25`
`29`	`29`	`- name: Cache Maven packages`
`30`	`30`	`uses: actions/cache@v4`
`31`	`31`	`with:`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@`
`3`	`3`
`4`	`4`	`FROM ghcr.io/oracle/oraclelinux:9-slim AS jre-build`
`5`	`5`
`6`		`-ENV JAVA_URL_X64="https://download.oracle.com/java/21/latest/jdk-21_linux-x64_bin.tar.gz"`
`7`		`-ENV JAVA_URL_AARCH64="https://download.oracle.com/java/21/latest/jdk-21_linux-aarch64_bin.tar.gz"`
	`6`	`+ENV JAVA_URL_X64="https://download.oracle.com/java/25/latest/jdk-25_linux-x64_bin.tar.gz"`
	`7`	`+ENV JAVA_URL_AARCH64="https://download.oracle.com/java/25/latest/jdk-25_linux-aarch64_bin.tar.gz"`
`8`	`8`
`9`	`9`	`RUN set -eux; \`
`10`	`10`	`microdnf -y install gzip tar; \`

Lines changed: 1 addition & 1 deletion

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@`
`64`	`64`
`65`	`65`	`<skip.dependency-check>false</skip.dependency-check>`
`66`	`66`
`67`		`- <java.version.range>21</java.version.range>`
	`67`	`+ <java.version.range>25</java.version.range>`
`68`	`68`	`<maven.version.range>[3.8.1,)</maven.version.range>`
`69`	`69`	`</properties>`
`70`	`70`
`@@ -389,7 +389,7 @@`
`389`	`389`	`<profile>`
`390`	`390`	`<id>helidon-sidecar</id>`
`391`	`391`	`<activation>`
`392`		`- <jdk>[21,)</jdk>`
	`392`	`+ <jdk>[25,)</jdk>`
`393`	`393`	`</activation>`
`394`	`394`	`<modules>`
`395`	`395`	`<module>build-helper-mojo</module>`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -133,8 +133,8 @@`
`133`	`133`	`<artifactId>maven-compiler-plugin</artifactId>`
`134`	`134`	`<version>${maven-compiler-plugin-version}</version>`
`135`	`135`	`<configuration>`
`136`		`- <source>21</source>`
`137`		`- <target>21</target>`
	`136`	`+ <source>25</source>`
	`137`	`+ <target>25</target>`
`138`	`138`	`<compilerArgs>`
`139`	`139`	`<arg>-Xpkginfo:always</arg>`
`140`	`140`	`<arg>-Xlint:all</arg>`

Comments

(0)