Skip to content

Commit d60f719

Browse files
authored
fix: fix broken release, migrate to maven central (#1464)
Tested with branch https://github.com/dtinit/data-transfer-project/actions/runs/16218526383/job/45793382690 Just making sure releases are unblocked, will update documentation later
1 parent b6ae653 commit d60f719

File tree

3 files changed

+13
-9
lines changed

3 files changed

+13
-9
lines changed

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ jobs:
5353
env:
5454
GRADLE_SIGNING_KEY: "${{ secrets.GRADLE_SIGNING_KEY }}"
5555
GRADLE_SIGNING_PASSWORD: "${{ secrets.GRADLE_SIGNING_PASSWORD }}"
56-
OSSRH_USERNAME: "${{ secrets.OSSRH_USERNAME }}"
57-
OSSRH_PASSWORD: "${{ secrets.OSSRH_PASSWORD }}"
5856
RELEASE_VERSION: "${{ needs.bump_version.outputs.version }}"
57+
CENTRAL_PORTAL_PASS: "${{ secrets.CENTRAL_PORTAL_PASS }}"
58+
CENTRAL_PORTAL_USER: "${{ secrets.CENTRAL_PORTAL_USER }}"
5959
# Exclude client-rest as it's not part of the java release
6060
run: ./gradlew clean build sign uploadArchives --exclude-task :client-rest:uploadArchives

build.gradle

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -148,17 +148,19 @@ def configurePublication(Project project) {
148148
mavenDeployer {
149149
beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
150150

151-
repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2") {
151+
// Please see https://central.sonatype.org/publish/publish-portal-ossrh-staging-api/#overview
152+
repository(url: "https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2") {
152153
authentication(
153-
userName: project.hasProperty('ossrhUsername') ? ossrhUsername : System.getenv('OSSRH_USERNAME'),
154-
password: project.hasProperty('ossrhPassword') ? ossrhPassword : System.getenv('OSSRH_PASSWORD')
154+
userName: project.hasProperty('ossrhUsername') ? ossrhUsername : System.getenv('CENTRAL_PORTAL_USER'),
155+
password: project.hasProperty('ossrhPassword') ? ossrhPassword : System.getenv('CENTRAL_PORTAL_PASS')
155156
)
156157
}
157158

158-
snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots") {
159+
// not sure if it works anymore
160+
snapshotRepository(url: "https://ossrh-staging-api.central.sonatype.com/content/repositories/snapshots") {
159161
authentication(
160-
userName: project.hasProperty('ossrhUsername') ? ossrhUsername : System.getenv('OSSRH_USERNAME'),
161-
password: project.hasProperty('ossrhPassword') ? ossrhPassword : System.getenv('OSSRH_PASSWORD')
162+
userName: project.hasProperty('ossrhUsername') ? ossrhUsername : System.getenv('CENTRAL_PORTAL_USER'),
163+
password: project.hasProperty('ossrhPassword') ? ossrhPassword : System.getenv('CENTRAL_PORTAL_PASS')
162164
)
163165
}
164166

portability-types-common/src/main/java/org/datatransferproject/types/common/models/photos/PhotoModel.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,9 @@ public String getMimeType() {
188188
return getMediaType();
189189
}
190190

191-
// TODO(zacsh) remove this in favor of getFolderId
191+
/**
192+
* TODO(zacsh) remove this in favor of getFolderId
193+
*/
192194
public String getAlbumId() {
193195
return albumId;
194196
}

0 commit comments

Comments
 (0)