Mods for Maven Central publishing

Build mods to cater for publishing of artefacts to Maven Central.

Also included removing some unsupported Javadoc tags from source to reduce warning noise

build.gradle

@@ -2,55 +2,77 @@
  * This build file was auto generated by running the Gradle 'init' task
  * by 'robw' at '21/12/16 15:04' with Gradle 3.2.1
  *
- * This generated file contains a commented-out sample Java project to get you started.
- * For more details take a look at the Java Quickstart chapter in the Gradle
- * user guide available at https://docs.gradle.org/3.2.1/userguide/tutorial_java_projects.html
  */
+ext {
+    dev_id = 'walkerr'
+    dev_name = 'Rob Walker'
+    dev_email = '[email protected]'
+    dev_organization = 'Ascert LLC'
+    dev_organizationUrl = 'http://www.ascert.com'
+
+    gpl_name = 'GNU Library General Public License version 2'
+    gpl_url = 'https://github.com/AscertLLC/openterm/blob/master/LICENSE'    
+}
+
 
 allprojects {
 
     repositories {
         // Usual ones
         mavenCentral()
         jcenter()     
-        // For GitHub project dependencies
-        maven { url 'https://jitpack.io' }
     }
 
-    apply plugin: 'maven-publish'
-
-    group = "com.github.AscertLLC"
-    description = 'open.term 3270'
-    version = '1.5.2'
-
+    group = "com.ascert.open"
 }
 
-
 subprojects { 
     apply plugin: 'java'
+    apply plugin: 'maven'
+    apply plugin: 'signing'
 
     dependencies {
-        testCompile group: 'junit', name: 'junit', version: '4.+'
+        testCompile group: 'junit', name: 'junit', version: '[4,)'
     }
 
-    jar {
-        manifest {
-            attributes( 'Implementation-Title': project.description,
-                        'Implementation-Version': project.version,
-                        'Main-Class': 'com.ascert.open.term.application.ClientLauncher', 
-                        )
-        }
-    }    
+    task javadocJar(type: Jar) {
+        classifier = 'javadoc'
+        javadoc.options.addBooleanOption('Xdoclint:none', true)
+        javadoc.options.addStringOption('-quiet')
+        from javadoc
+    }
 
-    publishing {
-        publications {
-            mavenJava(MavenPublication) {
-                from components.java
-            }
-        }
+    task sourcesJar(type: Jar) {
+        classifier = 'sources'
+        from sourceSets.main.allSource
     }
 
+    artifacts {
+        archives javadocJar, sourcesJar
+    }
+
+    signing {
+        //def signingKey = findProperty("signingKey")
+        //def signingPassword = findProperty("signingPassword")
+        //useInMemoryPgpKeys(signingKey, signingPassword)
+        sign configurations.archives
+    }
+
+    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)
+          }
+        }
+      }
+    }     
 }  
 
 

openterm/build.gradle

@@ -1,12 +1,64 @@
+description = 'open.term 3270'
+version = '1.5.3'
+archivesBaseName = 'openterm'
+
 dependencies {
     compile project(":vncj")
 }
 
+jar {
+    manifest {
+        attributes( 'Implementation-Title': project.description,
+                    'Implementation-Version': project.version,
+                    'Main-Class': 'com.ascert.open.term.application.ClientLauncher', 
+                    )
+    }
+}    
+
 task execute(type:JavaExec) {
     main = "com.ascert.open.term.application.ClientLauncher"
     classpath = sourceSets.main.runtimeClasspath
 
     systemProperties System.getProperties();
-    //println systemProperties
 }
 
