Skip to content

Commit 3c227ce

Browse files
sfioranisfiorani
authored
build: migration to java 21 (#37)
* build: migration to java 21 Signed-off-by: SimoneFiorani <simone.fiorani@abinsula.com> * fix: tests * test: fixed tests Signed-off-by: SimoneFiorani <simone.fiorani@abinsula.com> * test: removing sonar coverage Signed-off-by: SimoneFiorani <simone.fiorani@abinsula.com> * fix: general fix Signed-off-by: SimoneFiorani <simone.fiorani@abinsula.com> * test: fix junit version Signed-off-by: SimoneFiorani <simone.fiorani@abinsula.com> * fix: typos Signed-off-by: SimoneFiorani <simone.fiorani@abinsula.com> --------- Signed-off-by: SimoneFiorani <simone.fiorani@abinsula.com>
1 parent 941adaf commit 3c227ce

51 files changed

Lines changed: 75 additions & 77 deletions

File tree

  • .jenkins
  • README.md
  • kura-addon-prototypes
  • kura-apps-target-definition
  • kura-examples
    • bundles
      • ble
        • org.eclipse.kura.example.ble.tisensortag.dbus/META-INF
        • org.eclipse.kura.example.eddystone.advertiser/META-INF
        • org.eclipse.kura.example.eddystone.scanner/META-INF
        • org.eclipse.kura.example.ibeacon.advertiser/META-INF
        • org.eclipse.kura.example.ibeacon.scanner/META-INF
      • camel
        • org.eclipse.kura.example.camel.aggregation/META-INF
        • org.eclipse.kura.example.camel.publisher/META-INF
        • org.eclipse.kura.example.camel.quickstart/META-INF
      • can/org.eclipse.kura.example.can/META-INF
      • container-validation/org.eclipse.kura.example.container.signature.validation/META-INF
      • gpio
      • heater/org.eclipse.kura.demo.heater/META-INF
      • identity/org.eclipse.kura.example.identity.configuration.extension/META-INF
      • modbus/org.eclipse.kura.demo.modbus/META-INF
      • pom.xml
      • publishers
        • org.eclipse.kura.example.publisher/META-INF
        • org.eclipse.kura.example.serial.publisher/META-INF
      • security
        • org.eclipse.kura.example.rest.authentication.provider/META-INF
        • org.eclipse.kura.example.tamper.detection/META-INF
      • sensehat
        • org.eclipse.kura.example.driver.sensehat/META-INF
        • org.eclipse.kura.raspberrypi.sensehat.example/META-INF
        • org.eclipse.kura.raspberrypi.sensehat/META-INF
      • wire-components
        • org.eclipse.kura.example.wire.logic.multiport.provider/META-INF
        • org.eclipse.kura.example.wire.math.multiport.provider/META-INF
        • org.eclipse.kura.example.wire.math.singleport.provider/META-INF
        • org.eclipse.kura.example.wire.math.trig/META-INF
        • org.eclipse.kura.wire.devel.component.provider/META-INF
    • tests
      • ble-tests/org.eclipse.kura.example.ble.tisensortag.dbus.test/META-INF
      • container-validation-tests/org.eclipse.kura.example.container.signature.validation.test/META-INF
      • identity-tests/org.eclipse.kura.example.identity.configuration.extension.test/META-INF
      • pom.xml
      • test-util/org.eclipse.kura.example.testutil/META-INF
      • wire-components-tests
        • org.eclipse.kura.example.wire.devel.component.provider.test/META-INF
        • org.eclipse.kura.example.wire.logic.multiport.provider.test/META-INF
        • org.eclipse.kura.example.wire.math.multiport.provider.test/META-INF
        • org.eclipse.kura.example.wire.math.singleport.provider.test/META-INF
        • org.eclipse.kura.example.wire.math.trig.test/META-INF

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.jenkins/ci.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ node {
77
enable: true,
88
projectKey: "eclipse-kura_kura-apps",
99
tokenId: "sonarcloud-token-kura-apps",
10-
exclusions: "tests/**/*,**/*.xml,**/*.yml",
10+
exclusions: "kura-examples/tests/**/*,kura-addon-prototypes/tests/**/***/*.xml,**/*.yml",
1111
testExclusions: "**/*"
1212
],
1313
)

‎README.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ For the complete guide to setup the development environment, please refer to the
2121

2222
In order to be able to build the applications for Eclipse Kura™ on your development machine, you need to have the following programs installed in your system:
2323

24-
* JDK 17
25-
* Maven 3.9.x
24+
* JDK 21
25+
* Maven 3.9.9 or higher
2626

2727
<details>
2828
<summary>
@@ -31,7 +31,7 @@ In order to be able to build the applications for Eclipse Kura™ on your develo
3131

3232
</summary>
3333

