From ad1686e63d98013e410c2253691864c150d23a40 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens.pelzetter@googlemail.com>
Date: Mon, 24 Apr 2023 20:03:42 +0200
Subject: [PATCH] Added change for NPM to all modules deploying NPM modules

---
 ccm-cms-pagemodelseditor/pom.xml |  38 ++++++++--
 ccm-cms/pom.xml                  | 126 +++++++++++++++++--------------
 2 files changed, 103 insertions(+), 61 deletions(-)

diff --git a/ccm-cms-pagemodelseditor/pom.xml b/ccm-cms-pagemodelseditor/pom.xml
index 0025dbcfd..752334fad 100644
--- a/ccm-cms-pagemodelseditor/pom.xml
+++ b/ccm-cms-pagemodelseditor/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
@@ -7,6 +8,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <timestamp>${maven.build.timestamp}</timestamp>
         <maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ss'Z'Z</maven.build.timestamp.format>
+        <buildNumber></buildNumber>
     </properties>
 
     <parent>
@@ -155,6 +157,16 @@
                             <goal>npm</goal>
                         </goals>
                     </execution>
+                    <!-- Sync Maven module version and NPM module version -->
+                    <execution>
+                        <id>npm version</id>
+                        <goals>
+                            <goal>npm</goal>
+                        </goals>
+                        <configuration>
+                            <arguments>version --allow-same-version=true ${project.version}${buildNumber}</arguments>
+                        </configuration>
+                    </execution>
                     <execution>
                         <id>build</id>
                         <goals>
@@ -173,22 +185,36 @@
                             <arguments>link</arguments>
                         </configuration>
                     </execution>
-                    
-                    <!-- <execution>
+
+                    <execution>
                         <id>npm publish</id>
                         <goals>
                             <goal>npm</goal>
                         </goals>
-                        
+
                         <phase>deploy</phase>
-                        
+
                         <configuration>
                             <arguments>publish -userconfig ../libreccm.npmrc</arguments>
                         </configuration>
-                    </execution> -->
+                    </execution>
                 </executions>
             </plugin>
 
         </plugins>
     </build>
+
+    <profiles>
+        <profile>
+            <id>with-buildnumber</id>
+            <activation>
+                <property>
+                    <name>env.BUILD_NUMBER</name>
+                </property>
+            </activation>
+            <properties>
+                <buildNumber>.${env.BUILD_NUMBER}</buildNumber>
+            </properties>
+        </profile>
+    </profiles>
 </project>
diff --git a/ccm-cms/pom.xml b/ccm-cms/pom.xml
index b743ba4a4..6f512e179 100644
--- a/ccm-cms/pom.xml
+++ b/ccm-cms/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
@@ -13,13 +14,14 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <timestamp>${maven.build.timestamp}</timestamp>
         <maven.build.timestamp.format>yyyy-MM-dd'T'HHmmss</maven.build.timestamp.format>
+        <buildNumber></buildNumber>
     </properties>
-    
+
     <groupId>org.librecms</groupId>
     <artifactId>ccm-cms</artifactId>
-   
+
     <name>LibreCMS</name>
-    
+
     <licenses>
         <license>
             <name>Lesser GPL 2.1</name>
@@ -53,7 +55,7 @@
             <artifactId>hibernate-envers</artifactId>
             <scope>provided</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.hibernate.validator</groupId>
             <artifactId>hibernate-validator</artifactId>
@@ -64,19 +66,19 @@
             <artifactId>hibernate-validator-cdi</artifactId>
             <scope>provided</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-search-orm</artifactId>
             <scope>provided</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-multipart-provider</artifactId>
             <scope>provided</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>javax.mvc</groupId>
             <artifactId>javax.mvc-api</artifactId>
@@ -92,7 +94,7 @@
             <artifactId>krazo-freemarker</artifactId>
             <!--<scope>provided</scope>-->
         </dependency>
-        
+
         <dependency>
             <groupId>com.fasterxml.jackson.jaxrs</groupId>
             <artifactId>jackson-jaxrs-json-provider</artifactId>
@@ -105,14 +107,14 @@
             <groupId>com.fasterxml.jackson.datatype</groupId>
             <artifactId>jackson-datatype-jsr310</artifactId>
         </dependency>
-        
+
         <!-- Dependencies for log4j 2 -->
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
             <scope>provided</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.shiro</groupId>
             <artifactId>shiro-core</artifactId>
@@ -121,18 +123,18 @@
             <groupId>org.apache.shiro</groupId>
             <artifactId>shiro-web</artifactId>
         </dependency>
-        
+
         <dependency>
             <groupId>org.jsoup</groupId>
             <artifactId>jsoup</artifactId>
         </dependency>
-        
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-core</artifactId>
@@ -150,7 +152,7 @@
             <version>${project.parent.version}</version>
             <scope>test</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>nl.jqno.equalsverifier</groupId>
             <artifactId>equalsverifier</artifactId>
@@ -172,7 +174,7 @@
             <artifactId>shrinkwrap-resolver-impl-maven</artifactId>
             <scope>test</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
@@ -193,7 +195,7 @@
                 <directory>./target/generated-resources</directory>
             </resource>
         </resources>
-        
+
         <testResources>
             <testResource>
                 <directory>src/test/resources</directory>
@@ -215,7 +217,7 @@
                     <encoding>${project.build.sourceEncoding}</encoding>
                 </configuration>
             </plugin>
-            
+
             <plugin>
                 <groupId>com.github.eirslett</groupId>
                 <artifactId>frontend-maven-plugin</artifactId>
