Explorar el Código

Fix maven warnings about dynamic versioning (#1559)

Ruslan Ibragimov hace 3 años
padre
commit
6ab0e40685

+ 3 - 2
.github/workflows/branch-deploy.yml

@@ -35,8 +35,9 @@ jobs:
       - name: Build
         id: build
         run: |
-          mvn clean package -Pprod -DskipTests -DbuildVersion=$GITHUB_SHA
-          export VERSION=$(mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' -DbuildVersion=$GITHUB_SHA --non-recursive exec:exec)
+          mvn versions:set -DnewVersion=$GITHUB_SHA
+          mvn clean package -Pprod -DskipTests
+          export VERSION=$(mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec)
           echo "::set-output name=version::${VERSION}"
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1

+ 3 - 2
.github/workflows/master.yaml

@@ -26,8 +26,9 @@ jobs:
       - name: Build
         id: build
         run: |
-          mvn clean package -Pprod -DskipTests -DbuildVersion=$GITHUB_SHA
-          export VERSION=$(mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' -DbuildVersion=$GITHUB_SHA --non-recursive exec:exec)
+          mvn versions:set -DnewVersion=$GITHUB_SHA
+          mvn clean package -Pprod -DskipTests
+          export VERSION=$(mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec)
           echo "::set-output name=version::${VERSION}"
 #################
 #               #

+ 3 - 2
.github/workflows/release.yaml

@@ -33,8 +33,9 @@ jobs:
       - name: Build with Maven
         id: build
         run: |
-          mvn clean package -Pprod -DskipTests -DbuildVersion=${{ github.event.release.tag_name }}
-          export VERSION=$(mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' -DbuildVersion=${{ github.event.release.tag_name }} --non-recursive exec:exec)
+          mvn versions:set -DnewVersion=${{ github.event.release.tag_name }}
+          mvn clean package -Pprod -DskipTests
+          export VERSION=$(mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec)
           echo ::set-output name=version::${VERSION}
 
       - name: Upload files to a GitHub release

+ 1 - 1
kafka-ui-api/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>kafka-ui</artifactId>
         <groupId>com.provectus</groupId>
-        <version>${buildVersion}</version>
+        <version>0.0.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 1 - 1
kafka-ui-contract/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>kafka-ui</artifactId>
         <groupId>com.provectus</groupId>
-        <version>${buildVersion}</version>
+        <version>0.0.1-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

+ 1 - 1
kafka-ui-e2e-checks/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>kafka-ui</artifactId>
         <groupId>com.provectus</groupId>
-        <version>${buildVersion}</version>
+        <version>0.0.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 1 - 2
pom.xml

@@ -45,7 +45,6 @@
         </frontend-generated-sources-directory>
         <sonar.organization>provectus</sonar.organization>
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>
-        <buildVersion>0.0.1-SNAPSHOT</buildVersion>
     </properties>
 
     <repositories>
@@ -85,7 +84,7 @@
 
     <groupId>com.provectus</groupId>
     <artifactId>kafka-ui</artifactId>
-    <version>${buildVersion}</version>
+    <version>0.0.1-SNAPSHOT</version>
     <name>kafka-ui</name>
     <description>Kafka metrics for UI panel</description>
 </project>