+uploadArchives {
+  repositories {
+    mavenDeployer {
+      pom.project {
+        name project.description
+        packaging 'jar'
+        // optionally artifactId can be defined here 
+        description 'An open source emulator supporting 3270 and potentially later 5250 terminal types.'
+        url 'https://github.com/AscertLLC/openterm'
+
+        scm {
+          connection 'https://github.com/AscertLLC/openterm.git'
+          developerConnection 'scm:git:ssh://[email protected]/AscertLLC/openterm.git'
+          url 'https://github.com/AscertLLC/openterm'
+        }
+
+        licenses {
+          license {
+            name "${gpl_name}"
+            url "${gpl_url}"
+          }
+        }
+
+        developers {
+          developer {
+            id = "${dev_id}"
+            name = "${dev_name}"
+            email = "${dev_email}"
+            organization = "${dev_organization}"
+            organizationUrl = "${dev_organizationUrl}"
+          }
+        }
+      }
+    }
+  }
+}
+
+
+
+

openterm/src/main/java/com/ascert/open/term/application/OpenTermConfig.java

@@ -38,7 +38,7 @@
  *
  * @version 1,0 13-Oct-2017
  * @author rhw
- * @history 13-Oct-2017 rhw Created
+
  */
 public class OpenTermConfig
     implements SimpleConfig

openterm/src/main/java/com/ascert/open/term/core/AbstractTermChar.java

@@ -29,7 +29,7 @@
  *
  * @version 1,0 03-May-2017
  * @author srm
