[JBTM-3687] 'common' has been updated to remove all javax references

mmusgrov · Sep 1, 2022 · d32e7f7 · d32e7f7
1 parent e2802a8
commit d32e7f7
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 5 deletions.
diff --git a/common/pom.xml b/common/pom.xml
@@ -30,6 +30,15 @@
       </resource>
     </resources>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <compilerArgs>
+            <arg>-Aorg.jboss.logging.tools.addGeneratedAnnotation=false</arg>
+          </compilerArgs>
+        </configuration>
+      </plugin>
       <plugin>
         <inherited>false</inherited>
         <groupId>org.sonatype.plugins</groupId>
@@ -76,13 +85,20 @@
       <groupId>org.jboss.logging</groupId>
       <artifactId>jboss-logging</artifactId>
       <version>${version.org.jboss.logging.jboss-logging}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.logging</groupId>
+      <artifactId>jboss-logging-annotations</artifactId>
+      <version>${version.org.jboss.logging.jboss-logging-processor}</version>
       <scope>provided</scope>
+      <optional>true</optional>
     </dependency>
-      <dependency>
+    <dependency>
       <groupId>org.jboss.logging</groupId>
       <artifactId>jboss-logging-processor</artifactId>
       <version>${version.org.jboss.logging.jboss-logging-processor}</version>
       <scope>provided</scope>
+      <optional>true</optional>
     </dependency>
     <!-- START TEST -->
     <dependency>

diff --git a/osgi/jta/pom.xml b/osgi/jta/pom.xml
@@ -29,7 +29,7 @@
    <description>Narayana: OSGi JTA Bundles</description>
 
    <properties>
-	   <maven-bundle-plugin.version>2.4.0</maven-bundle-plugin.version>
+	   <maven-bundle-plugin.version>5.1.8</maven-bundle-plugin.version>
            <version.org.jboss.spec.javax.transaction>1.0.0.Final</version.org.jboss.spec.javax.transaction>
 	   <karaf.home>${project.build.directory}/apache-karaf-minimal-${version.apache.karaf}</karaf.home>
    </properties>
@@ -235,7 +235,7 @@
 						   osgi.service;effective:=active;objectClass=javax.transaction.UserTransaction
 					   </Provide-Capability>
 					   <Require-Capability>
-						   osgi.service;effective:=active;resolution:=optional;cardinality:=multiple;filter:=(objectClass=org.jboss.tm.XAResourceRecovery)
+						   osgi.service;effective:=active;resolution:=optional;cardinality:=multiple;filter:="(objectClass=org.jboss.tm.XAResourceRecovery)"
 					   </Require-Capability>
 					   <_include>src/main/resources/META-INF/MANIFEST.MF</_include>
 					   <_removeheaders>Include-Resource,Private-Package,Embed*,Bundle-ClassPath</_removeheaders>

diff --git a/pom.xml b/pom.xml
@@ -243,8 +243,8 @@
     <version.org.jboss.jandex>2.1.1.Final</version.org.jboss.jandex>
     <version.org.jboss.jboss-transaction-spi>7.6.1.Final</version.org.jboss.jboss-transaction-spi>
     <version.org.jboss.jboss-transaction-spi-jakarta>7.6.1.Final</version.org.jboss.jboss-transaction-spi-jakarta>
-    <version.org.jboss.logging.jboss-logging>3.2.1.Final</version.org.jboss.logging.jboss-logging>
-    <version.org.jboss.logging.jboss-logging-processor>2.0.0.Final</version.org.jboss.logging.jboss-logging-processor>
+    <version.org.jboss.logging.jboss-logging>3.5.0.Final</version.org.jboss.logging.jboss-logging>
+    <version.org.jboss.logging.jboss-logging-processor>2.2.1.Final</version.org.jboss.logging.jboss-logging-processor>
     <version.org.jboss.logmanager>1.5.1.Final</version.org.jboss.logmanager>
     <version.org.jboss.openjdk-orb>8.1.9.Final</version.org.jboss.openjdk-orb>
     <version.org.jboss.resteasy>4.7.4.Final</version.org.jboss.resteasy>