Merge pull request #44 from sbesson/gradle9

Bump Java runtime requirement to 11+ and build requirement to 17+

Author: sbesson

.github/workflows/build.yml

@@ -9,7 +9,7 @@ jobs:
   build:
     strategy:
       matrix:
-        java: [11, 17, 21]
+        java: [17, 21, 25]
         os: [ubuntu-latest]
     runs-on: ${{ matrix.os }}
     env:
@@ -27,11 +27,16 @@ jobs:
         run: |
           ./gradlew ${{ env.gradle_commands }}
       - name: Publish artifacts
-        if: github.event_name != 'pull_request' && matrix.java == 11
+        if: github.event_name != 'pull_request' && matrix.java == 17
         run: |
           ./gradlew -PArtifactoryUserName=${ArtifactoryUserName} -PArtifactoryPassword=${ArtifactoryPassword} publish
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:
           name: omero-ms-core ${{ matrix.java }}
           path: build/libs/*
+      - name: Create a GitHub release
+        if: startsWith(github.ref, 'refs/tags')
+        run: gh release create --generate-notes "${GITHUB_REF#refs/tags/}"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

README.md

@@ -10,11 +10,13 @@ Requirements
 * OMERO 5.6.x+
 * OMERO.web 5.6.x+
 * Redis backed sessions
-* Java 8+
+* Java 11+
 
 Development Installation
 ========================
 
+1. Install Java 17 or later
+
 1. Clone the repository::
 
         git clone https://github.com/glencoesoftware/omero-ms-core.git

build.gradle

@@ -7,17 +7,18 @@ plugins {
 group = 'com.glencoesoftware.omero'
 version = '0.11.1-SNAPSHOT'
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+compileJava {
+    options.release = 11
+}
 
 repositories {
     mavenCentral()
     maven {
-        name 'Unidata'
-        url 'https://artifacts.unidata.ucar.edu/content/repositories/unidata-releases'
+        name = 'Unidata'
+        url = 'https://artifacts.glencoesoftware.com/artifactory/unidata-releases'
     }
     maven {
-        url 'https://artifacts.glencoesoftware.com/artifactory/ome.releases'
+        url = 'https://artifacts.glencoesoftware.com/artifactory/ome.releases'
     }
 }
 
@@ -76,6 +77,21 @@ test {
   useTestNG()
 }
 
+jar {
+    manifest {
+        attributes(
+            "Created-By": "Gradle ${gradle.gradleVersion}",
+            "Build-Jdk": "${System.properties['java.version']} (${System.properties['java.vendor']} ${System.properties['java.vm.version']})",
+            "Built-By": System.properties['user.name'],
+            "Built-On": new java.text.SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ").format(new Date()),
+            "Implementation-Build": "git rev-parse --verify HEAD".execute().getText().trim(),
+            "Implementation-Title": "OMERO Microservice Core",
+            "Implementation-Version": archiveVersion,
+            "Implementation-Vendor": "Glencoe Software Inc.",
+        )
+    }
+}
+
 publishing {
     publications {
         omeroMsCore(MavenPublication) {
@@ -85,8 +101,8 @@ publishing {
 
     repositories {
         maven {
-            name 'gs-omero-snapshots-local'
-            url 'https://artifacts.glencoesoftware.com/artifactory/gs-omero-snapshots-local'
+            name = 'gs-omero-snapshots-local'
+            url = 'https://artifacts.glencoesoftware.com/artifactory/gs-omero-snapshots-local'
             credentials {
                username = project.properties.ArtifactoryUserName
                password = project.properties.ArtifactoryPassword

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists