Skip to content

Commit 05ed767

Browse files
migrated code to java 21
1 parent d6828cd commit 05ed767

150 files changed

Lines changed: 159 additions & 182 deletions

File tree

Some content is hidden

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

build-all.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22

33
#
4-
# Copyright (c) 2016, 2020 Red Hat and others
4+
# Copyright (c) 2016, 2026 Red Hat and others
55
#
66
# This program and the accompanying materials are made
77
# available under the terms of the Eclipse Public License 2.0
@@ -22,7 +22,7 @@ MAVEN_PROPS="-B"
2222

2323
[ -z "$RUN_TESTS" ] && MAVEN_PROPS="$MAVEN_PROPS -Dmaven.test.skip=true"
2424

25-
mvn "$@" -f target-platform/pom.xml clean install $MAVEN_PROPS &&
26-
mvn "$@" -f kura/pom.xml clean install $MAVEN_PROPS &&
27-
mvn "$@" -f kura/distrib/pom.xml clean install $MAVEN_PROPS
25+
mvn "$@" --color=always -f target-platform/pom.xml clean install $MAVEN_PROPS &&
26+
mvn "$@" --color=always -f kura/pom.xml clean install $MAVEN_PROPS &&
27+
mvn "$@" --color=always -f kura/distrib/pom.xml clean install $MAVEN_PROPS
2828

kura/distrib/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
</modules>
3939

4040
<properties>
41-
<tycho-version>4.0.11</tycho-version>
41+
<tycho-version>5.0.2</tycho-version>
4242
<jdeb-version>1.14</jdeb-version>
4343
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4444

@@ -82,7 +82,7 @@
8282
polkit | policykit-1 | polkitd,
8383
ssh | openssh, openssl, busybox, libpam-modules,
8484
python3,
85-
openjdk-17-jre-headless | temurin-17-jdk | java-runtime-headless (= 17) | java-runtime-headless (= 21),
85+
openjdk-21-jre-headless | temurin-21-jdk | java-runtime-headless (= 21),
8686
dos2unix, libtirpc3, chrony, chronyc | chrony, iputils-ping
8787
</deb.dependencies>
8888
<deb.recommendations></deb.recommendations>

kura/distrib/src/main/resources/filtered/pkg/bin/start_kura.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ KURA_CMD="${KURA_LAUNCH_COMMAND} -Xms${kura.mem.size} -Xmx${kura.mem.size} \
9797
-Ddpa.configuration=\${DIR}/packages/dpa.properties \
9898
-Dlog4j.configurationFile=file:\${DIR}/log4j/log4j.xml \
9999
-Dlog4j2.disable.jmx=true \
100-
-Djava.security.policy=\${DIR}/framework/java.policy \
101100
-Djdk.tls.trustNameService=true \
102101
-Declipse.consoleLog=true \
103102
-jar \${DIR}/plugins/org.eclipse.equinox.launcher-${org.eclipse.equinox.launcher.version}.jar \

kura/distrib/src/main/resources/unfiltered/pkg/framework/java.policy

Lines changed: 0 additions & 16 deletions
This file was deleted.

kura/distrib/src/main/resources/unfiltered/pkg/log4j/log4j.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) 2018, 2025 Eurotech and/or its affiliates and others
4+
Copyright (c) 2018, 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
@@ -34,15 +34,15 @@
3434
</RollingFile>
3535
<RollingFile name="audit" fileName="${log_dir}/${log_name}-audit.log"
3636
filePattern="${log_dir}/${log_name}-audit-%i.log.gz">
37-
<RFC5424Layout enterpriseNumber="28392" includeMDC="true" mdcId="RequestContext"
38-
appName="EclipseKura" mdcPrefix="" newLine="true">
37+
<Rfc5424Layout enterpriseNumber="28392" includeMDC="true" mdcId="RequestContext"
38+
appName="EclipseKura" mdcPrefix="" includeNL="true">
3939
<LoggerFields>
4040
<KeyValuePair key="thread" value="%t" />
4141
<KeyValuePair key="priority" value="%p" />
4242
<KeyValuePair key="category" value="%c" />
4343
<KeyValuePair key="exception" value="%ex" />
4444
</LoggerFields>
45-
</RFC5424Layout>
45+
</Rfc5424Layout>
4646
<Policies>
4747
<SizeBasedTriggeringPolicy size="10 MB" />
4848
</Policies>

kura/emulator/org.eclipse.kura.emulator.clock/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.emulator.clock
44
Bundle-SymbolicName: org.eclipse.kura.emulator.clock;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
Export-Package: org.eclipse.kura.emulator.clock; version="1.0.0"
99
Service-Component: OSGI-INF/*.xml
1010
Bundle-ActivationPolicy: lazy

kura/emulator/org.eclipse.kura.emulator.gpio/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.emulator.gpio
44
Bundle-SymbolicName: org.eclipse.kura.emulator.gpio;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
Export-Package: org.eclipse.kura.emulator.gpio; version="1.0.0"
99
Service-Component: OSGI-INF/*.xml
1010
Bundle-ActivationPolicy: lazy

kura/emulator/org.eclipse.kura.emulator.net/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.emulator.net
44
Bundle-SymbolicName: org.eclipse.kura.emulator.net;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
Export-Package: org.eclipse.kura.emulator.net; version="1.0.0"
99
Service-Component: OSGI-INF/*.xml
1010
Bundle-ActivationPolicy: lazy

kura/emulator/org.eclipse.kura.emulator.position/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.emulator.position
44
Bundle-SymbolicName: org.eclipse.kura.emulator.position;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
Export-Package: org.eclipse.kura.emulator.position; version="1.0.0"
99
Service-Component: OSGI-INF/*.xml
1010
Bundle-ActivationPolicy: lazy

kura/emulator/org.eclipse.kura.emulator.usb/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.emulator.usb
44
Bundle-SymbolicName: org.eclipse.kura.emulator.usb;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
Export-Package: org.eclipse.kura.emulator.usb; version="1.0.0"
99
Service-Component: OSGI-INF/*.xml
1010
Bundle-ActivationPolicy: lazy

0 commit comments

Comments
 (0)