Remove Bintray gradle files, add maven changesmavenCentralGradleUpdates

12 files changed, 101 insertions, 293 deletions

diff --git a/android/sdl_android/bintray.gradle b/android/sdl_android/bintray.gradle
deleted file mode 100644
index ed286eabd..000000000
--- a/android/sdl_android/bintray.gradle
+++ /dev/null
@@ -1,73 +0,0 @@
-apply plugin: "com.jfrog.bintray"
-apply plugin: 'com.github.dcendents.android-maven'
-apply plugin: 'maven-publish'
-
-def siteUrl = 'https://github.com/smartdevicelink/sdl_java_suite'      // Homepage URL of the library
-def gitUrl = 'https://github.com/smartdevicelink/sdl_java_suite.git'   // Git repository URL
-group = "com.smartdevicelink" // Maven Group ID for the artifact
-def libDescription = 'SmartDeviceLink mobile library for Android'
-def libVersion = new File(projectDir.path, ('/../../VERSION')).text.trim()
-
-
-install {
-    repositories.mavenInstaller {
-        pom {
-            project {
-                packaging 'aar'
-
-                // Add your description here
-                name 'com.smartdevicelink:sdl_android'
-                description = libDescription
-                url siteUrl
-
-                // Set your license
-                licenses {
-                    license {
-                        name 'BSD 3-Clause'
-                        url 'https://opensource.org/licenses/BSD-3-Clause'
-                    }
-                }
-                scm {
-                    connection gitUrl
-                    developerConnection gitUrl
-                    url siteUrl
-                }
-            }
-        }
-    }
-}
-
-task sourcesJar(type: Jar) {
-    from android.sourceSets.main.java.srcDirs
-    classifier = 'sources'
-}
-
-artifacts {
-    archives sourcesJar
-}
-
-bintray {
-    Properties props = new Properties()
-    props.load(new FileInputStream("$projectDir/bintray.properties"))
-
-    // Authorization
-    user = props.getProperty("bintray.user")
-    key = props.getProperty("bintray.key")
-    version = libVersion
-    configurations = ['archives']
-    pkg {
-        repo = props.getProperty("bintray.repo")
-        name = props.getProperty("bintray.artifact")
-        websiteUrl = siteUrl
-        vcsUrl = gitUrl
-        userOrg = props.getProperty("bintray.userorg")
-        licenses = ["BSD 3-Clause"]
-        publish = props.getProperty("bintray.publish")  // Will upload to jCenter
-        version {
-            name = libVersion // Change to release version
-            desc = libDescription
-            released = new Date()  // Will be the current date & time
-            vcsTag = libVersion // Should match git tag
-        }
-    }
-}
\ No newline at end of file
diff --git a/android/sdl_android/bintray.properties b/android/sdl_android/bintray.properties
deleted file mode 100644
index 05fe732b1..000000000
--- a/android/sdl_android/bintray.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-bintray.user=username
-bintray.key=apikey
-bintray.repo=sdl_android
-bintray.artifact=sdl_android
-bintray.userorg=smartdevicelink
-bintray.publish=true
\ No newline at end of file
diff --git a/android/sdl_android/build.gradle b/android/sdl_android/build.gradle
index 46c1221ba..fb3f1bceb 100644
--- a/android/sdl_android/build.gradle
+++ b/android/sdl_android/build.gradle
@@ -63,9 +63,9 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
+        classpath 'com.vanniktech:gradle-maven-publish-plugin:0.13.0'
     }
 }
 
