Upload correct artifacts

Author: MediaMarco

build.gradle

@@ -1,12 +1,19 @@
 buildscript {
+    ext {
+        springBootVersion = '2.0.0.RC2'
+    }
     repositories {
         mavenCentral()
+        maven { url "https://repo.spring.io/snapshot" }
+        maven { url "https://repo.spring.io/milestone" }
+    }
+    dependencies {
+        classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}")
     }
 }
-
 plugins {
-    id 'net.researchgate.release' version '2.4.0'
-    id 'io.codearte.nexus-staging' version '0.9.0'
+    //id 'net.researchgate.release' version '2.4.0'
+    id 'io.codearte.nexus-staging' version '0.11.0'
 }
 
 apply plugin: 'java'

core/build.gradle

@@ -1,14 +1,5 @@
-buildscript {
-    repositories {
-        mavenCentral()
-    }
-    dependencies {
-        classpath("org.springframework.boot:spring-boot-gradle-plugin:1.5.9.RELEASE")
-    }
-}
-
 plugins {
-    id 'org.springframework.boot' version '1.5.9.RELEASE'
+    id 'org.springframework.boot'
 }
 
 def seleniumVersion = '3.8.1'
@@ -54,30 +45,35 @@ task sourcesJar(type: Jar) {
     classifier = 'sources'
 }
 
+jar {
+    baseName = "jlineup"
+    archiveName = "jlineup.jar"
+}
+
+bootJar {
+    baseName = "jlineup"
+    archiveName = "jlineup.jar"
+    mainClassName = 'de.otto.jlineup.Main'
+    launchScript()
+}
+
 artifacts {
     archives sourcesJar
     archives javadocJar
+    archives bootJar
     archives jar
 }
 
-
-/*
-[distZip, distTar].each { task ->
+[distZip, bootDistZip, distTar, bootDistTar].each { task ->
     configurations.archives.artifacts.removeAll
             { it.class.simpleName == "ArchivePublishArtifact" && it.archiveTask == task }
     task.enabled = false
 }
-*/
 
 signing {
     sign configurations.archives
 }
 
-jar {
-    baseName = "jlineup"
-    archiveName = "jlineup.jar"
-}
-
 tasks.processResources.doLast { task ->
     def resourcesDir = project.sourceSets.main.output.resourcesDir
     resourcesDir.mkdirs()
@@ -90,11 +86,6 @@ tasks.processResources.doLast { task ->
     }
 }
 
-bootRepackage {
-    mainClass = 'de.otto.jlineup.Main'
-    executable = true
-}
-
 uploadArchives {
     configuration = configurations.archives
     repositories {
@@ -103,6 +94,8 @@ uploadArchives {
 
             // use this for local upload debugging instead of sonatype
             // repository(url: "file://${buildDir}/repo")
+            // snapshotRepository(url: "file://${buildDir}/repo")
+
 
             repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
                 authentication(userName: sonatypeUsername, password: sonatypePassword)
@@ -112,6 +105,7 @@ uploadArchives {
                 authentication(userName: sonatypeUsername, password: sonatypePassword)
             }
 
+
             pom.project {
                 name 'JLineup'
                 packaging 'jar'

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,5 @@
-#Wed Dec 20 09:50:02 CET 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.5.1-bin.zip

gradle/wrapper/gradle-wrapper.properties

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
@@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -154,16 +154,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
 # by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [[ "$(uname)" == "Darwin" ]] && [[ "$HOME" == "$PWD" ]]; then
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
   cd "$(dirname "$0")"
 fi
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+exec "$JAVACMD" "$@"