Skip to content

Commit bbce6f2

Browse files
Added maven.compiler.release.
Updated capability for bundles in target-platform
1 parent 80b6354 commit bbce6f2

11 files changed

Lines changed: 18 additions & 14 deletions

File tree

kura/pom.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@
106106

107107
<maven.compiler.source>21</maven.compiler.source>
108108
<maven.compiler.target>21</maven.compiler.target>
109+
<maven.compiler.release>21</maven.compiler.release>
109110

110111
<bnd.baseline.version>6.3.1</bnd.baseline.version>
111112
<exists-maven-plugin.version>0.0.3</exists-maven-plugin.version>
@@ -114,7 +115,7 @@
114115
<lifecycle-mapping.version>1.0.0</lifecycle-mapping.version>
115116
<license-maven-plugin.version>2.2</license-maven-plugin.version>
116117
<maven-antrun-plugin.version>1.8</maven-antrun-plugin.version>
117-
<maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
118+
<maven-compiler-plugin.version>3.15.0</maven-compiler-plugin.version>
118119
<maven-checkstyle-plugin.version>3.1.0</maven-checkstyle-plugin.version>
119120
<maven-deploy-plugin.version>3.0.0</maven-deploy-plugin.version>
120121
<maven-site-plugin.version>3.3</maven-site-plugin.version>
@@ -803,6 +804,7 @@
803804
<configuration>
804805
<source>${maven.compiler.source}</source>
805806
<target>${maven.compiler.target}</target>
807+
<release>${maven.compiler.release}</release>
806808
</configuration>
807809
</plugin>
808810
<plugin>

kura/test/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@
9797
<configuration>
9898
<source>${maven.compiler.source}</source>
9999
<target>${maven.compiler.target}</target>
100+
<release>${maven.compiler.release}</release>
100101
</configuration>
101102
</plugin>
102103
<plugin>

target-platform/com.codeminders.hidapi-parent/pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
<instructions>
5454
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
5555
<Require-Capability>
56-
osgi.ee;filter:="(&amp;(osgi.ee=JavaSE)(version=1.8))"
56+
osgi.ee;filter:="(&amp;(osgi.ee=JavaSE)(version=21))"
5757
</Require-Capability>
5858
</instructions>
5959
</configuration>
@@ -77,6 +77,7 @@
7777
<configuration>
7878
<source>${maven.compiler.source}</source>
7979
<target>${maven.compiler.target}</target>
80+
<release>${maven.compiler.release}</release>
8081
</configuration>
8182
</plugin>
8283
</plugins>

target-platform/log4j2-api-config/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
*;resolution:=optional
4747
</DynamicImport-Package>
4848
<Require-Capability>
49-
osgi.ee;filter:="(&amp;(osgi.ee=JavaSE)(version=1.8))"
49+
osgi.ee;filter:="(&amp;(osgi.ee=JavaSE)(version=21))"
5050
</Require-Capability>
5151
</instructions>
5252
</configuration>

target-platform/org.eclipse.kura.camel.sun.misc/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@
6464
<instructions>
6565
<Fragment-Host>org.apache.camel.camel-core;bundle-version="[2.16.0,2.26.0)"</Fragment-Host>>
6666
<Require-Capability>
67-
osgi.ee;filter:="(&amp;(osgi.ee=JavaSE)(version=1.8))"
68-
</Require-Capability>
67+
osgi.ee;filter:="(&amp;(osgi.ee=JavaSE)(version=21))"
68+
</Require-Capability>
6969
</instructions>
7070
</configuration>
7171
</plugin>

target-platform/org.eclipse.kura.sun.misc/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@
6767
<Fragment-Host>system.bundle; extension:=framework</Fragment-Host>
6868
<Bundle-Vendor>Eclipse Kura</Bundle-Vendor>
6969
<Require-Capability>
70-
osgi.ee;filter:="(&amp;(osgi.ee=JavaSE)(version=1.8))"
71-
</Require-Capability>
70+
osgi.ee;filter:="(&amp;(osgi.ee=JavaSE)(version=21))"
71+
</Require-Capability>
7272
</instructions>
7373
</configuration>
7474
</plugin>

target-platform/org.eclipse.soda.dk.comm-parent/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
<instructions>
5454
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
5555
<Require-Capability>
56-
osgi.ee;filter:="(&amp;(osgi.ee=JavaSE)(version=1.8))"
56+
osgi.ee;filter:="(&amp;(osgi.ee=JavaSE)(version=21))"
5757
</Require-Capability>
5858
</instructions>
5959
</configuration>

target-platform/org.moka7/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
Moka7;version="1.0.2"
5050
</Export-Package>
5151
<Require-Capability>
52-
osgi.ee;filter:="(&amp;(osgi.ee=JavaSE)(version=1.8))"
52+
osgi.ee;filter:="(&amp;(osgi.ee=JavaSE)(version=21))"
5353
</Require-Capability>
5454
</instructions>
5555
</configuration>

target-platform/org.usb4java/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@
122122
org.usb4java;uses:="org.apache.commons.lang3.builder,org.apache.commons.lang3.tuple";version="${usb4java.version}"
123123
</Export-Package>
124124
<Require-Capability>
125-
osgi.ee;filter:="(&amp;(osgi.ee=JavaSE)(version=1.8))"
125+
osgi.ee;filter:="(&amp;(osgi.ee=JavaSE)(version=21))"
126126
</Require-Capability>
127127
</instructions>
128128
</configuration>

target-platform/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,16 @@
2828
<check.plugins.exist.remote>false</check.plugins.exist.remote>
2929
<kura.addons.url>https://artifactory.dev.everyware.io/artifactory/kura-addons</kura.addons.url>
3030

31-
<maven.compiler.source>17</maven.compiler.source>
32-
<maven.compiler.target>17</maven.compiler.target>
31+
<maven.compiler.source>21</maven.compiler.source>
32+
<maven.compiler.target>21</maven.compiler.target>
3333

3434
<!-- Plugins versions -->
3535
<exists-maven-plugin.version>0.0.3</exists-maven-plugin.version>
3636
<lifecycle-mapping.version>1.0.0</lifecycle-mapping.version>
3737
<maven-antrun-plugin.version>1.8</maven-antrun-plugin.version>
3838
<maven-bundle-plugin.version>5.1.8</maven-bundle-plugin.version>
3939
<maven-clean-plugin.version>2.4.1</maven-clean-plugin.version>
40-
<maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
40+
<maven-compiler-plugin.version>3.15.0</maven-compiler-plugin.version>
4141
<maven-checkstyle-plugin.version>2.17</maven-checkstyle-plugin.version>
4242
<maven-dependency-plugin.version>3.0.0</maven-dependency-plugin.version>
4343
<maven-deploy-plugin.version>2.8.1</maven-deploy-plugin.version>

0 commit comments

Comments
 (0)