Skip to content

Commit f9f2776

Browse files
committed
Add a workaround for KARAF-7927
Upgraded maven-bundle-plugin ends up requiring java.nio.file.spi in downstreams. This patches our distribution to account for that. Change-Id: Ibd6bef76c86679c727ad67be4bdbffa357bffa61 Signed-off-by: Robert Varga <[email protected]>
1 parent fe1d280 commit f9f2776

File tree

2 files changed

+18
-0
lines changed

2 files changed

+18
-0
lines changed

karaf/opendaylight-karaf-resources/pom.xml

+8
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,14 @@
134134
token="/2.15.3" value="/2.17.3" failOnNoReplacements="true"/>
135135
<copy file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/8.0.27/pax-web-features-8.0.27-features.xml"
136136
tofile="${project.build.directory}/classes/system/org/ops4j/pax/web/pax-web-features/8.0.27/pax-web-features-8.0.27-features.xml"/>
137+
138+
<!-- Remove this once we have Karaf with https://issues.apache.org/jira/browse/KARAF-7927 -->
139+
<patch patchfile="${project.basedir}/src/main/patches/karaf-jre-properties.patch"
140+
originalfile="${project.build.directory}/assembly/etc/jre.properties"
141+
failonerror="true"/>
142+
<copy file="${project.build.directory}/assembly/etc/jre.properties"
143+
tofile="${project.build.directory}/classes/etc/jre.properties"/>
144+
137145
<!-- Add startup bundles to startup.properties — order is significant, bundles are wired in declaration order -->
138146
<echo file="${project.build.directory}/assembly/etc/startup.properties" append="true">
139147
# The following are added by opendaylight-karaf-resources
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
--- ./target/assembly/etc/jre.properties.orig 2025-02-10 13:36:22.856242236 +0100
2+
+++ ./target/assembly/etc/jre.properties 2025-02-10 13:36:37.318421946 +0100
3+
@@ -58,6 +58,7 @@
4+
java.nio.charset.spi, \
5+
java.nio.file, \
6+
java.nio.file.attribute, \
7+
+ java.nio.file.spi, \
8+
java.rmi, \
9+
java.rmi.activation, \
10+
java.rmi.dgc, \

0 commit comments

Comments
 (0)