diff --git a/client/web/src/components/AppFooter.js b/client/web/src/components/AppFooter.js index 8197da4a..ba28c814 100644 --- a/client/web/src/components/AppFooter.js +++ b/client/web/src/components/AppFooter.js @@ -28,6 +28,24 @@ const AppFooter = (props) => { const saasBoostEnvironment = useSelector((state) => selectSettingsById(state, 'SAAS_BOOST_ENVIRONMENT'), ) + + const prettyVersion = (versionParameter) => { + let versionString = versionParameter?.value + try { + let versionObject = JSON.parse(versionString) + if (versionObject?.tag && versionObject?.describe && versionObject?.commit) { + if (versionObject.tag === versionObject.describe) { + versionString = versionObject.tag + } else { + versionString = versionObject.describe + "@" + versionObject.commit + } + } + } catch (e) { + console.error("Failed parsing VERSION: '" + versionString + "' to JSON", e) + } + return versionString + } + return ( @@ -37,7 +55,7 @@ const AppFooter = (props) => {  © Amazon.com, Inc. - Version {version?.value} - {saasBoostEnvironment?.value} + Version {prettyVersion(version)} - {saasBoostEnvironment?.value} ) diff --git a/functions/authorizer/pom.xml b/functions/authorizer/pom.xml index a43f31c6..b9997338 100644 --- a/functions/authorizer/pom.xml +++ b/functions/authorizer/pom.xml @@ -60,29 +60,6 @@ limitations under the License. pl.project13.maven git-commit-id-plugin - 4.0.0 - - - get-the-git-infos - - revision - - initialize - - - - true - ${project.build.outputDirectory}/git.properties - - ^git.commit.id.describe - ^git.commit.id.describe-short - ^git.commit.time - ^git.closest.tag.name - - full - ../../.git - false - diff --git a/functions/core-stack-listener/pom.xml b/functions/core-stack-listener/pom.xml index 1852c758..644eaebb 100644 --- a/functions/core-stack-listener/pom.xml +++ b/functions/core-stack-listener/pom.xml @@ -52,31 +52,8 @@ limitations under the License. maven-assembly-plugin - pl.project13.maven - git-commit-id-plugin - 4.0.0 - - - get-the-git-infos - - revision - - initialize - - - - true - ${project.build.outputDirectory}/git.properties - - ^git.commit.id.describe - ^git.commit.id.describe-short - ^git.commit.time - ^git.closest.tag.name - - full - ../../.git - false - + io.github.git-commit-id + git-commit-id-maven-plugin diff --git a/functions/ecs-service-update/pom.xml b/functions/ecs-service-update/pom.xml index 9d09cb9c..b7e641f4 100644 --- a/functions/ecs-service-update/pom.xml +++ b/functions/ecs-service-update/pom.xml @@ -52,31 +52,8 @@ limitations under the License. maven-assembly-plugin - pl.project13.maven - git-commit-id-plugin - 4.0.0 - - - get-the-git-infos - - revision - - initialize - - - - true - ${project.build.outputDirectory}/git.properties - - ^git.commit.id.describe - ^git.commit.id.describe-short - ^git.commit.time - ^git.closest.tag.name - - full - ../../.git - false - + io.github.git-commit-id + git-commit-id-maven-plugin diff --git a/functions/ecs-shutdown-services/pom.xml b/functions/ecs-shutdown-services/pom.xml index a611ce9a..74ed8c4d 100644 --- a/functions/ecs-shutdown-services/pom.xml +++ b/functions/ecs-shutdown-services/pom.xml @@ -52,31 +52,8 @@ limitations under the License. maven-assembly-plugin - pl.project13.maven - git-commit-id-plugin - 4.0.0 - - - get-the-git-infos - - revision - - initialize - - - - true - ${project.build.outputDirectory}/git.properties - - ^git.commit.id.describe - ^git.commit.id.describe-short - ^git.commit.time - ^git.closest.tag.name - - full - ../../.git - false - + io.github.git-commit-id + git-commit-id-maven-plugin diff --git a/functions/ecs-startup-services/pom.xml b/functions/ecs-startup-services/pom.xml index 0259ac3d..5a6b8172 100644 --- a/functions/ecs-startup-services/pom.xml +++ b/functions/ecs-startup-services/pom.xml @@ -52,31 +52,8 @@ limitations under the License. maven-assembly-plugin - pl.project13.maven - git-commit-id-plugin - 4.0.0 - - - get-the-git-infos - - revision - - initialize - - - - true - ${project.build.outputDirectory}/git.properties - - ^git.commit.id.describe - ^git.commit.id.describe-short - ^git.commit.time - ^git.closest.tag.name - - full - ../../.git - false - + io.github.git-commit-id + git-commit-id-maven-plugin diff --git a/functions/onboarding-app-stack-listener/pom.xml b/functions/onboarding-app-stack-listener/pom.xml index 5e4acc10..03857dcd 100644 --- a/functions/onboarding-app-stack-listener/pom.xml +++ b/functions/onboarding-app-stack-listener/pom.xml @@ -58,31 +58,8 @@ limitations under the License. maven-assembly-plugin - pl.project13.maven - git-commit-id-plugin - 4.0.0 - - - get-the-git-infos - - revision - - initialize - - - - true - ${project.build.outputDirectory}/git.properties - - ^git.commit.id.describe - ^git.commit.id.describe-short - ^git.commit.time - ^git.closest.tag.name - - full - ../../.git - false - + io.github.git-commit-id + git-commit-id-maven-plugin diff --git a/functions/onboarding-stack-listener/pom.xml b/functions/onboarding-stack-listener/pom.xml index 6dd6d680..b023aace 100644 --- a/functions/onboarding-stack-listener/pom.xml +++ b/functions/onboarding-stack-listener/pom.xml @@ -52,31 +52,8 @@ limitations under the License. maven-assembly-plugin - pl.project13.maven - git-commit-id-plugin - 4.0.0 - - - get-the-git-infos - - revision - - initialize - - - - true - ${project.build.outputDirectory}/git.properties - - ^git.commit.id.describe - ^git.commit.id.describe-short - ^git.commit.time - ^git.closest.tag.name - - full - ../../.git - false - + io.github.git-commit-id + git-commit-id-maven-plugin diff --git a/functions/system-rest-api-client/pom.xml b/functions/system-rest-api-client/pom.xml index 6b8a5494..cdfcf31b 100644 --- a/functions/system-rest-api-client/pom.xml +++ b/functions/system-rest-api-client/pom.xml @@ -52,31 +52,8 @@ limitations under the License. maven-assembly-plugin - pl.project13.maven - git-commit-id-plugin - 4.0.0 - - - get-the-git-infos - - revision - - initialize - - - - true - ${project.build.outputDirectory}/git.properties - - ^git.commit.id.describe - ^git.commit.id.describe-short - ^git.commit.time - ^git.closest.tag.name - - full - ../../.git - false - + io.github.git-commit-id + git-commit-id-maven-plugin diff --git a/functions/workload-deploy/pom.xml b/functions/workload-deploy/pom.xml index 3a5db12b..e7e71b2a 100644 --- a/functions/workload-deploy/pom.xml +++ b/functions/workload-deploy/pom.xml @@ -52,31 +52,8 @@ limitations under the License. maven-assembly-plugin - pl.project13.maven - git-commit-id-plugin - 4.0.0 - - - get-the-git-infos - - revision - - initialize - - - - true - ${project.build.outputDirectory}/git.properties - - ^git.commit.id.describe - ^git.commit.id.describe-short - ^git.commit.time - ^git.closest.tag.name - - full - ../../.git - false - + io.github.git-commit-id + git-commit-id-maven-plugin diff --git a/installer/pom.xml b/installer/pom.xml index 5d052ed5..31b2b031 100644 --- a/installer/pom.xml +++ b/installer/pom.xml @@ -78,31 +78,8 @@ limitations under the License. - pl.project13.maven - git-commit-id-plugin - 4.0.0 - - - get-the-git-infos - - revision - - initialize - - - - true - ${project.build.outputDirectory}/git.properties - - ^git.commit.id.describe - ^git.commit.id.describe-short - ^git.commit.time - ^git.closest.tag.name - - full - ${project.basedir}/../.git - false - + io.github.git-commit-id + git-commit-id-maven-plugin diff --git a/installer/src/main/java/com/amazon/aws/partners/saasfactory/saasboost/workflow/UpdateWorkflow.java b/installer/src/main/java/com/amazon/aws/partners/saasfactory/saasboost/workflow/UpdateWorkflow.java index fa6e08a9..4b5c468b 100644 --- a/installer/src/main/java/com/amazon/aws/partners/saasfactory/saasboost/workflow/UpdateWorkflow.java +++ b/installer/src/main/java/com/amazon/aws/partners/saasfactory/saasboost/workflow/UpdateWorkflow.java @@ -17,6 +17,7 @@ package com.amazon.aws.partners.saasfactory.saasboost.workflow; import com.amazon.aws.partners.saasfactory.saasboost.Constants; +import com.amazon.aws.partners.saasfactory.saasboost.GitVersionInfo; import com.amazon.aws.partners.saasfactory.saasboost.Keyboard; import com.amazon.aws.partners.saasfactory.saasboost.SaaSBoostInstall; import com.amazon.aws.partners.saasfactory.saasboost.Utils; @@ -272,21 +273,38 @@ protected List findChangedPaths(Map cloudFormationParamMap // list all staged and committed changes against the last updated commit String versionParameter = cloudFormationParamMap.get("Version"); LOGGER.debug("Found existing version: {}", versionParameter); - // if Version was created with "Commit time", we need to remove that to get commit hash - if (versionParameter.contains(",")) { - versionParameter = versionParameter.split(",")[0]; - } - // if last update or install was created with uncommitted code, assume we're working from - // the last information we have: the commit on top of which the uncommitted code was written - if (versionParameter.contains("-dirty")) { - versionParameter = versionParameter.split("-")[0]; + String commitHash = null; + if (versionParameter.startsWith("{") && versionParameter.endsWith("}")) { + // we know this is a JSON-created versionParameter, so attempt deserialization to GitVersionInfo + GitVersionInfo parsedInfo = Utils.fromJson(versionParameter, GitVersionInfo.class); + if (parsedInfo != null) { + commitHash = parsedInfo.getCommit(); + } else { + // we cannot continue with an update without being able to parse the version information + throw new RuntimeException("Unable to continue with update; cannot parse VERSION as JSON: " + + versionParameter); + } + } else { + // this versionParameter was created before the JSON migration of git information, + // so parse using the old logic + + // if Version was created with "Commit time", we need to remove that to get commit hash + if (versionParameter.contains(",")) { + versionParameter = versionParameter.split(",")[0]; + } + // if last update or install was created with uncommitted code, assume we're working from + // the last information we have: the commit on top of which the uncommitted code was written + if (versionParameter.contains("-dirty")) { + versionParameter = versionParameter.split("-")[0]; + } + commitHash = versionParameter; } - LOGGER.debug("Parsed version to: {}", versionParameter); + LOGGER.debug("Parsed commit hash to: {}", commitHash); List changedPaths = new ArrayList<>(); // -b : ignore whitespace-only changes // --name-only : only output the filename (for easy parsing) - // $(version)..HEAD : output changes since $(version) - String gitDiffCommand = "git diff -b --name-only " + versionParameter; + // $(version) : output changes since $(version) + String gitDiffCommand = "git diff -b --name-only " + commitHash; changedPaths.addAll(listPathsFromGitCommand(gitDiffCommand)); // list all untracked changes (i.e. net new un-added files) diff --git a/layers/utils/pom.xml b/layers/utils/pom.xml index 8ce2756f..809bb578 100644 --- a/layers/utils/pom.xml +++ b/layers/utils/pom.xml @@ -33,7 +33,7 @@ limitations under the License. - 5 + 4 diff --git a/layers/utils/src/main/java/com/amazon/aws/partners/saasfactory/saasboost/GitVersionInfo.java b/layers/utils/src/main/java/com/amazon/aws/partners/saasfactory/saasboost/GitVersionInfo.java new file mode 100644 index 00000000..ebdb2a49 --- /dev/null +++ b/layers/utils/src/main/java/com/amazon/aws/partners/saasfactory/saasboost/GitVersionInfo.java @@ -0,0 +1,126 @@ +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.amazon.aws.partners.saasfactory.saasboost; + +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.Objects; +import java.util.Properties; + +@JsonDeserialize(builder = GitVersionInfo.Builder.class) +public final class GitVersionInfo { + private static final Logger LOGGER = LoggerFactory.getLogger(GitVersionInfo.class); + + // VisibleForTesting + public static final String TAG_NAME_PROPERTY = "git.closest.tag.name"; + public static final String COMMIT_HASH_PROPERTY = "git.commit.id.abbrev"; + public static final String DESCRIPTION_PROPERTY = "git.commit.id.describe-short"; + + private final String tag; + private final String commit; + private final String describe; + + private GitVersionInfo(Builder b) { + this.tag = b.tag; + this.commit = b.commit; + this.describe = b.describe; + } + + public String getTag() { + return tag; + } + + public String getCommit() { + return commit; + } + + public String getDescribe() { + return describe; + } + + @Override + public boolean equals(Object other) { + if (!(other instanceof GitVersionInfo)) { + return false; + } + GitVersionInfo otherVersionInfo = (GitVersionInfo) other; + return getTag().equals(otherVersionInfo.getTag()) + && getCommit().equals(otherVersionInfo.getCommit()) + && getDescribe().equals(otherVersionInfo.getDescribe()); + } + + @Override + public int hashCode() { + return Objects.hash(tag, commit, describe); + } + + public static Builder builder() { + return new Builder(); + } + + public static GitVersionInfo fromProperties(Properties gitProperties) { + /* e.g. + * #Generated by Git-Commit-Id-Plugin + * git.closest.tag.name=v2.0.0 + * git.commit.id.abbrev=18cc13b + * git.commit.id.describe-short=v2.0.0-2-dirty + */ + return builder() + .tag(gitProperties.getProperty(TAG_NAME_PROPERTY)) + .commit(gitProperties.getProperty(COMMIT_HASH_PROPERTY)) + .describe(gitProperties.getProperty(DESCRIPTION_PROPERTY)) + .build(); + } + + @JsonPOJOBuilder(withPrefix = "") // setters aren't named with[Property] + public static class Builder { + private String tag; + private String commit; + private String describe; + + private Builder() { + + } + + public Builder tag(String tag) { + this.tag = tag; + return this; + } + + public Builder commit(String commit) { + this.commit = commit; + return this; + } + + public Builder describe(String describe) { + this.describe = describe; + return this; + } + + public GitVersionInfo build() { + if (tag == null || commit == null || describe == null) { + LOGGER.error("Invalid attempted construction of git version information." + + "tag: {}, commit: {}, describe: {}", tag, commit, describe); + throw new IllegalArgumentException("Invalid attempted construction of git version information."); + } + return new GitVersionInfo(this); + } + } +} diff --git a/layers/utils/src/main/java/com/amazon/aws/partners/saasfactory/saasboost/Utils.java b/layers/utils/src/main/java/com/amazon/aws/partners/saasfactory/saasboost/Utils.java index 8813f349..3b09053e 100644 --- a/layers/utils/src/main/java/com/amazon/aws/partners/saasfactory/saasboost/Utils.java +++ b/layers/utils/src/main/java/com/amazon/aws/partners/saasfactory/saasboost/Utils.java @@ -434,7 +434,7 @@ public static String version(Class clazz) { try (InputStream propertiesFile = clazz.getClassLoader().getResourceAsStream(GIT_PROPERTIES_FILENAME)) { Properties versionProperties = new Properties(); versionProperties.load(propertiesFile); - version = versionProperties.getProperty("git.commit.id.describe"); + version = Utils.toJson(GitVersionInfo.fromProperties(versionProperties)); } catch (Exception e) { LOGGER.error("Error loading version info from {} for {}", GIT_PROPERTIES_FILENAME, clazz.getName()); LOGGER.error(Utils.getFullStackTrace(e)); diff --git a/layers/utils/src/test/java/com/amazon/aws/partners/saasfactory/saasboost/GitVersionInfoTest.java b/layers/utils/src/test/java/com/amazon/aws/partners/saasfactory/saasboost/GitVersionInfoTest.java new file mode 100644 index 00000000..46bb2a34 --- /dev/null +++ b/layers/utils/src/test/java/com/amazon/aws/partners/saasfactory/saasboost/GitVersionInfoTest.java @@ -0,0 +1,77 @@ +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.amazon.aws.partners.saasfactory.saasboost; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + +import java.util.Properties; + +import org.junit.Before; +import org.junit.Test; + +public final class GitVersionInfoTest { + + private static final String VALID_TAG = "v2.0.0"; + private static final String VALID_COMMIT = "9ac3fbe"; + private static final String VALID_DESC = "v2.0.0-4-dirty"; + private static final String VALID_JSON = "{\"tag\":\"" + VALID_TAG + + "\",\"commit\":\"" + VALID_COMMIT + + "\",\"describe\":\"" + VALID_DESC + "\"}"; + private static final GitVersionInfo VALID_INFO = GitVersionInfo.builder() + .tag(VALID_TAG).commit(VALID_COMMIT).describe(VALID_DESC).build(); + + private Properties properties; + + @Before + public void setup() { + properties = new Properties(); + properties.setProperty(GitVersionInfo.TAG_NAME_PROPERTY, VALID_TAG); + properties.setProperty(GitVersionInfo.COMMIT_HASH_PROPERTY, VALID_COMMIT); + properties.setProperty(GitVersionInfo.DESCRIPTION_PROPERTY, VALID_DESC); + } + + @Test(expected = IllegalArgumentException.class) + public void testFromProperties_empty() { + properties.clear(); + GitVersionInfo.fromProperties(properties); + } + + @Test(expected = NullPointerException.class) + public void testFromProperties_null() { + GitVersionInfo.fromProperties(null); + } + + @Test + public void testFromProperties_basic() { + GitVersionInfo info = GitVersionInfo.fromProperties(properties); + assertNotNull(info); + assertEquals(VALID_TAG, info.getTag()); + assertEquals(VALID_COMMIT, info.getCommit()); + assertEquals(VALID_DESC, info.getDescribe()); + } + + @Test + public void testJsonConfig_toJson() { + assertEquals(VALID_JSON, Utils.toJson(VALID_INFO)); + } + + @Test + public void testJsonConfig_fromJson() { + assertEquals(VALID_INFO, Utils.fromJson(VALID_JSON, GitVersionInfo.class)); + } +} diff --git a/metering-billing/lambdas/pom.xml b/metering-billing/lambdas/pom.xml index 952a6a77..0f86ca35 100644 --- a/metering-billing/lambdas/pom.xml +++ b/metering-billing/lambdas/pom.xml @@ -53,31 +53,8 @@ limitations under the License. maven-assembly-plugin - pl.project13.maven - git-commit-id-plugin - 4.0.0 - - - get-the-git-infos - - revision - - initialize - - - - true - ${project.build.outputDirectory}/git.properties - - ^git.commit.id.describe - ^git.commit.id.describe-short - ^git.commit.time - ^git.closest.tag.name - - full - ../../.git - false - + io.github.git-commit-id + git-commit-id-maven-plugin diff --git a/pom.xml b/pom.xml index 9c892afe..248786ca 100644 --- a/pom.xml +++ b/pom.xml @@ -199,6 +199,37 @@ maven-project-info-reports-plugin 2.9 + + io.github.git-commit-id + git-commit-id-maven-plugin + 5.0.0 + + + get-the-git-infos + + revision + + initialize + + + + true + ${project.build.outputDirectory}/git.properties + + ^git.commit.id.abbrev + ^git.commit.id.describe + ^git.commit.id.describe-short + ^git.closest.tag.name + + full + ${project.basedir}/../.git + false + + + true + + + diff --git a/resources/custom-resources/app-services-ecr-macro/pom.xml b/resources/custom-resources/app-services-ecr-macro/pom.xml index e76b4e91..85a76f24 100644 --- a/resources/custom-resources/app-services-ecr-macro/pom.xml +++ b/resources/custom-resources/app-services-ecr-macro/pom.xml @@ -51,31 +51,8 @@ limitations under the License. maven-assembly-plugin - pl.project13.maven - git-commit-id-plugin - 4.0.0 - - - get-the-git-infos - - revision - - initialize - - - - true - ${project.build.outputDirectory}/git.properties - - ^git.commit.id.describe - ^git.commit.id.describe-short - ^git.commit.time - ^git.closest.tag.name - - full - ../../.git - false - + io.github.git-commit-id + git-commit-id-maven-plugin diff --git a/resources/custom-resources/cidr-dynamodb/pom.xml b/resources/custom-resources/cidr-dynamodb/pom.xml index bcdf34b0..39bf8a10 100644 --- a/resources/custom-resources/cidr-dynamodb/pom.xml +++ b/resources/custom-resources/cidr-dynamodb/pom.xml @@ -51,31 +51,8 @@ limitations under the License. maven-assembly-plugin - pl.project13.maven - git-commit-id-plugin - 4.0.0 - - - get-the-git-infos - - revision - - initialize - - - - true - ${project.build.outputDirectory}/git.properties - - ^git.commit.id.describe - ^git.commit.id.describe-short - ^git.commit.time - ^git.closest.tag.name - - full - ../../.git - false - + io.github.git-commit-id + git-commit-id-maven-plugin diff --git a/resources/custom-resources/clear-s3-bucket/pom.xml b/resources/custom-resources/clear-s3-bucket/pom.xml index 63013251..32bfb82c 100644 --- a/resources/custom-resources/clear-s3-bucket/pom.xml +++ b/resources/custom-resources/clear-s3-bucket/pom.xml @@ -51,31 +51,8 @@ limitations under the License. maven-assembly-plugin - pl.project13.maven - git-commit-id-plugin - 4.0.0 - - - get-the-git-infos - - revision - - initialize - - - - true - ${project.build.outputDirectory}/git.properties - - ^git.commit.id.describe - ^git.commit.id.describe-short - ^git.commit.time - ^git.closest.tag.name - - full - ../../.git - false - + io.github.git-commit-id + git-commit-id-maven-plugin diff --git a/resources/custom-resources/fsx-dns-name/pom.xml b/resources/custom-resources/fsx-dns-name/pom.xml index 1587dc73..bb0fef6c 100644 --- a/resources/custom-resources/fsx-dns-name/pom.xml +++ b/resources/custom-resources/fsx-dns-name/pom.xml @@ -51,31 +51,8 @@ limitations under the License. maven-assembly-plugin - pl.project13.maven - git-commit-id-plugin - 4.0.0 - - - get-the-git-infos - - revision - - initialize - - - - true - ${project.build.outputDirectory}/git.properties - - ^git.commit.id.describe - ^git.commit.id.describe-short - ^git.commit.time - ^git.closest.tag.name - - full - ../../.git - false - + io.github.git-commit-id + git-commit-id-maven-plugin diff --git a/resources/custom-resources/rds-bootstrap/pom.xml b/resources/custom-resources/rds-bootstrap/pom.xml index 2888e303..ed0d10dd 100644 --- a/resources/custom-resources/rds-bootstrap/pom.xml +++ b/resources/custom-resources/rds-bootstrap/pom.xml @@ -51,31 +51,8 @@ limitations under the License. maven-assembly-plugin - pl.project13.maven - git-commit-id-plugin - 4.0.0 - - - get-the-git-infos - - revision - - initialize - - - - true - ${project.build.outputDirectory}/git.properties - - ^git.commit.id.describe - ^git.commit.id.describe-short - ^git.commit.time - ^git.closest.tag.name - - full - ../../.git - false - + io.github.git-commit-id + git-commit-id-maven-plugin diff --git a/resources/custom-resources/rds-options/pom.xml b/resources/custom-resources/rds-options/pom.xml index 2a64e4c3..d449f721 100644 --- a/resources/custom-resources/rds-options/pom.xml +++ b/resources/custom-resources/rds-options/pom.xml @@ -51,31 +51,8 @@ limitations under the License. maven-assembly-plugin - pl.project13.maven - git-commit-id-plugin - 4.0.0 - - - get-the-git-infos - - revision - - initialize - - - - true - ${project.build.outputDirectory}/git.properties - - ^git.commit.id.describe - ^git.commit.id.describe-short - ^git.commit.time - ^git.closest.tag.name - - full - ../../.git - false - + io.github.git-commit-id + git-commit-id-maven-plugin diff --git a/resources/custom-resources/redshift-table/pom.xml b/resources/custom-resources/redshift-table/pom.xml index 62d89101..7bb5fdef 100644 --- a/resources/custom-resources/redshift-table/pom.xml +++ b/resources/custom-resources/redshift-table/pom.xml @@ -51,31 +51,8 @@ limitations under the License. maven-assembly-plugin - pl.project13.maven - git-commit-id-plugin - 4.0.0 - - - get-the-git-infos - - revision - - initialize - - - - true - ${project.build.outputDirectory}/git.properties - - ^git.commit.id.describe - ^git.commit.id.describe-short - ^git.commit.time - ^git.closest.tag.name - - full - ../../.git - false - + io.github.git-commit-id + git-commit-id-maven-plugin diff --git a/resources/custom-resources/set-instance-protection/pom.xml b/resources/custom-resources/set-instance-protection/pom.xml index 697dc4a2..3df07213 100644 --- a/resources/custom-resources/set-instance-protection/pom.xml +++ b/resources/custom-resources/set-instance-protection/pom.xml @@ -51,31 +51,8 @@ limitations under the License. maven-assembly-plugin - pl.project13.maven - git-commit-id-plugin - 4.0.0 - - - get-the-git-infos - - revision - - initialize - - - - true - ${project.build.outputDirectory}/git.properties - - ^git.commit.id.describe - ^git.commit.id.describe-short - ^git.commit.time - ^git.closest.tag.name - - full - ../../.git - false - + io.github.git-commit-id + git-commit-id-maven-plugin diff --git a/services/metrics-service/pom.xml b/services/metrics-service/pom.xml index e817a3ce..d16fc8d8 100644 --- a/services/metrics-service/pom.xml +++ b/services/metrics-service/pom.xml @@ -52,31 +52,8 @@ limitations under the License. maven-assembly-plugin - pl.project13.maven - git-commit-id-plugin - 4.0.0 - - - get-the-git-infos - - revision - - initialize - - - - true - ${project.build.outputDirectory}/git.properties - - ^git.commit.id.describe - ^git.commit.id.describe-short - ^git.commit.time - ^git.closest.tag.name - - full - ../../.git - false - + io.github.git-commit-id + git-commit-id-maven-plugin diff --git a/services/onboarding-service/pom.xml b/services/onboarding-service/pom.xml index 7d94cde5..e5363a06 100644 --- a/services/onboarding-service/pom.xml +++ b/services/onboarding-service/pom.xml @@ -52,31 +52,8 @@ limitations under the License. maven-assembly-plugin - pl.project13.maven - git-commit-id-plugin - 4.0.0 - - - get-the-git-infos - - revision - - initialize - - - - true - ${project.build.outputDirectory}/git.properties - - ^git.commit.id.describe - ^git.commit.id.describe-short - ^git.commit.time - ^git.closest.tag.name - - full - ../../.git - false - + io.github.git-commit-id + git-commit-id-maven-plugin diff --git a/services/quotas-service/pom.xml b/services/quotas-service/pom.xml index 2e5cff57..a4564099 100644 --- a/services/quotas-service/pom.xml +++ b/services/quotas-service/pom.xml @@ -52,31 +52,8 @@ limitations under the License. maven-assembly-plugin - pl.project13.maven - git-commit-id-plugin - 4.0.0 - - - get-the-git-infos - - revision - - initialize - - - - true - ${project.build.outputDirectory}/git.properties - - ^git.commit.id.describe - ^git.commit.id.describe-short - ^git.commit.time - ^git.closest.tag.name - - full - ../../.git - false - + io.github.git-commit-id + git-commit-id-maven-plugin diff --git a/services/settings-service/pom.xml b/services/settings-service/pom.xml index 6a96c999..abd3e56a 100644 --- a/services/settings-service/pom.xml +++ b/services/settings-service/pom.xml @@ -77,31 +77,8 @@ limitations under the License. maven-assembly-plugin - pl.project13.maven - git-commit-id-plugin - 4.0.0 - - - get-the-git-infos - - revision - - initialize - - - - true - ${project.build.outputDirectory}/git.properties - - ^git.commit.id.describe - ^git.commit.id.describe-short - ^git.commit.time - ^git.closest.tag.name - - full - ../../.git - false - + io.github.git-commit-id + git-commit-id-maven-plugin diff --git a/services/tenant-service/pom.xml b/services/tenant-service/pom.xml index 2f9347ee..02053880 100644 --- a/services/tenant-service/pom.xml +++ b/services/tenant-service/pom.xml @@ -52,31 +52,8 @@ limitations under the License. maven-assembly-plugin - pl.project13.maven - git-commit-id-plugin - 4.0.0 - - - get-the-git-infos - - revision - - initialize - - - - true - ${project.build.outputDirectory}/git.properties - - ^git.commit.id.describe - ^git.commit.id.describe-short - ^git.commit.time - ^git.closest.tag.name - - full - ../../.git - false - + io.github.git-commit-id + git-commit-id-maven-plugin diff --git a/services/tier-service/pom.xml b/services/tier-service/pom.xml index 744b7f0e..040bdd26 100644 --- a/services/tier-service/pom.xml +++ b/services/tier-service/pom.xml @@ -77,31 +77,8 @@ limitations under the License. maven-assembly-plugin - pl.project13.maven - git-commit-id-plugin - 4.0.0 - - - get-the-git-infos - - revision - - initialize - - - - true - ${project.build.outputDirectory}/git.properties - - ^git.commit.id.describe - ^git.commit.id.describe-short - ^git.commit.time - ^git.closest.tag.name - - full - ../../.git - false - + io.github.git-commit-id + git-commit-id-maven-plugin diff --git a/services/user-service/pom.xml b/services/user-service/pom.xml index 2e6164f8..cc15e5a3 100644 --- a/services/user-service/pom.xml +++ b/services/user-service/pom.xml @@ -52,31 +52,8 @@ limitations under the License. maven-assembly-plugin - pl.project13.maven - git-commit-id-plugin - 4.0.0 - - - get-the-git-infos - - revision - - initialize - - - - true - ${project.build.outputDirectory}/git.properties - - ^git.commit.id.describe - ^git.commit.id.describe-short - ^git.commit.time - ^git.closest.tag.name - - full - ../../.git - false - + io.github.git-commit-id + git-commit-id-maven-plugin