Merge pull request #294 from RADAR-base/release-0.7.6

Release 0.7.6

Dockerfile

@@ -2,15 +2,16 @@ FROM gradle:7.3-jdk17 as builder
 
 RUN mkdir -p /code/java-sdk
 WORKDIR /code/java-sdk
-ENV GRADLE_USER_HOME=/code/.gradlecache
+ENV GRADLE_USER_HOME=/code/.gradlecache \
+   GRADLE_OPTS=-Djdk.lang.Process.launchMechanism=vfork
 
 COPY java-sdk/build.gradle java-sdk/settings.gradle /code/java-sdk/
 COPY java-sdk/radar-schemas-commons/build.gradle /code/java-sdk/radar-schemas-commons/
 COPY java-sdk/radar-schemas-core/build.gradle /code/java-sdk/radar-schemas-core/
 COPY java-sdk/radar-schemas-registration/build.gradle /code/java-sdk/radar-schemas-registration/
 COPY java-sdk/radar-schemas-tools/build.gradle /code/java-sdk/radar-schemas-tools/
 COPY java-sdk/radar-catalog-server/build.gradle /code/java-sdk/radar-catalog-server/
-RUN gradle downloadDependencies --no-watch-fs -Pprofile=docker
+RUN gradle downloadDependencies copyDependencies startScripts --no-watch-fs -Pprofile=docker
 
 COPY commons /code/commons
 COPY specifications /code/specifications
@@ -21,11 +22,7 @@ COPY java-sdk/radar-schemas-registration/src /code/java-sdk/radar-schemas-regist
 COPY java-sdk/radar-schemas-tools/src /code/java-sdk/radar-schemas-tools/src
 COPY java-sdk/radar-catalog-server/src /code/java-sdk/radar-catalog-server/src
 
-RUN gradle distTar --no-watch-fs -Pprofile=docker \
-  && cd radar-schemas-tools/build/distributions \
-  && tar xzf radar-schemas-tools*.tar.gz \
-  && cd ../../../radar-catalog-server/build/distributions \
-  && tar xzf radar-catalog-server*.tar.gz
+RUN gradle jar --no-watch-fs -Pprofile=docker
 
 FROM azul/zulu-openjdk-alpine:17-jre-headless
 
@@ -49,10 +46,9 @@ WORKDIR /schema
 RUN mkdir -p original merged java/src java/classes /usr/share/java \
   && chown 101 merged java/src java/classes
 
-COPY --from=builder /code/java-sdk/radar-schemas-tools/build/distributions/radar-schemas-tools-*/lib/* /usr/lib/
-COPY --from=builder /code/java-sdk/radar-catalog-server/build/distributions/radar-catalog-server-*/lib/* /usr/lib/
-COPY --from=builder /code/java-sdk/radar-schemas-tools/build/distributions/radar-schemas-tools-*/bin/radar-schemas-tools /usr/bin/
-COPY --from=builder /code/java-sdk/radar-catalog-server/build/distributions/radar-catalog-server-*/bin/radar-catalog-server /usr/bin/
+COPY --from=builder /code/java-sdk/radar-*/build/third-party/* /usr/lib/
+COPY --from=builder /code/java-sdk/radar-*/build/scripts/* /usr/bin/
+COPY --from=builder /code/java-sdk/radar-*/build/libs/* /usr/lib/
 COPY ./commons ./original/commons
 COPY ./specifications ./original/specifications
 

java-sdk/build.gradle

@@ -3,13 +3,13 @@
 //---------------------------------------------------------------------------//
 
 plugins {
-    id 'com.github.davidmc24.gradle.plugin.avro-base' version '1.2.1'
+    id 'com.github.davidmc24.gradle.plugin.avro-base' version '1.3.0'
     id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
     id("com.github.ben-manes.versions") version "0.39.0"
 }
 
 allprojects {
-    version = '0.7.5'
+    version = '0.7.6'
     group = 'org.radarbase'
 }
 
@@ -24,10 +24,10 @@ subprojects {
     ext.website = 'https://radar-base.org'
 
     ext {
-        avroVersion = '1.9.2'
+        avroVersion = '1.11.0'
         argparseVersion = '0.9.0'
         jacksonVersion = '2.12.5'
-        radarJerseyVersion = "0.8.0.1"
+        radarJerseyVersion = "0.8.1"
 
         junitVersion = '4.13.2'
         confluentVersion = '7.0.1'
@@ -73,5 +73,5 @@ nexusPublishing {
 }
 
 wrapper {
-    gradleVersion '7.3.1'
+    gradleVersion '7.3.3'
 }

java-sdk/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

java-sdk/radar-catalog-server/build.gradle

@@ -23,7 +23,7 @@ dependencies {
     implementation project(':radar-schemas-core')
     implementation group: 'net.sourceforge.argparse4j', name: 'argparse4j', version: argparseVersion
 
-    def log4j2Version = "2.16.0"
+    def log4j2Version = "2.17.0"
     runtimeOnly("org.apache.logging.log4j:log4j-slf4j-impl:$log4j2Version")
     runtimeOnly("org.apache.logging.log4j:log4j-api:$log4j2Version")
     runtimeOnly("org.apache.logging.log4j:log4j-jul:$log4j2Version")
@@ -41,6 +41,14 @@ if (!project.hasProperty("profile") || project.property("profile") != "docker")
     apply from: "$rootDir/gradle/testing.gradle"
 }
 
+task copyDependencies(type: Copy) {
+    from(configurations.named("runtimeClasspath").map {it.files })
+    into("$buildDir/third-party/")
+    doLast {
+        println("Copied third-party runtime dependencies")
+    }
+}
+
 //---------------------------------------------------------------------------//
 // Publishing                                                                //
 //---------------------------------------------------------------------------//

java-sdk/radar-schemas-commons/build.gradle

@@ -21,8 +21,8 @@ dependencies {
 }
 
 compileJava {
-    targetCompatibility = JavaVersion.VERSION_1_8
-    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_11
 }
 
 //---------------------------------------------------------------------------//

java-sdk/radar-schemas-tools/build.gradle

@@ -55,6 +55,14 @@ test {
 // Publishing                                                                //
 //---------------------------------------------------------------------------//
 
+task copyDependencies(type: Copy) {
+    from(configurations.named("runtimeClasspath").map {it.files })
+    into("$buildDir/third-party/")
+    doLast {
+        println("Copied third-party runtime dependencies")
+    }
+}
+
 tasks.withType(Tar) {
     compression = Compression.GZIP
     archiveExtension.set('tar.gz')