From 360b0d98824d2f51439193e0e3b7ba913eb42a0c Mon Sep 17 00:00:00 2001 From: Chas Honton Date: Mon, 24 Feb 2020 20:09:15 -0800 Subject: [PATCH] Rename plugin: maven-git-code-format -> git-code-format-maven-plugin Closes: #38 --- pom.xml | 5 ++--- src/main/java/com/cosium/code/format/InstallHooksMojo.java | 2 +- .../com/cosium/code/format/git-code-format.pre-commit.sh | 3 +++ .../cosium/code/format/maven-git-code-format.pre-commit.sh | 3 --- src/test/java/com/cosium/code/format/AbstractTest.java | 4 ++-- src/test/projects/non-root-module/module/pom.xml | 2 +- src/test/projects/single-module/pom.xml | 2 +- 7 files changed, 10 insertions(+), 11 deletions(-) create mode 100644 src/main/resources/com/cosium/code/format/git-code-format.pre-commit.sh delete mode 100644 src/main/resources/com/cosium/code/format/maven-git-code-format.pre-commit.sh diff --git a/pom.xml b/pom.xml index d698250..38fe4a0 100644 --- a/pom.xml +++ b/pom.xml @@ -3,11 +3,11 @@ 4.0.0 com.cosium.code - maven-git-code-format + git-code-format-maven-plugin 1.40-SNAPSHOT maven-plugin - maven-git-code-format Maven Plugin + Git Code Format Maven Plugin A maven plugin that automatically deploys https://github.com/google/google-java-format code formatter as a pre-commit git hook @@ -19,7 +19,6 @@ 2.6 3.9 1.3 - 1.25 diff --git a/src/main/java/com/cosium/code/format/InstallHooksMojo.java b/src/main/java/com/cosium/code/format/InstallHooksMojo.java index 532a455..9c0eefb 100644 --- a/src/main/java/com/cosium/code/format/InstallHooksMojo.java +++ b/src/main/java/com/cosium/code/format/InstallHooksMojo.java @@ -29,7 +29,7 @@ @Mojo(name = "install-hooks", defaultPhase = LifecyclePhase.INITIALIZE, threadSafe = true) public class InstallHooksMojo extends AbstractMavenGitCodeFormatMojo { - private static final String BASE_PLUGIN_PRE_COMMIT_HOOK = "maven-git-code-format.pre-commit.sh"; + private static final String BASE_PLUGIN_PRE_COMMIT_HOOK = "git-code-format.pre-commit.sh"; private static final String PRE_COMMIT_HOOK_BASE_SCRIPT = "pre-commit"; private final ExecutableManager executableManager = new ExecutableManager(this::getLog); diff --git a/src/main/resources/com/cosium/code/format/git-code-format.pre-commit.sh b/src/main/resources/com/cosium/code/format/git-code-format.pre-commit.sh new file mode 100644 index 0000000..409be68 --- /dev/null +++ b/src/main/resources/com/cosium/code/format/git-code-format.pre-commit.sh @@ -0,0 +1,3 @@ +#!/bin/bash +set -e +%s -f %s com.cosium.code:git-code-format-maven-plugin:on-pre-commit %s diff --git a/src/main/resources/com/cosium/code/format/maven-git-code-format.pre-commit.sh b/src/main/resources/com/cosium/code/format/maven-git-code-format.pre-commit.sh deleted file mode 100644 index f136739..0000000 --- a/src/main/resources/com/cosium/code/format/maven-git-code-format.pre-commit.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -set -e -%s -f %s git-code-format:on-pre-commit %s \ No newline at end of file diff --git a/src/test/java/com/cosium/code/format/AbstractTest.java b/src/test/java/com/cosium/code/format/AbstractTest.java index b466e8c..95f9a14 100644 --- a/src/test/java/com/cosium/code/format/AbstractTest.java +++ b/src/test/java/com/cosium/code/format/AbstractTest.java @@ -34,7 +34,7 @@ @RunWith(MavenJUnitTestRunner.class) public abstract class AbstractTest { private static final String GROUP_ID = "com.cosium.code"; - private static final String ARTIFACT_ID = "maven-git-code-format"; + private static final String ARTIFACT_ID = "git-code-format-maven-plugin"; @Rule public final TestResources resources; private final MavenRuntime maven; @@ -50,7 +50,7 @@ public AbstractTest( this.resources = new TestResources( "src/test/projects", - Files.createTempDirectory("maven-git-code-format-test").toString()); + Files.createTempDirectory(ARTIFACT_ID + "-test").toString()); this.maven = mavenBuilder.withCliOptions("-B", "-U").build(); this.projectRootDirectoryName = projectRootDirectoryName; } diff --git a/src/test/projects/non-root-module/module/pom.xml b/src/test/projects/non-root-module/module/pom.xml index 6ad1950..5d3f15f 100644 --- a/src/test/projects/non-root-module/module/pom.xml +++ b/src/test/projects/non-root-module/module/pom.xml @@ -17,7 +17,7 @@ com.cosium.code - maven-git-code-format + git-code-format-maven-plugin ${it-project.version} diff --git a/src/test/projects/single-module/pom.xml b/src/test/projects/single-module/pom.xml index baa4298..01bd31a 100644 --- a/src/test/projects/single-module/pom.xml +++ b/src/test/projects/single-module/pom.xml @@ -17,7 +17,7 @@ com.cosium.code - maven-git-code-format + git-code-format-maven-plugin ${it-project.version}