From 0e4e498f5898bbe81ba7f5f285c08a75b14402f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alberto=20C=2E=20R=C3=ADos?= <albertoimpl@gmail.com>
Date: Wed, 24 Jul 2024 11:47:45 +0200
Subject: [PATCH] 2.3.x: Enabling CI and upgrading to latest dependencies

---
 .github/dependabot.yml                   | 25 ------------------------
 build.gradle                             |  4 ++--
 ci/images/spring-credhub-ci/Dockerfile   |  9 ++++++++-
 ci/tasks/generate-docker-credentials.yml |  6 +++---
 settings.gradle                          |  4 ++--
 5 files changed, 15 insertions(+), 33 deletions(-)
 delete mode 100644 .github/dependabot.yml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
deleted file mode 100644
index 8c6d923..0000000
--- a/.github/dependabot.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: gradle
-    directory: "/"
-    target-branch: "main"
-    schedule:
-      interval: daily
-    open-pull-requests-limit: 15
-    labels:
-      - "dependency-upgrade"
-    ignore:
-      - dependency-name: "*"
-        update-types: ["version-update:semver-major", "version-update:semver-minor"]
-
-  - package-ecosystem: gradle
-    directory: "/"
-    target-branch: "2.2.x"
-    schedule:
-      interval: daily
-    open-pull-requests-limit: 15
-    labels:
-      - "dependency-upgrade"
-    ignore:
-      - dependency-name: "*"
-        update-types: ["version-update:semver-major", "version-update:semver-minor"]
diff --git a/build.gradle b/build.gradle
index 8ffc613..f4bbf79 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,7 +18,7 @@ plugins {
 	id 'checkstyle'
 	id 'io.spring.nohttp' version '0.0.11'
 	id 'io.spring.dependency-management' version '1.0.15.RELEASE'
-	id 'io.spring.javaformat' version '0.0.41'
+	id 'io.spring.javaformat' version '0.0.42'
 }
 
 description = "Spring CredHub"
@@ -82,7 +82,7 @@ configure(allprojects) {
 	}
 	
 	dependencies {
-		checkstyle("io.spring.javaformat:spring-javaformat-checkstyle:0.0.41")
+		checkstyle("io.spring.javaformat:spring-javaformat-checkstyle:0.0.42")
 	}
 }
 
diff --git a/ci/images/spring-credhub-ci/Dockerfile b/ci/images/spring-credhub-ci/Dockerfile
index 6d1d12c..8f5f0f2 100644
--- a/ci/images/spring-credhub-ci/Dockerfile
+++ b/ci/images/spring-credhub-ci/Dockerfile
@@ -1,4 +1,4 @@
-FROM harbor-repo.vmware.com/dockerhub-proxy-cache/library/ubuntu:jammy
+FROM spring-credhub-docker-virtual.usw1.packages.broadcom.com/ubuntu:jammy
 
 # Environment variables
 ENV TERM dumb
@@ -50,6 +50,13 @@ RUN mkdir -p /opt/openjdk && \
     cd /opt/openjdk && \
     curl -L https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_x64_linux_hotspot_8u292b10.tar.gz | tar xz --strip-components=1
 
+# https://github.com/docker/cli/issues/4807#issuecomment-1903950217
+RUN \
+    echo "ulimits: $(ulimit -Sn):$(ulimit -Hn)"; \
+    sed -i 's/ulimit -Hn/# ulimit -Hn/g' /etc/init.d/docker; \
+    service docker start; \
+    rm -rf /var/cache/apt;
+
 WORKDIR /unpack
 
 ADD "https://raw.githubusercontent.com/spring-io/concourse-java-scripts/v$CONCOURSE_JAVA_SCRIPTS_VERSION/concourse-java.sh" /opt/
diff --git a/ci/tasks/generate-docker-credentials.yml b/ci/tasks/generate-docker-credentials.yml
index 55ea08d..34f20c9 100644
--- a/ci/tasks/generate-docker-credentials.yml
+++ b/ci/tasks/generate-docker-credentials.yml
@@ -20,6 +20,6 @@ run:
 
 params:
   DOCKER_CONFIG_OUTPUT: ../docker-config
-  REGISTRY: ((registry))
-  REGISTRY_USERNAME: ((registry-username))
-  REGISTRY_PASSWORD: ((registry-password))
+  REGISTRY: ((spring-credhub-virtual-docker-registry))
+  REGISTRY_USERNAME: ((broadcom-jfrog-artifactory-robot-account.username))
+  REGISTRY_PASSWORD: ((broadcom-jfrog-artifactory-robot-account.password))
diff --git a/settings.gradle b/settings.gradle
index efff9c1..16e8420 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -33,8 +33,8 @@ pluginManagement {
 }
 
 plugins {
-	id 'com.gradle.enterprise' version '3.14.1'
-	id 'io.spring.ge.conventions' version '0.0.15'
+	id 'com.gradle.develocity' version '3.17.6'
+	id 'io.spring.ge.conventions' version '0.0.17'
 }
 
 rootProject.name = 'spring-credhub'