enhancement: project name and version are read from project.properties resource, prepare maven central deployment

Author: Gerhard Dickescheid

build.gradle

@@ -6,25 +6,31 @@
  *
  */
 
+
 group 'de.eacg'
-version '0.1.1-SNAPSHOT'
+version '0.1.1'
 
 buildscript {
     dependencies {
-        classpath 'de.eacg:ecs-gradle-plugin:0.1.1-SNAPSHOT'
-
+//        classpath 'de.eacg:ecs-gradle-plugin:0.1.1-SNAPSHOT'
+        classpath 'io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.5.3'
     }
     repositories {
         mavenLocal()
+        mavenCentral()
     }
 }
 
 apply plugin: 'groovy'
 apply plugin: 'maven'
-apply plugin: 'de.eacg.ecs.plugin.gradle'
+apply plugin: 'signing'
+apply plugin: 'io.codearte.nexus-staging'
+
+Jar Files
+//apply plugin: 'de.eacg.ecs.plugin.gradle'
 
-sourceCompatibility = 1.6
-targetCompatibility = 1.6
+sourceCompatibility = JavaVersion.VERSION_1_7
+targetCompatibility = JavaVersion.VERSION_1_7
 
 repositories {
     mavenLocal()
@@ -39,17 +45,100 @@ uploadArchives {
     }
 }
 
+processResources {
+    expand(project.properties)
+}
+
+nexusStaging {
+    // packageGroup = "org.mycompany.myproject" //optional if packageGroup == project.getGroup()
+    stagingProfileId = "3214c3fab3cb2b" //when not defined will be got from server using "packageGroup"
+}
+
+
 dependencies {
     compile gradleApi()
     compile localGroovy()
     compile 'de.eacg:ecs-java-client:0.1.0-SNAPSHOT'
     testCompile 'junit:junit:4.12'
 }
 
-ecsPlugin{
-    configuration 'runtime'
-    credentials =  '~/.ecsrc.json'
+//ecsPlugin {
+//    configuration 'runtime'
+//    credentials = '~/.ecsrc.json'
+//
+//    skipTransfer = false
+//    baseUrl = "http://localhost:3000"
+//}
+
+
+task wrapper(type: Wrapper) {
+    gradleVersion = '2.11'
+}
+
+task javadocJar(type: Jar) {
+    classifier = 'javadoc'
+    from javadoc
+}
+
+task sourcesJar(type: Jar) {
+    classifier = 'sources'
+    from sourceSets.main.allSource
+}
+
+artifacts {
+    archives javadocJar, sourcesJar
+}
+
+signing {
+    sign configurations.archives
+}
+
+archivesBaseName = 'ecs-gradle-plugin'
+uploadArchives {
+    repositories {
+        mavenDeployer {
+            beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
+
+            repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
+                authentication(userName: ossrhUsername, password: ossrhPassword)
+            }
+
+            snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") {
+                authentication(userName: ossrhUsername, password: ossrhPassword)
+            }
+
+            pom.project {
+                name 'ECS gradle plugin'
+                packaging 'jar'
+                // optionally artifactId can be defined here
+                description 'EACG Code Scan gradle plugin. A gradle plugin to transfer dependency information to ECS server.'
+
+                url 'https://github.com/eacg-gmbh/ecs-gradle-plugin'
+
+                scm {
+                    url 'https://github.com/eacg-gmbh/ecs-gradle-plugin'
+                }
+
+                licenses {
+                    license {
+                        name 'MIT'
+                        url 'https://raw.githubusercontent.com/eacg-gmbh/ecs-gradle-plugin/master/LICENSE'
+                        distribution 'repo'
+                    }
+                }
+
+                developers {
+                    developer {
+                        id 'gdd'
+                        name 'Gerhard Dickescheid'
+                        email 'gdd@eacg.de'
+                        organization 'EACG, Enterprise Architecture Consulting Group GmbH'
+                        organizationUrl 'https://www.eacg.de/'
+                    }
+                }
+            }
+        }
+    }
+}
+
 
-    skipTransfer = false
-    baseUrl = "http://localhost:3000"
-}

