0005140: Publish to maven using maven-publish

JumpMind · May 12, 2022 · 36cff95 · 36cff95
1 parent 5e1bb63
commit 36cff95
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 50 deletions.
diff --git a/symmetric-assemble/common.gradle b/symmetric-assemble/common.gradle
@@ -86,7 +86,7 @@ subprojects { subproject ->
 
     apply plugin: 'com.github.hierynomus.license'
     apply plugin: 'java-library'
-    apply plugin: 'maven'
+    apply plugin: 'maven-publish'
     apply plugin: 'jacoco'
 
     configurations { deployerJars }
@@ -103,8 +103,6 @@ subprojects { subproject ->
 			}
         }
         api.extendsFrom(provided)
-        project.conf2ScopeMappings.addMapping(300 + 1,
-			project.configurations.provided, "provided")
 		// Ensure only the compile configuration is exported
 		project.eclipse.classpath.file {
 			whenMerged { classpath ->
@@ -232,8 +230,7 @@ subprojects { subproject ->
         }
     }    
 
-    install.enabled = !project.properties.containsKey('pro')
-    uploadArchives.enabled = !project.properties.containsKey('pro')
+    publish.enabled = !project.properties.containsKey('pro')
 
 
     task sourcesJar(type: Jar, dependsOn:classes) {
@@ -243,18 +240,27 @@ subprojects { subproject ->
 
     artifacts { archives sourcesJar }    
 
-    uploadArchives {
-        repositories.mavenDeployer {
-            configuration = configurations.deployerJars
-            repository(url: deployUploadUrl) {
-                authentication(userName: deployUser, password: deployPassword)
-            }
-        }
-    }
+    publishing {
+    	publications {
+        	symmetricLibrary(MavenPublication) {
+            	from components.java
+        	}
+    	}
+    	repositories {
+        	maven {
+        		name = "jumpmindMaven"
+	    		credentials {
+	                username deployUser
+	                password deployPassword
+	            }
+            	url = deployUploadUrl
+        	}
+    	}
+	}
 
     task deploy {
         description 'Shortcut for Maven users'
-        dependsOn tasks.uploadArchives
+        dependsOn tasks.publish
     }
 
     task testJar(type: Jar) {

diff --git a/symmetric-assemble/standalone.publish.gradle b/symmetric-assemble/standalone.publish.gradle
@@ -3,34 +3,28 @@
  * Modify file path and pom info: ./gradlew -b standalone.publish.gradle uploadAllJars
  */
 
-apply plugin:'maven'
-
-configurations{ allJars }
-
-artifacts{ allJars file("/Users/cshenso/Dropbox/Jdbc/postgresql-9.4.1212.jre7.jar") }
-
-configurations { deployerJars }
-
-repositories {
-    mavenCentral()
-}
-
-uploadAllJars {
-    repositories {
-        mavenDeployer {
-            configuration = configurations.deployerJars
-            repository(url: deployUploadUrl) {
-                authentication(userName: deployUser, password: deployPassword)
-            }
-            pom.version = "9.4-1212.jre7"
-            pom.artifactId = "postgresql"
-            pom.groupId = "jdbc.postgresql"
-        }
-    }
-
-}
-
-dependencies {
-    deployerJars "org.apache.maven.wagon:wagon-ssh:3.5.1"
-
+apply plugin:'maven-publish'
+
+publishing {
+    	publications {
+        	myLibrary(MavenPublication) {
+            	artifact ("/Users/philipmarzullo/symmetric-workspaces/symmetric-workspace-3.14/git/symmetric-ds/symmetric-assemble/phil.jar")
+            	groupId "phil.test"
+            	artifactId "phil"
+            	version "1.1.1"
+        	}
+    	}
+    	repositories {
+        	maven {
+	    		credentials {
+	                username deployUser
+	                password deployPassword
+	            }
+            	url = deployUploadUrl
+        	}
+    	}
+	}
+
+task uploadAllJars {
+	dependsOn tasks.publish
 }
diff --git a/symmetric-sqlexplorer/build.gradle b/symmetric-sqlexplorer/build.gradle
@@ -17,10 +17,6 @@ plugins {
 
 apply from: symAssembleDir + '/common.gradle'
 
-apply plugin: 'maven'
-
-configurations { deployerJars }
-
 artifacts {
    archives file("$buildDir/libs/${jar.archiveBaseName.get()}-${jar.archiveVersion.get()}.${jar.archiveExtension.get()}")
 }
@@ -30,8 +26,6 @@ configurations.archives.with {
 }
 
 dependencies {
-    deployerJars "org.apache.maven.wagon:wagon-ssh:3.5.1"
-
     compile project(":symmetric-jdbc")
     compile project(":symmetric-io")