- * @history 03-May-2017 srm Created
+
  */
 public abstract class AbstractTermChar implements TermChar, Cloneable
 {

openterm/src/main/java/com/ascert/open/term/core/AbstractTermField.java

@@ -27,7 +27,7 @@
  *
  * @version 1,0 03-May-2017
  * @author srm
- * @history 03-May-2017 srm Created
+
  */
 public abstract class AbstractTermField implements TermField
 {

openterm/src/main/java/com/ascert/open/term/core/AbstractTerminal.java

@@ -39,7 +39,7 @@
  *
  * @version 1,0 24-Apr-2017
  * @author srm
- * @history 24-Apr-2017 srm Created
+
  */
 public abstract class AbstractTerminal
     implements Terminal

openterm/src/main/java/com/ascert/open/term/core/InputCharHandler.java

@@ -28,7 +28,7 @@
  *
  * @version 1,0 22-Jun-2017
  * @author srm
- * @history 22-Jun-2017 srm Created
+
  */
 public interface InputCharHandler
 {

openterm/src/main/java/com/ascert/open/term/core/KbdLockListener.java

@@ -22,7 +22,7 @@
  *
  * @version 1,0 14-Sep-2017
  * @author rhw
- * @history 14-Sep-2017 rhw Created
+
  */
 public interface KbdLockListener
 {

openterm/src/main/java/com/ascert/open/term/core/OhioScreenWrapper.java

@@ -45,7 +45,7 @@
  *
  * @version 1,0 25-Apr-2017
  * @author rhw
- * @history 25-Apr-2017 srm Created
+
  */
 public class OhioScreenWrapper implements OhioScreen
 {

openterm/src/main/java/com/ascert/open/term/core/SimpleConfig.java

@@ -32,7 +32,7 @@
  *
  * @version 1,0 13-Oct-2017
  * @author rhw
- * @history 13-Oct-2017 rhw Created
+
  */
 public interface SimpleConfig
 {

openterm/src/main/java/com/ascert/open/term/core/TermChar.java

@@ -26,7 +26,7 @@
  *
  * @version 1,0 25-Apr-2017
  * @author srm
- * @history 25-Apr-2017 srm Created
+
  */
 public interface TermChar
 {

openterm/src/main/java/com/ascert/open/term/core/TermField.java

@@ -24,7 +24,7 @@
  *
  * @version 1,0 25-Apr-2017
  * @author srm
- * @history 25-Apr-2017 srm Created
+
  */
 public interface TermField
 {

openterm/src/main/java/com/ascert/open/term/core/Terminal.java

@@ -35,7 +35,7 @@
  *
  * @version 1,0 24-Apr-2017
  * @author rhw
- * @history 24-Apr-2017 rhw Created
+
  */
 public interface Terminal
 {

openterm/src/main/java/com/ascert/open/term/core/TerminalFactory.java

@@ -26,7 +26,7 @@
  *
  * @version 1,0 31-May-2017
  * @author srm
- * @history 31-May-2017 srm Created
+
  */
 public interface TerminalFactory
 {

openterm/src/main/java/com/ascert/open/term/core/TerminalFactoryRegistrar.java

@@ -29,7 +29,7 @@
  *
  * @version 1,0 02-Jun-2017
  * @author srm
- * @history 02-Jun-2017 srm Created
+
  */
 public class TerminalFactoryRegistrar
 {

openterm/src/main/java/com/ascert/open/term/core/TnStreamParser.java

@@ -26,7 +26,7 @@
  *
  * @version 1,0 24-Apr-2017
  * @author srm
- * @history 24-Apr-2017 srm Created
+
  */
 public interface TnStreamParser
 {

openterm/src/main/java/com/ascert/open/term/core/TraceHandler.java

@@ -24,7 +24,7 @@
  *
  * @version 1,0 22-Nov-2017
  * @author srm
- * @history 22-Nov-2017 rhw Created
+
  */
 public interface TraceHandler
 {

openterm/src/main/java/com/ascert/open/term/gui/AbstractKeyHandler.java

@@ -45,7 +45,7 @@
  *
  * @version 1,0 21-Apr-2017
  * @author rhw
- * @history 21-Apr-2017 rhw Created
+
  */
 public abstract class AbstractKeyHandler implements KeyHandler
 {

openterm/src/main/java/com/ascert/open/term/gui/TermOptions.java

@@ -24,7 +24,7 @@
  *
  * @version 1,0 03-Jan-2018
  * @author rhw
- * @history
+
  *      03-Jan-2018    rhw        Created
  */
 public interface TermOptions

openterm/src/main/java/com/ascert/open/term/i3270/KeyHandler3270.java

@@ -34,7 +34,7 @@
  *
  * @version 1,0 21-Apr-2017
  * @author rhw
- * @history 21-Apr-2017 rhw Created
+
  */
 public class KeyHandler3270 extends AbstractKeyHandler
 {

openterm/src/main/java/com/ascert/open/term/i3270/Term3270Factory.java

@@ -38,7 +38,7 @@
  *
  * @version 1,0 31-May-2017
  * @author srm
- * @history 31-May-2017 srm Created
+
  */
 public class Term3270Factory implements TerminalFactory
 {

vncj/build.gradle

@@ -5,14 +5,52 @@
  * peer classes removed as no longer compatible with Java8+. 
  */
 description = 'Basic VNC Java Server'
-version = "2.0.1"
+version = "2.0.2"
+archivesBaseName = "vncj"
 
 dependencies 
 {
     compile "org.java-websocket:Java-WebSocket:1.3.8"
     // We track the Felix HTTP Jetty version here for maximum cross compatibility
-    compile ("org.eclipse.jetty.websocket:websocket-servlet:9.4.11.v20180605")
-
+    compile ("org.eclipse.jetty.websocket:websocket-servlet:9.4.11.v20180605")    
 }
 
+uploadArchives {
+  repositories {
+    mavenDeployer {
+      pom.project {
+        name project.description
+        packaging 'jar'
+        // optionally artifactId can be defined here 
+        description 'Basic set of Java classes to act as a VNC server.'
+        url 'https://github.com/AscertLLC/openterm'
+
+        scm {
+          connection 'https://github.com/AscertLLC/openterm.git'
+          developerConnection 'scm:git:ssh://[email protected]/AscertLLC/openterm.git'
+          url 'https://github.com/AscertLLC/openterm'
+        }
+
+        licenses {
+          license {
+            name "${gpl_name}"
+            url "${gpl_url}"
+          }
+        }
+
+        developers {
+          developer {
+            id = "${dev_id}"
+            name = "${dev_name}"
+            email = "${dev_email}"
+            organization = "${dev_organization}"
+            organizationUrl = "${dev_organizationUrl}"
+          }
+        }
+      }
+    }
+  }
+}
+
+