Set package.json version from Maven

master
Jens Pelzetter 2023-04-24 19:51:36 +02:00
parent 516ef5fc94
commit 0399809641
7 changed files with 37 additions and 25 deletions

View File

@ -183,7 +183,7 @@
<phase>deploy</phase> <phase>deploy</phase>
<configuration> <configuration>
<arguments>publish --userconfig ../libreccm.npmrc</arguments> <arguments>publish -userconfig ../libreccm.npmrc</arguments>
</configuration> </configuration>
</execution> --> </execution> -->
</executions> </executions>

View File

@ -1,12 +1,12 @@
{ {
"name": "@librecms/ccm-cms", "name": "@librecms/ccm-cms",
"version": "7.0.0-SNAPSHOT.2023-03-23T131710", "version": "7.0.0-SNAPSHOT.2023-04-24T174449",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "@librecms/ccm-cms", "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", "license": "LGPL-3.0-or-later",
"dependencies": { "dependencies": {
"@tiptap/core": "^2.0.0-beta.127", "@tiptap/core": "^2.0.0-beta.127",

View File

@ -1,6 +1,6 @@
{ {
"name": "@librecms/ccm-cms", "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", "description": "JavaScript stuff for ccm-cms",
"main": "target/generated-resources/assets/@content-sections/cms-admin.js", "main": "target/generated-resources/assets/@content-sections/cms-admin.js",
"types": "target/generated-resources/assets/@content-sections/cms-admin.d.ts", "types": "target/generated-resources/assets/@content-sections/cms-admin.d.ts",

View File

@ -238,7 +238,7 @@
<goal>npm</goal> <goal>npm</goal>
</goals> </goals>
<configuration> <configuration>
<arguments>pkg set version=${project.version}.${timestamp}</arguments> <arguments>version ${project.version}.${timestamp}</arguments>
</configuration> </configuration>
</execution> </execution>
<execution> <execution>
@ -266,7 +266,7 @@
<phase>deploy</phase> <phase>deploy</phase>
<configuration> <configuration>
<arguments>publish --userconfig ../libreccm.npmrc</arguments> <arguments>publish -userconfig ../libreccm.npmrc</arguments>
</configuration> </configuration>
</execution> --> </execution> -->
</executions> </executions>

View File

@ -1,12 +1,12 @@
{ {
"name": "@libreccm/ccm-static-theme-index-builder", "name": "@libreccm/ccm-static-theme-index-builder",
"version": "7.0.0", "version": "7.0.0-SNAPSHOT.23",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "@libreccm/ccm-static-theme-index-builder", "name": "@libreccm/ccm-static-theme-index-builder",
"version": "7.0.0", "version": "7.0.0-SNAPSHOT.23",
"license": "GPL-3.0", "license": "GPL-3.0",
"dependencies": { "dependencies": {
"@types/mime-types": "^2.1.1", "@types/mime-types": "^2.1.1",

View File

@ -1,6 +1,6 @@
{ {
"name": "@libreccm/ccm-static-theme-index-builder", "name": "@libreccm/ccm-static-theme-index-builder",
"version": "7.0.0-0", "version": "7.0.0-SNAPSHOT.23",
"type": "module", "type": "module",
"main": "target/dist/StaticThemeIndexBuilder.js", "main": "target/dist/StaticThemeIndexBuilder.js",
"bin": { "bin": {

View File

@ -8,6 +8,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<timestamp>${maven.build.timestamp}</timestamp> <timestamp>${maven.build.timestamp}</timestamp>
<maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ss'Z'Z</maven.build.timestamp.format> <maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ss'Z'Z</maven.build.timestamp.format>
<buildNumber></buildNumber>
</properties> </properties>
<parent> <parent>
@ -73,6 +74,16 @@
<arguments>install</arguments> <arguments>install</arguments>
</configuration> </configuration>
</execution> </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> <execution>
<id>build</id> <id>build</id>
<goals> <goals>
@ -92,20 +103,7 @@
</configuration> </configuration>
</execution> </execution>
<!-- <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>
<id>npm publish</id> <id>npm publish</id>
<goals> <goals>
<goal>npm</goal> <goal>npm</goal>
@ -114,13 +112,27 @@
<phase>deploy</phase> <phase>deploy</phase>
<configuration> <configuration>
<arguments>publish --userconfig ../libreccm.npmrc</arguments> <arguments>publish -userconfig ../libreccm.npmrc</arguments>
</configuration> </configuration>
</execution> --> </execution>
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </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> </project>