Merge pull request #172 from rwth-acis/github_packages

Release/1.4.0
rwth-acis · May 17, 2024 · fdb12e2 · fdb12e2
2 parents a6979c7 + 20407c2
commit fdb12e2
Show file tree

Hide file tree

Showing 9 changed files with 176 additions and 108 deletions.
diff --git a/.../workflows/publish_to_archiva_release.yml → ...kflows/publish_to_gh_packages_release.yml b/.../workflows/publish_to_archiva_release.yml → ...kflows/publish_to_gh_packages_release.yml
@@ -23,8 +23,8 @@ jobs:
       env:
         # set environment variable for release
         LAS2PEER_RELEASE: "yes"
-        ARCHIVA_USERNAME: ${{ secrets.ARCHIVA_USERNAME }}
-        ARCHIVA_PASSWORD: ${{ secrets.ARCHIVA_PASSWORD }} 
+        USERNAME: ${{ secrets.USERNAME }}
+        TOKEN: ${{ secrets.TOKEN }}
       run: ./gradlew publish
     - name: Upload artifacts on GitHub (attached to this workflow)
       uses: actions/upload-artifact@v2

diff --git a/...workflows/publish_to_archiva_snapshot.yml → ...flows/publish_to_gh_packages_snapshot.yml b/...workflows/publish_to_archiva_snapshot.yml → ...flows/publish_to_gh_packages_snapshot.yml
@@ -1,4 +1,4 @@
-name: Publish artifacts as snapshot to archiva
+name: Publish artifacts as snapshot to github packages
 
 # Run workflow on publish to develop branch automatically.
 # Also allow to run the workflow manually on every other branch.
@@ -27,8 +27,8 @@ jobs:
       run: chmod +x gradlew
     - name: Build with Gradle and publish as snapshot to archiva
       env:
-        ARCHIVA_USERNAME: ${{ secrets.ARCHIVA_USERNAME }}
-        ARCHIVA_PASSWORD: ${{ secrets.ARCHIVA_PASSWORD }} 
+        USERNAME: ${{ secrets.USERNAME }}
+        Token: ${{ secrets.TOKEN }}
       run: ./gradlew publish
     - name: Upload artifacts on GitHub (attached to this workflow)
       uses: actions/upload-artifact@v2

diff --git a/README.md b/README.md
@@ -75,3 +75,11 @@ JavaDocs of the latest release can be found online:
 
 Every commit to the develop branch is built by GitHub actions and will be published as a snapshot to our Archiva.
 Releases are drafted from the master branch.
+
+## Importing
+From Version 1.4.0 on, las2peer-bundle is available on Maven Central. To import las2peer into your project, add the following dependency to your build file:
+
+```groovy     
+implementation "io.github.rwth-acis.org.las2peer:las2peer-bundle:1.4.0"
+```
+As a repository, only Maven Central is required.
diff --git a/bundle/build.gradle b/bundle/build.gradle
@@ -15,7 +15,7 @@ def las2peerBuildNumber = "${project.property('las2peer.build.number')}"
 def las2peerRelease = System.env.LAS2PEER_RELEASE != null
 def las2peerVersion = las2peerRelease ? "$las2peerRevision.$las2peerBuildNumber" : "$las2peerRevision-SNAPSHOT"
 
-group = 'i5'
+group = 'io.github.rwth-acis.org.las2peer'
 archivesBaseName = 'las2peer-bundle'
 version = las2peerVersion
 mainClassName = "i5.las2peer.tools.L2pNodeLauncher"
@@ -25,16 +25,6 @@ targetCompatibility = "${project.property('java.version')}"
 repositories {
     // Use maven central for resolving dependencies.
     mavenCentral()
-
-    // DBIS Archiva
-    maven {
-        url "${project.property('dbis.archiva.url')}"
-    }
-
-    // DBIS Archiva (snapshots)
-    maven {
-        url "${project.property('dbis.archiva.url.snapshots')}"
-    }
 }
 
 dependencies {
@@ -57,6 +47,11 @@ jar {
     }
 }
 
