Skip to content

Commit 09fb939

Browse files
tanya732tanya732
authored
Update GitHub workflow (#211)
2 parents fc30fa5 + cfddcd1 commit 09fb939

9 files changed

Lines changed: 264 additions & 65 deletions

File tree

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

Lines changed: 15 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
@@ -30,15 +26,19 @@ runs:
3026
source "/home/runner/.sdkman/bin/sdkman-init.sh"
3127
sdk list java
3228
sdk install java ${{ inputs.java-version }} && sdk default java ${{ inputs.java-version }}
29+
export JAVA_HOME=${SDKMAN_DIR}/candidates/java/current
30+
echo "JAVA_HOME is set to $JAVA_HOME"
3331
3432
- uses: gradle/wrapper-validation-action@56b90f209b02bf6d1deae490e9ef18b21a389cd4 # pin@1.1.0
33+
env:
34+
JAVA_HOME: ${{ env.JAVA_HOME }}
3535

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
36+
- name: Publish Java Packages to Maven
4237
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 }}"
38+
run: ./gradlew publish -PisSnapshot=false --stacktrace
39+
env:
40+
JAVA_HOME: ${{ env.JAVA_HOME }}
41+
MAVEN_USERNAME: ${{ inputs.ossr-username }}
42+
MAVEN_PASSWORD: ${{ inputs.ossr-token }}
43+
SIGNING_KEY: ${{ inputs.signing-key}}
44+
SIGNING_PASSWORD: ${{ inputs.signing-password}}

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

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,11 @@ on:
66
java-version:
77
required: true
88
type: string
9-
is-android:
10-
required: true
11-
type: string
9+
1210
secrets:
1311
ossr-username:
1412
required: true
15-
ossr-password:
13+
ossr-token:
1614
required: true
1715
signing-key:
1816
required: true
@@ -66,14 +64,18 @@ jobs:
6664
- if: steps.tag_exists.outputs.exists == 'true'
6765
run: exit 1
6866

67+
# Set JAVA_HOME here and pass it to subsequent steps
68+
- name: Set JAVA_HOME for Gradle
69+
run: echo "JAVA_HOME=/home/runner/.sdkman/candidates/java/current" >> $GITHUB_ENV # This ensures JAVA_HOME is set globally
70+
env:
71+
SDKMAN_DIR: /home/runner/.sdkman
72+
6973
# Publish the release to Maven
7074
- uses: ./.github/actions/maven-publish
7175
with:
7276
java-version: ${{ inputs.java-version }}
73-
is-android: ${{ inputs.is-android }}
74-
version: ${{ steps.get_version.outputs.version }}
7577
ossr-username: ${{ secrets.ossr-username }}
76-
ossr-password: ${{ secrets.ossr-password }}
78+
ossr-token: ${{ secrets.ossr-token }}
7779
signing-key: ${{ secrets.signing-key }}
7880
signing-password: ${{ secrets.signing-password }}
7981

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,9 @@ jobs:
3535
needs: rl-scanner
3636
with:
3737
java-version: 8.0.382-tem
38-
is-android: false
3938
secrets:
4039
ossr-username: ${{ secrets.OSSR_USERNAME }}
41-
ossr-password: ${{ secrets.OSSR_PASSWORD }}
40+
ossr-token: ${{ secrets.OSSR_TOKEN }}
4241
signing-key: ${{ secrets.SIGNING_KEY }}
4342
signing-password: ${{ secrets.SIGNING_PASSWORD }}
4443
github-token: ${{ secrets.GITHUB_TOKEN }}

‎build.gradle‎

Lines changed: 81 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,34 @@
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+
}
11+
112
plugins {
213
id 'java'
314
id 'jacoco'
4-
id 'com.auth0.gradle.oss-library.java'
15+
id 'me.champeau.gradle.japicmp' version '0.2.9'
516
}
617

