Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update all builds to sourceCompatibility = 11 #584

Merged
merged 3 commits into from
Jun 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Java+Docker CI
name: Java CI

on:
pull_request:
Expand All @@ -11,10 +11,10 @@ jobs:

steps:
- uses: actions/checkout@v1
- name: Set up JDK 1.8
- name: Set up JDK 11
uses: actions/setup-java@v1
with:
java-version: 1.8
java-version: 11

- name: build and test storage-inventory-dm
run: cd storage-inventory-dm && ../gradlew --info clean build xslt
Expand All @@ -40,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
Expand Down
2 changes: 1 addition & 1 deletion baldur/VERSION
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion baldur/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ repositories {

apply from: '../opencadc.gradle'

sourceCompatibility = 1.8
sourceCompatibility = 11

group = 'org.opencadc'

Expand Down
4 changes: 2 additions & 2 deletions cadc-inventory-db/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
6 changes: 4 additions & 2 deletions cadc-inventory-server/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions cadc-inventory-util/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions cadc-inventory/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion cadc-storage-adapter-ad/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# cadc-storage-adapter-ad
# cadc-storage-adapter-ad -- OBSOLETE
AD storage adapter implementation.

Currently supports GET and Iterator functionality only.
Expand Down
4 changes: 2 additions & 2 deletions cadc-storage-adapter-fs/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions cadc-storage-adapter-swift/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down
4 changes: 2 additions & 2 deletions cadc-storage-adapter-test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions cadc-storage-adapter/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion critwall/VERSION
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion critwall/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ repositories {

apply from: '../opencadc.gradle'

sourceCompatibility = 1.8
sourceCompatibility = 11

group = 'org.opencadc'

Expand Down
2 changes: 1 addition & 1 deletion fenwick/VERSION
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion fenwick/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ repositories {
mavenLocal()
}

sourceCompatibility = 1.8
sourceCompatibility = 11

group = 'org.opencadc'

Expand Down
33 changes: 16 additions & 17 deletions minoc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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,)'
Expand All @@ -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,)'
}

Expand Down
2 changes: 1 addition & 1 deletion ratik/VERSION
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion ratik/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ repositories {
mavenLocal()
}

sourceCompatibility = 1.8
sourceCompatibility = 11

group = 'org.opencadc'

Expand Down
2 changes: 1 addition & 1 deletion raven/VERSION
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion raven/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ repositories {

apply from: '../opencadc.gradle'

sourceCompatibility = 1.8
sourceCompatibility = 11

group = 'org.opencadc'

Expand Down
2 changes: 1 addition & 1 deletion ringhold/VERSION
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion ringhold/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ repositories {
mavenLocal()
}

sourceCompatibility = 1.8
sourceCompatibility = 11

group = 'org.opencadc'

Expand Down
2 changes: 1 addition & 1 deletion tantar/VERSION
Original file line number Diff line number Diff line change
@@ -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
3 changes: 1 addition & 2 deletions tantar/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ repositories {

apply from: '../opencadc.gradle'

sourceCompatibility = 1.8
sourceCompatibility = 11

group = 'org.opencadc'

Expand All @@ -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)'
Expand Down
Loading