-apply from: 'bintray.gradle'
+apply plugin: "com.vanniktech.maven.publish"
diff --git a/android/sdl_android/gradle.properties b/android/sdl_android/gradle.properties
new file mode 100644
index 000000000..a632b5a87
--- /dev/null
+++ b/android/sdl_android/gradle.properties
@@ -0,0 +1,31 @@
+GROUP=com.smartdevicelink
+POM_ARTIFACT_ID=sdl_android
+VERSION_NAME=5.1.0
+
+POM_NAME=sdl_android
+POM_PACKAGING=aar
+
+POM_DESCRIPTION=The app library component of SDL is meant to run on the end user’s smart-device from within SDL enabled apps, as an embedded app, or connected to the cloud. App libraries allow the apps to connect to SDL enabled head-units and hardware through bluetooth, USB, and TCP for Android, and cloud and embedded apps can connect through web sockets, Java Beans, and other custom transports. Once the library establishes a connection between the smart device and head-unit through the preferred method of transport, the two components are able to communicate using the SDL defined protocol. The app integrating this library project is then able to expose its functionality to the head-unit through text, media, and other interactive elements.
+POM_INCEPTION_YEAR=2014
+
+POM_URL=https://github.com/smartdevicelink/sdl_java_suite
+POM_SCM_URL=https://github.com/smartdevicelink/sdl_java_suite
+POM_SCM_CONNECTION=scm:git@github.com:smartdevicelink/sdl_java_suite.git
+POM_SCM_DEV_CONNECTION=scm:git@github.com:smartdevicelink/sdl_java_suite.git
+
+POM_LICENCE_NAME=BSD 3-Clause
+POM_LICENCE_URL=https://opensource.org/licenses/BSD-3-Clause
+POM_LICENCE_DIST=repo
+
+RELEASE_REPOSITORY_URL=https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/
+SNAPSHOT_REPOSITORY_URL=https://s01.oss.sonatype.org/content/repositories/snapshots/
+
+POM_DEVELOPER_ID=
+POM_DEVELOPER_NAME=
+POM_DEVELOPER_URL=
+
+signing.keyId=
+signing.password=
+signing.secretKeyRingFile=
+SONATYPE_NEXUS_USERNAME=
+SONATYPE_NEXUS_PASSWORD=
\ No newline at end of file
diff --git a/javaEE/javaEE/bintray.gradle b/javaEE/javaEE/bintray.gradle
deleted file mode 100644
index f54efe333..000000000
--- a/javaEE/javaEE/bintray.gradle
+++ /dev/null
@@ -1,96 +0,0 @@
-apply plugin: "com.jfrog.bintray"
-apply plugin: 'maven-publish'
-apply plugin: 'maven'
-
-def siteUrl = 'https://github.com/smartdevicelink/sdl_java_suite'      // Homepage URL of the library
-def gitUrl = 'https://github.com/smartdevicelink/sdl_java_suite.git'   // Git repository URL
-def libDescription = 'SmartDeviceLink mobile library'
-def libVersion = new File(projectDir.path, ('/../../VERSION')).text.trim()
-
-task sourcesJar(type: Jar, dependsOn: classes) {
-    classifier = 'sources'
-    from sourceSets.main.allSource
-}
-
-javadoc.failOnError = false
-task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier = 'javadoc'
-    from javadoc.destinationDir
-}
-
-artifacts {
-    archives sourcesJar
-    archives javadocJar
-}
-
-bintray {
-    Properties props = new Properties()
-    props.load(new FileInputStream("$projectDir/bintray.properties"))
-
-    // Authorization
-    user = props.getProperty("bintray.user")
-    key = props.getProperty("bintray.key")
-    version = libVersion
-    publications = ['mavenPublication']
-
-
-    pkg {
-        repo = props.getProperty("bintray.repo")
-        name = props.getProperty("bintray.package")
-        websiteUrl = siteUrl
-        vcsUrl = gitUrl
-        userOrg = props.getProperty("bintray.userorg")
-        licenses = ["BSD 3-Clause"]
-        publish = props.getProperty("bintray.publish")  // Will upload to jCenter
-        version {
-            name = libVersion  // Change to release version
-            desc = libDescription
-            released  = new Date()  // Will be the current date & time
-            vcsTag = libVersion // Should match git tag
-        }
-    }
-}
-
-def pomConfig = {
-    Properties props = new Properties()
-    props.load(new FileInputStream("$projectDir/bintray.properties"))
-
-    licenses {
-        license {
-            name 'BSD 3-Clause'
-            url 'https://opensource.org/licenses/BSD-3-Clause'
-            distribution "repo"
-        }
-    }
-
-    scm {
-        url siteUrl
-    }
-}
-
-publishing {
-    publications {
-        mavenPublication(MavenPublication) {
-            Properties props = new Properties()
-            props.load(new FileInputStream("$projectDir/bintray.properties"))
-
-            from components.java
-            artifact sourcesJar {
-                classifier "sources"
-            }
-            artifact javadocJar {
-                classifier "javadoc"
-            }
-            groupId props.getProperty("bintray.group")
-            artifactId props.getProperty("bintray.artifact")
-            version libVersion
-            pom.withXml {
-                def root = asNode()
-                root.appendNode('description', libDescription)
-                root.appendNode('name', props.getProperty("bintray.artifact"))
-                root.appendNode('url', siteUrl)
-                root.children().last() + pomConfig
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/javaEE/javaEE/bintray.properties b/javaEE/javaEE/bintray.properties
deleted file mode 100644
index aa1926ba5..000000000
--- a/javaEE/javaEE/bintray.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-bintray.user=username
-bintray.key=apikey
-bintray.userorg=smartdevicelink
-bintray.repo=sdl_java_ee
-bintray.package=sdl_javaee
-bintray.group=com.smartdevicelink
-bintray.artifact=sdl_java_ee
-bintray.publish=true
\ No newline at end of file
diff --git a/javaEE/javaEE/build.gradle b/javaEE/javaEE/build.gradle
index 1efaa324e..e509a9e08 100644
--- a/javaEE/javaEE/build.gradle
+++ b/javaEE/javaEE/build.gradle
@@ -8,9 +8,10 @@ sourceCompatibility = 1.7
 buildscript {
     repositories {
         jcenter()
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
+        classpath 'com.vanniktech:gradle-maven-publish-plugin:0.13.0'
     }
 }
 
@@ -78,4 +79,4 @@ public final class BuildConfig {
     }
 }
 
-apply from: 'bintray.gradle'
\ No newline at end of file
+apply plugin: "com.vanniktech.maven.publish"
\ No newline at end of file
diff --git a/javaEE/javaEE/gradle.properties b/javaEE/javaEE/gradle.properties
new file mode 100644
index 000000000..eb9b1d6d8
--- /dev/null
+++ b/javaEE/javaEE/gradle.properties
@@ -0,0 +1,31 @@
+GROUP=com.smartdevicelink
+POM_ARTIFACT_ID=sdl_java_ee
+VERSION_NAME=5.1.0
+
+POM_NAME=sdl_java_ee
+POM_PACKAGING=jar
+
+POM_DESCRIPTION=The app library component of SDL is meant to run on the end user’s smart-device from within SDL enabled apps, as an embedded app, or connected to the cloud. App libraries allow the apps to connect to SDL enabled head-units and hardware through bluetooth, USB, and TCP for Android, and cloud and embedded apps can connect through web sockets, Java Beans, and other custom transports. Once the library establishes a connection between the smart device and head-unit through the preferred method of transport, the two components are able to communicate using the SDL defined protocol. The app integrating this library project is then able to expose its functionality to the head-unit through text, media, and other interactive elements.
+POM_INCEPTION_YEAR=2014
+
+POM_URL=https://github.com/smartdevicelink/sdl_java_suite
+POM_SCM_URL=https://github.com/smartdevicelink/sdl_java_suite
+POM_SCM_CONNECTION=scm:git@github.com:smartdevicelink/sdl_java_suite.git
+POM_SCM_DEV_CONNECTION=scm:git@github.com:smartdevicelink/sdl_java_suite.git
+
+POM_LICENCE_NAME=BSD 3-Clause
+POM_LICENCE_URL=https://opensource.org/licenses/BSD-3-Clause
+POM_LICENCE_DIST=repo
+
+RELEASE_REPOSITORY_URL=https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/
+SNAPSHOT_REPOSITORY_URL=https://s01.oss.sonatype.org/content/repositories/snapshots/
+
+POM_DEVELOPER_ID=
+POM_DEVELOPER_NAME=
+POM_DEVELOPER_URL=
+
+signing.keyId=
+signing.password=
+signing.secretKeyRingFile=
+SONATYPE_NEXUS_USERNAME=
+SONATYPE_NEXUS_PASSWORD=
diff --git a/javaSE/javaSE/bintray.gradle b/javaSE/javaSE/bintray.gradle
deleted file mode 100644
index 9b890b842..000000000
--- a/javaSE/javaSE/bintray.gradle
+++ /dev/null
@@ -1,96 +0,0 @@
-apply plugin: "com.jfrog.bintray"
-apply plugin: 'maven-publish'
-apply plugin: 'maven'
-
-def siteUrl = 'https://github.com/smartdevicelink/sdl_java_suite'      // Homepage URL of the library
-def gitUrl = 'https://github.com/smartdevicelink/sdl_java_suite.git'   // Git repository URL
-def libDescription = 'SmartDeviceLink mobile library'
-def libVersion = new File(projectDir.path, ('/../../VERSION')).text.trim()
-
-task sourcesJar(type: Jar, dependsOn: classes) {
-    classifier = 'sources'
-    from sourceSets.main.allSource
-}
-
-javadoc.failOnError = false
-task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier = 'javadoc'
-    from javadoc.destinationDir
-}
-
-artifacts {
-    archives sourcesJar
-    archives javadocJar
-}
-
-bintray {
-    Properties props = new Properties()
-    props.load(new FileInputStream("$projectDir/bintray.properties"))
-
-    // Authorization
-    user = props.getProperty("bintray.user")
-    key = props.getProperty("bintray.key")
-    version = libVersion
-    publications = ['mavenPublication']
-
-
-    pkg {
-        repo = props.getProperty("bintray.repo")
-        name = props.getProperty("bintray.package")
-        websiteUrl = siteUrl
-        vcsUrl = gitUrl
-        userOrg = props.getProperty("bintray.userorg")
-        licenses = ["BSD 3-Clause"]
-        publish = props.getProperty("bintray.publish")  // Will upload to jCenter
-        version {
-            name = libVersion  // Change to release version
-            desc = libDescription
-            released = new Date()  // Will be the current date & time
-            vcsTag = libVersion // Should match git tag
-        }
-    }
-}
-
-def pomConfig = {
-    Properties props = new Properties()
-    props.load(new FileInputStream("$projectDir/bintray.properties"))
-
-    licenses {
-        license {
-            name 'BSD 3-Clause'
-            url 'https://opensource.org/licenses/BSD-3-Clause'
-            distribution "repo"
-        }
-    }
-
-    scm {
-        url siteUrl
-    }
-}
-
-publishing {
-    publications {
-        mavenPublication(MavenPublication) {
-            Properties props = new Properties()
-            props.load(new FileInputStream("$projectDir/bintray.properties"))
-
-            from components.java
-            artifact sourcesJar {
-                classifier "sources"
-            }
-            artifact javadocJar {
-                classifier "javadoc"
-            }
-            groupId props.getProperty("bintray.group")
-            artifactId props.getProperty("bintray.artifact")
-            version libVersion
-            pom.withXml {
-                def root = asNode()
-                root.appendNode('description', libDescription)
-                root.appendNode('name', props.getProperty("bintray.artifact"))
-                root.appendNode('url', siteUrl)
-                root.children().last() + pomConfig
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/javaSE/javaSE/bintray.properties b/javaSE/javaSE/bintray.properties
deleted file mode 100644
index b491c7774..000000000
--- a/javaSE/javaSE/bintray.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-bintray.user=username
-bintray.key=apikey
-bintray.userorg=smartdevicelink
-bintray.repo=sdl_java_se
-bintray.package=sdl_javase
-bintray.group=com.smartdevicelink
-bintray.artifact=sdl_java_se
-bintray.publish=true
\ No newline at end of file
diff --git a/javaSE/javaSE/build.gradle b/javaSE/javaSE/build.gradle
index ef93e9aad..284d55c43 100644
--- a/javaSE/javaSE/build.gradle
+++ b/javaSE/javaSE/build.gradle
@@ -9,9 +9,10 @@ sourceCompatibility = 1.7
 buildscript {
     repositories {
         jcenter()
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
+        classpath 'com.vanniktech:gradle-maven-publish-plugin:0.13.0'
     }
 }
 
@@ -78,4 +79,4 @@ public final class BuildConfig {
     }
 }
 
-apply from: 'bintray.gradle'
+apply plugin: "com.vanniktech.maven.publish"
\ No newline at end of file
diff --git a/javaSE/javaSE/gradle.properties b/javaSE/javaSE/gradle.properties
new file mode 100644
index 000000000..f1f2d583a
--- /dev/null
+++ b/javaSE/javaSE/gradle.properties
@@ -0,0 +1,31 @@
+GROUP=com.smartdevicelink
+POM_ARTIFACT_ID=sdl_java_se
+VERSION_NAME=5.1.0
+
+POM_NAME=sdl_java_se
+POM_PACKAGING=jar
+
+POM_DESCRIPTION=The app library component of SDL is meant to run on the end user’s smart-device from within SDL enabled apps, as an embedded app, or connected to the cloud. App libraries allow the apps to connect to SDL enabled head-units and hardware through bluetooth, USB, and TCP for Android, and cloud and embedded apps can connect through web sockets, Java Beans, and other custom transports. Once the library establishes a connection between the smart device and head-unit through the preferred method of transport, the two components are able to communicate using the SDL defined protocol. The app integrating this library project is then able to expose its functionality to the head-unit through text, media, and other interactive elements.
+POM_INCEPTION_YEAR=2014
+
+POM_URL=https://github.com/smartdevicelink/sdl_java_suite
+POM_SCM_URL=https://github.com/smartdevicelink/sdl_java_suite
+POM_SCM_CONNECTION=scm:git@github.com:smartdevicelink/sdl_java_suite.git
+POM_SCM_DEV_CONNECTION=scm:git@github.com:smartdevicelink/sdl_java_suite.git
+
+POM_LICENCE_NAME=BSD 3-Clause
+POM_LICENCE_URL=https://opensource.org/licenses/BSD-3-Clause
+POM_LICENCE_DIST=repo
+
+RELEASE_REPOSITORY_URL=https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/
+SNAPSHOT_REPOSITORY_URL=https://s01.oss.sonatype.org/content/repositories/snapshots/
+
+POM_DEVELOPER_ID=
+POM_DEVELOPER_NAME=
+POM_DEVELOPER_URL=
+
+signing.keyId=
+signing.password=
+signing.secretKeyRingFile=
+SONATYPE_NEXUS_USERNAME=
+SONATYPE_NEXUS_PASSWORD=