Fix #1441: Filter jboss descriptor with bouncycastle version from pom

wultra · Oct 5, 2023 · 5ee0d3f · 5ee0d3f
1 parent dcd7b77
commit 5ee0d3f
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 7 deletions.
diff --git a/docs/Deploying-Wildfly.md b/docs/Deploying-Wildfly.md
@@ -25,7 +25,7 @@ Web Flow contains the following configuration in `jboss-deployment-structure.xml
 		
 		<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-${BC_VERSION}.jar" use-physical-code-source="true"/>
 		</resources>
 
 		<local-last value="true" />
@@ -49,7 +49,7 @@ Similarly, Next Step contains the following configuration in `jboss-deployment-s
 		
 		<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-${BC_VERSION}.jar" use-physical-code-source="true"/>
 		</resources>
 
 		<local-last value="true" />

diff --git a/pom.xml b/pom.xml
@@ -91,7 +91,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
-        <bc.version>1.76</bc.version>
+        <bcprov-jdk18on.version>1.76</bcprov-jdk18on.version>
         <zxing.version>3.5.0</zxing.version>
         <passay.version>1.6.4</passay.version>
         <springdoc-openapi-starter-webmvc-ui.version>2.2.0</springdoc-openapi-starter-webmvc-ui.version>
@@ -246,13 +246,13 @@
             <dependency>
                 <groupId>org.bouncycastle</groupId>
                 <artifactId>bcprov-jdk18on</artifactId>
-                <version>${bc.version}</version>
+                <version>${bcprov-jdk18on.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>org.bouncycastle</groupId>
                 <artifactId>bcpkix-jdk18on</artifactId>
-                <version>${bc.version}</version>
+                <version>${bcprov-jdk18on.version}</version>
             </dependency>
 
             <!-- Library for formatting monetary amounts -->

diff --git a/powerauth-nextstep/pom.xml b/powerauth-nextstep/pom.xml
@@ -183,6 +183,19 @@
                     </execution>
                 </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>
         </plugins>
     </build>
 

diff --git a/powerauth-nextstep/src/main/webapp/WEB-INF/jboss-deployment-structure.xml b/powerauth-nextstep/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" />

diff --git a/powerauth-webflow/pom.xml b/powerauth-webflow/pom.xml
@@ -232,6 +232,19 @@
                     </execution>
                 </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>
         </plugins>
     </build>
 

diff --git a/powerauth-webflow/src/main/webapp/WEB-INF/jboss-deployment-structure.xml b/powerauth-webflow/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" />