Skip to content

Commit 52dafe5

Browse files
committed
fix: adjustments after merge of #9
1 parent b1cdba5 commit 52dafe5

File tree

7 files changed

+31
-44
lines changed

7 files changed

+31
-44
lines changed

.github/FUNDING.yml

Lines changed: 0 additions & 1 deletion
This file was deleted.

build.gradle

Lines changed: 8 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,12 @@
1-
apply plugin: 'java'
2-
3-
buildscript {
4-
repositories {
5-
mavenCentral()
6-
mavenLocal()
7-
}
8-
dependencies {
9-
classpath 'se.bjurr.gradle:gradle-scripts:2.+'
10-
}
1+
plugins {
2+
id "se.bjurr.gradle.conventional-release" version "0.+"
3+
id "se.bjurr.gradle.java-convention" version "0.+"
4+
id "se.bjurr.gradle.update-versions" version "0.+"
115
}
12-
project.ext.buildConfig = [
13-
repoType: "COMMAND",
14-
publishing: [
15-
relocate: [
16-
'org:org',
17-
'javax:javax',
18-
'com:com',
19-
'se:se',
20-
'io:io'
21-
]
22-
],
23-
violations: [
24-
updateReadme: true
25-
],
26-
manifest: [
27-
mainClass: 'se.bjurr.violations.main.Main'
28-
]
29-
]
30-
apply from: project.buildscript.classLoader.getResource('main.gradle').toURI()
316

327
dependencies {
33-
implementation 'se.bjurr.violations:violation-comments-to-bitbucket-cloud-lib:1.16.1'
34-
implementation 'se.bjurr.violations:violations-lib:1.157.0'
35-
implementation 'se.softhouse:jargo:0.4.14'
36-
implementation 'org.slf4j:slf4j-simple:2.0.0'
8+
implementation 'se.bjurr.violations:violation-comments-to-bitbucket-cloud-lib:1.17.1'
9+
implementation 'se.bjurr.violations:violations-lib:1.158.1'
10+
implementation 'se.softhouse:jargo:0.4.14'
11+
implementation 'org.slf4j:slf4j-simple:2.0.17'
3712
}

gradle.properties

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
#Sun Mar 24 18:37:54 CET 2024
1+
#
2+
#Wed Jul 16 19:08:12 CEST 2025
23
description='Report static code analysis to Bitbucket Cloud.'
3-
version=1.34.0
44
group='se.bjurr.violations'
5+
version=1.35.0
6+
relocate=org,com,javax,se,io
7+
mainClass=se.bjurr.violations.main.Main
8+
repoType=COMMAND
9+
maxViolations=17

gradle/wrapper/gradle-wrapper.jar

121 Bytes
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

settings.gradle

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
pluginManagement {
2+
repositories {
3+
gradlePluginPortal()
4+
mavenCentral()
5+
mavenLocal()
6+
}
7+
}

src/main/java/se/bjurr/violations/main/Runner.java

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,11 @@ public void main(final String args[]) throws Exception {
105105
"You can create an 'application password' in Bitbucket to use here. See https://confluence.atlassian.com/bitbucket/app-passwords-828781300.html")
106106
.build();
107107
final Argument<String> apiTokenArg =
108-
stringArgument("-api-token", "-t")
109-
.defaultValue("")
110-
.description(
111-
"You can create an 'API token' in Bitbucket to use here. See https://support.atlassian.com/bitbucket-cloud/docs/api-tokens/")
112-
.build();
108+
stringArgument("-api-token", "-t")
109+
.defaultValue("")
110+
.description(
111+
"You can create an 'API token' in Bitbucket to use here. See https://support.atlassian.com/bitbucket-cloud/docs/api-tokens/")
112+
.build();
113113
final Argument<Boolean> shouldCommentOnlyChangedContentArg =
114114
booleanArgument("-comment-only-changed-content", "-cocc")
115115
.defaultValue(true)
@@ -179,7 +179,8 @@ public void main(final String args[]) throws Exception {
179179
}
180180

181181
if (this.apiToken != null && (this.username != null || this.password != null)) {
182-
throw new Exception("API tokens and application passwords cannot be used simultaneously. Specify either one of them.");
182+
throw new Exception(
183+
"API tokens and application passwords cannot be used simultaneously. Specify either one of them.");
183184
}
184185

185186
} catch (final ArgumentException exception) {
@@ -233,7 +234,7 @@ public void log(final Level level, final String string, final Throwable t) {
233234
.withPassword(this.password);
234235
}
235236

236-
if (!this.apiToken.isEmpty()){
237+
if (!this.apiToken.isEmpty()) {
237238
violationCommentsToBitbucketServerApi
238239
.withApiToken(this.apiToken);
239240
}

0 commit comments

Comments
 (0)