7-
group = 'com.auth0'
8-
9-
logger.lifecycle("Using version ${version} for ${name} group $group")
10-
11-
def signingKey = findProperty('signingKey')
12-
def signingKeyPwd = findProperty('signingPassword')
13-
14-
oss {
15-
name 'jwks-rsa'
16-
repository 'jwks-rsa-java'
17-
organization 'auth0'
18-
description 'JSON Web Key Set parser library'
19-
baselineCompareVersion '0.15.0'
20-
skipAssertSigningConfiguration true
21-
22-
developers {
23-
auth0 {
24-
displayName = 'Auth0'
25-
email = 'oss@auth0.com'
26-
}
27-
lbalmaceda {
28-
displayName = 'Luciano Balmaceda'
29-
email = 'luciano.balmaceda@auth0.com'
30-
}
31-
hzalaz {
32-
displayName = 'Hernan Zalazar'
33-
email = 'hernan@auth0.com'
34-
}
35-
}
18+
jacoco {
19+
toolVersion = "0.8.11" // Latest version as of 2025
3620
}
3721

38-
signing {
39-
useInMemoryPgpKeys(signingKey, signingKeyPwd)
22+
repositories {
23+
mavenCentral()
4024
}
4125

26+
apply from: rootProject.file('gradle/versioning.gradle')
27+
28+
version = getVersionFromFile()
29+
group = GROUP
30+
logger.lifecycle("Using version ${version} for ${name} group $group")
31+
4232
jacocoTestReport {
4333
reports {
4434
xml.enabled = true
@@ -57,15 +47,70 @@ compileJava {
5747
targetCompatibility '1.8'
5848
}
5949

50+
import me.champeau.gradle.japicmp.JapicmpTask
51+
52+
project.afterEvaluate {
53+
54+
def versions = project.ext.testInJavaVersions
55+
for (pluginJavaTestVersion in versions) {
56+
def taskName = "testInJava-${pluginJavaTestVersion}"
57+
tasks.register(taskName, Test) {
58+
def versionToUse = taskName.split("-").getAt(1) as Integer
59+
description = "Runs unit tests on Java version ${versionToUse}."
60+
project.logger.quiet("Test will be running in ${versionToUse}")
61+
group = 'verification'
62+
javaLauncher.set(javaToolchains.launcherFor {
63+
languageVersion = JavaLanguageVersion.of(versionToUse)
64+
})
65+
shouldRunAfter(tasks.named('test'))
66+
}
67+
tasks.named('check') {
68+
dependsOn(taskName)
69+
}
70+
}
71+
72+
project.configure(project) {
73+
def baselineVersion = project.ext.baselineCompareVersion
74+
task('apiDiff', type: JapicmpTask, dependsOn: 'jar') {
75+
oldClasspath = files(getBaselineJar(project, baselineVersion))
76+
newClasspath = files(jar.archiveFile)
77+
onlyModified = true
78+
failOnModification = true
79+
ignoreMissingClasses = true
80+
htmlOutputFile = file("$buildDir/reports/apiDiff/apiDiff.html")
81+
txtOutputFile = file("$buildDir/reports/apiDiff/apiDiff.txt")
82+
doLast {
83+
project.logger.quiet("Comparing against baseline version ${baselineVersion}")
84+
}
85+
}
86+
}
87+
}
88+
89+
private static File getBaselineJar(Project project, String baselineVersion) {
90+
// Use detached configuration: https://github.com/square/okhttp/blob/master/build.gradle#L270
91+
def group = project.group
92+
try {
93+
def baseline = "${project.group}:${project.name}:$baselineVersion"
94+
project.group = 'virtual_group_for_japicmp'
95+
def dependency = project.dependencies.create(baseline + "@jar")
96+
return project.configurations.detachedConfiguration(dependency).files.find {
97+
it.name == "${project.name}-${baselineVersion}.jar"
98+
}
99+
} finally {
100+
project.group = group
101+
}
102+
}
103+
60104
test {
61105
testLogging {
62106
events "skipped", "failed"
63107
exceptionFormat "short"
64108
}
65109
}
66110

67-
repositories {
68-
mavenCentral()
111+
ext {
112+
baselineCompareVersion = '0.15.0'
113+
testInJavaVersions = [8, 11, 17, 21]
69114
}
70115

71116
dependencies {
@@ -75,8 +120,9 @@ dependencies {
75120
exclude group: "org.mockito", module: "mockito-core"
76121
}
77122
testImplementation group: 'junit', name: 'junit', version:'4.13.1'
78-
testImplementation group: 'org.mockito', name: 'mockito-core', version:'1.10.19'
123+
testImplementation "org.mockito:mockito-core:4.8.1"
79124
testImplementation group: 'org.hamcrest', name: 'hamcrest-library', version:'1.3'
125+
80126
}
81127

82128
// See https://github.com/google/guava/releases/tag/v32.1.0 for why this is required

‎gradle.properties‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
GROUP=com.auth0
2+
POM_ARTIFACT_ID=jwks-rsa
3+
4+
POM_NAME=jwks-rsa-java
5+
POM_DESCRIPTION=JSON Web Key Set parser library
6+
POM_PACKAGING=jar
7+
8+
POM_URL=https://github.com/auth0/jwks-rsa-java
9+
POM_SCM_URL=https://github.com/auth0/jwks-rsa-java
10+
11+
POM_SCM_CONNECTION=scm:git:https://github.com/auth0/jwks-rsa-java.git
12+
POM_SCM_DEV_CONNECTION=scm:git:https://github.com/auth0/jwks-rsa-java.git
13+
14+
POM_LICENCE_NAME=The MIT License (MIT)
15+
POM_LICENCE_URL=https://raw.githubusercontent.com/auth0/jwks-rsa-java/master/LICENSE
16+
POM_LICENCE_DIST=repo
17+
18+
POM_DEVELOPER_ID=auth0
19+
POM_DEVELOPER_NAME=Auth0
20+
POM_DEVELOPER_EMAIL=oss@auth0.com

‎gradle/maven-publish.gradle‎

Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,114 @@
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', "8")
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+
}
114+

0 commit comments

Comments
 (0)