Merge pull request #18 from IntershopCommunicationsAG/update44

Update44

README.asciidoc

@@ -1,5 +1,5 @@
 = Version Recommender Plugin
-:latestRevision: 2.1.0
+:latestRevision: 2.3.0
 :toc:
 :icons: font
 

build.gradle

@@ -12,7 +12,7 @@ plugins {
     id 'maven-publish'
 
     // intershop version plugin
-    id 'com.intershop.gradle.scmversion' version '3.2.0'
+    id 'com.intershop.gradle.scmversion' version '3.4.0'
 
     // plugin for documentation
     id 'org.asciidoctor.convert' version '1.5.3'
@@ -34,6 +34,15 @@ group 'com.intershop.gradle.versionrecommender'
 description 'Gradle Version Recommendation Plugin'
 version = scm.version.version
 
+gradlePlugin {
+    plugins {
+        versionrecommenderPlugin {
+            id = 'com.intershop.gradle.versionrecommender'
+            implementationClass = 'com.intershop.gradle.versionrecommender.VersionRecommenderPlugin'
+        }
+    }
+}
+
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
 
@@ -219,8 +228,8 @@ pluginBundle {
     tags = ['intershop', 'gradle', 'plugin', 'version', 'dependencies', 'versionrecommendation']
 
     plugins {
-        gradleVersionRecommender {
-            id = 'com.intershop.gradle.versionrecommender'
+        versionrecommenderPlugin {
+            id = gradlePlugin.plugins.versionrecommenderPlugin.id
             displayName = project.description
         }
     }

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-all.zip

src/main/groovy/com/intershop/gradle/versionrecommender/VersionRecommenderPlugin.groovy

@@ -15,8 +15,8 @@
  */
 package com.intershop.gradle.versionrecommender
 
-import com.intershop.gradle.versionrecommender.extension.VersionRecommenderExtension
 import com.intershop.gradle.versionrecommender.extension.PublicationXmlGenerator
+import com.intershop.gradle.versionrecommender.extension.VersionRecommenderExtension
 import com.intershop.gradle.versionrecommender.util.NoVersionException
 import com.netflix.nebula.interop.ConfigurationsKt
 import groovy.transform.CompileStatic
@@ -28,26 +28,13 @@ import org.gradle.api.Action
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.XmlProvider
-import org.gradle.api.artifacts.Configuration
-import org.gradle.api.artifacts.Dependency
-import org.gradle.api.artifacts.DependencyArtifact
-import org.gradle.api.artifacts.DependencyResolveDetails
-import org.gradle.api.artifacts.DependencySet
-import org.gradle.api.artifacts.ExcludeRule
-import org.gradle.api.artifacts.ExternalModuleDependency
-import org.gradle.api.artifacts.ModuleDependency
-import org.gradle.api.artifacts.ModuleVersionSelector
-import org.gradle.api.artifacts.ProjectDependency
-import org.gradle.api.artifacts.ResolvableDependencies
-import org.gradle.api.artifacts.ResolvedDependency
+import org.gradle.api.artifacts.*
 import org.gradle.api.publish.ivy.IvyPublication
 import org.gradle.api.publish.ivy.plugins.IvyPublishPlugin
 import org.gradle.api.publish.maven.MavenPublication
 import org.gradle.api.publish.maven.plugins.MavenPublishPlugin
 import org.gradle.api.specs.Spec
-import org.gradle.api.tasks.TaskDependency
 
-import javax.annotation.Nullable
 import java.lang.reflect.Method
 
 /**
@@ -267,7 +254,6 @@ class VersionRecommenderPlugin implements Plugin<Project> {
                                                 if (rv) {
                                                     details.useVersion(rv)
                                                 } else {
-                                                    println "not found ........ "
                                                     throw new NoVersionException("Version for '${details.requested.group}:${details.requested.name}' not found! Please check your dependency configuration and the version recommender version.")
                                                 }
                                             }

src/main/groovy/com/intershop/gradle/versionrecommender/extension/PublicationXmlGenerator.groovy

@@ -17,7 +17,6 @@ package com.intershop.gradle.versionrecommender.extension
 
 import com.intershop.gradle.versionrecommender.recommendation.RecommendationProviderContainer
 import com.intershop.gradle.versionrecommender.util.ModuleNotationParser
-import com.sun.org.apache.xerces.internal.dom.DocumentImpl
 import groovy.transform.CompileStatic
 import org.gradle.api.Action
 import org.gradle.api.GradleException

src/main/groovy/com/intershop/gradle/versionrecommender/extension/VersionRecommenderExtension.groovy

@@ -33,7 +33,7 @@ class VersionRecommenderExtension {
 
     final static String EXTENSIONNAME = 'versionRecommendation'
 
-    private Project project
+    private final Project project
 
     /**
      * Holds the version recommendation.

src/main/groovy/com/intershop/gradle/versionrecommender/recommendation/IvyRecommendationProvider.groovy

@@ -18,13 +18,10 @@ package com.intershop.gradle.versionrecommender.recommendation
 import com.intershop.gradle.versionrecommender.util.FileInputType
 import groovy.transform.CompileStatic
 import groovy.util.logging.Slf4j
-import groovy.util.slurpersupport.GPathResult
-import groovy.util.slurpersupport.NodeChildren
 import org.gradle.api.Project
 import org.w3c.dom.Document
 import org.w3c.dom.Element
 import org.w3c.dom.NodeList
-import org.w3c.dom.Node
 
 import javax.xml.parsers.DocumentBuilder
 import javax.xml.parsers.DocumentBuilderFactory

src/main/groovy/com/intershop/gradle/versionrecommender/recommendation/RecommendationStrategy.groovy

@@ -1,6 +1,5 @@
 package com.intershop.gradle.versionrecommender.recommendation
 
-import org.gradle.api.artifacts.Dependency
 import org.gradle.api.artifacts.DependencyResolveDetails
 import org.gradle.api.artifacts.ModuleVersionSelector
 

src/main/groovy/com/intershop/gradle/versionrecommender/scm/ScmCommitException.groovy

@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-
 package com.intershop.gradle.versionrecommender.scm
 
 import groovy.transform.CompileStatic

src/main/groovy/com/intershop/gradle/versionrecommender/scm/SshConnector.groovy

@@ -13,8 +13,6 @@
  * See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-
-
 package com.intershop.gradle.versionrecommender.scm
 
 import com.jcraft.jsch.JSch

src/main/groovy/com/intershop/gradle/versionrecommender/update/FileVersionProvider.groovy

@@ -16,13 +16,6 @@
 package com.intershop.gradle.versionrecommender.update
 
 import groovy.transform.CompileStatic
-import groovy.util.slurpersupport.GPathResult
-import org.w3c.dom.Document
-import org.w3c.dom.Element
-import org.w3c.dom.NodeList
-
-import javax.xml.parsers.DocumentBuilder
-import javax.xml.parsers.DocumentBuilderFactory
 
 /**
  * This class provides methods to collect all available version in file based repositories.