+java {
+    withJavadocJar()
+    withSourcesJar()
+}
+
 // las2peer bundle jar
 shadowJar {
     // remove the "-all" at the end of the artifact / file name
@@ -70,34 +65,57 @@ clean.doLast {
 }
 
 publishing {
+    repositories {
+        maven {
+            name = "GitHubPackages"
+            url = uri("https://maven.pkg.github.com/rwth-acis/las2peer")
+            credentials {
+                username = project.findProperty("gpr.user") ?: System.getenv("USERNAME")
+                password = project.findProperty("gpr.key") ?: System.getenv("TOKEN")
+            }
+        }
+    }
     publications {
-        bundle(MavenPublication) {
+        gpr(MavenPublication) {
             from components.java
             artifact shadowJar
             pom {
-                artifactId "las2peer-bundle"
-                packaging "jar"
+                name = 'las2peer-bundle'
+                artifactId = 'las2peer-bundle'
+                description = 'A bundle for the las2peer project'
+                url = 'https://las2peer.org/'
+                packaging = 'jar'
+                licenses {
+                    license {
+                        name = 'MIT License'
+                        url = 'https://github.com/rwth-acis/las2peer?tab=License-1-ov-file#readme'
+                        distribution = 'repo'
+                    }
+                }
+                developers {
+                    developer {
+                        name = 'rwth-acis'
+                        email= '[email protected]'
+                        organization = 'rwth-acis'
+                        organizationUrl = 'https://las2peer.org/'
+                    }
+                }
+                scm {
+                    connection = 'scm:git:git://github.com/rwth-acis/las2peer.git'
+                    developerConnection = 'scm:git:ssh://[email protected]:rwth-acis/las2peer.git'
+                    url = 'https://github.com/rwth-acis/las2peer'
+                }
             }
 
             // fix pom file by removing dependencies node
             pom.withXml {
+                def packagingNode = asNode().appendNode('packaging', 'jar')
+
                 Node pomNode = asNode()
                 pomNode.remove(pomNode.get("dependencies"))
             }
         }
     }
-
-    repositories {
-        maven {
-            if (las2peerRelease) url = "${project.property('dbis.archiva.url')}"
-            else url = "${project.property('dbis.archiva.url.snapshots')}"
-
-            credentials {
-                username = System.env.ARCHIVA_USERNAME
-                password = System.env.ARCHIVA_PASSWORD
-            }
-        }
-    }
 }
 
 // disable module metadata publication

diff --git a/core/build.gradle b/core/build.gradle
@@ -11,7 +11,7 @@ def las2peerBuildNumber = "${project.property('las2peer.build.number')}"
 def las2peerRelease = System.env.LAS2PEER_RELEASE != null
 def las2peerVersion = las2peerRelease ? "$las2peerRevision.$las2peerBuildNumber" : "$las2peerRevision-SNAPSHOT"
 
-group = 'i5'
+group = 'io.github.rwth-acis.org.las2peer'
 archivesBaseName = 'las2peer'
 version = las2peerVersion
 mainClassName = "i5.las2peer.tools.L2pNodeLauncher"
@@ -22,15 +22,6 @@ repositories {
     // Use maven central for resolving dependencies.
     mavenCentral()
 
-    // DBIS Archiva
-    maven {
-        url "${project.property('dbis.archiva.url')}"
-    }
-
-    // DBIS Archiva (snapshots)
-    maven {
-        url "${project.property('dbis.archiva.url.snapshots')}"
-    }
 }
 
 compileJava {
@@ -60,7 +51,10 @@ dependencies {
     implementation "junit:junit:${project.property('junit.version')}"
     testImplementation "org.mockito:mockito-all:1.9.5"
 
-    api "FreePastry:FreePastry:3.1.0"
+    //use local jars
+    implementation fileTree(dir: '../jars', include: '*.jar')
+
+    //api "FreePastry:FreePastry:3.1.0"
     api "xpp3:xpp3:1.1.4c" // FreePastry dependency
     //api "javax.xml.parsers:jaxp-api:1.4.5"
 
@@ -70,7 +64,7 @@ dependencies {
         exclude module: "xml-apis"
     }
     api "commons-logging:commons-logging:1.2"
-    api "net:sbbi-upnplib:1.0.4"
+    //implementation group: 'net.sbbi', name: 'sbbi-upnplib', version: '1.0.4'
 
     // Web3j for Ethereum node interaction
     api("ch.qos.logback:logback-core:1.2.3") {
@@ -90,7 +84,7 @@ tasks.withType(Jar) {
 
 jar {
     manifest {
-        attributes("Main-Class": "i5.las2peer.tools.L2pNodeLauncher", 
+        attributes("Main-Class": "i5.las2peer.tools.L2pNodeLauncher",
                    "Implementation-Version": las2peerVersion,
                    "Class-Path": configurations.runtimeClasspath.files.collect { it.getName() }.join(" "))
     }
@@ -196,7 +190,7 @@ task jar_test1_1_1(type: Jar) {
     archiveFileName = "i5.las2peer.classLoaders.testPackage1-1.0.jar"
     from sourceSets.testHelp.output
     include "i5/las2peer/classLoaders/testPackage1/**/*"
-    
+
     manifest {
         attributes "Library-SymbolicName": "i5.las2peer.classLoaders.testPackage1"
         attributes "Library-Version": "1.0"
@@ -311,25 +305,47 @@ publishing.publications.all {
 }
 
 publishing {
+    repositories {
+        maven {
+            name = "GitHubPackages"
+            url = uri("https://maven.pkg.github.com/rwth-acis/las2peer")
+            credentials {
+                username = project.findProperty("gpr.user") ?: System.getenv("USERNAME")
+                password = project.findProperty("gpr.key") ?: System.getenv("TOKEN")
+            }
+        }
+    }
     publications {
-        core(MavenPublication) {
+        gpr(MavenPublication) {
             from components.java
             pom {
-                artifactId "las2peer"
-                packaging "jar"
+                name = 'las2peer'
+                artifactId = 'las2peer'
+                description = 'The las2peer core.'
+                url = 'https://las2peer.org/'
+                packaging = 'jar'
+                licenses {
+                    license {
+                        name = 'MIT License'
+                        url = 'https://github.com/rwth-acis/las2peer?tab=License-1-ov-file#readme'
+                        distribution = 'repo'
+                    }
+                }
+                developers {
+                    developer {
+                        name = 'rwth-acis'
+                        email= '[email protected]'
+                        organization = 'rwth-acis'
+                        organizationUrl = 'https://las2peer.org/'
+                    }
+                }
+                scm {
+                    connection = 'scm:git:git://github.com/rwth-acis/las2peer.git'
+                    developerConnection = 'scm:git:ssh://[email protected]:rwth-acis/las2peer.git'
+                    url = 'https://github.com/rwth-acis/las2peer'
+                }
             }
-        }
-    }
 
-    repositories {
-        maven {
-            if (las2peerRelease) url = "${project.property('dbis.archiva.url')}"
-            else url = "${project.property('dbis.archiva.url.snapshots')}"
-
-            credentials {
-                username = System.env.ARCHIVA_USERNAME
-                password = System.env.ARCHIVA_PASSWORD
-            }
         }
     }
 }

diff --git a/jars/FreePastry-3.1.0.jar b/jars/FreePastry-3.1.0.jar
diff --git a/jars/sbbi-upnplib-1.0.4.jar b/jars/sbbi-upnplib-1.0.4.jar
diff --git a/restmapper/build.gradle b/restmapper/build.gradle
@@ -11,7 +11,7 @@ def las2peerBuildNumber = "${project.property('las2peer.build.number')}"
 def las2peerRelease = System.env.LAS2PEER_RELEASE != null
 def las2peerVersion = las2peerRelease ? "$las2peerRevision.$las2peerBuildNumber" : "$las2peerRevision-SNAPSHOT"
 
-group = 'i5'
+group = 'io.github.rwth-acis.org.las2peer'
 archivesBaseName = 'las2peer-rest-mapper'
 version = las2peerVersion
 sourceCompatibility = "${project.property('java.version')}"
@@ -21,15 +21,6 @@ repositories {
     // Use maven central for resolving dependencies.
     mavenCentral()
 
-    // DBIS Archiva
-    maven {
-        url "${project.property('dbis.archiva.url')}"
-    }
-
-    // DBIS Archiva (snapshots)
-    maven {
-        url "${project.property('dbis.archiva.url.snapshots')}"
-    }
 }
 
 compileJava {
@@ -106,25 +97,47 @@ publishing.publications.all {
 }
 
 publishing {
+    repositories {
+        maven {
+            name = "GitHubPackages"
+            url = uri("https://maven.pkg.github.com/rwth-acis/las2peer")
+            credentials {
+                username = project.findProperty("gpr.user") ?: System.getenv("USERNAME")
+                password = project.findProperty("gpr.key") ?: System.getenv("TOKEN")
+            }
+        }
+    }
     publications {
-        restmapper(MavenPublication) {
+        gpr(MavenPublication) {
             from components.java
             pom {
-                artifactId "las2peer-rest-mapper"
-                packaging "jar"
+                name = 'las2peer-rest-mapper'
+                artifactId = 'las2peer-restmapper'
+                description = 'The restmapper component of the las2peer project'
+                url = 'https://las2peer.org/'
+                packaging = 'jar'
+                licenses {
+                    license {
+                        name = 'MIT License'
+                        url = 'https://github.com/rwth-acis/las2peer?tab=License-1-ov-file#readme'
+                        distribution = 'repo'
+                    }
+                }
+                developers {
+                    developer {
+                        name = 'rwth-acis'
+                        email= '[email protected]'
+                        organization = 'rwth-acis'
+                        organizationUrl = 'https://las2peer.org/'
+                    }
+                }
+                scm {
+                    connection = 'scm:git:git://github.com/rwth-acis/las2peer.git'
+                    developerConnection = 'scm:git:ssh://[email protected]:rwth-acis/las2peer.git'
+                    url = 'https://github.com/rwth-acis/las2peer'
+                }
             }
-        }
-    }
-
-    repositories {
-        maven {
-            if (las2peerRelease) url = "${project.property('dbis.archiva.url')}"
-            else url = "${project.property('dbis.archiva.url.snapshots')}"
 
-            credentials {
-                username = System.env.ARCHIVA_USERNAME
-                password = System.env.ARCHIVA_PASSWORD
-            }
         }
     }
 }