Merge pull request #18 from rundeck-plugins/replage-log4j

fix log4j error

Author: ltamaster

.github/workflows/gradle.yml

@@ -0,0 +1,34 @@
+name: Java CI
+
+on: [push]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Get Fetch Tags
+        run: git -c protocol.version=2 fetch --tags --progress --no-recurse-submodules origin
+        if: "!contains(github.ref, 'refs/tags')"
+      - name: Set up JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+      - name: Build with Gradle
+        run: ./gradlew build
+      - name: Get Release Version
+        id: get_version
+        run: VERSION=$(./gradlew currentVersion -q -Prelease.quiet) && echo ::set-output name=VERSION::$VERSION
+      - name: Upload git-plugin jar
+        uses: actions/[email protected]
+        with:
+          # Artifact name
+          name: Grails-Plugin-${{ steps.get_version.outputs.VERSION }}
+          # Directory containing files to upload
+          path: build/libs/git-plugin-${{ steps.get_version.outputs.VERSION }}.jar

.github/workflows/release.yml

@@ -0,0 +1,47 @@
+on:
+  push:
+    # Sequence of patterns matched against refs/tags
+    tags:
+      - '*' # Push events to matching v*, i.e. v1.0, v20.15.10
+
+name: Upload Release Asset
+
+jobs:
+  build:
+    name: Upload Release Asset
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: set up JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: Build with Gradle
+        run: ./gradlew build
+      - name: Get Release Version
+        id: get_version
+        run: VERSION=$(./gradlew currentVersion -q -Prelease.quiet) && echo ::set-output name=VERSION::$VERSION
+      - name: Create Release
+        id: create_release
+        uses: actions/[email protected]
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: Release ${{ steps.get_version.outputs.VERSION }}
+          draft: false
+          prerelease: false
+      - name: Upload Release Asset (jar)
+        id: upload-release-asset
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: build/libs/git-plugin-${{ steps.get_version.outputs.VERSION }}.jar
+          asset_name: git-plugin-${{ steps.get_version.outputs.VERSION }}.jar
+          asset_content_type: application/octet-stream
+

.gitignore

@@ -1,4 +1,3 @@
 .gradle
 .idea
 build
-gradle

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'pl.allegro.tech.build.axion-release' version '1.3.2'
+    id 'pl.allegro.tech.build.axion-release' version '1.11.0'
 }
 
 group 'com.rundeck'
@@ -10,7 +10,7 @@ ext.pluginName = 'Git Plugin'
 ext.pluginDescription = 'This is a git plugin (based on Jgit) which contain a Resource model and worflow steps'
 
 scmVersion {
-    ignoreUncommittedChanges = false
+    ignoreUncommittedChanges = true
     tag {
         prefix = ''
         versionSeparator = ''
@@ -48,6 +48,7 @@ dependencies {
     testCompile group: 'junit', name: 'junit', version: '4.12'
 
     compile group: 'org.rundeck', name: 'rundeck-core', version: '2.11.4'
+    compile 'org.slf4j:slf4j-api:1.7.30'
 
     pluginLibs( 'org.eclipse.jgit:org.eclipse.jgit:4.4.0.201606070830-r') {
         exclude module: 'slf4j-api'

gradle/wrapper/gradle-wrapper.jar

@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -6,7 +6,6 @@ import com.dtolabs.rundeck.core.plugins.Plugin
 import com.dtolabs.rundeck.core.plugins.configuration.Describable
 import com.dtolabs.rundeck.core.plugins.configuration.Description
 import com.dtolabs.rundeck.core.plugins.configuration.PropertyUtil
-import com.dtolabs.rundeck.plugins.PluginLogger
 import com.dtolabs.rundeck.plugins.ServiceNameConstants
 import com.dtolabs.rundeck.core.plugins.configuration.PropertyScope
 import com.dtolabs.rundeck.plugins.descriptions.PluginDescription

src/main/groovy/com/rundeck/plugin/GitCloneWorkflowStep.groovy

@@ -1,7 +1,6 @@
 package com.rundeck.plugin
 
 import com.rundeck.plugin.util.PluginSshSessionFactory
-import org.apache.log4j.Logger
 import org.eclipse.jgit.api.Git
 import org.eclipse.jgit.api.PullResult
 import org.eclipse.jgit.api.TransportCommand
@@ -16,12 +15,14 @@ import java.nio.file.Files
 import java.nio.file.Path
 import java.nio.file.Paths
 
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
 /**
  * Created by luistoledo on 12/20/17.
  */
 class GitManager {
 
-    static Logger logger = Logger.getLogger(GitManager.class);
+    private static final Logger logger = LoggerFactory.getLogger(GitManager.class);
 
     public static final String REMOTE_NAME = "origin"
     Git git

src/main/groovy/com/rundeck/plugin/GitManager.groovy

@@ -10,7 +10,6 @@ import com.dtolabs.rundeck.core.resources.format.ResourceFormatParser
 import com.dtolabs.rundeck.core.resources.format.ResourceFormatParserException
 import com.dtolabs.rundeck.core.resources.format.UnsupportedFormatException
 import com.dtolabs.utils.Streams
-import org.apache.log4j.Logger
 
 
 /**