gradle/wrapper/gradle-wrapper.jar

@@ -1,14 +1,6 @@
-#
-#
-# Copyright (c) 2016. Enterprise Architecture Group, EACG
-#
-# SPDX-License-Identifier:	MIT
-#
-#
-
-#Tue Jan 05 19:45:07 CET 2016
+#Fri Feb 12 13:25:02 CET 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.11-bin.zip

gradle/wrapper/gradle-wrapper.properties

@@ -42,11 +42,6 @@ case "`uname`" in
     ;;
 esac
 
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
 # Attempt to set APP_HOME
 # Resolve links: $0 may be a link
 PRG="$0"
@@ -61,9 +56,9 @@ while [ -h "$PRG" ] ; do
     fi
 done
 SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
+cd "`dirname \"$PRG\"`/" >/dev/null
 APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
+cd "$SAVED" >/dev/null
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
@@ -114,6 +109,7 @@ fi
 if $cygwin ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
     ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`

gradlew

@@ -17,43 +17,9 @@ class EcsPlugin implements Plugin<Project> {
         project.ecsPlugin.projectName = project.name
         project.ecsPlugin.moduleName = project.name
         project.ecsPlugin.moduleId = project.group + ':' + project.name
-        project.task('scan', type: ScanTask)
+        project.task('dependency-scan', type: ScanTask)
     }
 }
 
 
-// Extension according to
-// https://docs.gradle.org/current/userguide/custom_plugins.html
-// Chapter 39.3. Getting input from the build
-class EcsPluginExtension {
-    def configurations = []
-
-    String baseUrl = 'https://ecs-app.eacg.de'
-    String apiPath = '/api/v1'
-
-    String projectName
-    String moduleName
-    String moduleId
-
-    String credentials
-    String userName
-    String apiKey
-
-    Boolean skip = false
-    Boolean skipTransfer = false
-
-    void configuration(String... confs) {
-        for(String s in confs) {
-            configurations << s
-        }
-    }
-
-    def getConfigurations() {
-        if(this.configurations.isEmpty()) {
-            this.configurations << 'default'
-        }
-        return this.configurations as Set
-    }
-}
-
 

src/main/groovy/de/eacg/ecs/gradle/plugin/EcsPlugin.groovy

@@ -0,0 +1,44 @@
+/*
+ *
+ * Copyright (c) 2016. Enterprise Architecture Group, EACG
+ *
+ * SPDX-License-Identifier:	MIT
+ *
+ */
+
+package de.eacg.ecs.gradle.plugin
+
+// Extension according to
+// https://docs.gradle.org/current/userguide/custom_plugins.html
+// Chapter 39.3. Getting input from the build
+class EcsPluginExtension {
+    def configurations = []
+
+    String baseUrl = 'https://ecs-app.eacg.de'
+    String apiPath = '/api/v1'
+
+    String projectName
+    String moduleName
+    String moduleId
+
+    String credentials
+    String userName
+    String apiKey
+
+    Boolean skip = false
+    Boolean skipTransfer = false
+    Boolean verbose = false
+
+    void configuration(String... confs) {
+        for (String s in confs) {
+            configurations << s
+        }
+    }
+
+    def getConfigurations() {
+        if (this.configurations.isEmpty()) {
+            this.configurations << 'default'
+        }
+        return this.configurations as Set
+    }
+}

src/main/groovy/de/eacg/ecs/gradle/plugin/EcsPluginExtension.groovy

@@ -0,0 +1,27 @@
+/*
+ *
+ * Copyright (c) 2016. Enterprise Architecture Group, EACG
+ *
+ * SPDX-License-Identifier:	MIT
+ *
+ */
+
+package de.eacg.ecs.gradle.plugin;
+
+import java.io.IOException;
+import java.util.Properties;
+
+public class ProjectProperties extends Properties {
+
+    public ProjectProperties() throws IOException {
+        super.load(this.getClass().getResourceAsStream("/project.properties"));
+    }
+
+    public String getName() {
+        return this.getProperty("artifactId");
+    }
+
+    public String getVersion() {
+        return this.getProperty("version");
+    }
+}