这是indexloc提供的服务,不要输入任何密码
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
32 changes: 16 additions & 16 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ plugins {
id 'com.gradle.plugin-publish' version '1.3.1'
id 'com.github.sherter.google-java-format' version '0.9'
id 'io.github.gradle-nexus.publish-plugin' version '2.0.0'
id 'org.owasp.dependencycheck' version '12.1.1'
id 'org.owasp.dependencycheck' version '12.1.3'
}

ext {
Expand Down Expand Up @@ -177,37 +177,37 @@ if (project.hasProperty('signing.keyId')) { // publish as library in maven centr

dependencies {
api 'com.github.spullara.mustache.java:compiler:0.9.14'
api 'com.fasterxml.jackson.core:jackson-databind:2.19.0'
api 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.19.0'
api 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.19.0'
api 'commons-io:commons-io:2.19.0'
api 'com.fasterxml.jackson.core:jackson-databind:2.19.2'
api 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.19.2'
api 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.19.2'
api 'commons-io:commons-io:2.20.0'
api gradleApi()

implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.19.0'
implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.19.2'
implementation 'org.reflections:reflections:0.10.2'
// swagger generators
implementation('io.swagger.codegen.v3:swagger-codegen-generators:1.0.56') {
implementation('io.swagger.codegen.v3:swagger-codegen-generators:1.0.57') {
exclude group: 'net.sf.jopt-simple', module: 'jopt-simple'
}
constraints { // for previous swagger dependency
implementation('commons-codec:commons-codec:1.18.0') {
implementation('commons-codec:commons-codec:1.19.0') {
because "This version closes a security vulnerability"
}
}
implementation 'com.googlecode.lambdaj:lambdaj:2.3.3'
implementation 'com.google.googlejavaformat:google-java-format:1.27.0'
implementation 'com.google.googlejavaformat:google-java-format:1.28.0'

testImplementation gradleTestKit()
testImplementation 'org.mockito:mockito-junit-jupiter:5.18.0'
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.12.2'
testImplementation 'org.junit.jupiter:junit-jupiter-params:5.12.2'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.12.2'
testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.12.2'
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.13.4'
testImplementation 'org.junit.jupiter:junit-jupiter-params:5.13.4'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.13.4'
testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.13.4'

compileOnly 'org.projectlombok:lombok:1.18.38'
annotationProcessor 'org.projectlombok:lombok:1.18.38'
implementation 'com.squareup.okhttp3:okhttp:4.12.0'
testImplementation 'com.squareup.okhttp3:mockwebserver:4.12.0'
implementation 'com.squareup.okhttp3:okhttp:5.1.0'
testImplementation 'com.squareup.okhttp3:mockwebserver:5.1.0'
}

jacocoTestReport {
Expand Down Expand Up @@ -291,7 +291,7 @@ tasks.register('installGitHooks') {
}

tasks.named('wrapper') {
gradleVersion = '8.14.1'
gradleVersion = '8.14.3'
}

tasks.register('ci-updater', JavaExec) {
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
18 changes: 9 additions & 9 deletions src/main/java/co/com/bancolombia/Constants.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,20 @@ public final class Constants {
public static final String APP_SERVICE = "app-service";
public static final String PATH_GRAPHQL = "/graphql";
// dependencies
public static final String SECRETS_VERSION = "4.4.33";
public static final String SPRING_BOOT_VERSION = "3.5.3";
public static final String SECRETS_VERSION = "4.4.34";
public static final String SPRING_BOOT_VERSION = "3.5.4";
public static final String LOMBOK_VERSION = "1.18.38";
public static final String REACTIVE_COMMONS_VERSION = "5.4.1";
public static final String REACTIVE_COMMONS_VERSION = "5.5.0";
public static final String REACTIVE_COMMONS_MAPPER_VERSION = "0.1.0";
public static final String BLOCK_HOUND_VERSION = "1.0.11.RELEASE";
public static final String AWS_BOM_VERSION = "2.32.3";
public static final String COMMONS_JMS_VERSION = "2.4.2";
public static final String BLOCK_HOUND_VERSION = "1.0.13.RELEASE";
public static final String AWS_BOM_VERSION = "2.32.13";
public static final String COMMONS_JMS_VERSION = "2.4.5";
public static final String GRAPHQL_KICKSTART_VERSION = "15.1.0";
public static final String ARCH_UNIT_VERSION = "1.4.0";
public static final String OKHTTP_VERSION = "4.12.0";
public static final String ARCH_UNIT_VERSION = "1.4.1";
public static final String OKHTTP_VERSION = "5.1.0";
public static final String RESILIENCE_4J_VERSION = "2.3.0";
public static final String BIN_STASH_VERSION = "1.3.1";
public static final String SPRING_DOC_OPENAPI_VERSION = "2.8.8";
public static final String SPRING_DOC_OPENAPI_VERSION = "2.8.9";
public static final String CLOUD_EVENTS_VERSION = "4.0.1";
// gradle plugins
public static final String JACOCO_VERSION = "0.8.13";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ public class PipelineAzure implements ModuleFactory {

@Override
public void buildModule(ModuleBuilder builder) throws IOException, CleanException {
builder.addParam("sonar.java.binaries", "**/build/classes/java/main");
builder.addParam("sonar.junit.reportsPaths", "**/build/test-results/test");
builder.setupFromTemplate("pipeline/azure");
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@

public class UpgradeY2022M05D05 implements UpgradeAction {
@Override
@SuppressWarnings("unchecked")
public boolean up(ModuleBuilder builder) {
String name = builder.getProject().getRootProject().getName();
try {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public boolean up(ModuleBuilder builder) {

@Override
public String name() {
return "3.18.2->3.18.3";
return "3.18.2->3.19.0";
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ private String updateUrl(ModuleBuilder builder, String file, String content) {

@Override
public String name() {
return "3.18.3->3.20.16";
return "3.20.6->3.20.15";
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,44 +43,42 @@ public boolean up(ModuleBuilder builder) {
| builder.updateFile(
GRADLE_PROPERTIES,
content -> {
String modifiedContent = content;

modifiedContent =
content =
updateGradleProperties(
builder,
modifiedContent,
content,
CONFIGURATION_CACHE_INTEGRITY_REGEX,
"org.gradle.configuration-cache.integrity-check=false",
"org.gradle.configuration-cache.integrity-check=",
CONFIGURATION_CACHE_INTEGRITY);

modifiedContent =
content =
updateGradleProperties(
builder,
modifiedContent,
content,
CONFIGURATION_CACHE_PARALLEL_REGEX,
"org.gradle.configuration-cache.parallel=false",
"org.gradle.configuration-cache.parallel=",
CONFIGURATION_CACHE_PARALLEL);

modifiedContent =
content =
updateGradleProperties(
builder,
modifiedContent,
content,
CONFIGURATION_CACHE_REGEX,
"org.gradle.configuration-cache=false",
"org.gradle.configuration-cache=",
CONFIGURATION_CACHE);
modifiedContent =
content =
updateGradleProperties(
builder,
modifiedContent,
content,
CACHING_REGEX,
"org.gradle.caching=false",
"org.gradle.caching=",
CACHING);

return modifiedContent;
return content;
})
| UpdateUtils.appendIfNotContains(builder, "./.gitignore", "build-cache", "\nbuild-cache");
}
Expand All @@ -100,7 +98,7 @@ private String updateGradleProperties(

@Override
public String name() {
return "3.22.4->3.22.5";
return "3.22.4->3.23.0";
}

@Override
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
package co.com.bancolombia.factory.upgrades.actions;

import static co.com.bancolombia.Constants.MainFiles.BUILD_GRADLE;

import co.com.bancolombia.factory.ModuleBuilder;
import co.com.bancolombia.factory.upgrades.UpgradeAction;
import lombok.SneakyThrows;

public class UpgradeY2025M08D01Sonar implements UpgradeAction {
private static final String SONAR_TESTS_REGEX = "\"sonar\\.test\"";
private static final String SONAR_JAVA_BINARIES_REGEX =
"\"sonar\\.java\\.binaries\",\\s*\"([^\"]*)\"";
private static final String SONAR_JUNIT_REPORTS_PATH_REGEX =
"\"sonar\\.junit\\.reportsPath\",\\s*\"([^\"]*)\"";

@Override
@SneakyThrows
public boolean up(ModuleBuilder builder) {
return builder.updateFile(
BUILD_GRADLE, content -> content.replaceAll(SONAR_TESTS_REGEX, "\"sonar.tests\""))
| builder.updateFile(
BUILD_GRADLE,
content ->
content.replaceAll(
SONAR_JAVA_BINARIES_REGEX,
"\"sonar.java.binaries\", \"**/build/classes/java/main\""))
| builder.updateFile(
BUILD_GRADLE,
content ->
content.replaceAll(
SONAR_JUNIT_REPORTS_PATH_REGEX,
"\"sonar.junit.reportsPath\", \"**/build/test-results/test\""));
}

@Override
public String name() {
return "3.23.2->3.23.3";
}

@Override
public String description() {
return "Add block hound validations";
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package {{package}}.mq.sender;
import co.com.bancolombia.commons.jms.api.MQMessageSender;
import co.com.bancolombia.commons.jms.mq.EnableMQGateway;
{{#lombok}}
import lombok.AllArgsConstructor;
import lombok.RequiredArgsConstructor;
{{/lombok}}
import org.springframework.stereotype.Component;
import reactor.core.publisher.Mono;
Expand All @@ -12,7 +12,7 @@ import jakarta.jms.Message;

@Component
{{#lombok}}
@AllArgsConstructor
@RequiredArgsConstructor
{{/lombok}}
@EnableMQGateway(scanBasePackages = "{{package}}")
public class SampleMQMessageSender /* implements SomeGateway */ {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package {{package}}.mq.reqreply;

import co.com.bancolombia.commons.jms.mq.EnableMQGateway;
{{#lombok}}
import lombok.AllArgsConstructor;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
{{/lombok}}
import org.springframework.stereotype.Component;
Expand All @@ -13,7 +13,7 @@ import jakarta.jms.TextMessage;

@Component
{{#lombok}}
@AllArgsConstructor
@RequiredArgsConstructor
{{/lombok}}
@EnableMQGateway(scanBasePackages = "{{package}}")
public class SampleMQReqReply /* implements SomeGateway */ {
Expand Down
Loading