Merge pull request #55 from burmanm/dep_upgrades

Update some dependencies
datastax · Apr 10, 2024 · c319ff0 · c319ff0
2 parents df39056 + ae0616b
commit c319ff0
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 32 deletions.
diff --git a/.github/workflows/buildAndDeploy.yml b/.github/workflows/buildAndDeploy.yml
@@ -9,42 +9,51 @@ jobs:
     name: Build Cass Config Builder Docker Image
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         if: github.event_name == 'pull_request'
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           submodules: true
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         if: github.event_name != 'pull_request'
         with:
           submodules: true
-      - name: Login to GitHub Package Registry
-        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u "${{ github.actor }}" --password-stdin
-      - name: Setup Buildx
-        id: buildx
-        uses: crazy-max/ghaction-docker-buildx@v3
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '8'
+      - name: Login to DockerHub
+        if: ${{ !env.ACT }}
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
       - name: Cache Docker layers
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         id: cache
         with:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-buildx-${{ github.sha }}
           restore-keys: |
             ${{ runner.os }}-buildx-
           java-version: 1.8
-      - name: Run tests
-        if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'datastax/cass-config-builder'
-        env:
-          ORG_GRADLE_PROJECT_dockerRegistry: docker.pkg.github.com
-          ORG_GRADLE_PROJECT_dockerRegistryUsername: ${{ github.actor }}
-          ORG_GRADLE_PROJECT_dockerRegistryPassword: ${{ secrets.GITHUB_TOKEN }}
-        uses: eskatos/gradle-command-action@v1
-        with:
-          gradle-version: 6.0.1
-          arguments: test
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v3
+      - name: Build with Gradle
+        run: ./gradlew test
       - name: Build docker image
         env:
           GITHUB_REPO_OWNER: ${{ github.repository_owner }}
         run: |
           export GITHUB_REPO_URL="https://github.com/${{ github.repository }}"
           ./scripts/build-push-images.sh
+      - name: Archive build logs
+        if: ${{ failure() }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: gradle-logs
+          path: build/reports
+
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -10,16 +10,19 @@ jobs:
     name: Release Cass Config Builder
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           submodules: true
       - name: Login to DockerHub
-        run: echo "${{ secrets.DOCKERHUB_PASS }}" | docker login -u "${{ secrets.DOCKERHUB_USER }}" --password-stdin
-      - name: Setup Buildx
-        id: buildx
-        uses: crazy-max/ghaction-docker-buildx@v3
+        if: ${{ !env.ACT }}
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USER }}
+          password: ${{ secrets.DOCKERHUB_PASS }}
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
       - name: Cache Docker layers
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         id: cache
         with:
           path: /tmp/.buildx-cache

diff --git a/build.gradle b/build.gradle
@@ -41,6 +41,10 @@ repositories {
     name = 'clojars'
     url = 'https://repo.clojars.org'
   }
+  maven {
+    name = 'redhatEA'
+    url = 'https://maven.repository.redhat.com/earlyaccess/all/'
+  }
 }
 
 sourceCompatibility = 1.8
@@ -88,13 +92,14 @@ configurations {
 }
 
 dependencies {
-    implementation "org.clojure:clojure:1.10.1"
-    implementation "org.clojure:core.match:0.3.0-alpha5"
-    implementation "org.clojure:core.memoize:0.5.9"
+    implementation "org.clojure:clojure:1.11.2"
+    implementation "org.clojure:core.match:1.1.0"
+    implementation "org.clojure:core.memoize:1.1.266"
     implementation "slingshot:slingshot:0.12.2"
-    implementation "org.yaml:snakeyaml:1.23"
-    implementation "cheshire:cheshire:5.8.0"
-    implementation ("selmer:selmer:1.12.27") { // templating lib
+    implementation 'org.yaml:snakeyaml:1.33.0.SP1-redhat-00001'
+    implementation "cheshire:cheshire:5.13.0"
+    implementation 'commons-codec:commons-codec:1.16.1'
+    implementation ("selmer:selmer:1.12.59") { // templating lib
         exclude module: 'hiccups'
         exclude module: 'cheshire'
         exclude group: 'com.fasterxml.jackson.core', module: 'jackson-core'

diff --git a/test/com/datastax/configbuilder/operator_test.clj b/test/com/datastax/configbuilder/operator_test.clj
@@ -26,8 +26,7 @@
         :definitions-location test-data/definitions-location})
       (is false "Malformed input was not detected")
       (catch Exception e
-        (is (= "Unexpected end-of-input within/between Object entries\n at [Source: (StringReader); line: 1, column: 31]"
-               (.getMessage e))
+        (is (clojure.string/includes? (.getMessage e) "Unexpected end-of-input within/between Object entries")
             "Wrong error thrown"))))
   (testing "ensure all files generated"
     (sut/make-configs