remove git properties plugin because it only led to problems

cg505 · Apr 4, 2020 · 44b2241 · 44b2241
1 parent aa0d7c0
commit 44b2241
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 29 deletions.
diff --git a/build.gradle b/build.gradle
@@ -26,7 +26,6 @@ plugins {
     id "jacoco"
     id "org.springframework.boot"
     id "com.google.cloud.tools.jib" version "2.1.0"
-    id "com.gorylenko.gradle-git-properties"
     id "com.github.node-gradle.node"
     id "net.ltgt.apt-eclipse"
     id "net.ltgt.apt-idea"
@@ -324,15 +323,10 @@ if (project.hasProperty("nodeInstall")) {
     }
 }
 
-gitProperties {
-    failOnNoGitDirectory = false
-    keys = ["git.branch", "git.commit.id.abbrev", "git.commit.id.describe"]
-}
-
 // Command to execute the JavaDoc checkstyle verification ./gradlew checkstyleMain
 checkstyle {
     toolVersion "8.10"
-    configFile file("checkstyle.xml")
+    configFile file("${rootDir}/checkstyle.xml")
     checkstyleTest.enabled = false
     maxErrors = 0
 }

diff --git a/checkstyle.xml b/checkstyle.xml
@@ -1,17 +1,10 @@
 <?xml version="1.0"?>
-<!DOCTYPE module PUBLIC
-    "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
-    "https://checkstyle.org/dtds/configuration_1_3.dtd">
-
+<!DOCTYPE module PUBLIC "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN" "https://checkstyle.org/dtds/configuration_1_3.dtd">
 <module name="Checker">
     <property name="charset" value="UTF-8" />
-
     <property name="severity" value="warning" />
-
     <property name="fileExtensions" value="java, properties, xml" />
-
     <module name="TreeWalker">
-
         <module name="JavadocMethod">
             <property name="scope" value="public" />
             <property name="allowMissingParamTags" value="false"  />

diff --git a/gradle.properties b/gradle.properties
@@ -2,8 +2,8 @@ rootProject.name=Artemis
 profile=dev
 
 # Build properties
-node_version=12.16.1
-npm_version=6.14.2
+node_version=13.8.0
+npm_version=6.14.4
 yarn_version=1.22.0
 
 # Dependency versions
@@ -24,7 +24,6 @@ jaxb_runtime_version=2.3.2
 
 # gradle plugin version
 jib_plugin_version=2.0.0
-git_properties_plugin_version=2.2.2
 gradle_node_plugin_version=2.2.3
 apt_plugin_version=0.21
 liquibase_plugin_version=2.0.2

diff --git a/gradle/profile_prod.gradle b/gradle/profile_prod.gradle
@@ -37,16 +37,6 @@ processResources {
     }
 }
 
-generateGitProperties {
-    onlyIf {
-        !source.isEmpty()
-    }
-}
-
-gitProperties {
-    keys = ['git.branch', 'git.commit.id.abbrev', 'git.commit.id.describe']
-}
-
 test.dependsOn webpack_test
 processResources.dependsOn webpack
 bootJar.dependsOn processResources
diff --git a/settings.gradle b/settings.gradle
@@ -2,7 +2,6 @@ pluginManagement {
     plugins {
         id 'org.springframework.boot' version "${spring_boot_version}"
         id 'com.google.cloud.tools.jib' version "${jib_plugin_version}"
-        id 'com.gorylenko.gradle-git-properties' version "${git_properties_plugin_version}"
         id 'com.github.node-gradle.node' version "${gradle_node_plugin_version}"
         id 'org.liquibase.gradle' version "${liquibase_plugin_version}"
         id 'net.ltgt.apt-eclipse' version "${apt_plugin_version}"