Skip to content

Commit 7132cc1

Browse files
tanya732tanya732
authored
Added maven-publish changes (#707)
2 parents 1ea8c33 + 87710ed commit 7132cc1

File tree

8 files changed

+230
-50
lines changed

8 files changed

+230
-50
lines changed

‎.github/actions/maven-publish/action.yml‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,16 @@
11
name: Publish release to Java
22

33
inputs:
4+
java-version:
5+
required: true
46
ossr-username:
57
required: true
6-
ossr-password:
8+
ossr-token:
79
required: true
810
signing-key:
911
required: true
1012
signing-password:
1113
required: true
12-
java-version:
13-
required: true
14-
is-android:
15-
required: true
16-
version:
17-
required: true
1814

1915
runs:
2016
using: composite
@@ -33,12 +29,11 @@ runs:
3329
3430
- uses: gradle/wrapper-validation-action@56b90f209b02bf6d1deae490e9ef18b21a389cd4 # [email protected]
3531

36-
- name: Publish Java
37-
shell: bash
38-
if: inputs.is-android == 'false'
39-
run: ./gradlew clean assemble sign publishMavenJavaPublicationToMavenRepository -PisSnapshot=false -Pversion="${{ inputs.version }}" -PossrhUsername="${{ inputs.ossr-username }}" -PossrhPassword="${{ inputs.ossr-password }}" -PsigningKey="${{ inputs.signing-key }}" -PsigningPassword="${{ inputs.signing-password }}"
40-
41-
- name: Publish Android
32+
- name: Publish Android/Java Packages to Maven
4233
shell: bash
43-
if: inputs.is-android == 'true'
44-
run: ./gradlew clean assemble sign publishAndroidLibraryPublicationToMavenRepository -PisSnapshot=false -Pversion="${{ inputs.version }}" -PossrhUsername="${{ inputs.ossr-username }}" -PossrhPassword="${{ inputs.ossr-password }}" -PsigningKey="${{ inputs.signing-key }}" -PsigningPassword="${{ inputs.signing-password }}"
34+
run: ./gradlew publish -PisSnapshot=false --stacktrace
35+
env:
36+
MAVEN_USERNAME: ${{ inputs.ossr-username }}
37+
MAVEN_PASSWORD: ${{ inputs.ossr-token }}
38+
SIGNING_KEY: ${{ inputs.signing-key}}
39+
SIGNING_PASSWORD: ${{ inputs.signing-password}}

‎.github/workflows/java-release.yml‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,10 @@ on:
66
java-version:
77
required: true
88
type: string
9-
is-android:
10-
required: true
11-
type: string
129
secrets:
1310
ossr-username:
1411
required: true
15-
ossr-password:
12+
ossr-token:
1613
required: true
1714
signing-key:
1815
required: true
@@ -70,10 +67,8 @@ jobs:
7067
- uses: ./.github/actions/maven-publish
7168
with:
7269
java-version: ${{ inputs.java-version }}
73-
is-android: ${{ inputs.is-android }}
74-
version: ${{ steps.get_version.outputs.version }}
7570
ossr-username: ${{ secrets.ossr-username }}
76-
ossr-password: ${{ secrets.ossr-password }}
71+
ossr-token: ${{ secrets.ossr-token }}
7772
signing-key: ${{ secrets.signing-key }}
7873
signing-password: ${{ secrets.signing-password }}
7974

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,9 @@ jobs:
3232
needs: rl-scanner
3333
with:
3434
java-version: 11.0.21-tem
35-
is-android: false
3635
secrets:
3736
ossr-username: ${{ secrets.OSSR_USERNAME }}
38-
ossr-password: ${{ secrets.OSSR_PASSWORD }}
37+
ossr-token: ${{ secrets.OSSR_TOKEN }}
3938
signing-key: ${{ secrets.SIGNING_KEY }}
4039
signing-password: ${{ secrets.SIGNING_PASSWORD }}
4140
github-token: ${{ secrets.GITHUB_TOKEN }}

‎gradle.properties‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,24 @@ org.gradle.jvmargs=-Xmx1536m
1515
# This option should only be used with decoupled projects. More details, visit
1616
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
1717
# org.gradle.parallel=true
18+
19+
GROUP=com.auth0
20+
POM_ARTIFACT_ID=java-jwt
21+
22+
POM_NAME=java jwt
23+
POM_DESCRIPTION=Java client library for the Auth0 platform
24+
POM_PACKAGING=jar
25+
26+
POM_URL=https://github.com/auth0/java-jwt
27+
POM_SCM_URL=https://github.com/auth0/java-jwt
28+
29+
POM_SCM_CONNECTION=scm:git:https://github.com/auth0/java-jwt.git
30+
POM_SCM_DEV_CONNECTION=scm:git:https://github.com/auth0/java-jwt.git
31+
32+
POM_LICENCE_NAME=The MIT License (MIT)
33+
POM_LICENCE_URL=https://raw.githubusercontent.com/auth0/java-jwt/master/LICENSE
34+
POM_LICENCE_DIST=repo
35+
36+
POM_DEVELOPER_ID=auth0
37+
POM_DEVELOPER_NAME=Auth0
38+
POM_DEVELOPER_EMAIL=[email protected]

‎gradle/maven-publish.gradle‎

Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
apply plugin: 'maven-publish'
2+
apply plugin: 'signing'
3+
4+
task('sourcesJar', type: Jar, dependsOn: classes) {
5+
archiveClassifier = 'sources'
6+
from sourceSets.main.allSource
7+
}
8+
9+
task('javadocJar', type: Jar, dependsOn: javadoc) {
10+
archiveClassifier = 'javadoc'
11+
from javadoc.getDestinationDir()
12+
}
13+
tasks.withType(Javadoc).configureEach {
14+
javadocTool = javaToolchains.javadocToolFor {
15+
// Use latest JDK for javadoc generation
16+
languageVersion = JavaLanguageVersion.of(17)
17+
}
18+
}
19+
20+
javadoc {
21+
// Specify the Java version that the project will use
22+
options.addStringOption('-release', "11")
23+
}
24+
artifacts {
25+
archives sourcesJar, javadocJar
26+
}
27+
28+
29+
final releaseRepositoryUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
30+
final snapshotRepositoryUrl = "https://oss.sonatype.org/content/repositories/snapshots/"
31+
32+
publishing {
33+
publications {
34+
mavenJava(MavenPublication) {
35+
36+
groupId = GROUP
37+
artifactId = POM_ARTIFACT_ID
38+
version = getVersionName()
39+
40+
artifact("$buildDir/libs/${project.name}-${version}.jar")
41+
artifact sourcesJar
42+
artifact javadocJar
43+
44+
pom {
45+
name = POM_NAME
46+
packaging = POM_PACKAGING
47+
description = POM_DESCRIPTION
48+
url = POM_URL
49+
50+
licenses {
51+
license {
52+
name = POM_LICENCE_NAME
53+
url = POM_LICENCE_URL
54+
distribution = POM_LICENCE_DIST
55+
}
56+
}
57+
58+
developers {
59+
developer {
60+
id = POM_DEVELOPER_ID
61+
name = POM_DEVELOPER_NAME
62+
email = POM_DEVELOPER_EMAIL
63+
}
64+
}
65+
66+
scm {
67+
url = POM_SCM_URL
68+
connection = POM_SCM_CONNECTION
69+
developerConnection = POM_SCM_DEV_CONNECTION
70+
}
71+
72+
pom.withXml {
73+
def dependenciesNode = asNode().appendNode('dependencies')
74+
75+
project.configurations.implementation.allDependencies.each {
76+
def dependencyNode = dependenciesNode.appendNode('dependency')
77+
dependencyNode.appendNode('groupId', it.group)
78+
dependencyNode.appendNode('artifactId', it.name)
79+
dependencyNode.appendNode('version', it.version)
80+
}
81+
}
82+
}
83+
}
84+
}
85+
repositories {
86+
maven {
87+
name = "sonatype"
88+
url = version.endsWith('SNAPSHOT') ? snapshotRepositoryUrl : releaseRepositoryUrl
89+
credentials {
90+
username = System.getenv("MAVEN_USERNAME")
91+
password = System.getenv("MAVEN_PASSWORD")
92+
}
93+
}
94+
}
95+
}
96+
97+
signing {
98+
def signingKey = System.getenv("SIGNING_KEY")
99+
def signingPassword = System.getenv("SIGNING_PASSWORD")
100+
useInMemoryPgpKeys(signingKey, signingPassword)
101+
102+
sign publishing.publications.mavenJava
103+
}
104+
105+
javadoc {
106+
if(JavaVersion.current().isJava9Compatible()) {
107+
options.addBooleanOption('html5', true)
108+
}
109+
}
110+
111+
tasks.named('publish').configure {
112+
dependsOn tasks.named('assemble')
113+
}

‎gradle/versioning.gradle‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
def getVersionFromFile() {
2+
def versionFile = rootProject.file('.version')
3+
return versionFile.text.readLines().first().trim()
4+
}
5+
6+
def isSnapshot() {
7+
return hasProperty('isSnapshot') ? isSnapshot.toBoolean() : true
8+
}
9+
10+
def getVersionName() {
11+
return isSnapshot() ? project.version+"-SNAPSHOT" : project.version
12+
}
13+
14+
ext {
15+
getVersionName = this.&getVersionName
16+
getVersionFromFile = this.&getVersionFromFile
17+
}

‎lib/build.gradle‎

Lines changed: 66 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,19 @@
1+
buildscript {
2+
repositories {
3+
jcenter()
4+
}
5+
6+
dependencies {
7+
// https://github.com/melix/japicmp-gradle-plugin/issues/36
8+
classpath 'com.google.guava:guava:31.1-jre'
9+
}
10+
}
111

212
plugins {
313
id 'java'
414
id 'jacoco'
5-
id 'com.auth0.gradle.oss-library.java'
615
id 'checkstyle'
16+
id 'me.champeau.gradle.japicmp' version '0.2.9'
717
}
818

919
sourceSets {
@@ -29,37 +39,69 @@ tasks.named("checkstyleJmh").configure({
2939
enabled = false
3040
})
3141

32-
logger.lifecycle("Using version ${version} for ${group}.${name}")
42+
apply from: rootProject.file('gradle/versioning.gradle')
43+
44+
version = getVersionFromFile()
45+
group = GROUP
46+
logger.lifecycle("Using version ${version} for ${name} group $group")
3347

34-
def signingKey = findProperty('signingKey')
35-
def signingKeyPwd = findProperty('signingPassword')
48+
import me.champeau.gradle.japicmp.JapicmpTask
3649

37-
oss {
38-
name "java jwt"
39-
repository "java-jwt"
40-
organization "auth0"
41-
description "Java implementation of JSON Web Token (JWT)"
42-
baselineCompareVersion "4.1.0"
43-
skipAssertSigningConfiguration true
50+
project.afterEvaluate {
4451

45-
developers {
46-
auth0 {
47-
displayName = "Auth0"
48-
email = "[email protected]"
52+
def versions = project.ext.testInJavaVersions
53+
for (pluginJavaTestVersion in versions) {
54+
def taskName = "testInJava-${pluginJavaTestVersion}"
55+
tasks.register(taskName, Test) {
56+
def versionToUse = taskName.split("-").getAt(1) as Integer
57+
description = "Runs unit tests on Java version ${versionToUse}."
58+
project.logger.quiet("Test will be running in ${versionToUse}")
59+
group = 'verification'
60+
javaLauncher.set(javaToolchains.launcherFor {
61+
languageVersion = JavaLanguageVersion.of(versionToUse)
62+
})
63+
shouldRunAfter(tasks.named('test'))
4964
}
50-
lbalmaceda {
51-
displayName = "Luciano Balmaceda"
52-
email = "[email protected]"
65+
tasks.named('check') {
66+
dependsOn(taskName)
5367
}
54-
hzalaz {
55-
displayName = "Hernan Zalazar"
56-
email = "[email protected]"
68+
}
69+
70+
project.configure(project) {
71+
def baselineVersion = project.ext.baselineCompareVersion
72+
task('apiDiff', type: JapicmpTask, dependsOn: 'jar') {
73+
oldClasspath = files(getBaselineJar(project, baselineVersion))
74+
newClasspath = files(jar.archiveFile)
75+
onlyModified = true
76+
failOnModification = true
77+
ignoreMissingClasses = true
78+
htmlOutputFile = file("$buildDir/reports/apiDiff/apiDiff.html")
79+
txtOutputFile = file("$buildDir/reports/apiDiff/apiDiff.txt")
80+
doLast {
81+
project.logger.quiet("Comparing against baseline version ${baselineVersion}")
82+
}
83+
}
84+
}
85+
}
86+
87+
private static File getBaselineJar(Project project, String baselineVersion) {
88+
// Use detached configuration: https://github.com/square/okhttp/blob/master/build.gradle#L270
89+
def group = project.group
90+
try {
91+
def baseline = "${project.group}:${project.name}:$baselineVersion"
92+
project.group = 'virtual_group_for_japicmp'
93+
def dependency = project.dependencies.create(baseline + "@jar")
94+
return project.configurations.detachedConfiguration(dependency).files.find {
95+
it.name == "${project.name}-${baselineVersion}.jar"
5796
}
97+
} finally {
98+
project.group = group
5899
}
59100
}
60101

61-
signing {
62-
useInMemoryPgpKeys(signingKey, signingKeyPwd)
102+
ext {
103+
baselineCompareVersion = '4.1.0'
104+
testInJavaVersions = [8, 11, 17, 21]
63105
}
64106

65107
java {
@@ -198,3 +240,4 @@ tasks.register('jmhHelp', JavaExec) {
198240
args '-h'
199241
}
200242

243+
apply from: rootProject.file('gradle/maven-publish.gradle')

‎settings.gradle‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@ pluginManagement {
22
repositories {
33
gradlePluginPortal()
44
}
5-
plugins {
6-
id 'com.auth0.gradle.oss-library.java' version '0.17.2'
7-
}
85
}
96

107
include ':java-jwt'

0 commit comments

Comments
 (0)