Merge pull request #146 from KPMP/develop

Atlas 2024 Q3 Release

.classpath

@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="bin/main" path="src/main/java">
+	<classpathentry kind="src" output="bin/test" path="src/test/java">
 		<attributes>
-			<attribute name="gradle_scope" value="main"/>
-			<attribute name="gradle_used_by_scope" value="main,test"/>
+			<attribute name="gradle_scope" value="test"/>
+			<attribute name="gradle_used_by_scope" value="test"/>
+			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="src" output="bin/main" path="src/main/resources">
@@ -12,14 +13,13 @@
 			<attribute name="gradle_used_by_scope" value="main,test"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" output="bin/test" path="src/test/java">
+	<classpathentry kind="src" output="bin/main" path="src/main/java">
 		<attributes>
-			<attribute name="gradle_scope" value="test"/>
-			<attribute name="gradle_used_by_scope" value="test"/>
-			<attribute name="test" value="true"/>
+			<attribute name="gradle_scope" value="main"/>
+			<attribute name="gradle_used_by_scope" value="main,test"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21/"/>
 	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
 	<classpathentry kind="output" path="bin/default"/>
 </classpath>

.github/workflows/build-gradle-project.yml

@@ -6,7 +6,7 @@ on:
 jobs:
   build-gradle-project:
     env:
-      IMAGE_TAG: 2.4.0
+      IMAGE_TAG: 2.5.0
     runs-on: ubuntu-latest
     steps:
       - name: Get branch names
@@ -21,12 +21,12 @@ jobs:
         uses: actions/checkout@v3
       - uses: actions/setup-java@v3
         with:
-          java-version: '8'
+          java-version: '21'
           distribution: 'temurin'
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2
         with:
-          gradle-version: 7.4
+          gradle-version: 8.5
 
       - name: Login to Docker Hub
         uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
@@ -41,7 +41,7 @@ jobs:
       - name: Push to Docker Hub if branch is develop
         if: steps.branch-names.outputs.current_branch == 'develop'
         run: | 
-         docker push "kingstonduo/pegasus-data:$IMAGE_TAG"
+         docker push "kingstonduo/pegasus-data:${{env.IMAGE_TAG}}"
 
       - name: Push to Docker Hub if branch is not develop
         if: steps.branch-names.outputs.current_branch != 'develop'

Dockerfile

@@ -1,7 +1,7 @@
-FROM alpine:3.19.1
+FROM --platform=linux/amd64 alpine:3.19.1
 
 RUN apk update
-RUN apk add openjdk8
+RUN apk add openjdk21
 
 VOLUME /tmp
 ARG DEPENDENCY=target/dependency

build.gradle

@@ -3,50 +3,54 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("org.springframework.boot:spring-boot-gradle-plugin:2.6.3")
+        classpath("org.springframework.boot:spring-boot-gradle-plugin:3.2.5")
     }
 }
 
 plugins {
-    id 'com.palantir.docker' version '0.22.1'
+    id 'com.palantir.docker' version '0.35.0'
+    id 'org.springframework.boot' version '3.2.5'
 }
 
 group = 'kingstonduo'
+version = '2.5.0'
 
 apply plugin: 'java'
 apply plugin: 'eclipse'
 apply plugin: 'idea'
 apply plugin: 'org.springframework.boot'
 apply plugin: 'io.spring.dependency-management'
 
-jar {
-    baseName='pegasus-data'
-    version= '2.4.0'
-}
 
 repositories {
     mavenCentral()
 }
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+sourceCompatibility = '21'
+targetCompatibility = '21'
 
 dependencies {
+
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
     implementation 'org.springframework.boot:spring-boot-starter-test'
-    implementation 'org.springframework:spring-test:5.0.5.RELEASE'
-    implementation 'commons-io:commons-io:2.6'
-    implementation 'mysql:mysql-connector-java:8.0.15'
-    implementation 'org.apache.commons:commons-compress:1.17'
-    implementation 'org.apache.commons:commons-text:1.7'
+
+    implementation 'commons-io:commons-io:2.16.1'
+    implementation 'com.mysql:mysql-connector-j:9.0.0'
+    implementation 'org.apache.commons:commons-compress:1.26.2'
+    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-core'
-    testImplementation 'org.springframework.boot:spring-boot-starter-test:2.2.0.RELEASE'
+    implementation 'org.springframework.graphql:spring-graphql'
     implementation 'org.springframework.boot:spring-boot-starter-cache'
     implementation 'com.hazelcast:hazelcast-all:4.2.5'
+
+    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'
+
 }
 
 springBoot {
@@ -75,15 +79,15 @@ def getCurrentGitBranch() {
       } catch (e) {
         }
         if (gitBranch == "develop" || gitBranch == "master"){
-          return jar.version
+          return project.version
         }else{
           return gitBranch
         }
     }
 }
 
 docker {
-    name "kingstonduo/${jar.baseName}:" + getCurrentGitBranch()
+    name "kingstonduo/pegasus-data:" + getCurrentGitBranch()
     copySpec.from(tasks.unpack.outputs).into("dependency")
     buildArgs(['DEPENDENCY': "dependency"])
 }

changelog.md

@@ -1,6 +1,16 @@
 # Changelog
 
-## Release 2.4 [unreleased]
+## Release 2.5 (unreleased)
+Brief summary of what's in this release:
+
+### Breaking changes
+Breaking changes include any database updates needed, if we need to edit any files on system (like .env or certs, etc). Things that are outside of the code itself that need changed for the system to work.
+
+### Non-breaking changes
+Just a place to keep track of things that have changed in the code that we may want to pay special attention to when smoke testing, etc.
+
+------
+## Release 2.4 (released 07/08/2024)
 Brief summary of what's in this release:
 - added a total column to show total number of files for a grouping (needed back end because total includes groups not shown on atlas home page or explorer home page)
 

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip

src/main/java/org/kpmp/Application.java

@@ -24,7 +24,7 @@ public WebMvcConfigurer corsConfigurer() {
 		return new WebMvcConfigurer() {
 			@Override
 			public void addCorsMappings(CorsRegistry registry) {
-				registry.addMapping("/graphql").allowedOrigins("http://localhost:3000");
+				registry.addMapping("/graphql").allowedOrigins("*");
 			}
 		};
 	}