Merge pull request #275 from /issues/272-filter-jboss-descriptor

Fix #272: Filter jboss descriptor with bouncycastle version from pom
wultra · Oct 6, 2023 · cfc233a · cfc233a
2 parents b82ce3c + f4025b6
commit cfc233a
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/powerauth-data-adapter/pom.xml b/powerauth-data-adapter/pom.xml
@@ -64,6 +64,7 @@
     <properties>
         <springdoc-openapi-starter-webmvc-ui.version>2.2.0</springdoc-openapi-starter-webmvc-ui.version>
         <logstash.version>7.4</logstash.version>
+        <bcprov-jdk18on.version>1.76</bcprov-jdk18on.version>
 
         <powerauth-crypto.version>1.5.1</powerauth-crypto.version>
         <powerauth-webflow.version>1.5.0</powerauth-webflow.version>
@@ -131,7 +132,7 @@
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcprov-jdk18on</artifactId>
-            <version>1.76</version>
+            <version>${bcprov-jdk18on.version}</version>
         </dependency>
 
         <!-- Logging -->
@@ -164,6 +165,20 @@
                 </executions>
             </plugin>
 
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <configuration>
+                    <webResources>
+                        <webResource>
+                            <directory>src/main/webapp/WEB-INF</directory>
+                            <targetPath>WEB-INF</targetPath>
+                            <filtering>true</filtering>
+                        </webResource>
+                    </webResources>
+                </configuration>
+            </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>

diff --git a/powerauth-data-adapter/src/main/webapp/WEB-INF/jboss-deployment-structure.xml b/powerauth-data-adapter/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
@@ -12,7 +12,7 @@
 
         <resources>
             <!-- use WAR provided Bouncy Castle -->
-            <resource-root path="WEB-INF/lib/bcprov-jdk18on-1.76.jar" use-physical-code-source="true"/>
+            <resource-root path="WEB-INF/lib/bcprov-jdk18on-${bcprov-jdk18on.version}.jar" use-physical-code-source="true"/>
         </resources>
 
         <local-last value="true"/>