Skip to content

Commit c88822b

Browse files
authored
build: migration to java 21 (#4)
* build: migration to java 21 Signed-off-by: SimoneFiorani <simone.fiorani@abinsula.com> * build: updated maven-compiler release version Signed-off-by: SimoneFiorani <simone.fiorani@abinsula.com> --------- Signed-off-by: SimoneFiorani <simone.fiorani@abinsula.com>
1 parent a3d89c3 commit c88822b

4 files changed

Lines changed: 11 additions & 14 deletions

File tree

bundles/org.eclipse.kura.ai.triton.server/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Bundle-Name: org.eclipse.kura.ai.triton.server
44
Bundle-SymbolicName: org.eclipse.kura.ai.triton.server;singleton:=true
55
Bundle-Version: 2.0.0.qualifier
66
Bundle-Vendor: Eclipse Kura
7-
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=17))"
7+
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=21))"
88
Service-Component: OSGI-INF/*.xml
99
Bundle-ClassPath: .,
1010
lib/grpc-api.jar,

bundles/pom.xml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright (c) 2025 Eurotech and/or its affiliates and others
4+
Copyright (c) 2025, 2026 Eurotech and/or its affiliates and others
55
66
This program and the accompanying materials are made
77
available under the terms of the Eclipse Public License 2.0
@@ -35,7 +35,7 @@
3535

3636
<properties>
3737
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
38-
<tycho-version>4.0.11</tycho-version>
38+
<tycho-version>5.0.2</tycho-version>
3939
<bnd-version>7.1.0</bnd-version>
4040
<maven.jarsigner.plugin.version>1.4</maven.jarsigner.plugin.version>
4141
<skip.artifact.signing>true</skip.artifact.signing>
@@ -44,6 +44,8 @@
4444
<grpc.version>1.76.0</grpc.version>
4545
<perfmark-api.version>0.26.0</perfmark-api.version>
4646
<protobuf.version>4.30.2</protobuf.version>
47+
48+
<maven.compiler.release>21</maven.compiler.release>
4749
</properties>
4850

4951
<dependencyManagement>
@@ -169,8 +171,7 @@
169171
<artifactId>tycho-compiler-plugin</artifactId>
170172
<version>${tycho-version}</version>
171173
<configuration>
172-
<source>17</source>
173-
<target>17</target>
174+
<release>${maven.compiler.release}</release>
174175
<showDeprecation>true</showDeprecation>
175176
<showWarnings>true</showWarnings>
176177
<requireJREPackageImports>true</requireJREPackageImports>

tests/org.eclipse.kura.ai.triton.server.test/META-INF/MANIFEST.MF

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Bundle-Name: org.eclipse.kura.ai.triton.server.test
44
Bundle-SymbolicName: org.eclipse.kura.ai.triton.server.test;singleton:=true
55
Bundle-Version: 2.0.0.qualifier
66
Bundle-Vendor: Eclipse Kura
7-
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=17))"
7+
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=21))"
88
Fragment-Host: org.eclipse.kura.ai.triton.server
99
Import-Package: com.sun.net.httpserver,
1010
org.apache.commons.io;version="[2.11,3.0)",
@@ -13,11 +13,11 @@ Import-Package: com.sun.net.httpserver,
1313
org.eclipse.kura.core.linux.executor;version="[1.0,2.0)",
1414
org.eclipse.kura.core.testutil;version="1.0.0",
1515
org.eclipse.kura.executor;version="[1.0,2.0)",
16-
org.junit;version="[4.12.0,5.0.0)",
16+
org.junit;version="4.12.0",
1717
org.junit.runner;version="[4.12.0,5.0.0)",
1818
org.junit.runners;version="[4.12.0,5.0.0)",
19-
org.mockito;version="[4.0.0,5.0.0)",
20-
org.mockito.stubbing;version="[4.0.0,5.0.0)",
19+
org.mockito;version="5.21.0",
20+
org.mockito.stubbing;version="5.21.0",
2121
org.osgi.framework;version="1.7"
2222
Bundle-ActivationPolicy: lazy
2323
Bundle-ClassPath: .,

tests/pom.xml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright (c) 2025 Eurotech and/or its affiliates and others
4+
Copyright (c) 2025, 2026 Eurotech and/or its affiliates and others
55
66
This program and the accompanying materials are made
77
available under the terms of the Eclipse Public License 2.0
@@ -163,13 +163,10 @@
163163
<configuration>
164164
<failIfNoTests>false</failIfNoTests>
165165
<providerHint>junit4</providerHint>
166-
<parallel>classes</parallel>
167166
<useUnlimitedThreads>true</useUnlimitedThreads>
168167
<argLine>
169168
${tycho.testArgLine}
170169
-Dosgi.console=5002
171-
-Declipse.security=osgi
172-
-Dorg.osgi.framework.security=osgi
173170
-Dosgi.signedcontent.support=all
174171
-XX:HeapDumpPath=/dev/null
175172
-Dorg.eclipse.kura.mode=emulator
@@ -187,7 +184,6 @@
187184
<level>4</level>
188185
<autoStart>true</autoStart>
189186
</defaultStartLevel>
190-
191187
<bundleStartLevel>
192188
<bundle>
193189
<id>org.apache.logging.log4j.slf4j2.impl</id>

0 commit comments

Comments
 (0)