From c9d8fc83acec2a7e3a6a071bcd838c4542dea886 Mon Sep 17 00:00:00 2001 From: Patrick Dowler Date: Wed, 19 Jun 2024 10:51:11 -0700 Subject: [PATCH 1/3] update all builds to sourceCompatibility = 11 --- baldur/VERSION | 2 +- baldur/build.gradle | 2 +- cadc-inventory-db/build.gradle | 4 +-- cadc-inventory-server/build.gradle | 6 +++-- cadc-inventory-util/build.gradle | 4 +-- cadc-inventory/build.gradle | 4 +-- cadc-storage-adapter-ad/README.md | 2 +- cadc-storage-adapter-fs/build.gradle | 4 +-- cadc-storage-adapter-swift/build.gradle | 4 +-- cadc-storage-adapter-test/build.gradle | 4 +-- cadc-storage-adapter/build.gradle | 4 +-- critwall/VERSION | 2 +- critwall/build.gradle | 2 +- fenwick/VERSION | 2 +- fenwick/build.gradle | 2 +- minoc/build.gradle | 33 ++++++++++++------------- ratik/VERSION | 2 +- ratik/build.gradle | 2 +- raven/VERSION | 2 +- raven/build.gradle | 2 +- ringhold/VERSION | 2 +- ringhold/build.gradle | 2 +- tantar/VERSION | 2 +- tantar/build.gradle | 3 +-- 24 files changed, 49 insertions(+), 49 deletions(-) diff --git a/baldur/VERSION b/baldur/VERSION index 300f66c1a..803988228 100644 --- a/baldur/VERSION +++ b/baldur/VERSION @@ -1,6 +1,6 @@ ## deployable containers have a semantic and build tag # semantic version tag: major.minor # build version tag: timestamp -VER=0.3.6 +VER=0.3.7 TAGS="${VER} ${VER}-$(date --utc +"%Y%m%dT%H%M%S")" unset VER diff --git a/baldur/build.gradle b/baldur/build.gradle index 5b00e5b9d..84ff32206 100644 --- a/baldur/build.gradle +++ b/baldur/build.gradle @@ -13,7 +13,7 @@ repositories { apply from: '../opencadc.gradle' -sourceCompatibility = 1.8 +sourceCompatibility = 11 group = 'org.opencadc' diff --git a/cadc-inventory-db/build.gradle b/cadc-inventory-db/build.gradle index 8822b4dee..e563f6801 100644 --- a/cadc-inventory-db/build.gradle +++ b/cadc-inventory-db/build.gradle @@ -13,11 +13,11 @@ repositories { apply from: '../opencadc.gradle' -sourceCompatibility = 1.8 +sourceCompatibility = 11 group = 'org.opencadc' -version = '1.0.2' +version = '1.0.3' description = 'OpenCADC Storage Inventory database library' def git_url = 'https://github.com/opencadc/storage-inventory' diff --git a/cadc-inventory-server/build.gradle b/cadc-inventory-server/build.gradle index cfe7d425a..76745ca1b 100644 --- a/cadc-inventory-server/build.gradle +++ b/cadc-inventory-server/build.gradle @@ -10,9 +10,11 @@ repositories { mavenLocal() } -sourceCompatibility = 1.8 +sourceCompatibility = 11 + group = 'org.opencadc' -version = '0.3.1' + +version = '0.3.2' description = 'OpenCADC Storage Inventory server utility library' def git_url = 'https://github.com/opencadc/storage-inventory' diff --git a/cadc-inventory-util/build.gradle b/cadc-inventory-util/build.gradle index 112c25204..a78e0e681 100644 --- a/cadc-inventory-util/build.gradle +++ b/cadc-inventory-util/build.gradle @@ -12,11 +12,11 @@ repositories { apply from: '../opencadc.gradle' -sourceCompatibility = 1.8 +sourceCompatibility = 11 group = 'org.opencadc' -version = '0.1.11' +version = '0.1.12' description = 'OpenCADC Storage Inventory client utility library' def git_url = 'https://github.com/opencadc/storage-inventory' diff --git a/cadc-inventory/build.gradle b/cadc-inventory/build.gradle index b56ba421b..70584fd98 100644 --- a/cadc-inventory/build.gradle +++ b/cadc-inventory/build.gradle @@ -10,11 +10,11 @@ repositories { mavenLocal() } -sourceCompatibility = 1.8 +sourceCompatibility = 11 group = 'org.opencadc' -version = '1.0.1' +version = '1.0.2' description = 'OpenCADC Storage Inventory core library' def git_url = 'https://github.com/opencadc/storage-inventory' diff --git a/cadc-storage-adapter-ad/README.md b/cadc-storage-adapter-ad/README.md index 126dcc13c..d752b3aee 100644 --- a/cadc-storage-adapter-ad/README.md +++ b/cadc-storage-adapter-ad/README.md @@ -1,4 +1,4 @@ -# cadc-storage-adapter-ad +# cadc-storage-adapter-ad -- OBSOLETE AD storage adapter implementation. Currently supports GET and Iterator functionality only. diff --git a/cadc-storage-adapter-fs/build.gradle b/cadc-storage-adapter-fs/build.gradle index 0085cb7aa..1269afb7e 100644 --- a/cadc-storage-adapter-fs/build.gradle +++ b/cadc-storage-adapter-fs/build.gradle @@ -10,13 +10,13 @@ repositories { mavenLocal() } -sourceCompatibility = 1.8 +sourceCompatibility = 11 apply from: '../opencadc.gradle' group = 'org.opencadc' -version = '0.9.3' +version = '0.9.4' description = 'OpenCADC Storage Inventory FileSystem StorageAdapter implementation' def git_url = 'https://github.com/opencadc/storage-inventory' diff --git a/cadc-storage-adapter-swift/build.gradle b/cadc-storage-adapter-swift/build.gradle index 437fc0557..f920db1d4 100644 --- a/cadc-storage-adapter-swift/build.gradle +++ b/cadc-storage-adapter-swift/build.gradle @@ -10,11 +10,11 @@ repositories { mavenLocal() } -sourceCompatibility = 1.8 +sourceCompatibility = 11 group = 'org.opencadc' -version = '0.8.7' +version = '0.8.8' apply from: '../opencadc.gradle' diff --git a/cadc-storage-adapter-test/build.gradle b/cadc-storage-adapter-test/build.gradle index 8bc015a8e..3bd1fcb36 100644 --- a/cadc-storage-adapter-test/build.gradle +++ b/cadc-storage-adapter-test/build.gradle @@ -10,11 +10,11 @@ repositories { mavenLocal() } -sourceCompatibility = 1.8 +sourceCompatibility = 11 group = 'org.opencadc' -version = '0.5.2' +version = '0.5.3' description = 'OpenCADC Storage Inventory StorageAdapter test library' def git_url = 'https://github.com/opencadc/storage-inventory' diff --git a/cadc-storage-adapter/build.gradle b/cadc-storage-adapter/build.gradle index 6fef828ea..3db4ceccc 100644 --- a/cadc-storage-adapter/build.gradle +++ b/cadc-storage-adapter/build.gradle @@ -10,11 +10,11 @@ repositories { mavenLocal() } -sourceCompatibility = 1.8 +sourceCompatibility = 11 group = 'org.opencadc' -version = '1.0.0' +version = '1.0.1' description = 'OpenCADC Storage Inventory StorageAdapter API library' def git_url = 'https://github.com/opencadc/storage-inventory' diff --git a/critwall/VERSION b/critwall/VERSION index 03dfe36f1..0cb76787b 100644 --- a/critwall/VERSION +++ b/critwall/VERSION @@ -1,6 +1,6 @@ ## deployable containers have a semantic and build tag # semantic version tag: major.minor[.patch] # build version tag: timestamp -VER=1.0.1 +VER=1.0.2 TAGS="${VER} ${VER}-$(date --utc +"%Y%m%dT%H%M%S")" unset VER diff --git a/critwall/build.gradle b/critwall/build.gradle index 9787055f2..058863539 100644 --- a/critwall/build.gradle +++ b/critwall/build.gradle @@ -12,7 +12,7 @@ repositories { apply from: '../opencadc.gradle' -sourceCompatibility = 1.8 +sourceCompatibility = 11 group = 'org.opencadc' diff --git a/fenwick/VERSION b/fenwick/VERSION index 9d4fb6797..1ecbba0a0 100644 --- a/fenwick/VERSION +++ b/fenwick/VERSION @@ -4,6 +4,6 @@ # tags with and without build number so operators use the versioned # tag but we always keep a timestamped tag in case a semantic tag gets # replaced accidentally -VER=1.0.1 +VER=1.0.2 TAGS="${VER} ${VER}-$(date --utc +"%Y%m%dT%H%M%S")" unset VER diff --git a/fenwick/build.gradle b/fenwick/build.gradle index f7feee09f..640e6ba0e 100644 --- a/fenwick/build.gradle +++ b/fenwick/build.gradle @@ -10,7 +10,7 @@ repositories { mavenLocal() } -sourceCompatibility = 1.8 +sourceCompatibility = 11 group = 'org.opencadc' diff --git a/minoc/build.gradle b/minoc/build.gradle index f2c7d515b..1551e09eb 100644 --- a/minoc/build.gradle +++ b/minoc/build.gradle @@ -26,23 +26,23 @@ war { } dependencies { - implementation 'org.opencadc:cadc-util:[1.10.2,2.0)' - implementation 'org.opencadc:cadc-log:[1.1.6,2.0)' - implementation 'org.opencadc:cadc-registry:[1.7,)' - implementation 'org.opencadc:cadc-vosi:[1.4.3,2.0)' - implementation 'org.opencadc:cadc-rest:[1.3.14,)' - implementation 'org.opencadc:cadc-cdp:[1.0,)' - implementation 'org.opencadc:cadc-data-ops-fits:[0.4.0,)' - implementation 'org.opencadc:cadc-gms:[1.0.0,)' - implementation 'org.opencadc:cadc-inventory:[1.0,2.0)' - implementation 'org.opencadc:cadc-inventory-db:[1.0,2.0)' - implementation 'org.opencadc:cadc-soda-server:[1.2.0,2.0.0)' - implementation 'org.opencadc:cadc-storage-adapter:[1.0,)' - implementation 'org.opencadc:cadc-permissions:[0.3.1,)' - implementation 'org.opencadc:cadc-permissions-client:[0.3,)' - implementation 'org.opencadc:cadc-gms:[1.0,)' + compile 'org.opencadc:cadc-util:[1.10.2,2.0)' + compile 'org.opencadc:cadc-log:[1.1.6,2.0)' + compile 'org.opencadc:cadc-registry:[1.7,)' + compile 'org.opencadc:cadc-vosi:[1.4.3,2.0)' + compile 'org.opencadc:cadc-rest:[1.3.14,)' + compile 'org.opencadc:cadc-cdp:[1.0,)' + compile 'org.opencadc:cadc-data-ops-fits:[0.4.0,)' + compile 'org.opencadc:cadc-gms:[1.0.0,)' + compile 'org.opencadc:cadc-inventory:[1.0,2.0)' + compile 'org.opencadc:cadc-inventory-db:[1.0,2.0)' + compile 'org.opencadc:cadc-soda-server:[1.2.0,2.0.0)' + compile 'org.opencadc:cadc-storage-adapter:[1.0,)' + compile 'org.opencadc:cadc-permissions:[0.3.1,)' + compile 'org.opencadc:cadc-permissions-client:[0.3,)' + compile 'org.opencadc:cadc-gms:[1.0,)' - implementation 'gov.nasa.gsfc.heasarc:nom-tam-fits:1.20.0' + compile 'gov.nasa.gsfc.heasarc:nom-tam-fits:1.20.0' testImplementation 'junit:junit:[4.0,)' testImplementation 'org.opencadc:cadc-storage-adapter-fs:[0.9.3,)' @@ -51,7 +51,6 @@ dependencies { runtimeOnly 'org.opencadc:cadc-access-control-identity:[1.2.1,2.0)' runtimeOnly 'org.opencadc:cadc-storage-adapter-fs:[0.9.3,)' - runtimeOnly 'org.opencadc:cadc-storage-adapter-ad:[0.7.0,)' runtimeOnly 'org.opencadc:cadc-storage-adapter-swift:[0.8.7,)' } diff --git a/ratik/VERSION b/ratik/VERSION index 9d4fb6797..1ecbba0a0 100644 --- a/ratik/VERSION +++ b/ratik/VERSION @@ -4,6 +4,6 @@ # tags with and without build number so operators use the versioned # tag but we always keep a timestamped tag in case a semantic tag gets # replaced accidentally -VER=1.0.1 +VER=1.0.2 TAGS="${VER} ${VER}-$(date --utc +"%Y%m%dT%H%M%S")" unset VER diff --git a/ratik/build.gradle b/ratik/build.gradle index 79137835c..4c8d1477a 100644 --- a/ratik/build.gradle +++ b/ratik/build.gradle @@ -10,7 +10,7 @@ repositories { mavenLocal() } -sourceCompatibility = 1.8 +sourceCompatibility = 11 group = 'org.opencadc' diff --git a/raven/VERSION b/raven/VERSION index 426807032..29770a8ab 100644 --- a/raven/VERSION +++ b/raven/VERSION @@ -2,6 +2,6 @@ # semantic version tag: major.minor[.patch] # build version tag: timestamp # tag: {semantic}-{build} -VER=1.0.1 +VER=1.0.2 TAGS="${VER} ${VER}-$(date --utc +"%Y%m%dT%H%M%S")" unset VER diff --git a/raven/build.gradle b/raven/build.gradle index 2586886cf..c278b5e9b 100644 --- a/raven/build.gradle +++ b/raven/build.gradle @@ -12,7 +12,7 @@ repositories { apply from: '../opencadc.gradle' -sourceCompatibility = 1.8 +sourceCompatibility = 11 group = 'org.opencadc' diff --git a/ringhold/VERSION b/ringhold/VERSION index d849b8f34..03dfe36f1 100644 --- a/ringhold/VERSION +++ b/ringhold/VERSION @@ -1,6 +1,6 @@ ## deployable containers have a semantic and build tag # semantic version tag: major.minor[.patch] # build version tag: timestamp -VER=1.0.0 +VER=1.0.1 TAGS="${VER} ${VER}-$(date --utc +"%Y%m%dT%H%M%S")" unset VER diff --git a/ringhold/build.gradle b/ringhold/build.gradle index 685a569da..92be3cbcb 100644 --- a/ringhold/build.gradle +++ b/ringhold/build.gradle @@ -10,7 +10,7 @@ repositories { mavenLocal() } -sourceCompatibility = 1.8 +sourceCompatibility = 11 group = 'org.opencadc' diff --git a/tantar/VERSION b/tantar/VERSION index 0cb76787b..cbf79bc89 100644 --- a/tantar/VERSION +++ b/tantar/VERSION @@ -1,6 +1,6 @@ ## deployable containers have a semantic and build tag # semantic version tag: major.minor[.patch] # build version tag: timestamp -VER=1.0.2 +VER=1.0.3 TAGS="${VER} ${VER}-$(date --utc +"%Y%m%dT%H%M%S")" unset VER diff --git a/tantar/build.gradle b/tantar/build.gradle index 4f38b15ba..92cd21b27 100644 --- a/tantar/build.gradle +++ b/tantar/build.gradle @@ -12,7 +12,7 @@ repositories { apply from: '../opencadc.gradle' -sourceCompatibility = 1.8 +sourceCompatibility = 11 group = 'org.opencadc' @@ -27,7 +27,6 @@ dependencies { compile 'org.opencadc:cadc-storage-adapter:[1.0,)' runtime 'org.opencadc:cadc-storage-adapter-fs:[0.9.3,)' - runtime 'org.opencadc:cadc-storage-adapter-ad:[0.6.3,)' runtime 'org.opencadc:cadc-storage-adapter-swift:[0.8.7,)' testCompile 'junit:junit:[4.12,5.0)' From f64c7cf0f65f12b789a4eba545646a41cf376db6 Mon Sep 17 00:00:00 2001 From: Patrick Dowler Date: Wed, 19 Jun 2024 11:52:47 -0700 Subject: [PATCH 2/3] update CI to use JDK 11 --- .github/workflows/gradle.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 40c2bed6f..f2ac19b7a 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -10,11 +10,12 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 - - name: Set up JDK 1.8 - uses: actions/setup-java@v1 + - uses: actions/checkout@v3 + - name: Set up JDK 11 + uses: actions/setup-java@v3 with: - java-version: 1.8 + distribution: 'temurin' + java-version: 11 - name: build and test storage-inventory-dm run: cd storage-inventory-dm && ../gradlew --info clean build xslt From 61caf167787534c34645e73b21b82794583bb2f3 Mon Sep 17 00:00:00 2001 From: Patrick Dowler Date: Wed, 19 Jun 2024 12:44:15 -0700 Subject: [PATCH 3/3] tweak CI setup --- .github/workflows/gradle.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index f2ac19b7a..d1fac84c2 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -1,4 +1,4 @@ -name: Java+Docker CI +name: Java CI on: pull_request: @@ -10,11 +10,10 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v1 - name: Set up JDK 11 - uses: actions/setup-java@v3 + uses: actions/setup-java@v1 with: - distribution: 'temurin' java-version: 11 - name: build and test storage-inventory-dm @@ -41,8 +40,8 @@ jobs: - name: build and test cadc-storage-adapter-fs run: cd cadc-storage-adapter-fs && ../gradlew --info clean build javadoc checkstyleMain install - - name: build and test cadc-storage-adapter-ad - run: cd cadc-storage-adapter-ad && ../gradlew --info clean build javadoc checkstyleMain install +# - name: build and test cadc-storage-adapter-ad +# run: cd cadc-storage-adapter-ad && ../gradlew --info clean build javadoc checkstyleMain install # - name: build and test cadc-storage-adapter-s3 # run: cd cadc-storage-adapter-s3 && ../gradlew --info clean build javadoc checkstyleMain install