Merge pull request apache#584 from jboss-fuse/ggrzybek-alignment1

Ggrzybek alignment1
gnodet · Jan 31, 2023 · 3fe5a23 · 3fe5a23
2 parents 7af981b + d9ae5ed
commit 3fe5a23
Show file tree

Hide file tree

Showing 28 changed files with 637 additions and 106 deletions.
diff --git a/assemblies/features/base/pom.xml b/assemblies/features/base/pom.xml
@@ -77,7 +77,6 @@
             <!-- can't upgrade to jakarta, see: https://github.com/eclipse-ee4j/jaf/issues/67 -->
             <groupId>com.sun.activation</groupId>
             <artifactId>javax.activation</artifactId>
-            <version>1.2.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.specs</groupId>

diff --git a/assemblies/features/base/src/main/filtered-resources/resources/bin/inc b/assemblies/features/base/src/main/filtered-resources/resources/bin/inc
@@ -302,8 +302,8 @@ setupDefaults() {
     if [ "x${JAVA_DEBUG_PORT}" = "x" ]; then
         JAVA_DEBUG_PORT="${DEFAULT_JAVA_DEBUG_PORT}"
     fi
-    DEFAULT_JAVA_DEBUG_OPTS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:${JAVA_DEBUG_PORT}"
-    DEFAULT_JAVA_DEBUGS_OPTS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=*:${JAVA_DEBUG_PORT}"
+    DEFAULT_JAVA_DEBUG_OPTS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=${JAVA_DEBUG_PORT}"
+    DEFAULT_JAVA_DEBUGS_OPTS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=${JAVA_DEBUG_PORT}"
 
     if [ "x${JAVA_OPTS}" = "x" ]; then
         JAVA_OPTS="${DEFAULT_JAVA_OPTS}"

diff --git a/assemblies/features/enterprise/pom.xml b/assemblies/features/enterprise/pom.xml
@@ -197,10 +197,20 @@
         </dependency>
 
         <!-- hibernate deps -->
+        <dependency>
+            <groupId>jakarta.interceptor</groupId>
+            <artifactId>jakarta.interceptor-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-osgi</artifactId>
             <version>${hibernate.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.interceptor</groupId>
+                    <artifactId>javax.interceptor-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 

diff --git a/assemblies/features/enterprise/src/main/feature/feature.xml b/assemblies/features/enterprise/src/main/feature/feature.xml
@@ -30,11 +30,11 @@
     <repository>mvn:org.apache.openjpa/openjpa-features/${openjpa.version}/xml/features</repository>
 
     <feature name="transaction-api" version="1.2.0">
-        <bundle dependency="true">mvn:javax.interceptor/javax.interceptor-api/1.2.2</bundle>
+        <bundle dependency="true">mvn:jakarta.interceptor/jakarta.interceptor-api/${jakarta.interceptor.version}</bundle>
         <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-inject/${servicemix-javax-inject.version}</bundle>
-        <bundle dependency="true">mvn:jakarta.el/jakarta.el-api/3.0.3</bundle>
-        <bundle dependency="true">mvn:javax.enterprise/cdi-api/1.2</bundle>
-        <bundle>mvn:javax.transaction/javax.transaction-api/1.2</bundle>
+        <bundle dependency="true">mvn:jakarta.el/jakarta.el-api/${jakarta.el.version}</bundle>
+        <bundle dependency="true">mvn:jakarta.enterprise/jakarta.enterprise.cdi-api/${jakarta.enterprise.cdi.version}</bundle>
+        <bundle>mvn:javax.transaction/javax.transaction-api/${javax.transaction.version}</bundle>
         <feature>pax-transx-tm-api</feature>
     </feature>
 
@@ -189,7 +189,7 @@ com.atomikos.icatch.log_base_dir=${karaf.data}/atomikos
         <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/${dom4j.bundle.version}</bundle>
         <bundle>mvn:org.hibernate.common/hibernate-commons-annotations/${hibernate.common.version}</bundle>
         <bundle>mvn:org.hibernate/hibernate-core/${hibernate.version}</bundle>
-        <bundle>mvn:javax.interceptor/javax.interceptor-api/${javax.interceptor.version}</bundle>
+        <bundle>mvn:jakarta.interceptor/jakarta.interceptor-api/${jakarta.interceptor.version}</bundle>
         <bundle>mvn:org.hibernate/hibernate-osgi/${hibernate.version}</bundle>
         <capability>
             osgi.service;objectClass=javax.persistence.spi.PersistenceProvider;effective:=active;javax.persistence.provider=org.hibernate.jpa.HibernatePersistenceProvider

diff --git a/assemblies/features/framework/src/main/feature/feature.xml b/assemblies/features/framework/src/main/feature/feature.xml
@@ -33,8 +33,8 @@
         <bundle start-level="8">mvn:org.ops4j.pax.logging/pax-logging-log4j2/${pax.logging.version}</bundle>
         <bundle start-level="8">mvn:org.fusesource.jansi/jansi/${jansi.version}</bundle>
         <!-- config admin -->
-        <bundle start-level="9">mvn:org.osgi/org.osgi.util.function/1.2.0</bundle>
-        <bundle start-level="9">mvn:org.osgi/org.osgi.util.promise/1.2.0</bundle>
+        <bundle start-level="9">mvn:org.osgi/org.osgi.util.function/${org.osgi.util.function.version}</bundle>
+        <bundle start-level="9">mvn:org.osgi/org.osgi.util.promise/${org.osgi.util.promise.version}</bundle>
         <bundle start-level="9">mvn:org.apache.felix/org.apache.felix.coordinator/${felix.coordinator.version}</bundle>
         <bundle start-level="9">mvn:org.apache.felix/org.apache.felix.converter/${felix.converter.version}</bundle>
         <bundle start-level="10">mvn:org.apache.felix/org.apache.felix.configadmin/${felix.configadmin.version}</bundle>
@@ -60,8 +60,8 @@
         <bundle start-level="8">mvn:org.ops4j.pax.logging/pax-logging-api/${pax.logging.version}</bundle>
         <bundle start-level="8">mvn:org.ops4j.pax.logging/pax-logging-logback/${pax.logging.version}</bundle>
         <!-- config admin -->
-        <bundle start-level="9">mvn:org.osgi/org.osgi.util.function/1.2.0</bundle>
-        <bundle start-level="9">mvn:org.osgi/org.osgi.util.promise/1.2.0</bundle>
+        <bundle start-level="9">mvn:org.osgi/org.osgi.util.function/${org.osgi.util.function.version}</bundle>
+        <bundle start-level="9">mvn:org.osgi/org.osgi.util.promise/${org.osgi.util.promise.version}</bundle>
         <bundle start-level="9">mvn:org.apache.felix/org.apache.felix.coordinator/${felix.coordinator.version}</bundle>
         <bundle start-level="9">mvn:org.apache.felix/org.apache.felix.converter/${felix.converter.version}</bundle>
         <bundle start-level="10">mvn:org.apache.felix/org.apache.felix.configadmin/${felix.configadmin.version}</bundle>

diff --git a/assemblies/features/specs/src/main/feature/feature.xml b/assemblies/features/specs/src/main/feature/feature.xml
@@ -40,7 +40,7 @@
 
     <!-- activation -->
     <feature name="activation" version="${spec.activation.version}">
-        <bundle start-level="10" dependency="true">mvn:com.sun.activation/jakarta.activation/${spec.activation.version}</bundle>
+        <bundle start-level="10" dependency="true">mvn:com.sun.activation/javax.activation/${spec.activation.version}</bundle>
     </feature>
 
     <!-- jaxb -->
@@ -111,8 +111,8 @@
 
     <!-- util -->
     <feature name="util" version="1.2.0">
-        <bundle dependency="true">mvn:org.osgi/org.osgi.util.function/1.2.0</bundle>
-        <bundle dependency="true">mvn:org.osgi/org.osgi.util.promise/1.2.0</bundle>
+        <bundle dependency="true">mvn:org.osgi/org.osgi.util.function/${org.osgi.util.function.version}</bundle>
+        <bundle dependency="true">mvn:org.osgi/org.osgi.util.promise/${org.osgi.util.promise.version}</bundle>
     </feature>
 
     <!-- xbean -->

diff --git a/assemblies/features/standard/src/main/feature/feature.xml b/assemblies/features/standard/src/main/feature/feature.xml
@@ -2372,7 +2372,7 @@ encrypt = admin, manager, viewer
     <feature name="spring-security-crypto-encryption" description="Advanced encryption support for Karaf security" version="${project.version}">
         <feature>jaas</feature>
         <bundle dependency="true" start-level="30">mvn:org.bouncycastle/bcprov-jdk15on/${bouncycastle.version}</bundle>
-        <bundle dependency="true" start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-crypto/${spring.security53.version}</bundle>
+        <bundle dependency="true" start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-crypto/${spring.security57.version}</bundle>
         <bundle start-level="30">mvn:org.apache.karaf.jaas/org.apache.karaf.jaas.spring-security-crypto/${project.version}</bundle>
     </feature>