From a702a995f8bd09d8073e8df7ffea278419170e75 Mon Sep 17 00:00:00 2001 From: dert1129 Date: Thu, 21 May 2026 12:01:37 -0400 Subject: [PATCH 1/4] try upgrading hydra-data --- .github/workflows/build-gradle-project.yml | 6 ++--- Dockerfile | 2 +- build.gradle | 28 ++++++---------------- gradle/wrapper/gradle-wrapper.properties | 2 +- src/main/java/org/kpmp/Query.java | 5 ++-- 5 files changed, 15 insertions(+), 28 deletions(-) diff --git a/.github/workflows/build-gradle-project.yml b/.github/workflows/build-gradle-project.yml index a36b602..b126d07 100644 --- a/.github/workflows/build-gradle-project.yml +++ b/.github/workflows/build-gradle-project.yml @@ -6,7 +6,7 @@ on: jobs: build-gradle-project: env: - IMAGE_TAG: 1.11.0 + IMAGE_TAG: 1.12.0 runs-on: ubuntu-latest steps: - name: Get branch names @@ -26,7 +26,7 @@ jobs: - name: Setup Gradle uses: gradle/gradle-build-action@v2 with: - gradle-version: 8.5 + gradle-version: 8.14 - name: Login to Docker Hub uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a @@ -36,7 +36,7 @@ jobs: - name: Run build with Gradle Wrapper run: | - ./gradlew build docker + ./gradlew bootBuildImage - name: Push to Docker Hub if branch is develop if: steps.branch-names.outputs.current_branch == 'develop' diff --git a/Dockerfile b/Dockerfile index 1ea33df..7ffe6d4 100755 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.19.1 +FROM alpine:3.22.4 RUN apk update && \ apk upgrade diff --git a/build.gradle b/build.gradle index 130ec94..dd2684e 100755 --- a/build.gradle +++ b/build.gradle @@ -3,17 +3,16 @@ buildscript { mavenCentral() } dependencies { - classpath("org.springframework.boot:spring-boot-gradle-plugin:3.2.2") + classpath("org.springframework.boot:spring-boot-gradle-plugin:4.0.6") } } plugins { - id 'com.palantir.docker' version '0.35.0' - id 'org.springframework.boot' version '3.2.2' + id 'org.springframework.boot' version '4.0.6' } group='kingstonduo' -version='1.11.0' +version='1.12.0' apply plugin: 'java' @@ -37,16 +36,13 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-cache' implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'org.springframework.boot:spring-boot-starter-graphql' + implementation 'com.fasterxml.jackson.core:jackson-databind' implementation 'com.mysql:mysql-connector-j:8.3.0' implementation 'org.apache.commons:commons-text:1.12.0' - - implementation 'com.graphql-java:graphql-spring-boot-starter:5.0.2' - implementation 'com.graphql-java:graphiql-spring-boot-starter:5.0.2' - implementation 'com.graphql-java:graphql-java-tools:5.2.4' testImplementation('org.mockito:mockito-junit-jupiter:3.12.4') testImplementation 'org.springframework.boot:spring-boot-starter-test' - testImplementation 'org.springframework:spring-test:5.2.25.RELEASE' testImplementation 'org.mockito:mockito-core' } @@ -54,12 +50,6 @@ springBoot { mainClass = "org.kpmp.Application" } -task unpack(type: Copy) { - dependsOn bootJar - from(zipTree(tasks.bootJar.outputs.files.singleFile)) - into("build/dependency") -} - def getCurrentGitBranch() { if (project.hasProperty('tag')) { def tagValue = project.property('tag') @@ -83,9 +73,5 @@ def getCurrentGitBranch() { } } - -docker { - name "kingstonduo/hydra-data:" + getCurrentGitBranch() - copySpec.from(tasks.unpack.outputs).into("dependency") - buildArgs(['DEPENDENCY': "dependency"]) -} +// Docker image building is now handled by Spring Boot's bootBuildImage task +// Usage: ./gradlew bootBuildImage --imageName=kingstonduo/hydra-data: diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a595206..5c82cb0 100755 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/org/kpmp/Query.java b/src/main/java/org/kpmp/Query.java index c1efa09..4b0234c 100644 --- a/src/main/java/org/kpmp/Query.java +++ b/src/main/java/org/kpmp/Query.java @@ -1,16 +1,16 @@ package org.kpmp; -import com.coxautodev.graphql.tools.GraphQLQueryResolver; import org.kpmp.repositoryDataset.RepositoryDatasetDisplay; import org.kpmp.repositoryDataset.RepositoryDatasetService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.graphql.data.method.annotation.QueryMapping; import org.springframework.stereotype.Component; import java.io.IOException; import java.util.List; @Component -public class Query implements GraphQLQueryResolver { +public class Query { private RepositoryDatasetService repositoryDatasetService; @@ -19,6 +19,7 @@ public Query(RepositoryDatasetService repositoryDatasetService) { this.repositoryDatasetService = repositoryDatasetService; } + @QueryMapping public List getRepositoryDataset() throws IOException, Exception { return repositoryDatasetService.getRepositoryDataset(); } From c94c7611e9479f9e0b4a2b76a29d8511b5839d75 Mon Sep 17 00:00:00 2001 From: dert1129 Date: Thu, 21 May 2026 13:22:19 -0400 Subject: [PATCH 2/4] edit github steps --- .github/workflows/build-gradle-project.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-gradle-project.yml b/.github/workflows/build-gradle-project.yml index b126d07..7aed84e 100644 --- a/.github/workflows/build-gradle-project.yml +++ b/.github/workflows/build-gradle-project.yml @@ -41,10 +41,10 @@ jobs: - name: Push to Docker Hub if branch is develop if: steps.branch-names.outputs.current_branch == 'develop' run: | - docker push "kingstonduo/hydra-data:$IMAGE_TAG" - + docker push "kingstonduo/hydra-data:${{env.IMAGE_TAG}}" + - name: Push to Docker Hub if branch is not develop - if: ${{ !steps.branch-names.outputs.current_branch == 'develop' }} + if: steps.branch-names.outputs.current_branch != 'develop' run: | docker push "kingstonduo/hydra-data:${{ steps.branch-names.outputs.current_branch }}" From df294cc757d77be1a884739b22d0a170cf4d3c4b Mon Sep 17 00:00:00 2001 From: dert1129 Date: Thu, 21 May 2026 14:10:50 -0400 Subject: [PATCH 3/4] update booBuildImage task --- build.gradle | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/build.gradle b/build.gradle index dd2684e..613494d 100755 --- a/build.gradle +++ b/build.gradle @@ -73,5 +73,10 @@ def getCurrentGitBranch() { } } +bootBuildImage { + imageName = "kingstonduo/hydra-data:" + getCurrentGitBranch() + createdDate = "now" +} + // Docker image building is now handled by Spring Boot's bootBuildImage task // Usage: ./gradlew bootBuildImage --imageName=kingstonduo/hydra-data: From 5f2628b27db01ed990e723a7f51fa854b56ccead Mon Sep 17 00:00:00 2001 From: dert1129 Date: Thu, 21 May 2026 14:21:38 -0400 Subject: [PATCH 4/4] fix comment --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 613494d..2dd5d6e 100755 --- a/build.gradle +++ b/build.gradle @@ -79,4 +79,4 @@ bootBuildImage { } // Docker image building is now handled by Spring Boot's bootBuildImage task -// Usage: ./gradlew bootBuildImage --imageName=kingstonduo/hydra-data: +// Usage: ./gradlew bootBuildImage