@@ -233,20 +235,20 @@
                         </configuration>
                     </execution>
                     <execution>
-                        <id>set package version</id>
-                        <goals>
-                            <goal>npm</goal>
-                        </goals>
-                        <configuration>
-                            <arguments>version ${project.version}.${timestamp}</arguments>
-                        </configuration>
-                    </execution>
-                   <execution>
                         <id>npm install</id>
                         <goals>
                             <goal>npm</goal>
                         </goals>
                     </execution>
+                    <execution>
+                        <id>npm version</id>
+                        <goals>
+                            <goal>npm</goal>
+                        </goals>
+                        <configuration>
+                            <arguments>version --allow-same-version=true ${project.version}.${buildNumber}</arguments>
+                        </configuration>
+                    </execution>
                     <execution>
                         <id>build</id>
                         <goals>
@@ -256,22 +258,22 @@
                             <arguments>run build</arguments>
                         </configuration>
                     </execution>
-                    
-                    <!-- <execution>
+
+                    <execution>
                         <id>npm publish</id>
                         <goals>
                             <goal>npm</goal>
                         </goals>
-                        
+
                         <phase>deploy</phase>
-                        
+
                         <configuration>
                             <arguments>publish -userconfig ../libreccm.npmrc</arguments>
                         </configuration>
-                    </execution> -->
+                    </execution>
                 </executions>
             </plugin>
-            
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -326,7 +328,7 @@
                     </execution>
                 </executions>
             </plugin>
-            
+
         </plugins>
 
     </build>
@@ -367,7 +369,7 @@
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
             </plugin>
-            
+
             <plugin>
                 <groupId>com.github.spotbugs</groupId>
                 <artifactId>spotbugs-maven-plugin</artifactId>
@@ -423,9 +425,23 @@
             </plugin>
         </plugins>
     </reporting>
-    
-    
+
+
     <profiles>
+        <profiles>
+            <profile>
+                <id>with-buildnumber</id>
+                <activation>
+                    <property>
+                        <name>env.BUILD_NUMBER</name>
+                    </property>
+                </activation>
+                <properties>
+                    <buildNumber>.${env.BUILD_NUMBER}</buildNumber>
+                </properties>
+            </profile>
+        </profiles>
+
         <profile>
             <id>run-its-with-wildfly-h2mem</id>
             <dependencies>
@@ -438,9 +454,9 @@
                     <groupId>net.sf.saxon</groupId>
                     <artifactId>Saxon-HE</artifactId>
                 </dependency>
-                    
+
             </dependencies>
-            
+
             <build>
                 <testResources>
                     <testResource>
@@ -452,9 +468,9 @@
                     <testResource>
                         <directory>${project.build.directory}/generated-resources</directory>
                     </testResource>
-                    
+
                 </testResources>
-                
+
                 <plugins>
                     <plugin>
                         <groupId>de.jpdigital</groupId>
@@ -553,7 +569,7 @@
                     </plugin>
                 </plugins>
             </build>
-            
+
             <reporting>
                 <plugins>
                     <plugin>
@@ -571,7 +587,7 @@
                 </plugins>
             </reporting>
         </profile>
-        
+
         <profile>
             <id>run-its-with-wildfly-pgsql</id>
             <dependencies>
@@ -590,7 +606,7 @@
                     <scope>provided</scope>
                 </dependency>
             </dependencies>
-            
+
             <build>
                 <testResources>
                     <testResource>
@@ -603,7 +619,7 @@
                         <directory>${project.build.directory}/generated-resources</directory>
                     </testResource>
                 </testResources>
-                
+
                 <plugins>
                     <plugin>
                         <groupId>de.jpdigital</groupId>
@@ -732,7 +748,7 @@
                     </plugin>
                 </plugins>
             </build>
-            
+
             <reporting>
                 <plugins>
                     <plugin>
@@ -750,7 +766,7 @@
                 </plugins>
             </reporting>
         </profile>
-      
+
         <profile>
             <id>run-its-in-remote-wildfly-h2mem</id>
             <dependencies>
@@ -764,7 +780,7 @@
                     <artifactId>Saxon-HE</artifactId>
                 </dependency>
             </dependencies>
-            
+
             <build>
                 <testResources>
                     <testResource>
@@ -777,7 +793,7 @@
                         <directory>${project.build.directory}/generated-resources</directory>
                     </testResource>
                 </testResources>
-                
+
                 <plugins>
                     <plugin>
                         <groupId>de.jpdigital</groupId>
@@ -825,7 +841,7 @@
                     </plugin>
                 </plugins>
             </build>
-            
+
             <reporting>
                 <plugins>
                     <plugin>
@@ -843,7 +859,7 @@
                 </plugins>
             </reporting>
         </profile>
-        
+
         <profile>
             <id>run-its-in-remote-wildfly-pgsql</id>
             <dependencies>
@@ -857,7 +873,7 @@
                     <artifactId>Saxon-HE</artifactId>
                 </dependency>
             </dependencies>
-            
+
             <build>
                 <testResources>
                     <testResource>
@@ -870,7 +886,7 @@
                         <directory>${project.build.directory}/generated-resources</directory>
                     </testResource>
                 </testResources>
-                
+
                 <plugins>
                     <plugin>
                         <groupId>de.jpdigital</groupId>
@@ -918,7 +934,7 @@
                     </plugin>
                 </plugins>
             </build>
-            
+
             <reporting>
                 <plugins>
                     <plugin>
@@ -938,5 +954,5 @@
         </profile>
 
     </profiles>
-    
+
 </project>