34-
To install Java 17, download the JDK tar archive from the [Adoptium Project Repository](https://adoptium.net/en-GB/temurin/releases/?variant=openjdk8&jvmVariant=hotspot&version=17).
34+
To install Java 21, download the JDK tar archive from the [Adoptium Project Repository](https://adoptium.net/en-GB/temurin/releases/?variant=openjdk8&jvmVariant=hotspot&version=21).
3535

3636
Once downloaded, copy the tar archive in `/Library/Java/JavaVirtualMachines/` and cd into it. Unpack the archive with the following command:
3737

@@ -71,11 +71,11 @@ export PATH="/usr/local/opt/maven@3.9/bin:$PATH"
7171

7272
For Java
7373
```bash
74-
sudo apt install openjdk-17-jdk
74+
sudo apt install openjdk-21-jdk
7575
```
7676
For Maven
7777

78-
You can follow the tutorial from the official [Maven](http://maven.apache.org/install.html) site. Remember that you need to install the 3.9.x version.
78+
You can follow the tutorial from the official [Maven](http://maven.apache.org/install.html) site. Remember that you need to install the 3.9.9 or higher version.
7979

8080
</details>
8181

‎kura-addon-prototypes/bundles/example-configurable-component.bundle/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
33
Bundle-SymbolicName: org.eclipse.kura.example.configurable.component.bundle;singleton:=true
44
Bundle-Version: 1.0.0.qualifier
55
Bundle-Vendor: Eclipse Kura
6-
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=17))"
6+
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=21))"
77
Import-Package: org.eclipse.kura;version="[1.4,2.0)",
88
org.eclipse.kura.configuration;version="[1.0,2.0)",
99
org.eclipse.kura.configuration.metatype;version="[1.1,2.0)",

‎kura-addon-prototypes/bundles/example-driver.bundle/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
33
Bundle-SymbolicName: org.eclipse.kura.example.driver.bundle;singleton:=true
44
Bundle-Version: 1.0.0.qualifier
55
Bundle-Vendor: Eclipse Kura
6-
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=17))"
6+
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=21))"
77
Import-Package: org.eclipse.kura;version="[1.4,2.0)",
88
org.eclipse.kura.channel;version="[1.4,2.0)",
99
org.eclipse.kura.channel.listener;version="[1.0,2.0)",

‎kura-addon-prototypes/bundles/example-factory-component.bundle/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
33
Bundle-SymbolicName: org.eclipse.kura.example.factory.component.bundle;singleton:=true
44
Bundle-Version: 1.0.0.qualifier
55
Bundle-Vendor: Eclipse Kura
6-
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=17))"
6+
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=21))"
77
Import-Package: org.eclipse.kura;version="[1.4,2.0)",
88
org.eclipse.kura.configuration;version="[1.0,2.0)",
99
org.eclipse.kura.configuration.metatype;version="[1.1,2.0)",

‎kura-addon-prototypes/bundles/example-wire-component.bundle/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
33
Bundle-SymbolicName: org.eclipse.kura.example.wire.component.bundle;singleton:=true
44
Bundle-Version: 1.0.0.qualifier
55
Bundle-Vendor: Eclipse Kura
6-
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=17))"
6+
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=21))"
77
Import-Package: org.eclipse.kura;version="[1.4,2.0)",
88
org.eclipse.kura.configuration;version="[1.0,2.0)",
99
org.eclipse.kura.configuration.metatype;version="[1.1,2.0)",

‎kura-addon-prototypes/bundles/pom.xml‎

Lines changed: 4 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>
@@ -50,8 +50,8 @@
5050
<artifactId>tycho-compiler-plugin</artifactId>
5151
<version>${tycho-version}</version>
5252
<configuration>
53-
<source>17</source>
54-
<target>17</target>
53+
<source>21</source>
54+
<target>21</target>
5555
<showDeprecation>true</showDeprecation>
5656
<showWarnings>true</showWarnings>
5757
<requireJREPackageImports>true</requireJREPackageImports>

‎kura-addon-prototypes/tests/example-configurable-component.bundle.test/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Bundle-Name: Example component tests
44
Bundle-SymbolicName: org.eclipse.kura.example.configurable.component.bundle.test;singleton:=true
55
Bundle-Version: 1.0.0.qualifier
66
Bundle-Vendor: EUROTECH
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.example.configurable.component.bundle
99
Require-Bundle: org.junit,
1010
org.mockito.mockito-core,

‎kura-addon-prototypes/tests/example-driver.bundle.test/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Bundle-Name: Example component tests
44
Bundle-SymbolicName: org.eclipse.kura.example.driver.bundle.test;singleton:=true
55
Bundle-Version: 1.0.0.qualifier
66
Bundle-Vendor: EUROTECH
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.example.driver.bundle
99
Require-Bundle: org.junit,
1010
org.mockito.mockito-core,

‎kura-addon-prototypes/tests/example-factory-component.bundle.test/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Bundle-Name: Factory component examples tests
44
Bundle-SymbolicName: org.eclipse.kura.example.factory.component.bundle.test;singleton:=true
55
Bundle-Version: 1.0.0.qualifier
66
Bundle-Vendor: EUROTECH
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.example.factory.component.bundle
99
Require-Bundle: org.junit,
1010
org.mockito.mockito-core,

0 commit comments

Comments
 (0)