From 9ddc9b514a8aecd0da35c73a4562402ece23a4a6 Mon Sep 17 00:00:00 2001 From: Matt Pavlovich Date: Tue, 2 Sep 2025 12:27:57 -0500 Subject: [PATCH 1/5] [#8005] Update minimum release/source/target to JDK 21 --- .github/workflows/build.yml | 4 +- .../resources/archetype-resources/pom.xml | 5 +- archetypes/bundle/pom.xml | 5 +- .../resources/archetype-resources/pom.xml | 5 +- .../resources/archetype-resources/pom.xml | 5 +- .../filtered-resources/etc/config.properties | 129 ++- pom.xml | 4 +- tooling/karaf-maven-plugin/pom.xml | 28 +- .../src/it/test-aggregate-features/pom.xml | 2 - .../src/it/test-basic-generation/pom.xml | 2 - .../test-check-dependencies-failure/pom.xml | 2 - .../src/it/test-check-dependencies/pom.xml | 2 - .../src/it/test-feature-dependencies/pom.xml | 2 - .../transitive/pom.xml | 2 - .../it/test-include-project-artifact/pom.xml | 2 - .../src/it/test-input-file/pom.xml | 2 - .../src/it/test-recursive/pom.xml | 2 - .../src/it/test-rename-main-feature/pom.xml | 2 - .../it/test-repository-dependencies/pom.xml | 2 - .../src/it/test-run-bundle/pom.xml | 2 - .../src/it/test-simplify-bundles/pom.xml | 2 - .../it/test-transitive-as-dependency/pom.xml | 2 - .../src/it/test-type-classifier/pom.xml | 2 - .../src/main/resources/config.properties | 735 +++++------------- 24 files changed, 345 insertions(+), 605 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 33fb46a5a3a..43d53405382 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,10 +34,10 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v4 with: - java-version: '17' + java-version: '21' distribution: 'temurin' - name: Build run: mvn -U -B -e clean install -DskipTests -Prat diff --git a/archetypes/blueprint/src/main/resources/archetype-resources/pom.xml b/archetypes/blueprint/src/main/resources/archetype-resources/pom.xml index 738507ac93d..52dedc8d200 100644 --- a/archetypes/blueprint/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/blueprint/src/main/resources/archetype-resources/pom.xml @@ -63,8 +63,9 @@ maven-compiler-plugin 3.13.0 - 1.8 - 1.8 + 21 + 21 + 21 256M diff --git a/archetypes/bundle/pom.xml b/archetypes/bundle/pom.xml index 3bbc2cecbac..0cb6128f97a 100644 --- a/archetypes/bundle/pom.xml +++ b/archetypes/bundle/pom.xml @@ -57,8 +57,9 @@ org.apache.maven.plugins maven-compiler-plugin - 1.8 - 1.8 + 21 + 21 + 21 256M diff --git a/archetypes/bundle/src/main/resources/archetype-resources/pom.xml b/archetypes/bundle/src/main/resources/archetype-resources/pom.xml index a6d0c97a5c1..b120803f3e8 100644 --- a/archetypes/bundle/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/bundle/src/main/resources/archetype-resources/pom.xml @@ -82,8 +82,9 @@ maven-compiler-plugin 3.13.0 - 1.8 - 1.8 + 21 + 21 + 21 256M diff --git a/archetypes/command/src/main/resources/archetype-resources/pom.xml b/archetypes/command/src/main/resources/archetype-resources/pom.xml index 1548463bc7d..84efb47ad22 100644 --- a/archetypes/command/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/command/src/main/resources/archetype-resources/pom.xml @@ -67,8 +67,9 @@ true 3.13.0 - 1.8 - 1.8 + 21 + 21 + 21 diff --git a/itests/test/src/test/filtered-resources/etc/config.properties b/itests/test/src/test/filtered-resources/etc/config.properties index 73f73b4fc45..e012e02ace8 100644 --- a/itests/test/src/test/filtered-resources/etc/config.properties +++ b/itests/test/src/test/filtered-resources/etc/config.properties @@ -60,8 +60,8 @@ org.osgi.framework.system.packages= \ org.osgi.dto;version="1.1",\ org.osgi.resource;version="1.0",\ org.osgi.resource.dto;version="1.0";uses:="org.osgi.dto",\ - org.osgi.framework;version="1.9",\ - org.osgi.framework.dto;version="1.9";uses:="org.osgi.dto",\ + org.osgi.framework;version="1.10",\ + org.osgi.framework.dto;version="1.10";uses:="org.osgi.dto",\ org.osgi.framework.hooks.bundle;version="1.1";uses:="org.osgi.framework",\ org.osgi.framework.hooks.resolver;version="1.0";uses:="org.osgi.framework.wiring",\ org.osgi.framework.hooks.service;version="1.1";uses:="org.osgi.framework",\ @@ -89,17 +89,60 @@ org.osgi.framework.system.packages= \ # org.osgi.framework.system.packages.extra= \ org.apache.karaf.branding, \ - org.apache.karaf.jaas.boot.principal, \ - org.apache.karaf.jaas.boot, \ - sun.misc + sun.misc, \ + com.sun.jmx.remote.protocol, \ + com.sun.jmx.remote.protocol.jmxmp org.osgi.framework.system.capabilities= \ ${eecap-${java.specification.version}}, \ - osgi.service;effective:=active;objectClass=org.osgi.service.packageadmin.PackageAdmin, \ - osgi.service;effective:=active;objectClass=org.osgi.service.resolver.Resolver, \ - osgi.service;effective:=active;objectClass=org.osgi.service.startlevel.StartLevel, \ - osgi.service;effective:=active;objectClass=org.osgi.service.url.URLHandlers + ${${karaf.framework}-capabilities}, \ + ${karaf-capabilities} +karaf-capabilities= \ + osgi.service;objectClass:List=org.apache.karaf.info.ServerInfo + +felix-capabilities= \ + osgi.service;objectClass:List=org.osgi.service.packageadmin.PackageAdmin, \ + osgi.service;objectClass:List=org.osgi.service.resolver.Resolver, \ + osgi.service;objectClass:List=org.osgi.service.startlevel.StartLevel + +equinox-capabilities= \ + osgi.service;objectClass:List=java.lang.ClassLoader;equinox.classloader.type=contextClassLoader, \ + osgi.service;objectClass:List=javax.xml.parsers.DocumentBuilderFactory, \ + osgi.service;objectClass:List=javax.xml.parsers.SAXParserFactory, \ + osgi.service;objectClass:List=org.eclipse.osgi.framework.log.FrameworkLog, \ + osgi.service;objectClass:List=org.eclipse.osgi.framework.log.FrameworkLog;performance=true, \ + osgi.service;objectClass:List=org.eclipse.osgi.service.datalocation.Location;type=eclipse.home.location, \ + osgi.service;objectClass:List=org.eclipse.osgi.service.datalocation.Location;type=osgi.configuration.area, \ + osgi.service;objectClass:List=org.eclipse.osgi.service.datalocation.Location;type=osgi.install.area, \ + osgi.service;objectClass:List=org.eclipse.osgi.service.datalocation.Location;type=osgi.instance.area, \ + osgi.service;objectClass:List=org.eclipse.osgi.service.datalocation.Location;type=osgi.user.area, \ + osgi.service;objectClass:List=org.eclipse.osgi.service.debug.DebugOptions, \ + osgi.service;objectClass:List=org.eclipse.osgi.service.environment.EnvironmentInfo, \ + osgi.service;objectClass:List=org.eclipse.osgi.service.localization.BundleLocalization, \ + osgi.service;objectClass:List="org.osgi.service.log.LogReaderService,org.eclipse.equinox.log.ExtendedLogReaderService", \ + osgi.service;objectClass:List="org.osgi.service.log.LogService,org.eclipse.equinox.log.ExtendedLogService", \ + osgi.service;objectClass:List=org.eclipse.osgi.service.security.TrustEngine;osgi.signedcontent.trust.engine=org.eclipse.osgi, \ + osgi.service;objectClass:List=org.eclipse.osgi.service.urlconversion.URLConverter;protocol:List="bundleentry,bundleresource" + +eecap-21 = osgi.ee; osgi.ee="OSGi/Minimum"; version:List="1.0,1.1,1.2", \ + osgi.ee; osgi.ee="JavaSE"; version:List="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0,17.0,18.0,19.0,20.0,21.0", \ + osgi.ee; osgi.ee="JRE"; version:List="1.0,1.1", \ + osgi.ee; osgi.ee="JavaSE/compact1"; version:List="1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0,17.0,18.0,19.0,20.0,21.0", \ + osgi.ee; osgi.ee="JavaSE/compact2"; version:List="1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0,17.0,18.0,19.0,20.0,21.0", \ + osgi.ee; osgi.ee="JavaSE/compact3"; version:List="1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0,17.0,18.0,19.0,20.0,21.0" +eecap-20 = osgi.ee; osgi.ee="OSGi/Minimum"; version:List="1.0,1.1,1.2", \ + osgi.ee; osgi.ee="JavaSE"; version:List="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0,17.0,18.0,19.0,20.0", \ + osgi.ee; osgi.ee="JRE"; version:List="1.0,1.1", \ + osgi.ee; osgi.ee="JavaSE/compact1"; version:List="1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0,17.0,18.0,19.0,20.0", \ + osgi.ee; osgi.ee="JavaSE/compact2"; version:List="1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0,17.0,18.0,19.0,20.0", \ + osgi.ee; osgi.ee="JavaSE/compact3"; version:List="1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0,17.0,18.0,19.0,20.0" +eecap-19 = osgi.ee; osgi.ee="OSGi/Minimum"; version:List="1.0,1.1,1.2", \ + osgi.ee; osgi.ee="JavaSE"; version:List="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0,17.0,18.0,19.0", \ + osgi.ee; osgi.ee="JRE"; version:List="1.0,1.1", \ + osgi.ee; osgi.ee="JavaSE/compact1"; version:List="1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0,17.0,18.0,19.0", \ + osgi.ee; osgi.ee="JavaSE/compact2"; version:List="1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0,17.0,18.0,19.0", \ + osgi.ee; osgi.ee="JavaSE/compact3"; version:List="1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0,17.0,18.0,19.0" eecap-18 = osgi.ee; osgi.ee="OSGi/Minimum"; version:List="1.0,1.1,1.2", \ osgi.ee; osgi.ee="JavaSE"; version:List="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0,17.0,18.0", \ osgi.ee; osgi.ee="JRE"; version:List="1.0,1.1", \ @@ -118,19 +161,19 @@ eecap-16 = osgi.ee; osgi.ee="OSGi/Minimum"; version:List="1.0,1.1,1.2", osgi.ee; osgi.ee="JavaSE/compact1"; version:List="1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0", \ osgi.ee; osgi.ee="JavaSE/compact2"; version:List="1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0", \ osgi.ee; osgi.ee="JavaSE/compact3"; version:List="1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0" -eecap-15= osgi.ee; osgi.ee="OSGi/Minimum"; version:List="1.0,1.1,1.2", \ +eecap-15 = osgi.ee; osgi.ee="OSGi/Minimum"; version:List="1.0,1.1,1.2", \ osgi.ee; osgi.ee="JavaSE"; version:List="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8,9.0,10.0,11.0,13.0,14.0,15.0", \ osgi.ee; osgi.ee="JRE"; version:List="1.0,1.1", \ osgi.ee; osgi.ee="JavaSE/compact1"; version:List="1.8,9.0,10.0,11.0,13.0,14.0,15.0", \ osgi.ee; osgi.ee="JavaSE/compact2"; version:List="1.8,9.0,10.0,11.0,13.0,14.0,15.0", \ osgi.ee; osgi.ee="JavaSE/compact3"; version:List="1.8,9.0,10.0,11.0,13.0,14.0,15.0" -eecap-14= osgi.ee; osgi.ee="OSGi/Minimum"; version:List="1.0,1.1,1.2", \ +eecap-14 = osgi.ee; osgi.ee="OSGi/Minimum"; version:List="1.0,1.1,1.2", \ osgi.ee; osgi.ee="JavaSE"; version:List="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8,9.0,10.0,11.0,13.0,14.0", \ osgi.ee; osgi.ee="JRE"; version:List="1.0,1.1", \ osgi.ee; osgi.ee="JavaSE/compact1"; version:List="1.8,9.0,10.0,11.0,13.0,14.0", \ osgi.ee; osgi.ee="JavaSE/compact2"; version:List="1.8,9.0,10.0,11.0,13.0,14.0", \ osgi.ee; osgi.ee="JavaSE/compact3"; version:List="1.8,9.0,10.0,11.0,13.0,14.0" -eecap-13= osgi.ee; osgi.ee="OSGi/Minimum"; version:List="1.0,1.1,1.2", \ +eecap-13 = osgi.ee; osgi.ee="OSGi/Minimum"; version:List="1.0,1.1,1.2", \ osgi.ee; osgi.ee="JavaSE"; version:List="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8,9.0,10.0,11.0,13.0", \ osgi.ee; osgi.ee="JRE"; version:List="1.0,1.1", \ osgi.ee; osgi.ee="JavaSE/compact1"; version:List="1.8,9.0,10.0,11.0,13.0", \ @@ -149,35 +192,40 @@ eecap-10= osgi.ee; osgi.ee="OSGi/Minimum"; version:List="1.0,1.1,1.2", osgi.ee; osgi.ee="JavaSE/compact2"; version:List="1.8,9.0,10.0", \ osgi.ee; osgi.ee="JavaSE/compact3"; version:List="1.8,9.0,10.0" eecap-9= osgi.ee; osgi.ee="OSGi/Minimum"; version:List="1.0,1.1,1.2", \ - osgi.ee; osgi.ee="JavaSE"; version:List="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8,9" + osgi.ee; osgi.ee="JavaSE"; version:List="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8,9.0", \ + osgi.ee; osgi.ee="JRE"; version:List="1.0,1.1", \ + osgi.ee; osgi.ee="JavaSE/compact1"; version:List="1.8,9.0", \ + osgi.ee; osgi.ee="JavaSE/compact2"; version:List="1.8,9.0", \ + osgi.ee; osgi.ee="JavaSE/compact3"; version:List="1.8,9.0" eecap-1.8= osgi.ee; osgi.ee="OSGi/Minimum"; version:List="1.0,1.1,1.2", \ - osgi.ee; osgi.ee="JavaSE"; version:List="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8" -eecap-1.7= osgi.ee; osgi.ee="OSGi/Minimum"; version:List="1.0,1.1,1.2", \ - osgi.ee; osgi.ee="JavaSE"; version:List="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7" -eecap-1.6= osgi.ee; osgi.ee="OSGi/Minimum"; version:List="1.0,1.1,1.2", \ - osgi.ee; osgi.ee="JavaSE"; version:List="1.0,1.1,1.2,1.3,1.4,1.5,1.6" -eecap-1.5= osgi.ee; osgi.ee="OSGi/Minimum"; version:List="1.0,1.1,1.2", \ - osgi.ee; osgi.ee="JavaSE"; version:List="1.0,1.1,1.2,1.3,1.4,1.5" -eecap-1.4= osgi.ee; osgi.ee="OSGi/Minimum"; version:List="1.0,1.1,1.2", \ - osgi.ee; osgi.ee="JavaSE"; version:List="1.0,1.1,1.2,1.3,1.4" -eecap-1.3= osgi.ee; osgi.ee="OSGi/Minimum"; version:List="1.0,1.1", \ - osgi.ee; osgi.ee="JavaSE"; version:List="1.0,1.1,1.2,1.3" -eecap-1.2= osgi.ee; osgi.ee="OSGi/Minimum"; version:List="1.0,1.1", \ - osgi.ee; osgi.ee="JavaSE"; version:List="1.0,1.1,1.2" + osgi.ee; osgi.ee="JavaSE"; version:List="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8", \ + osgi.ee; osgi.ee="JRE"; version:List="1.0,1.1", \ + osgi.ee; osgi.ee="JavaSE/compact1"; version:List="1.8", \ + osgi.ee; osgi.ee="JavaSE/compact2"; version:List="1.8", \ + osgi.ee; osgi.ee="JavaSE/compact3"; version:List="1.8" # -# javax.transaction is needed to avoid class loader constraint violation when using javax.sql +# javax.transaction is needed ONLY for com.sun.corba.se.impl.javax.rmi.CORBA.Util.mapSystemException(). +# JDK8 and earlier provide only 3 exception classes in this package, so full JTA API bundles should always try the +# bootdelegation first - even if they also package (and export) javax.transaction package +# +# boot delegation of javax.transaction.xa is needed to avoid class loader constraint violation when using javax.sql +# and this package is always complete in all JDKs +# +# javax.security.cert is needed by pax-transx-tm-narayana as it uses URLClassLoader and otherwise is unable to create +# object store. # org.osgi.framework.bootdelegation=\ com.sun.*, \ javax.transaction, \ - javax.transaction.*, \ + javax.transaction.xa, \ javax.xml.crypto, \ javax.xml.crypto.*, \ + javax.security.cert, \ jdk.nashorn.*, \ sun.*, \ - org.apache.karaf.jaas.boot, \ - org.apache.karaf.jaas.boot.principal + jdk.internal.reflect, \ + jdk.internal.reflect.* # jVisualVM support # in order to use Karaf with jvisualvm, the org.osgi.framework.bootdelegation property has to contain the org.netbeans.lib.profiler.server package @@ -192,11 +240,6 @@ org.osgi.framework.bootdelegation=\ # org.osgi.framework.bootdelegation=org.apache.karaf.jaas.boot,org.apache.karaf.jaas.boot.principal,sun.*,com.sun.*,javax.transaction,javax.transaction.*,javax.xml.crypto,javax.xml.crypto.*,org.apache.xerces.jaxp.datatype,org.apache.xerces.stax,org.apache.xerces.parsers,org.apache.xerces.jaxp,org.apache.xerces.jaxp.validation,org.apache.xerces.dom,com.yourkit.* # -# -# OSGi Execution Environment -# -org.osgi.framework.executionenvironment=J2SE-1.7,JavaSE-1.7,J2SE-1.6,JavaSE-1.6,J2SE-1.5,JavaSE-1.5,J2SE-1.4,JavaSE-1.4,J2SE-1.3,JavaSE-1.3,J2SE-1.2,,JavaSE-1.2,CDC-1.1/Foundation-1.1,CDC-1.0/Foundation-1.0,J2ME,OSGi/Minimum-1.1,OSGi/Minimum-1.0 - # # Set the parent classloader for the bundle to the classloader that loads the Framework (i.e. everything in lib/*.jar) # @@ -209,16 +252,26 @@ org.osgi.framework.startlevel.beginning=100 karaf.startlevel.bundle=80 # -# The location of the Karaf shutdown port file +# The location of the Karaf shutdown port file used to stop instance # karaf.shutdown.port.file=${karaf.data}/port +# +# The location of the Karaf pid file +# +karaf.pid.file=${karaf.base}/karaf.pid + +# +# Configuration secrets file location +# +org.apache.felix.configadmin.plugin.interpolation.secretsdir=${karaf.etc} + # # Configuration FileMonitor properties # felix.fileinstall.enableConfigSave = true felix.fileinstall.dir = ${karaf.etc} -felix.fileinstall.filter = .*\\.(cfg|config) +felix.fileinstall.filter = .*\\.(cfg|config|json) felix.fileinstall.poll = 1000 felix.fileinstall.noInitialDelay = true felix.fileinstall.log.level = 3 @@ -253,7 +306,7 @@ org.apache.aries.proxy.weaving.enabled= # # mvn url handler requires config instance configuration # -#org.ops4j.pax.url.mvn.requireConfigAdminConfig=true +org.ops4j.pax.url.mvn.requireConfigAdminConfig=true # # Don't delay the console startup. Set to true if you want the console to start after all other bundles diff --git a/pom.xml b/pom.xml index 62f8a781a71..fda72ea12fe 100644 --- a/pom.xml +++ b/pom.xml @@ -151,7 +151,7 @@ 1695310533 - 11 + 21 scm:git:https://gitbox.apache.org/repos/asf/karaf.git scm:git:https://gitbox.apache.org/repos/asf/karaf.git @@ -921,7 +921,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 1.8 + 21 diff --git a/tooling/karaf-maven-plugin/pom.xml b/tooling/karaf-maven-plugin/pom.xml index 7cc1ec47abc..782da418a68 100644 --- a/tooling/karaf-maven-plugin/pom.xml +++ b/tooling/karaf-maven-plugin/pom.xml @@ -284,6 +284,30 @@ true + + + + maven-release-plugin + + + org.ow2.asm + asm + 9.8 + + + org.ow2.asm + asm-commons + 9.8 + + + org.ow2.asm + asm-tree + 9.8 + + + + + org.apache.maven.plugins @@ -357,7 +381,7 @@ maven-plugin-plugin - 3.6.0 + 3.15.1 default-descriptor @@ -372,8 +396,6 @@ org.apache.maven.plugins maven-compiler-plugin - 1.8 - 1.8 256M ${compiler.fork} diff --git a/tooling/karaf-maven-plugin/src/it/test-aggregate-features/pom.xml b/tooling/karaf-maven-plugin/src/it/test-aggregate-features/pom.xml index f0009ac396c..efc3d39e8fa 100644 --- a/tooling/karaf-maven-plugin/src/it/test-aggregate-features/pom.xml +++ b/tooling/karaf-maven-plugin/src/it/test-aggregate-features/pom.xml @@ -47,8 +47,6 @@ org.apache.maven.plugins maven-compiler-plugin - 1.8 - 1.8 256M ${compiler.fork} diff --git a/tooling/karaf-maven-plugin/src/it/test-basic-generation/pom.xml b/tooling/karaf-maven-plugin/src/it/test-basic-generation/pom.xml index 45122f8b064..54ca3b8a673 100644 --- a/tooling/karaf-maven-plugin/src/it/test-basic-generation/pom.xml +++ b/tooling/karaf-maven-plugin/src/it/test-basic-generation/pom.xml @@ -36,8 +36,6 @@ org.apache.maven.plugins maven-compiler-plugin - 1.8 - 1.8 256M ${compiler.fork} diff --git a/tooling/karaf-maven-plugin/src/it/test-check-dependencies-failure/pom.xml b/tooling/karaf-maven-plugin/src/it/test-check-dependencies-failure/pom.xml index f4b22b2f53f..29fc8781486 100644 --- a/tooling/karaf-maven-plugin/src/it/test-check-dependencies-failure/pom.xml +++ b/tooling/karaf-maven-plugin/src/it/test-check-dependencies-failure/pom.xml @@ -43,8 +43,6 @@ org.apache.maven.plugins maven-compiler-plugin - 1.8 - 1.8 256M ${compiler.fork} diff --git a/tooling/karaf-maven-plugin/src/it/test-check-dependencies/pom.xml b/tooling/karaf-maven-plugin/src/it/test-check-dependencies/pom.xml index fb2e03ac23e..a83ec2b9078 100644 --- a/tooling/karaf-maven-plugin/src/it/test-check-dependencies/pom.xml +++ b/tooling/karaf-maven-plugin/src/it/test-check-dependencies/pom.xml @@ -44,8 +44,6 @@ org.apache.maven.plugins maven-compiler-plugin - 1.8 - 1.8 256M ${compiler.fork} diff --git a/tooling/karaf-maven-plugin/src/it/test-feature-dependencies/pom.xml b/tooling/karaf-maven-plugin/src/it/test-feature-dependencies/pom.xml index b60f6502281..643ae0fddb3 100644 --- a/tooling/karaf-maven-plugin/src/it/test-feature-dependencies/pom.xml +++ b/tooling/karaf-maven-plugin/src/it/test-feature-dependencies/pom.xml @@ -47,8 +47,6 @@ org.apache.maven.plugins maven-compiler-plugin - 1.8 - 1.8 256M ${compiler.fork} diff --git a/tooling/karaf-maven-plugin/src/it/test-feature-use-version-range-transfer-properties/transitive/pom.xml b/tooling/karaf-maven-plugin/src/it/test-feature-use-version-range-transfer-properties/transitive/pom.xml index 42ec7de9b4a..538bbe6fe48 100644 --- a/tooling/karaf-maven-plugin/src/it/test-feature-use-version-range-transfer-properties/transitive/pom.xml +++ b/tooling/karaf-maven-plugin/src/it/test-feature-use-version-range-transfer-properties/transitive/pom.xml @@ -34,8 +34,6 @@ org.apache.maven.plugins maven-compiler-plugin - 1.8 - 1.8 256M ${compiler.fork} diff --git a/tooling/karaf-maven-plugin/src/it/test-include-project-artifact/pom.xml b/tooling/karaf-maven-plugin/src/it/test-include-project-artifact/pom.xml index 925f726230f..ef3459b0804 100644 --- a/tooling/karaf-maven-plugin/src/it/test-include-project-artifact/pom.xml +++ b/tooling/karaf-maven-plugin/src/it/test-include-project-artifact/pom.xml @@ -36,8 +36,6 @@ org.apache.maven.plugins maven-compiler-plugin - 1.8 - 1.8 256M ${compiler.fork} diff --git a/tooling/karaf-maven-plugin/src/it/test-input-file/pom.xml b/tooling/karaf-maven-plugin/src/it/test-input-file/pom.xml index a135fb1b30e..b3d5c9a0600 100644 --- a/tooling/karaf-maven-plugin/src/it/test-input-file/pom.xml +++ b/tooling/karaf-maven-plugin/src/it/test-input-file/pom.xml @@ -42,8 +42,6 @@ org.apache.maven.plugins maven-compiler-plugin - 1.8 - 1.8 256M ${compiler.fork} diff --git a/tooling/karaf-maven-plugin/src/it/test-recursive/pom.xml b/tooling/karaf-maven-plugin/src/it/test-recursive/pom.xml index 46e8ac969b4..d5d4d951bcc 100644 --- a/tooling/karaf-maven-plugin/src/it/test-recursive/pom.xml +++ b/tooling/karaf-maven-plugin/src/it/test-recursive/pom.xml @@ -43,8 +43,6 @@ org.apache.maven.plugins maven-compiler-plugin - 1.8 - 1.8 256M ${compiler.fork} diff --git a/tooling/karaf-maven-plugin/src/it/test-rename-main-feature/pom.xml b/tooling/karaf-maven-plugin/src/it/test-rename-main-feature/pom.xml index d81411df4ee..eb704fb2da2 100644 --- a/tooling/karaf-maven-plugin/src/it/test-rename-main-feature/pom.xml +++ b/tooling/karaf-maven-plugin/src/it/test-rename-main-feature/pom.xml @@ -36,8 +36,6 @@ org.apache.maven.plugins maven-compiler-plugin - 1.8 - 1.8 256M ${compiler.fork} diff --git a/tooling/karaf-maven-plugin/src/it/test-repository-dependencies/pom.xml b/tooling/karaf-maven-plugin/src/it/test-repository-dependencies/pom.xml index 063e4ff3750..9bf5dfbec4e 100644 --- a/tooling/karaf-maven-plugin/src/it/test-repository-dependencies/pom.xml +++ b/tooling/karaf-maven-plugin/src/it/test-repository-dependencies/pom.xml @@ -45,8 +45,6 @@ org.apache.maven.plugins maven-compiler-plugin - 1.8 - 1.8 256M ${compiler.fork} diff --git a/tooling/karaf-maven-plugin/src/it/test-run-bundle/pom.xml b/tooling/karaf-maven-plugin/src/it/test-run-bundle/pom.xml index ec2d2342cf3..eb20c8100d8 100644 --- a/tooling/karaf-maven-plugin/src/it/test-run-bundle/pom.xml +++ b/tooling/karaf-maven-plugin/src/it/test-run-bundle/pom.xml @@ -32,8 +32,6 @@ org.apache.maven.plugins maven-compiler-plugin - 1.8 - 1.8 256M ${compiler.fork} diff --git a/tooling/karaf-maven-plugin/src/it/test-simplify-bundles/pom.xml b/tooling/karaf-maven-plugin/src/it/test-simplify-bundles/pom.xml index 6eebb6565e8..b0b8dd7aa8e 100644 --- a/tooling/karaf-maven-plugin/src/it/test-simplify-bundles/pom.xml +++ b/tooling/karaf-maven-plugin/src/it/test-simplify-bundles/pom.xml @@ -56,8 +56,6 @@ org.apache.maven.plugins maven-compiler-plugin - 1.8 - 1.8 256M ${compiler.fork} diff --git a/tooling/karaf-maven-plugin/src/it/test-transitive-as-dependency/pom.xml b/tooling/karaf-maven-plugin/src/it/test-transitive-as-dependency/pom.xml index 3dde7c68be5..1c7d73eb019 100644 --- a/tooling/karaf-maven-plugin/src/it/test-transitive-as-dependency/pom.xml +++ b/tooling/karaf-maven-plugin/src/it/test-transitive-as-dependency/pom.xml @@ -45,8 +45,6 @@ org.apache.maven.plugins maven-compiler-plugin - 1.8 - 1.8 256M ${compiler.fork} diff --git a/tooling/karaf-maven-plugin/src/it/test-type-classifier/pom.xml b/tooling/karaf-maven-plugin/src/it/test-type-classifier/pom.xml index 3fc5a796d12..57b5fe95565 100644 --- a/tooling/karaf-maven-plugin/src/it/test-type-classifier/pom.xml +++ b/tooling/karaf-maven-plugin/src/it/test-type-classifier/pom.xml @@ -37,8 +37,6 @@ org.apache.maven.plugins maven-compiler-plugin - 1.8 - 1.8 256M ${compiler.fork} diff --git a/tooling/karaf-maven-plugin/src/main/resources/config.properties b/tooling/karaf-maven-plugin/src/main/resources/config.properties index 05f6f48297c..80137d6c66f 100644 --- a/tooling/karaf-maven-plugin/src/main/resources/config.properties +++ b/tooling/karaf-maven-plugin/src/main/resources/config.properties @@ -1,470 +1,133 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at +################################################################################ # -# http://www.apache.org/licenses/LICENSE-2.0 +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at # -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +################################################################################ -jre-1.5= \ - javax.accessibility; \ - javax.activity; \ - javax.crypto; \ - javax.crypto.interfaces; \ - javax.crypto.spec; \ - javax.imageio; \ - javax.imageio.event; \ - javax.imageio.metadata; \ - javax.imageio.plugins.bmp; \ - javax.imageio.plugins.jpeg; \ - javax.imageio.spi; \ - javax.imageio.stream; \ - javax.management; \ - javax.management.loading; \ - javax.management.modelmbean; \ - javax.management.monitor; \ - javax.management.openmbean; \ - javax.management.relation; \ - javax.management.remote; \ - javax.management.remote.rmi; \ - javax.management.timer; \ - javax.naming; \ - javax.naming.directory; \ - javax.naming.event; \ - javax.naming.ldap; \ - javax.naming.spi; \ - javax.net; \ - javax.net.ssl; \ - javax.print; \ - javax.print.attribute; \ - javax.print.attribute.standard; \ - javax.print.event; \ - javax.rmi; \ - javax.rmi.CORBA; \ - javax.rmi.ssl; \ - javax.security.auth; \ - javax.security.auth.callback; \ - javax.security.auth.kerberos; \ - javax.security.auth.login; \ - javax.security.auth.spi; \ - javax.security.auth.x500; \ - javax.security.cert; \ - javax.security.sasl; \ - javax.sound.midi; \ - javax.sound.midi.spi; \ - javax.sound.sampled; \ - javax.sound.sampled.spi; \ - javax.sql; \ - javax.sql.rowset; \ - javax.sql.rowset.serial; \ - javax.sql.rowset.spi; \ - javax.swing; \ - javax.swing.border; \ - javax.swing.colorchooser; \ - javax.swing.event; \ - javax.swing.filechooser; \ - javax.swing.plaf; \ - javax.swing.plaf.basic; \ - javax.swing.plaf.metal; \ - javax.swing.plaf.multi; \ - javax.swing.plaf.synth; \ - javax.swing.table; \ - javax.swing.text; \ - javax.swing.text.html; \ - javax.swing.text.html.parser; \ - javax.swing.text.rtf; \ - javax.swing.tree; \ - javax.swing.undo; \ - javax.xml; \ - javax.xml.datatype; \ - javax.xml.namespace; \ - javax.xml.parsers; \ - javax.xml.transform; \ - javax.xml.transform.dom; \ - javax.xml.transform.sax; \ - javax.xml.transform.stream; \ - javax.xml.validation; \ - javax.xml.xpath; \ - org.ietf.jgss; \ - org.omg.CORBA; \ - org.omg.CORBA_2_3; \ - org.omg.CORBA_2_3.portable; \ - org.omg.CORBA.DynAnyPackage; \ - org.omg.CORBA.ORBPackage; \ - org.omg.CORBA.portable; \ - org.omg.CORBA.TypeCodePackage; \ - org.omg.CosNaming; \ - org.omg.CosNaming.NamingContextExtPackage; \ - org.omg.CosNaming.NamingContextPackage; \ - org.omg.Dynamic; \ - org.omg.DynamicAny; \ - org.omg.DynamicAny.DynAnyFactoryPackage; \ - org.omg.DynamicAny.DynAnyPackage; \ - org.omg.IOP; \ - org.omg.IOP.CodecFactoryPackage; \ - org.omg.IOP.CodecPackage; \ - org.omg.Messaging; \ - org.omg.PortableInterceptor; \ - org.omg.PortableInterceptor.ORBInitInfoPackage; \ - org.omg.PortableServer; \ - org.omg.PortableServer.CurrentPackage; \ - org.omg.PortableServer.POAManagerPackage; \ - org.omg.PortableServer.POAPackage; \ - org.omg.PortableServer.portable; \ - org.omg.PortableServer.ServantLocatorPackage; \ - org.omg.SendingContext; \ - org.omg.stub.java.rmi; \ - org.omg.stub.javax.management.remote.rmi; \ - org.w3c.dom; \ - org.w3c.dom.bootstrap; \ - org.w3c.dom.css; \ - org.w3c.dom.events; \ - org.w3c.dom.html; \ - org.w3c.dom.ls; \ - org.w3c.dom.ranges; \ - org.w3c.dom.stylesheets; \ - org.w3c.dom.traversal; \ - org.w3c.dom.views; \ - org.xml.sax; \ - org.xml.sax.ext; \ - org.xml.sax.helpers; \ - sun.misc; \ - sun.reflect +# +# Java platform package export properties. +# -jre-1.6= \ - javax.accessibility, \ - javax.activation;version="1.1", \ - javax.activity, \ - javax.annotation;version="1.0", \ - javax.annotation.processing;version="1.0", \ - javax.crypto, \ - javax.crypto.interfaces, \ - javax.crypto.spec, \ - javax.imageio, \ - javax.imageio.event, \ - javax.imageio.metadata, \ - javax.imageio.plugins.bmp, \ - javax.imageio.plugins.jpeg, \ - javax.imageio.spi, \ - javax.imageio.stream, \ - javax.jws, \ - javax.jws.soap, \ - javax.lang.model, \ - javax.lang.model.element, \ - javax.lang.model.type, \ - javax.lang.model.util, \ - javax.management, \ - javax.management.loading, \ - javax.management.modelmbean, \ - javax.management.monitor, \ - javax.management.openmbean, \ - javax.management.relation, \ - javax.management.remote, \ - javax.management.remote.rmi, \ - javax.management.timer, \ - javax.naming, \ - javax.naming.directory, \ - javax.naming.event, \ - javax.naming.ldap, \ - javax.naming.spi, \ - javax.net, \ - javax.net.ssl, \ - javax.print, \ - javax.print.attribute, \ - javax.print.attribute.standard, \ - javax.print.event, \ - javax.rmi, \ - javax.rmi.CORBA, \ - javax.rmi.ssl, \ - javax.script, \ - javax.security.auth, \ - javax.security.auth.callback, \ - javax.security.auth.kerberos, \ - javax.security.auth.login, \ - javax.security.auth.spi, \ - javax.security.auth.x500, \ - javax.security.cert, \ - javax.security.sasl, \ - javax.sound.midi, \ - javax.sound.midi.spi, \ - javax.sound.sampled, \ - javax.sound.sampled.spi, \ - javax.sql, \ - javax.sql.rowset, \ - javax.sql.rowset.serial, \ - javax.sql.rowset.spi, \ - javax.swing, \ - javax.swing.border, \ - javax.swing.colorchooser, \ - javax.swing.event, \ - javax.swing.filechooser, \ - javax.swing.plaf, \ - javax.swing.plaf.basic, \ - javax.swing.plaf.metal, \ - javax.swing.plaf.multi, \ - javax.swing.plaf.synth, \ - javax.swing.table, \ - javax.swing.text, \ - javax.swing.text.html, \ - javax.swing.text.html.parser, \ - javax.swing.text.rtf, \ - javax.swing.tree, \ - javax.swing.undo, \ - javax.tools, \ - javax.transaction; javax.transaction.xa; partial=true; mandatory:=partial, \ - javax.xml, \ - javax.xml.bind;version="2.2.1", \ - javax.xml.bind.annotation;version="2.2.1", \ - javax.xml.bind.annotation.adapters;version="2.2.1", \ - javax.xml.bind.attachment;version="2.2.1", \ - javax.xml.bind.helpers;version="2.2.1", \ - javax.xml.bind.util;version="2.2.1", \ - javax.xml.crypto, \ - javax.xml.crypto.dom, \ - javax.xml.crypto.dsig, \ - javax.xml.crypto.dsig.dom, \ - javax.xml.crypto.dsig.keyinfo, \ - javax.xml.crypto.dsig.spec, \ - javax.xml.datatype, \ - javax.xml.namespace, \ - javax.xml.parsers, \ - javax.xml.soap;version="1.3", \ - javax.xml.stream;version="1.2", \ - javax.xml.stream.events;version="1.2", \ - javax.xml.stream.util;version="1.2", \ - javax.xml.transform, \ - javax.xml.transform.dom, \ - javax.xml.transform.sax, \ - javax.xml.transform.stax, \ - javax.xml.transform.stream, \ - javax.xml.validation, \ - javax.xml.ws;version="2.2", \ - javax.xml.ws.handler;version="2.2", \ - javax.xml.ws.handler.soap;version="2.2", \ - javax.xml.ws.http;version="2.2", \ - javax.xml.ws.soap;version="2.2", \ - javax.xml.ws.spi;version="2.2", \ - javax.xml.ws.wsaddressing;version="2.2", \ - javax.xml.ws.spi.http;version="2.2", \ - javax.xml.xpath, \ - org.ietf.jgss, \ - org.omg.CORBA, \ - org.omg.CORBA_2_3, \ - org.omg.CORBA_2_3.portable, \ - org.omg.CORBA.DynAnyPackage, \ - org.omg.CORBA.ORBPackage, \ - org.omg.CORBA.portable, \ - org.omg.CORBA.TypeCodePackage, \ - org.omg.CosNaming, \ - org.omg.CosNaming.NamingContextExtPackage, \ - org.omg.CosNaming.NamingContextPackage, \ - org.omg.Dynamic, \ - org.omg.DynamicAny, \ - org.omg.DynamicAny.DynAnyFactoryPackage, \ - org.omg.DynamicAny.DynAnyPackage, \ - org.omg.IOP, \ - org.omg.IOP.CodecFactoryPackage, \ - org.omg.IOP.CodecPackage, \ - org.omg.Messaging, \ - org.omg.PortableInterceptor, \ - org.omg.PortableInterceptor.ORBInitInfoPackage, \ - org.omg.PortableServer, \ - org.omg.PortableServer.CurrentPackage, \ - org.omg.PortableServer.POAManagerPackage, \ - org.omg.PortableServer.POAPackage, \ - org.omg.PortableServer.portable, \ - org.omg.PortableServer.ServantLocatorPackage, \ - org.omg.SendingContext, \ - org.omg.stub.java.rmi, \ - org.omg.stub.javax.management.remote.rmi, \ - org.w3c.dom, \ - org.w3c.dom.bootstrap, \ - org.w3c.dom.css, \ - org.w3c.dom.events, \ - org.w3c.dom.html, \ - org.w3c.dom.ls, \ - org.w3c.dom.ranges, \ - org.w3c.dom.stylesheets, \ - org.w3c.dom.traversal, \ - org.w3c.dom.views, \ - org.w3c.dom.xpath, \ - org.xml.sax, \ - org.xml.sax.ext, \ - org.xml.sax.helpers +# Contains java.* packages provided by the JDK (and so system packages) +jre-base= \ + java.applet, \ + java.awt, \ + java.awt.color, \ + java.awt.datatransfer, \ + java.awt.dnd, \ + java.awt.event, \ + java.awt.font, \ + java.awt.geom, \ + java.awt.im, \ + java.awt.im.spi, \ + java.awt.image, \ + java.awt.image.renderable, \ + java.awt.print, \ + java.beans, \ + java.beans.beancontext, \ + java.io, \ + java.lang, \ + java.lang.annotation, \ + java.lang.constant, \ + java.lang.instrument, \ + java.lang.invoke, \ + java.lang.management, \ + java.lang.ref, \ + java.lang.reflect, \ + java.lang.runtime, \ + java.math, \ + java.net, \ + java.net.http, \ + java.nio, \ + java.nio.channels, \ + java.nio.channels.spi, \ + java.nio.charset, \ + java.nio.charset.spi, \ + java.nio.file, \ + java.nio.file.attribute, \ + java.nio.file.spi, \ + java.rmi, \ + java.rmi.activation, \ + java.rmi.dgc, \ + java.rmi.registry, \ + java.rmi.server, \ + java.security, \ + java.security.acl, \ + java.security.cert, \ + java.security.interfaces, \ + java.security.spec, \ + java.sql, \ + java.text, \ + java.text.spi, \ + java.time, \ + java.time.chrono, \ + java.time.format, \ + java.time.temporal, \ + java.time.zone, \ + java.util, \ + java.util.concurrent, \ + java.util.concurrent.atomic, \ + java.util.concurrent.locks, \ + java.util.function, \ + java.util.random, \ + java.util.jar, \ + java.util.logging, \ + java.util.prefs, \ + java.util.regex, \ + java.util.spi, \ + java.util.stream, \ + java.util.zip, \ + jdk.net -jre-1.7= \ - javax.accessibility, \ - javax.activation;version="1.1", \ - javax.activity, \ - javax.annotation;version="1.0", \ - javax.annotation.processing;version="1.0", \ - javax.crypto, \ - javax.crypto.interfaces, \ - javax.crypto.spec, \ - javax.imageio, \ - javax.imageio.event, \ - javax.imageio.metadata, \ - javax.imageio.plugins.bmp, \ - javax.imageio.plugins.jpeg, \ - javax.imageio.spi, \ - javax.imageio.stream, \ - javax.jws, \ - javax.jws.soap, \ - javax.lang.model, \ - javax.lang.model.element, \ - javax.lang.model.type, \ - javax.lang.model.util, \ - javax.management, \ - javax.management.loading, \ - javax.management.modelmbean, \ - javax.management.monitor, \ - javax.management.openmbean, \ - javax.management.relation, \ - javax.management.remote, \ - javax.management.remote.rmi, \ - javax.management.timer, \ - javax.naming, \ - javax.naming.directory, \ - javax.naming.event, \ - javax.naming.ldap, \ - javax.naming.spi, \ - javax.net, \ - javax.net.ssl, \ - javax.print, \ - javax.print.attribute, \ - javax.print.attribute.standard, \ - javax.print.event, \ - javax.rmi, \ - javax.rmi.CORBA, \ - javax.rmi.ssl, \ - javax.script, \ - javax.security.auth, \ - javax.security.auth.callback, \ - javax.security.auth.kerberos, \ - javax.security.auth.login, \ - javax.security.auth.spi, \ - javax.security.auth.x500, \ - javax.security.cert, \ - javax.security.sasl, \ - javax.sound.midi, \ - javax.sound.midi.spi, \ - javax.sound.sampled, \ - javax.sound.sampled.spi, \ - javax.sql, \ - javax.sql.rowset, \ - javax.sql.rowset.serial, \ - javax.sql.rowset.spi, \ - javax.swing, \ - javax.swing.border, \ - javax.swing.colorchooser, \ - javax.swing.event, \ - javax.swing.filechooser, \ - javax.swing.plaf, \ - javax.swing.plaf.basic, \ - javax.swing.plaf.metal, \ - javax.swing.plaf.multi, \ - javax.swing.plaf.synth, \ - javax.swing.table, \ - javax.swing.text, \ - javax.swing.text.html, \ - javax.swing.text.html.parser, \ - javax.swing.text.rtf, \ - javax.swing.tree, \ - javax.swing.undo, \ - javax.tools, \ - javax.transaction; javax.transaction.xa; partial=true; mandatory:=partial, \ - javax.xml, \ - javax.xml.bind;version="2.2.1", \ - javax.xml.bind.annotation;version="2.2.1", \ - javax.xml.bind.annotation.adapters;version="2.2.1", \ - javax.xml.bind.attachment;version="2.2.1", \ - javax.xml.bind.helpers;version="2.2.1", \ - javax.xml.bind.util;version="2.2.1", \ - javax.xml.crypto, \ - javax.xml.crypto.dom, \ - javax.xml.crypto.dsig, \ - javax.xml.crypto.dsig.dom, \ - javax.xml.crypto.dsig.keyinfo, \ - javax.xml.crypto.dsig.spec, \ - javax.xml.datatype, \ - javax.xml.namespace, \ - javax.xml.parsers, \ - javax.xml.soap;version="1.3", \ - javax.xml.stream;version="1.2", \ - javax.xml.stream.events;version="1.2", \ - javax.xml.stream.util;version="1.2", \ - javax.xml.transform, \ - javax.xml.transform.dom, \ - javax.xml.transform.sax, \ - javax.xml.transform.stax, \ - javax.xml.transform.stream, \ - javax.xml.validation, \ - javax.xml.ws;version="2.2", \ - javax.xml.ws.handler;version="2.2", \ - javax.xml.ws.handler.soap;version="2.2", \ - javax.xml.ws.http;version="2.2", \ - javax.xml.ws.soap;version="2.2", \ - javax.xml.ws.spi;version="2.2", \ - javax.xml.ws.wsaddressing;version="2.2", \ - javax.xml.ws.spi.http;version="2.2", \ - javax.xml.xpath, \ - org.ietf.jgss, \ - org.omg.CORBA, \ - org.omg.CORBA_2_3, \ - org.omg.CORBA_2_3.portable, \ - org.omg.CORBA.DynAnyPackage, \ - org.omg.CORBA.ORBPackage, \ - org.omg.CORBA.portable, \ - org.omg.CORBA.TypeCodePackage, \ - org.omg.CosNaming, \ - org.omg.CosNaming.NamingContextExtPackage, \ - org.omg.CosNaming.NamingContextPackage, \ - org.omg.Dynamic, \ - org.omg.DynamicAny, \ - org.omg.DynamicAny.DynAnyFactoryPackage, \ - org.omg.DynamicAny.DynAnyPackage, \ - org.omg.IOP, \ - org.omg.IOP.CodecFactoryPackage, \ - org.omg.IOP.CodecPackage, \ - org.omg.Messaging, \ - org.omg.PortableInterceptor, \ - org.omg.PortableInterceptor.ORBInitInfoPackage, \ - org.omg.PortableServer, \ - org.omg.PortableServer.CurrentPackage, \ - org.omg.PortableServer.POAManagerPackage, \ - org.omg.PortableServer.POAPackage, \ - org.omg.PortableServer.portable, \ - org.omg.PortableServer.ServantLocatorPackage, \ - org.omg.SendingContext, \ - org.omg.stub.java.rmi, \ - org.omg.stub.javax.management.remote.rmi, \ - org.w3c.dom, \ - org.w3c.dom.bootstrap, \ - org.w3c.dom.css, \ - org.w3c.dom.events, \ - org.w3c.dom.html, \ - org.w3c.dom.ls, \ - org.w3c.dom.ranges, \ - org.w3c.dom.stylesheets, \ - org.w3c.dom.traversal, \ - org.w3c.dom.views, \ - org.w3c.dom.xpath, \ - org.xml.sax, \ - org.xml.sax.ext, \ - org.xml.sax.helpers +# +# A note about javax.transaction and javax.transaction.xa packages in JDK8 and JDK9+ +# - javax.transaction package is not provided at all in JDK9+ because of the removal of Corba +# - javax.transaction package in JDK8 and earlier contains only 3 exception classes required to translate 3 Corba/OMG +# exception: org.omg.CORBA.TRANSACTION_REQUIRED, org.omg.CORBA.TRANSACTION_ROLLEDBACK, org.omg.CORBA.INVALID_TRANSACTION +# - javax.transaction.xa package should always be provided by JDK itself (thus exported from system bundle and bootdelegated) +# because of javax.sql.XAConnection interface relying on javax.sql.xa.XAResource interface +# - I decided to export javax.transaction.xa package with all the versions: 1.1, 1.2 and 1.3 just to satisfy all potential +# import version ranges (and emphasize the fact that JavaEE doesn't version packages at all) +# - javax.transaction package should be exported by JDK8 (but not JDK9+) with mandatory attribute ("partial" is an +# arbirtary name mentioned in "https://docs.osgi.org/specification/osgi.core/7.0.0/framework.module.html#framework.module.requirebundle" +# - javax.transaction exported with "partial=true;mandatory:=partial" prevents system bundle to be a wire candidate for +# bundles with just "Import-Package: javax.transaction" - actual JTA API bundle is needed to provide all the classes +# from this package (like javax.transaction.UserTransaction) +# - thus javax.transaction package is exported without a version - because each bundle with "Import-Package: javax.transaction" +# should always wire to full JTA API bundle. The fact that the JDK8 provided exception classes from this package +# are always loaded using boot class loader is an obvious, but internal consequence +# - the full trick mentioned in "3.13.1 Require-Bundle" requires another bundle that exports javax.transaction package +# without mandatory attribute and that has Require-Bundle requirement to a bundle that exports the package with mandatory +# attribute - and that's what javax.transaction/javax.transaction-api/1.2 does - it contains "Require-Bundle: system.bundle" +# - Require-Bundle in JTA API bundle is not needed if javax.transaction is boot-delegated - because failure to search +# boot-delegated javax.* packages doesn't stop the class loading process - local content is checked +# - jakarta.transaction/jakarta.transaction-api/1.3.x doesn't have (by mistake, see https://github.com/eclipse-ee4j/jta-api/issues/186) +# "Require-Bundle: system.bundle", but it still works thanks to boot-delegation +# And last, but important thing - DBCP2 (see DBCP-571) has "Import-Package: javax.transaction.xa;partial=true;mandatory:=partial" +# which is simply wrong (if anything, javax.transaction package should be imported this way, not javax.transaction.xa), +# but to allow DBCP2 to be resolved on Karaf, special export package is added just for DBCP2: +# Export-Package: javax.transaction.xa;partial=true;mandatory:=partial;version="1.1" +# - mandatory "partial" attribute is added to javax.transaction export (JDK8) to prevent wiring to this package without +# full JTA API bundle +# - mandatory "partial" attribute is added to javax.transaction.xa export (all JDKs) to satisfy DBCP2 +# jre-1.8= \ + ${jre-base}, \ javax.accessibility, \ - javax.activation;version="1.1", \ javax.activity, \ javax.annotation;version="1.0", \ javax.annotation.processing;version="1.0", \ @@ -542,14 +205,18 @@ jre-1.8= \ javax.swing.tree, \ javax.swing.undo, \ javax.tools, \ - javax.transaction; javax.transaction.xa; partial=true; mandatory:=partial, \ + javax.transaction;partial=true;mandatory:=partial, \ + javax.transaction.xa;version="1.1";partial=true;mandatory:=partial, \ + javax.transaction.xa;version="1.1", \ + javax.transaction.xa;version="1.2", \ + javax.transaction.xa;version="1.3", \ javax.xml, \ - javax.xml.bind;version="2.2.1", \ - javax.xml.bind.annotation;version="2.2.1", \ - javax.xml.bind.annotation.adapters;version="2.2.1", \ - javax.xml.bind.attachment;version="2.2.1", \ - javax.xml.bind.helpers;version="2.2.1", \ - javax.xml.bind.util;version="2.2.1", \ + javax.xml.bind;version="2.2.8", \ + javax.xml.bind.annotation;version="2.2.8", \ + javax.xml.bind.annotation.adapters;version="2.2.8", \ + javax.xml.bind.attachment;version="2.2.8", \ + javax.xml.bind.helpers;version="2.2.8", \ + javax.xml.bind.util;version="2.2.8", \ javax.xml.crypto, \ javax.xml.crypto.dom, \ javax.xml.crypto.dsig, \ @@ -559,7 +226,6 @@ jre-1.8= \ javax.xml.datatype, \ javax.xml.namespace, \ javax.xml.parsers, \ - javax.xml.soap;version="1.3", \ javax.xml.stream;version="1.2", \ javax.xml.stream.events;version="1.2", \ javax.xml.stream.util;version="1.2", \ @@ -578,6 +244,42 @@ jre-1.8= \ javax.xml.ws.wsaddressing;version="2.2", \ javax.xml.ws.spi.http;version="2.2", \ javax.xml.xpath, \ + javafx.animation, \ + javafx.application, \ + javafx.beans, \ + javafx.beans.binding, \ + javafx.beans.property, \ + javafx.beans.property.adapter, \ + javafx.beans.value, \ + javafx.collections, \ + javafx.collections.transform, \ + javafx.concurrent, \ + javafx.css, \ + javafx.embed.swing, \ + javafx.embed.swt, \ + javafx.event, \ + javafx.fxml, \ + javafx.geometry, \ + javafx.print, \ + javafx.scene, \ + javafx.scene.canvas, \ + javafx.scene.chart, \ + javafx.scene.control, \ + javafx.scene.control.cell, \ + javafx.scene.effect, \ + javafx.scene.image, \ + javafx.scene.input, \ + javafx.scene.layout, \ + javafx.scene.media, \ + javafx.scene.paint, \ + javafx.scene.shape, \ + javafx.scene.text, \ + javafx.scene.transform, \ + javafx.scene.web, \ + javafx.stage, \ + javafx.util, \ + javafx.util.converter, \ + netscape.javascript, \ org.ietf.jgss, \ org.omg.CORBA, \ org.omg.CORBA_2_3, \ @@ -621,14 +323,20 @@ jre-1.8= \ org.w3c.dom.xpath, \ org.xml.sax, \ org.xml.sax.ext, \ - org.xml.sax.helpers + org.xml.sax.helpers, \ + com.sun.nio.sctp jre-9= \ + ${jre-base}, \ + java.lang.module, \ + java.net.spi, \ javax.accessibility, \ - javax.activation;version="1.1", \ javax.activity, \ - javax.annotation;version="1.0", \ + javax.annotation;version="1.3.2", \ javax.annotation.processing;version="1.0", \ + javax.annotation.security;version="1.3.2", \ + javax.annotation.sql;version="1.3.2", \ + javax.activation;version="1.2.1", \ javax.crypto, \ javax.crypto.interfaces, \ javax.crypto.spec, \ @@ -639,8 +347,6 @@ jre-9= \ javax.imageio.plugins.jpeg, \ javax.imageio.spi, \ javax.imageio.stream, \ - javax.jws, \ - javax.jws.soap, \ javax.lang.model, \ javax.lang.model.element, \ javax.lang.model.type, \ @@ -666,7 +372,6 @@ jre-9= \ javax.print.attribute.standard, \ javax.print.event, \ javax.rmi, \ - javax.rmi.CORBA, \ javax.rmi.ssl, \ javax.script, \ javax.security.auth, \ @@ -703,14 +408,18 @@ jre-9= \ javax.swing.tree, \ javax.swing.undo, \ javax.tools, \ - javax.transaction; javax.transaction.xa; partial=true; mandatory:=partial, \ + javax.transaction.xa;version="1.1";partial=true;mandatory:=partial, \ + javax.transaction.xa;version="1.1", \ + javax.transaction.xa;version="1.2", \ + javax.transaction.xa;version="1.3", \ javax.xml, \ - javax.xml.bind;version="2.2.1", \ - javax.xml.bind.annotation;version="2.2.1", \ - javax.xml.bind.annotation.adapters;version="2.2.1", \ - javax.xml.bind.attachment;version="2.2.1", \ - javax.xml.bind.helpers;version="2.2.1", \ - javax.xml.bind.util;version="2.2.1", \ + javax.xml.bind;version="2.3.0", \ + javax.xml.bind.annotation;version="2.3.0", \ + javax.xml.bind.annotation.adapters;version="2.3.0", \ + javax.xml.bind.attachment;version="2.3.0", \ + javax.xml.bind.helpers;version="2.3.0", \ + javax.xml.bind.util;version="2.3.0", \ + javax.xml.catalog, \ javax.xml.crypto, \ javax.xml.crypto.dom, \ javax.xml.crypto.dsig, \ @@ -720,7 +429,6 @@ jre-9= \ javax.xml.datatype, \ javax.xml.namespace, \ javax.xml.parsers, \ - javax.xml.soap;version="1.3", \ javax.xml.stream;version="1.2", \ javax.xml.stream.events;version="1.2", \ javax.xml.stream.util;version="1.2", \ @@ -730,14 +438,6 @@ jre-9= \ javax.xml.transform.stax, \ javax.xml.transform.stream, \ javax.xml.validation, \ - javax.xml.ws;version="2.2", \ - javax.xml.ws.handler;version="2.2", \ - javax.xml.ws.handler.soap;version="2.2", \ - javax.xml.ws.http;version="2.2", \ - javax.xml.ws.soap;version="2.2", \ - javax.xml.ws.spi;version="2.2", \ - javax.xml.ws.wsaddressing;version="2.2", \ - javax.xml.ws.spi.http;version="2.2", \ javax.xml.xpath, \ javafx.animation, \ javafx.application, \ @@ -747,6 +447,7 @@ jre-9= \ javafx.beans.property.adapter, \ javafx.beans.value, \ javafx.collections, \ + javafx.collections.transformation, \ javafx.concurrent, \ javafx.css, \ javafx.embed.swing, \ @@ -754,6 +455,7 @@ jre-9= \ javafx.event, \ javafx.fxml, \ javafx.geometry, \ + javafx.print, \ javafx.scene, \ javafx.scene.canvas, \ javafx.scene.chart, \ @@ -772,36 +474,8 @@ jre-9= \ javafx.stage, \ javafx.util, \ javafx.util.converter, \ + netscape.javascript, \ org.ietf.jgss, \ - org.omg.CORBA, \ - org.omg.CORBA_2_3, \ - org.omg.CORBA_2_3.portable, \ - org.omg.CORBA.DynAnyPackage, \ - org.omg.CORBA.ORBPackage, \ - org.omg.CORBA.portable, \ - org.omg.CORBA.TypeCodePackage, \ - org.omg.CosNaming, \ - org.omg.CosNaming.NamingContextExtPackage, \ - org.omg.CosNaming.NamingContextPackage, \ - org.omg.Dynamic, \ - org.omg.DynamicAny, \ - org.omg.DynamicAny.DynAnyFactoryPackage, \ - org.omg.DynamicAny.DynAnyPackage, \ - org.omg.IOP, \ - org.omg.IOP.CodecFactoryPackage, \ - org.omg.IOP.CodecPackage, \ - org.omg.Messaging, \ - org.omg.PortableInterceptor, \ - org.omg.PortableInterceptor.ORBInitInfoPackage, \ - org.omg.PortableServer, \ - org.omg.PortableServer.CurrentPackage, \ - org.omg.PortableServer.POAManagerPackage, \ - org.omg.PortableServer.POAPackage, \ - org.omg.PortableServer.portable, \ - org.omg.PortableServer.ServantLocatorPackage, \ - org.omg.SendingContext, \ - org.omg.stub.java.rmi, \ - org.omg.stub.javax.management.remote.rmi, \ org.w3c.dom, \ org.w3c.dom.bootstrap, \ org.w3c.dom.css, \ @@ -815,8 +489,25 @@ jre-9= \ org.w3c.dom.xpath, \ org.xml.sax, \ org.xml.sax.ext, \ - org.xml.sax.helpers - + org.xml.sax.helpers, \ + com.sun.security.sasl, \ + com.sun.security.sasl.digest, \ + com.sun.security.sasl.ntlm, \ + com.sun.security.sasl.util -osgi= \ - org.osgi.framework; +jre-10 = ${jre-9} +jre-11 = ${jre-9} +jre-12 = ${jre-9} +jre-13 = ${jre-9} +jre-14 = ${jre-9} +jre-15 = ${jre-9} +jre-16 = ${jre-9} +jre-17 = ${jre-9} +jre-18 = ${jre-9} +jre-19 = ${jre-9} +jre-20 = ${jre-9} +jre-21 = ${jre-9} +jre-23 = ${jre-9} +jre-24 = ${jre-9} +jre-25 = ${jre-9} +jre-26 = ${jre-9} From 9e9c410dfec3217b789ba98fb32aff1c49e4d0a9 Mon Sep 17 00:00:00 2001 From: Matt Pavlovich Date: Sat, 27 Sep 2025 09:52:57 -0500 Subject: [PATCH 2/5] [KARAF-8005] Various config/jre properties file updates --- .../resources/etc/config.properties | 32 +++++++++++-------- .../instance/resources/etc/config.properties | 20 +++++++++++- 2 files changed, 38 insertions(+), 14 deletions(-) diff --git a/assemblies/features/base/src/main/filtered-resources/resources/etc/config.properties b/assemblies/features/base/src/main/filtered-resources/resources/etc/config.properties index e012e02ace8..59fc238ea12 100644 --- a/assemblies/features/base/src/main/filtered-resources/resources/etc/config.properties +++ b/assemblies/features/base/src/main/filtered-resources/resources/etc/config.properties @@ -87,11 +87,15 @@ org.osgi.framework.system.packages= \ # # Extra packages appended after standard packages # -org.osgi.framework.system.packages.extra= \ +org.osgi.framework.system.packages.extra = \ org.apache.karaf.branding, \ sun.misc, \ com.sun.jmx.remote.protocol, \ - com.sun.jmx.remote.protocol.jmxmp + com.sun.jmx.remote.protocol.jmxmp, \ + org.apache.karaf.diagnostic.core;uses:=org.osgi.framework;version=@@karaf.osgi.version@@, \ + org.apache.karaf.diagnostic.core.common;uses:=org.apache.karaf.diagnostic.core;version=@@karaf.osgi.version@@, \ + org.apache.karaf.jaas.boot;uses:=\"javax.security.auth,javax.security.auth.callback,javax.security.auth.login,javax.security.auth.spi,org.osgi.framework\";version=@@karaf.osgi.version@@, \ + org.apache.karaf.jaas.boot.principal;uses:=javax.security.auth;version=@@karaf.osgi.version@@ org.osgi.framework.system.capabilities= \ ${eecap-${java.specification.version}}, \ @@ -215,17 +219,19 @@ eecap-1.8= osgi.ee; osgi.ee="OSGi/Minimum"; version:List="1.0,1.1,1.2", # javax.security.cert is needed by pax-transx-tm-narayana as it uses URLClassLoader and otherwise is unable to create # object store. # -org.osgi.framework.bootdelegation=\ - com.sun.*, \ - javax.transaction, \ - javax.transaction.xa, \ - javax.xml.crypto, \ - javax.xml.crypto.*, \ - javax.security.cert, \ - jdk.nashorn.*, \ - sun.*, \ - jdk.internal.reflect, \ - jdk.internal.reflect.* +org.osgi.framework.bootdelegation = \ + com.sun.*, \ + javax.transaction, \ + javax.transaction.xa, \ + javax.xml.crypto, \ + javax.xml.crypto.*, \ + javax.security.cert, \ + jdk.nashorn.*, \ + sun.*, \ + jdk.internal.reflect, \ + jdk.internal.reflect.*, \ + org.apache.karaf.jaas.boot, \ + org.apache.karaf.jaas.boot.principal # jVisualVM support # in order to use Karaf with jvisualvm, the org.osgi.framework.bootdelegation property has to contain the org.netbeans.lib.profiler.server package diff --git a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/config.properties b/instance/src/main/resources/org/apache/karaf/instance/resources/etc/config.properties index f59a2950eb4..a6f26b60ecf 100644 --- a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/config.properties +++ b/instance/src/main/resources/org/apache/karaf/instance/resources/etc/config.properties @@ -129,6 +129,24 @@ equinox-capabilities= \ osgi.service;objectClass:List=org.eclipse.osgi.service.security.TrustEngine;osgi.signedcontent.trust.engine=org.eclipse.osgi, \ osgi.service;objectClass:List=org.eclipse.osgi.service.urlconversion.URLConverter;protocol:List="bundleentry,bundleresource" +eecap-21 = osgi.ee; osgi.ee="OSGi/Minimum"; version:List="1.0,1.1,1.2", \ + osgi.ee; osgi.ee="JavaSE"; version:List="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0,17.0,18.0,19.0,20.0,21.0", \ + osgi.ee; osgi.ee="JRE"; version:List="1.0,1.1", \ + osgi.ee; osgi.ee="JavaSE/compact1"; version:List="1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0,17.0,18.0,19.0,20.0,21.0", \ + osgi.ee; osgi.ee="JavaSE/compact2"; version:List="1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0,17.0,18.0,19.0,20.0,21.0", \ + osgi.ee; osgi.ee="JavaSE/compact3"; version:List="1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0,17.0,18.0,19.0,20.0,21.0" +eecap-20 = osgi.ee; osgi.ee="OSGi/Minimum"; version:List="1.0,1.1,1.2", \ + osgi.ee; osgi.ee="JavaSE"; version:List="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0,17.0,18.0,19.0,20.0", \ + osgi.ee; osgi.ee="JRE"; version:List="1.0,1.1", \ + osgi.ee; osgi.ee="JavaSE/compact1"; version:List="1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0,17.0,18.0,19.0,20.0", \ + osgi.ee; osgi.ee="JavaSE/compact2"; version:List="1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0,17.0,18.0,19.0,20.0", \ + osgi.ee; osgi.ee="JavaSE/compact3"; version:List="1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0,17.0,18.0,19.0,20.0" +eecap-19 = osgi.ee; osgi.ee="OSGi/Minimum"; version:List="1.0,1.1,1.2", \ + osgi.ee; osgi.ee="JavaSE"; version:List="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0,17.0,18.0,19.0", \ + osgi.ee; osgi.ee="JRE"; version:List="1.0,1.1", \ + osgi.ee; osgi.ee="JavaSE/compact1"; version:List="1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0,17.0,18.0,19.0", \ + osgi.ee; osgi.ee="JavaSE/compact2"; version:List="1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0,17.0,18.0,19.0", \ + osgi.ee; osgi.ee="JavaSE/compact3"; version:List="1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0,17.0,18.0,19.0" eecap-18 = osgi.ee; osgi.ee="OSGi/Minimum"; version:List="1.0,1.1,1.2", \ osgi.ee; osgi.ee="JavaSE"; version:List="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0,17.0,18.0", \ osgi.ee; osgi.ee="JRE"; version:List="1.0,1.1", \ @@ -251,7 +269,7 @@ karaf.pid.file=${karaf.base}/karaf.pid # felix.fileinstall.enableConfigSave = true felix.fileinstall.dir = ${karaf.etc} -felix.fileinstall.filter = .*\\.(cfg|config) +felix.fileinstall.filter = .*\\.(cfg|config|json) felix.fileinstall.poll = 1000 felix.fileinstall.noInitialDelay = true felix.fileinstall.log.level = 3 From eea9745def9bcb8b23990c28fff714124cc507d5 Mon Sep 17 00:00:00 2001 From: Matt Pavlovich Date: Sat, 27 Sep 2025 09:53:16 -0500 Subject: [PATCH 3/5] [KARAF-8005] javase jdk version in pom.xml updates --- .../assembly/src/main/resources/archetype-resources/pom.xml | 2 +- assemblies/apache-karaf-minimal/pom.xml | 2 +- assemblies/apache-karaf/pom.xml | 2 +- assemblies/features/enterprise/pom.xml | 2 +- assemblies/features/specs/pom.xml | 4 ++-- assemblies/features/spring-legacy/pom.xml | 2 +- assemblies/features/spring/pom.xml | 2 +- assemblies/features/standard/pom.xml | 2 +- .../karaf-docker-example-dynamic-dist/pom.xml | 4 ++-- .../karaf-docker-example-static-dist/pom.xml | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/archetypes/assembly/src/main/resources/archetype-resources/pom.xml b/archetypes/assembly/src/main/resources/archetype-resources/pom.xml index e255be1e278..8cefb1c5b2e 100644 --- a/archetypes/assembly/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/assembly/src/main/resources/archetype-resources/pom.xml @@ -174,7 +174,7 @@ - 11 + 21 diff --git a/assemblies/apache-karaf-minimal/pom.xml b/assemblies/apache-karaf-minimal/pom.xml index 73dd86f274a..481bbedd666 100644 --- a/assemblies/apache-karaf-minimal/pom.xml +++ b/assemblies/apache-karaf-minimal/pom.xml @@ -145,7 +145,7 @@ !org.apache.karaf.command.acl.*, * - 11 + 21 diff --git a/assemblies/apache-karaf/pom.xml b/assemblies/apache-karaf/pom.xml index 64185742bf5..60dd7a90911 100644 --- a/assemblies/apache-karaf/pom.xml +++ b/assemblies/apache-karaf/pom.xml @@ -178,7 +178,7 @@ - 11 + 21 ${project.build.directory} Apache Karaf (full) diff --git a/assemblies/features/enterprise/pom.xml b/assemblies/features/enterprise/pom.xml index b50a3599ad9..ae831569f39 100644 --- a/assemblies/features/enterprise/pom.xml +++ b/assemblies/features/enterprise/pom.xml @@ -241,7 +241,7 @@ file:${project.build.directory}/feature/feature.xml org.apache.karaf.features:framework - 11 + 21 framework diff --git a/assemblies/features/specs/pom.xml b/assemblies/features/specs/pom.xml index 5d44bdd1d10..36ba1df5130 100644 --- a/assemblies/features/specs/pom.xml +++ b/assemblies/features/specs/pom.xml @@ -96,7 +96,7 @@ file:${project.build.directory}/feature/feature.xml org.apache.karaf.features:framework - 11 + 21 framework @@ -149,4 +149,4 @@ - \ No newline at end of file + diff --git a/assemblies/features/spring-legacy/pom.xml b/assemblies/features/spring-legacy/pom.xml index 17e6ddff116..42ad7c1750d 100644 --- a/assemblies/features/spring-legacy/pom.xml +++ b/assemblies/features/spring-legacy/pom.xml @@ -158,7 +158,7 @@ file:${project.build.directory}/feature/feature.xml org.apache.karaf.features:framework - 17 + 21 framework diff --git a/assemblies/features/spring/pom.xml b/assemblies/features/spring/pom.xml index b5abe0e26ad..c04a2ca250c 100644 --- a/assemblies/features/spring/pom.xml +++ b/assemblies/features/spring/pom.xml @@ -158,7 +158,7 @@ file:${project.build.directory}/feature/feature.xml org.apache.karaf.features:framework - 17 + 21 framework diff --git a/assemblies/features/standard/pom.xml b/assemblies/features/standard/pom.xml index a82c623aea4..a31e822aed1 100644 --- a/assemblies/features/standard/pom.xml +++ b/assemblies/features/standard/pom.xml @@ -465,7 +465,7 @@ file:${project.build.directory}/feature/feature.xml org.apache.karaf.features:framework - 11 + 21 framework diff --git a/examples/karaf-docker-example/karaf-docker-example-dynamic-dist/pom.xml b/examples/karaf-docker-example/karaf-docker-example-dynamic-dist/pom.xml index ae13f67f3ca..729a495cc3e 100644 --- a/examples/karaf-docker-example/karaf-docker-example-dynamic-dist/pom.xml +++ b/examples/karaf-docker-example/karaf-docker-example-dynamic-dist/pom.xml @@ -138,7 +138,7 @@ - 11 + 21 @@ -194,4 +194,4 @@ - \ No newline at end of file + diff --git a/examples/karaf-docker-example/karaf-docker-example-static-dist/pom.xml b/examples/karaf-docker-example/karaf-docker-example-static-dist/pom.xml index 0a36d879bed..dbc715cc36d 100644 --- a/examples/karaf-docker-example/karaf-docker-example-static-dist/pom.xml +++ b/examples/karaf-docker-example/karaf-docker-example-static-dist/pom.xml @@ -108,7 +108,7 @@ static true static - 11 + 21 From a5d2878d2abb16f92226acaaafe7a4142912b7cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?JB=20Onofr=C3=A9?= Date: Sun, 28 Sep 2025 06:54:20 +0200 Subject: [PATCH 4/5] On the XATest, set timeout and use service lookup for Artemis broker. --- .../test/java/org/apache/karaf/itests/XATest.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/itests/test/src/test/java/org/apache/karaf/itests/XATest.java b/itests/test/src/test/java/org/apache/karaf/itests/XATest.java index 5d8207daebe..a201f57ab6c 100644 --- a/itests/test/src/test/java/org/apache/karaf/itests/XATest.java +++ b/itests/test/src/test/java/org/apache/karaf/itests/XATest.java @@ -52,12 +52,13 @@ public class XATest extends BaseTest { public Option[] config() { String version = MavenUtils.getArtifactVersion("org.apache.karaf", "apache-karaf"); List