Skip to content

Fix build and bump dependencies #446

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.

Sign up for GitHub

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
cdancy merged 2 commits into from
Feb 12, 2025
Merged

Fix build and bump dependencies #446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
499c06d
Upgrade to Apache jclouds 2.7.0
hpoettker Jan 30, 2025
0a14bcc
Complete relocation of dependencies in shadow jar
hpoettker Feb 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 11 additions & 13 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id 'java-library'
id 'maven-publish'
id 'com.github.johnrengelman.shadow' version '6.1.0'
id 'com.github.johnrengelman.shadow' version '7.1.2'
id "io.github.gradle-nexus.publish-plugin" version "2.0.0"
//id 'checkstyle'
id 'jacoco'
Expand All @@ -19,7 +19,7 @@ repositories {
mavenCentral()
}

def gsonVersion = "2.8.9"
def gsonVersion = "2.11.0"

configurations {
all {
Expand All @@ -30,17 +30,17 @@ configurations {
}

dependencies {
ext.jcloudsVersion = '2.6.0'
ext.jcloudsVersion = '2.7.0'
ext.autoServiceVersion = '1.1.1'
ext.autoValueVersion = '1.10.4'
ext.guiceVersion = '5.1.0'
ext.autoValueVersion = '1.11.0'
ext.guiceVersion = '7.0.0'

// The transitive dependencies that are exposed via the public API of this project
api "com.google.code.gson:gson:${gsonVersion}"

implementation ("com.google.code.gson:gson:${gsonVersion}")
implementation 'javax.xml.bind:jaxb-api:2.3.1'
implementation 'javax.annotation:javax.annotation-api:1.3.2'
implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.2'
implementation 'jakarta.annotation:jakarta.annotation-api:2.0.0'
implementation ("org.apache.jclouds:jclouds-core:${jcloudsVersion}")
implementation ("com.google.inject:guice:${guiceVersion}")
implementation ("com.google.inject.extensions:guice-assistedinject:${guiceVersion}")
Expand All @@ -49,16 +49,14 @@ dependencies {
implementation ("com.google.auto.service:auto-service-annotations:${autoServiceVersion}")
annotationProcessor ("com.google.auto.service:auto-service:${autoServiceVersion}")

implementation ('javax.xml.bind:jaxb-api:2.3.1')

testImplementation ("org.apache.jclouds:jclouds-core:${jcloudsVersion}:tests")
testImplementation ("org.apache.jclouds.driver:jclouds-slf4j:${jcloudsVersion}")
testImplementation ('org.assertj:assertj-core:3.25.3')
testImplementation ('org.assertj:assertj-core:3.27.3')
testImplementation ('org.testng:testng:7.10.2')
testImplementation ('com.squareup.okhttp:mockwebserver:2.7.5')
testImplementation ('ch.qos.logback:logback-classic:1.5.6')
testImplementation ('ch.qos.logback:logback-core:1.5.6')
testImplementation ('commons-io:commons-io:2.16.1')
testImplementation ('ch.qos.logback:logback-classic:1.5.16')
testImplementation ('ch.qos.logback:logback-core:1.5.16')
testImplementation ('commons-io:commons-io:2.18.0')
}

ext.compatibilityVersion = JavaVersion.VERSION_11
Expand Down
14 changes: 7 additions & 7 deletions gradle/additional-artifacts.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@ shadowJar {
def foundName = rootProject.name.replaceAll('-', '.')
def newBasePackage = "${foundGroup}.${foundName}"

relocate 'org.aopalliance', "${newBasePackage}.shaded.org.aopalliance"
relocate 'org.objectweb', "${newBasePackage}.shaded.org.objectweb"
relocate 'com.google', "${newBasePackage}.shaded.com.google"
relocate 'net.sf', "${newBasePackage}.shaded.net.sf"
relocate 'javax.inject', "${newBasePackage}.shaded.javax.inject"
relocate 'com.sun', "${newBasePackage}.shaded.com.sun"
relocate 'org.aopalliance', "${newBasePackage}.shaded.org.aopalliance"
relocate 'org.checkerframework', "${newBasePackage}.shaded.org.checkerframework"
relocate 'org.eclipse', "${newBasePackage}.shaded.org.eclipse"
relocate 'org.glassfish', "${newBasePackage}.shaded.org.glassfish"
relocate 'org.jclouds', "${newBasePackage}.shaded.org.jclouds"
relocate 'javax.inject', "${newBasePackage}.shaded.javax.inject"
relocate 'jakarta', "${newBasePackage}.shaded.jakarta"
relocate 'javax.activation', "${newBasePackage}.shaded.javax.activation"
relocate 'javax.annotation', "${newBasePackage}.shaded.javax.annotation"
relocate 'javax.ws.rs', "${newBasePackage}.shaded.javax.ws.rs"
relocate 'javax.xml.bind', "${newBasePackage}.shaded.javax.xml.bind"
}

task sourcesJar(type: Jar) {
Expand Down
2 changes: 1 addition & 1 deletion gradle/publishing.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ publishing {
def root = asNode()
root.appendNode('name', 'Bitbucket Rest')
root.appendNode('description', 'Java client for working with Bitbucket REST API.')
root.appendNode('url', 'https://github.com/cdancy/jenkins-rest')
root.appendNode('url', 'https://github.com/cdancy/bitbucket-rest')
root.appendNode('inceptionYear', '2016')

def scm = root.appendNode('scm')
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
18 changes: 14 additions & 4 deletions gradlew
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 9 additions & 6 deletions gradlew.bat
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/main/java/com/cdancy/bitbucket/rest/binders/BindHookSettingsToPayload.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

import com.cdancy.bitbucket.rest.domain.repository.HookSettings;

import javax.inject.Singleton;
import jakarta.inject.Singleton;

import org.jclouds.http.HttpRequest;
import org.jclouds.rest.Binder;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/cdancy/bitbucket/rest/binders/BindSearchRequestToPayload.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

import com.cdancy.bitbucket.rest.domain.search.SearchRequest;

import javax.inject.Singleton;
import jakarta.inject.Singleton;

import org.jclouds.http.HttpRequest;
import org.jclouds.rest.Binder;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/cdancy/bitbucket/rest/fallbacks/BitbucketFallbacks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,7 @@ public Object createOrPropagate(final Throwable throwable) throws Exception {
if (checkNotNull(throwable, "throwable") != null) {
// if the repo sync is disabled a 204 is returned with 'null' as the content
final Boolean is204 = returnValueOnCodeOrNull(throwable, true, equalTo(204));
final boolean isAvailable = (is204 != null) ? true : false;
final boolean isAvailable = is204 != null;
final List<Error> errors = getErrors(throwable.getMessage());
if (errors.size() > 0
&& errors.get(0).context() != null
Expand Down
18 changes: 9 additions & 9 deletions src/main/java/com/cdancy/bitbucket/rest/features/AdminApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@
import org.jclouds.rest.annotations.RequestFilters;
import org.jclouds.rest.annotations.ResponseParser;

import javax.inject.Named;
import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.POST;
import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType;
import jakarta.inject.Named;
import jakarta.ws.rs.Consumes;
import jakarta.ws.rs.DELETE;
import jakarta.ws.rs.GET;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.POST;
import jakarta.ws.rs.Produces;
import jakarta.ws.rs.QueryParam;
import jakarta.ws.rs.core.MediaType;

@Produces(MediaType.APPLICATION_JSON)
@RequestFilters(BitbucketAuthenticationFilter.class)
Expand Down
24 changes: 12 additions & 12 deletions src/main/java/com/cdancy/bitbucket/rest/features/BranchApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,18 +37,18 @@
import org.jclouds.rest.annotations.PayloadParam;
import org.jclouds.rest.annotations.RequestFilters;
import org.jclouds.rest.binders.BindToJsonPayload;
import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
import javax.ws.rs.GET;
import javax.ws.rs.POST;
import javax.ws.rs.PUT;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType;

import javax.inject.Named;
import jakarta.ws.rs.Consumes;
import jakarta.ws.rs.DELETE;
import jakarta.ws.rs.GET;
import jakarta.ws.rs.POST;
import jakarta.ws.rs.PUT;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.PathParam;
import jakarta.ws.rs.Produces;
import jakarta.ws.rs.QueryParam;
import jakarta.ws.rs.core.MediaType;

import jakarta.inject.Named;
import java.util.List;
import org.jclouds.rest.annotations.ResponseParser;

Expand Down
18 changes: 9 additions & 9 deletions src/main/java/com/cdancy/bitbucket/rest/features/BuildStatusApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@
import org.jclouds.rest.annotations.Fallback;
import org.jclouds.rest.annotations.RequestFilters;

import javax.inject.Named;
import javax.ws.rs.Consumes;
import javax.ws.rs.GET;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType;
import jakarta.inject.Named;
import jakarta.ws.rs.Consumes;
import jakarta.ws.rs.GET;
import jakarta.ws.rs.POST;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.PathParam;
import jakarta.ws.rs.Produces;
import jakarta.ws.rs.QueryParam;
import jakarta.ws.rs.core.MediaType;
import org.jclouds.rest.annotations.BinderParam;
import org.jclouds.rest.annotations.ResponseParser;
import org.jclouds.rest.binders.BindToJsonPayload;
Expand Down
20 changes: 10 additions & 10 deletions src/main/java/com/cdancy/bitbucket/rest/features/CommentsApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@

package com.cdancy.bitbucket.rest.features;

import javax.inject.Named;
import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
import javax.ws.rs.GET;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType;
import jakarta.inject.Named;
import jakarta.ws.rs.Consumes;
import jakarta.ws.rs.DELETE;
import jakarta.ws.rs.GET;
import jakarta.ws.rs.POST;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.PathParam;
import jakarta.ws.rs.Produces;
import jakarta.ws.rs.QueryParam;
import jakarta.ws.rs.core.MediaType;

import org.jclouds.rest.annotations.BinderParam;
import org.jclouds.rest.annotations.Fallback;
Expand Down
16 changes: 8 additions & 8 deletions src/main/java/com/cdancy/bitbucket/rest/features/CommitsApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@
import org.jclouds.rest.annotations.Fallback;
import org.jclouds.rest.annotations.RequestFilters;

import javax.inject.Named;
import javax.ws.rs.Consumes;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
import jakarta.inject.Named;
import jakarta.ws.rs.Consumes;
import jakarta.ws.rs.GET;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.PathParam;
import jakarta.ws.rs.Produces;
import jakarta.ws.rs.QueryParam;

import javax.ws.rs.core.MediaType;
import jakarta.ws.rs.core.MediaType;
import org.jclouds.javax.annotation.Nullable;

@Produces(MediaType.APPLICATION_JSON)
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/cdancy/bitbucket/rest/features/CompareApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
import org.jclouds.rest.annotations.Fallback;
import org.jclouds.rest.annotations.RequestFilters;

import javax.inject.Named;
import javax.ws.rs.*;
import javax.ws.rs.core.MediaType;
import jakarta.inject.Named;
import jakarta.ws.rs.*;
import jakarta.ws.rs.core.MediaType;

@Produces(MediaType.APPLICATION_JSON)
@RequestFilters(BitbucketAuthenticationFilter.class)
Expand Down
Loading