-
Notifications
You must be signed in to change notification settings - Fork 113
Release v3.12.6 #993
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Release v3.12.6 #993
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
12811d5
release v3.12.6
shijiesheng cb01ec2
v3.12.6 and simplify publishing in build.gradle
shijiesheng 5562b3a
fix signing task
shijiesheng 5502a29
fix unfound mavenJava issue
shijiesheng 0bba5cb
increase timeout for docker tests
shijiesheng File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -29,13 +29,6 @@ apply plugin: 'org.jruyi.thrift' | |
| apply plugin: 'maven-publish' | ||
| apply plugin: 'com.github.sherter.google-java-format' | ||
|
|
||
| if (hasProperty('signing.keyId')) { | ||
| apply plugin: 'signing' | ||
| signing { | ||
| sign configurations.archives | ||
| } | ||
| } | ||
|
|
||
| googleJavaFormat { | ||
| toolVersion '1.5' | ||
| include '**/*.java' | ||
|
|
@@ -45,7 +38,7 @@ googleJavaFormat { | |
| tasks.googleJavaFormat.dependsOn 'license' | ||
|
|
||
| group = 'com.uber.cadence' | ||
| version = '3.12.5' | ||
| version = '3.12.6' | ||
|
|
||
| description = '''Uber Cadence Java Client''' | ||
|
|
||
|
|
@@ -225,47 +218,40 @@ def ossrhUsername = hasProperty('ossrhUsername') ? property('ossrhUsername') : ' | |
| def ossrhPassword = hasProperty('ossrhPassword') ? property('ossrhPassword') : '' | ||
|
|
||
| publishing { | ||
|
|
||
| publications { | ||
| // Uncomment below if you want to run "publishMavenLocal" | ||
| maven(MavenPublication) { | ||
| pom.withXml { | ||
| asNode().with { | ||
| appendNode('packaging', 'jar') | ||
| appendNode('name', 'cadence-client') | ||
| appendNode('description', description) | ||
| appendNode('url', 'https://github.com/uber-java/cadence-client') | ||
| appendNode('scm').with { | ||
| appendNode('url', 'https://github.com/uber-java/cadence-client') | ||
| appendNode('connection', '[email protected]:uber-java/cadence-client.git') | ||
| mavenJava(MavenPublication) { | ||
| from components.java | ||
| artifact javadocJar | ||
| artifact sourcesJar | ||
| pom { | ||
| name = 'cadence-client' | ||
| description = 'Uber Cadence Java Client' | ||
| url = 'https://github.com/uber-java/cadence-client' | ||
| scm { | ||
| url = 'https://github.com/uber-java/cadence-client' | ||
| connection = 'scm:git:[email protected]:uber-java/cadence-client.git/' | ||
| developerConnection = 'scm:git:[email protected]:uber-java/cadence-client.git/' | ||
| } | ||
| licenses { | ||
| license { | ||
| name = 'The Apache License, Version 2.0' | ||
| url = 'http://www.apache.org/licenses/LICENSE-2.0.txt' | ||
| } | ||
| appendNode('licenses').with { | ||
| appendNode('license').with { | ||
| appendNode('name', 'The Apache License, Version 2.0') | ||
| appendNode('url', 'http://www.apache.org/licenses/LICENSE-2.0.txt') | ||
| } | ||
| } | ||
| developers { | ||
| developer { | ||
| id = 'maxim' | ||
| name = 'Maxim Fateev' | ||
| email = '[email protected]' | ||
| } | ||
| appendNode('developers').with { | ||
| appendNode('maxim').with { | ||
| appendNode('id', 'maxim') | ||
| appendNode('name', 'Maxim Fateev') | ||
| appendNode('email', '[email protected]') | ||
| } | ||
| appendNode('developer').with { | ||
| appendNode('id', 'meiliang') | ||
| appendNode('name', 'Liang Mei') | ||
| appendNode('email', '[email protected]') | ||
| } | ||
| developer { | ||
| id = 'meiliang' | ||
| name = 'Liang Mei' | ||
| email = '[email protected]' | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| mavenJava(MavenPublication) { | ||
| from components.java | ||
| artifact javadocJar | ||
| artifact sourcesJar | ||
| } | ||
| } | ||
| repositories { | ||
| maven { | ||
|
|
@@ -282,6 +268,14 @@ publishing { | |
| } | ||
| } | ||
|
|
||
| if (hasProperty('signing.keyId')) { | ||
| apply plugin: 'signing' | ||
| signing { | ||
| sign configurations.archives | ||
| sign publishing.publications.mavenJava | ||
| } | ||
| } | ||
|
|
||
| task registerDomain(type:JavaExec) { | ||
| main = 'com.uber.cadence.RegisterTestDomain' | ||
| classpath = sourceSets.test.runtimeClasspath | ||
|
|
@@ -299,61 +293,6 @@ test { | |
| } | ||
| } | ||
|
|
||
| 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) | ||
| } | ||
|
|
||
| pom.project { | ||
| name 'cadence-client' | ||
| packaging 'jar' | ||
| // optionally artifactId can be defined here | ||
| description 'Uber Cadence Java Client' | ||
| url 'https://github.com/uber-java/cadence-client' | ||
|
|
||
| scm { | ||
| connection 'scm:git:[email protected]:uber-java/cadence-client.git/' | ||
| developerConnection 'scm:git:[email protected]:uber-java/cadence-client.git/' | ||
| url 'https://github.com/uber-java/cadence-client' | ||
| } | ||
|
|
||
| licenses { | ||
| license { | ||
| name 'The Apache License, Version 2.0' | ||
| url 'http://www.apache.org/licenses/LICENSE-2.0.txt' | ||
| } | ||
| } | ||
|
|
||
| developers { | ||
| developer { | ||
| id 'maxim' | ||
| name 'Maxim Fateev' | ||
| email '[email protected]' | ||
| } | ||
| developer { | ||
| id 'mkol' | ||
| name 'Max K' | ||
| email '[email protected]' | ||
| } | ||
| developer { | ||
| id 'meiliang' | ||
| name 'Liang Mei' | ||
| email '[email protected]' | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| jacoco { | ||
| toolVersion = "0.8.2" | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe there's a group cadence alias we can point to instead?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we can add mailingLists. I'll try to release first and in another PR to add it