Merge pull request #2529 from jlawyerorg/feature/bea-api-v9

Upgrade to beA API v9. issue #2527
jlawyerorg · Aug 6, 2024 · 111cc8a · 111cc8a
2 parents 9428628 + c99cdb7
commit 111cc8a
Show file tree

Hide file tree

Showing 56 changed files with 176 additions and 138 deletions.
diff --git a/j-lawyer-client/lib/bea/ASN1_signature-3.19.0.2.jar b/j-lawyer-client/lib/bea/ASN1_signature-3.19.0.2.jar
diff --git a/j-lawyer-client/lib/bea/ASN1_signature-3.26.0.1.jar b/j-lawyer-client/lib/bea/ASN1_signature-3.26.0.1.jar
diff --git a/j-lawyer-client/lib/bea/BeaPayload-3.19.0.2.jar b/j-lawyer-client/lib/bea/BeaPayload-3.19.0.2.jar
diff --git a/j-lawyer-client/lib/bea/BeaPayload-3.26.0.1.jar b/j-lawyer-client/lib/bea/BeaPayload-3.26.0.1.jar
diff --git a/j-lawyer-client/lib/bea/BeaToolkit-3.19.0.2.jar b/j-lawyer-client/lib/bea/BeaToolkit-3.19.0.2.jar
diff --git a/j-lawyer-client/lib/bea/BeaToolkit-3.26.0.1.jar b/j-lawyer-client/lib/bea/BeaToolkit-3.26.0.1.jar
diff --git a/j-lawyer-client/lib/bea/KSWToolkit-3.16.0.2.jar b/j-lawyer-client/lib/bea/KSWToolkit-3.16.0.2.jar
diff --git a/j-lawyer-client/lib/bea/KSWToolkit-3.20.0.1.jar b/j-lawyer-client/lib/bea/KSWToolkit-3.20.0.1.jar
diff --git a/j-lawyer-client/lib/bea/PCard-3.19.0.2.jar b/j-lawyer-client/lib/bea/PCard-3.19.0.2.jar
diff --git a/j-lawyer-client/lib/bea/PCard-3.26.0.1.jar b/j-lawyer-client/lib/bea/PCard-3.26.0.1.jar
diff --git a/j-lawyer-client/lib/bea/SignerToolBox-3.19.0.2.jar b/j-lawyer-client/lib/bea/SignerToolBox-3.19.0.2.jar
diff --git a/j-lawyer-client/lib/bea/SignerToolBox-3.26.0.1.jar b/j-lawyer-client/lib/bea/SignerToolBox-3.26.0.1.jar
diff --git a/j-lawyer-client/lib/bea/bcpkix-jdk15on-1.69.jar b/j-lawyer-client/lib/bea/bcpkix-jdk15on-1.69.jar
diff --git a/j-lawyer-client/lib/bea/bcpkix-jdk18on-1.74.jar b/j-lawyer-client/lib/bea/bcpkix-jdk18on-1.74.jar
diff --git a/j-lawyer-client/lib/bea/bcprov-jdk15on-1.69.jar b/j-lawyer-client/lib/bea/bcprov-jdk15on-1.69.jar
diff --git a/j-lawyer-client/lib/bea/bcprov-jdk18on-1.74.jar b/j-lawyer-client/lib/bea/bcprov-jdk18on-1.74.jar
diff --git a/j-lawyer-client/lib/bea/bctls-jdk15on-1.69.jar b/j-lawyer-client/lib/bea/bctls-jdk15on-1.69.jar
diff --git a/j-lawyer-client/lib/bea/bctls-jdk18on-1.74.jar b/j-lawyer-client/lib/bea/bctls-jdk18on-1.74.jar
diff --git a/j-lawyer-client/lib/bea/bcutil-jdk15on-1.69.jar b/j-lawyer-client/lib/bea/bcutil-jdk15on-1.69.jar
diff --git a/j-lawyer-client/lib/bea/bcutil-jdk18on-1.74.jar b/j-lawyer-client/lib/bea/bcutil-jdk18on-1.74.jar
diff --git a/j-lawyer-client/lib/bea/bea-osci-1.10.0.jar b/j-lawyer-client/lib/bea/bea-osci-1.10.0.jar
diff --git a/j-lawyer-client/lib/bea/bea-osci-1.14.0.jar b/j-lawyer-client/lib/bea/bea-osci-1.14.0.jar
diff --git a/j-lawyer-client/lib/bea/bea-xjustiz-1.13.0.jar b/j-lawyer-client/lib/bea/bea-xjustiz-1.13.0.jar
diff --git a/j-lawyer-client/lib/bea/bea-xjustiz-1.9.0.jar b/j-lawyer-client/lib/bea/bea-xjustiz-1.9.0.jar
diff --git a/j-lawyer-client/lib/bea/checker-qual-3.12.0.jar b/j-lawyer-client/lib/bea/checker-qual-3.12.0.jar
diff --git a/j-lawyer-client/lib/bea/checker-qual-3.33.0.jar b/j-lawyer-client/lib/bea/checker-qual-3.33.0.jar
diff --git a/j-lawyer-client/lib/bea/commons-io-2.11.0.jar b/j-lawyer-client/lib/bea/commons-io-2.11.0.jar
diff --git a/j-lawyer-client/lib/bea/commons-io-2.15.1.jar b/j-lawyer-client/lib/bea/commons-io-2.15.1.jar
diff --git a/j-lawyer-client/lib/bea/dtos-3.19.0.2.jar b/j-lawyer-client/lib/bea/dtos-3.19.0.2.jar
diff --git a/j-lawyer-client/lib/bea/dtos-3.26.0.1.jar b/j-lawyer-client/lib/bea/dtos-3.26.0.1.jar
diff --git a/j-lawyer-client/lib/bea/error_prone_annotations-2.11.0.jar b/j-lawyer-client/lib/bea/error_prone_annotations-2.11.0.jar
diff --git a/j-lawyer-client/lib/bea/error_prone_annotations-2.18.0.jar b/j-lawyer-client/lib/bea/error_prone_annotations-2.18.0.jar
diff --git a/j-lawyer-client/lib/bea/freemarker-2.3.28.jar b/j-lawyer-client/lib/bea/freemarker-2.3.28.jar
diff --git a/j-lawyer-client/lib/bea/freemarker-2.3.32.jar b/j-lawyer-client/lib/bea/freemarker-2.3.32.jar
diff --git a/j-lawyer-client/lib/bea/guava-31.1-jre.jar b/j-lawyer-client/lib/bea/guava-31.1-jre.jar
diff --git a/j-lawyer-client/lib/bea/guava-32.1.1-jre.jar b/j-lawyer-client/lib/bea/guava-32.1.1-jre.jar
diff --git a/j-lawyer-client/lib/bea/j2objc-annotations-1.3.jar b/j-lawyer-client/lib/bea/j2objc-annotations-1.3.jar
diff --git a/j-lawyer-client/lib/bea/jackson-annotations-2.12.3.jar b/j-lawyer-client/lib/bea/jackson-annotations-2.12.3.jar
diff --git a/j-lawyer-client/lib/bea/jackson-annotations-2.16.1.jar b/j-lawyer-client/lib/bea/jackson-annotations-2.16.1.jar
diff --git a/j-lawyer-client/lib/bea/jackson-core-2.12.3.jar b/j-lawyer-client/lib/bea/jackson-core-2.12.3.jar
diff --git a/j-lawyer-client/lib/bea/jackson-core-2.16.1.jar b/j-lawyer-client/lib/bea/jackson-core-2.16.1.jar
diff --git a/j-lawyer-client/lib/bea/jackson-databind-2.12.3.jar b/j-lawyer-client/lib/bea/jackson-databind-2.12.3.jar
diff --git a/j-lawyer-client/lib/bea/jackson-databind-2.16.1.jar b/j-lawyer-client/lib/bea/jackson-databind-2.16.1.jar
diff --git a/j-lawyer-client/lib/bea/jaxb-api-2.3.0.jar b/j-lawyer-client/lib/bea/jaxb-api-2.3.0.jar
diff --git a/j-lawyer-client/lib/bea/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar b/j-lawyer-client/lib/bea/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar
diff --git a/...-client/lib/bea/osci-bibliothek-2.1.0.jar → ...-client/lib/bea/osci-bibliothek-2.4.0.jar b/...-client/lib/bea/osci-bibliothek-2.1.0.jar → ...-client/lib/bea/osci-bibliothek-2.4.0.jar
diff --git a/j-lawyer-client/lib/bea/slf4j-api-1.7.30.jar → j-lawyer-client/lib/bea/slf4j-api-1.7.36.jar b/j-lawyer-client/lib/bea/slf4j-api-1.7.30.jar → j-lawyer-client/lib/bea/slf4j-api-1.7.36.jar
diff --git a/j-lawyer-client/lib/bea/xmlsec-2.2.3.jar → j-lawyer-client/lib/bea/xmlsec-2.2.6.jar b/j-lawyer-client/lib/bea/xmlsec-2.2.3.jar → j-lawyer-client/lib/bea/xmlsec-2.2.6.jar
diff --git a/j-lawyer-client/lib/j-lawyer-cloud/j-lawyer-cloud.jar b/j-lawyer-client/lib/j-lawyer-cloud/j-lawyer-cloud.jar
diff --git a/j-lawyer-client/lib/jboss-client.jar b/j-lawyer-client/lib/jboss-client.jar
diff --git a/j-lawyer-client/lib/jboss-client.jar.original b/j-lawyer-client/lib/jboss-client.jar.original
diff --git a/j-lawyer-client/nbproject/project.properties b/j-lawyer-client/nbproject/project.properties
diff --git a/j-lawyer-cloud/dependency-reduced-pom.xml b/j-lawyer-cloud/dependency-reduced-pom.xml
@@ -26,7 +26,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>3.2.4</version>
+        <version>3.6.0</version>
         <executions>
           <execution>
             <phase>package</phase>
