From 039980964174aa0e206c68d83ccea0e80283c2e5 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens.pelzetter@googlemail.com>
Date: Mon, 24 Apr 2023 19:51:36 +0200
Subject: [PATCH] Set package.json version from Maven

---
 ccm-cms-pagemodelseditor/pom.xml              |  2 +-
 ccm-cms/package-lock.json                     |  4 +-
 ccm-cms/package.json                          |  2 +-
 ccm-cms/pom.xml                               |  4 +-
 .../package-lock.json                         |  4 +-
 ccm-static-theme-index-builder/package.json   |  2 +-
 ccm-static-theme-index-builder/pom.xml        | 44 ++++++++++++-------
 7 files changed, 37 insertions(+), 25 deletions(-)

diff --git a/ccm-cms-pagemodelseditor/pom.xml b/ccm-cms-pagemodelseditor/pom.xml
index 88a7d2a4a..0025dbcfd 100644
--- a/ccm-cms-pagemodelseditor/pom.xml
+++ b/ccm-cms-pagemodelseditor/pom.xml
@@ -183,7 +183,7 @@
                         <phase>deploy</phase>
                         
                         <configuration>
-                            <arguments>publish --userconfig ../libreccm.npmrc</arguments>
+                            <arguments>publish -userconfig ../libreccm.npmrc</arguments>
                         </configuration>
                     </execution> -->
                 </executions>
diff --git a/ccm-cms/package-lock.json b/ccm-cms/package-lock.json
index 19e6bf84a..c2743a711 100644
--- a/ccm-cms/package-lock.json
+++ b/ccm-cms/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "@librecms/ccm-cms",
-    "version": "7.0.0-SNAPSHOT.2023-03-23T131710",
+    "version": "7.0.0-SNAPSHOT.2023-04-24T174449",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "@librecms/ccm-cms",
-            "version": "7.0.0-SNAPSHOT.2023-03-23T131710",
+            "version": "7.0.0-SNAPSHOT.2023-04-24T174449",
             "license": "LGPL-3.0-or-later",
             "dependencies": {
                 "@tiptap/core": "^2.0.0-beta.127",
diff --git a/ccm-cms/package.json b/ccm-cms/package.json
index b91767d19..1668411a9 100644
--- a/ccm-cms/package.json
+++ b/ccm-cms/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@librecms/ccm-cms",
-    "version": "7.0.0-SNAPSHOT.2023-03-23T131710",
+    "version": "7.0.0-SNAPSHOT.2023-04-24T174449",
     "description": "JavaScript stuff for ccm-cms",
     "main": "target/generated-resources/assets/@content-sections/cms-admin.js",
     "types": "target/generated-resources/assets/@content-sections/cms-admin.d.ts",
diff --git a/ccm-cms/pom.xml b/ccm-cms/pom.xml
index 8431a1c73..b743ba4a4 100644
--- a/ccm-cms/pom.xml
+++ b/ccm-cms/pom.xml
@@ -238,7 +238,7 @@
                             <goal>npm</goal>
                         </goals>
                         <configuration>
-                            <arguments>pkg set version=${project.version}.${timestamp}</arguments>
+                            <arguments>version ${project.version}.${timestamp}</arguments>
                         </configuration>
                     </execution>
                    <execution>
@@ -266,7 +266,7 @@
                         <phase>deploy</phase>
                         
                         <configuration>
-                            <arguments>publish --userconfig ../libreccm.npmrc</arguments>
+                            <arguments>publish -userconfig ../libreccm.npmrc</arguments>
                         </configuration>
                     </execution> -->
                 </executions>
diff --git a/ccm-static-theme-index-builder/package-lock.json b/ccm-static-theme-index-builder/package-lock.json
index faaa5fae2..db72a8170 100644
--- a/ccm-static-theme-index-builder/package-lock.json
+++ b/ccm-static-theme-index-builder/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "@libreccm/ccm-static-theme-index-builder",
-    "version": "7.0.0",
+    "version": "7.0.0-SNAPSHOT.23",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "@libreccm/ccm-static-theme-index-builder",
-            "version": "7.0.0",
+            "version": "7.0.0-SNAPSHOT.23",
             "license": "GPL-3.0",
             "dependencies": {
                 "@types/mime-types": "^2.1.1",
diff --git a/ccm-static-theme-index-builder/package.json b/ccm-static-theme-index-builder/package.json
index 598111e81..b25f926a0 100644
--- a/ccm-static-theme-index-builder/package.json
+++ b/ccm-static-theme-index-builder/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@libreccm/ccm-static-theme-index-builder",
-    "version": "7.0.0-0",
+    "version": "7.0.0-SNAPSHOT.23",
     "type": "module",
     "main": "target/dist/StaticThemeIndexBuilder.js",
     "bin": {
diff --git a/ccm-static-theme-index-builder/pom.xml b/ccm-static-theme-index-builder/pom.xml
index 7f83e1910..59f811a14 100644
--- a/ccm-static-theme-index-builder/pom.xml
+++ b/ccm-static-theme-index-builder/pom.xml
@@ -8,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>
@@ -73,6 +74,16 @@
                             <arguments>install</arguments>
                         </configuration>
                     </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>
@@ -92,20 +103,7 @@
                         </configuration>
                     </execution>
 
-                    <!-- <execution>
-                        <id>npm login</id>
-                        <goals>
-                            <goal>npm</goal>
-                        </goals>
-
-                        <phase>deploy</phase>
-
-                        <configuration>
-                            <arguments>login -userconfig ../libreccm.npmrc -scope=@libreccm -registry=https://git.libreccm.org/api/packages/libreccm/npm/</arguments>
-                        </configuration>
-                    </execution> -->
-                    
-                    <!-- <execution>
+                    <execution>
                         <id>npm publish</id>
                         <goals>
                             <goal>npm</goal>
@@ -114,13 +112,27 @@
                         <phase>deploy</phase>
 
                         <configuration>
-                            <arguments>publish --userconfig ../libreccm.npmrc</arguments>
+                            <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>