@@ -61,9 +61,23 @@
       </plugin>
     </plugins>
   </build>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>com.fasterxml.jackson.core</groupId>
+        <artifactId>jackson-databind</artifactId>
+        <version>2.16.1</version>
+      </dependency>
+      <dependency>
+        <groupId>com.fasterxml.jackson.core</groupId>
+        <artifactId>jackson-core</artifactId>
+        <version>2.16.1</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
   <properties>
-    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.source>17</maven.compiler.source>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.target>17</maven.compiler.target>
   </properties>
 </project>
diff --git a/j-lawyer-cloud/pom.xml b/j-lawyer-cloud/pom.xml
@@ -5,27 +5,44 @@
     <artifactId>j-lawyer-cloud</artifactId>
     <version>1.0-SNAPSHOT</version>
     <packaging>jar</packaging>
+
+    <dependencyManagement>
+        <!-- jackson conflicts with the version that is part of bea-wrapper, therefore fix its version -->
+        <dependencies>
+            <dependency>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-databind</artifactId>
+                <version>2.16.1</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-core</artifactId>
+                <version>2.16.1</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <dependency>
             <groupId>org.aarboard.nextcloud</groupId>
             <artifactId>nextcloud-api</artifactId>
-            <version>12.0.4</version>
+            <version>13.1.0</version>
         </dependency>
         <!-- dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
             <version>1.2.17</version>
         </dependency -->
-          <dependency>
-    <groupId>org.apache.logging.log4j</groupId>
-    <artifactId>log4j-api</artifactId>
-    <version>2.17.1</version>
-  </dependency>
-  <dependency>
-    <groupId>org.apache.logging.log4j</groupId>
-    <artifactId>log4j-core</artifactId>
-    <version>2.17.1</version>
-  </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
+            <version>2.17.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <version>2.17.1</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.jackrabbit</groupId>
             <artifactId>jackrabbit-webdav</artifactId>
@@ -47,8 +64,8 @@
     </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
     </properties>
     <build>
         <plugins>
@@ -122,7 +139,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.4</version>
+                <version>3.6.0</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -151,6 +168,19 @@
                                         <exclude>org.apache.logging.*</exclude>
                                     </excludes>
                                 </relocation>
+                                <!-- jackson core conflicts with the version that is part of bea-wrapper, therefore shade it -->
+                                <!-- relocation>
+                                    <pattern>com.fasterxml.jackson.core</pattern>
+                                    <shadedPattern>shaded.com.fasterxml.jackson.core</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>com.fasterxml.jackson.annotation</pattern>
+                                    <shadedPattern>shaded.com.fasterxml.jackson.annotation</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>com.fasterxml.jackson.databind</pattern>
+                                    <shadedPattern>shaded.com.fasterxml.jackson.databind</shadedPattern>
+                                </relocation -->
                             </relocations>
                         </configuration>
                     </execution>

diff --git a/j-lawyer-proprietary/libs/j-lawyer-bea-wrapper.jar b/j-lawyer-proprietary/libs/j-lawyer-bea-wrapper.jar
diff --git a/j-lawyer-server/j-lawyer-server-ejb/lib/j-lawyer-cloud.jar b/j-lawyer-server/j-lawyer-server-ejb/lib/j-lawyer-cloud.jar