From 1aa1ad1f08a2b0e1675aa45a85ef0208f59e5c0c Mon Sep 17 00:00:00 2001 From: ndp-opendap Date: Wed, 11 Mar 2026 14:14:05 -0700 Subject: [PATCH 01/10] Tear out --- {src => retired/src}/opendap/dap4/Attribute.java | 0 {src => retired/src}/opendap/dap4/Byte.java | 0 {src => retired/src}/opendap/dap4/Char.java | 0 {src => retired/src}/opendap/dap4/ContainerAttribute.java | 0 {src => retired/src}/opendap/dap4/DapString.java | 0 {src => retired/src}/opendap/dap4/Dataset.java | 0 {src => retired/src}/opendap/dap4/DatasetTest.java | 0 {src => retired/src}/opendap/dap4/Dim.java | 0 {src => retired/src}/opendap/dap4/Dimension.java | 0 {src => retired/src}/opendap/dap4/Float32.java | 0 {src => retired/src}/opendap/dap4/Float64.java | 0 {src => retired/src}/opendap/dap4/Int16.java | 0 {src => retired/src}/opendap/dap4/Int32.java | 0 {src => retired/src}/opendap/dap4/Int64.java | 0 {src => retired/src}/opendap/dap4/Int8.java | 0 {src => retired/src}/opendap/dap4/UInt16.java | 0 {src => retired/src}/opendap/dap4/UInt32.java | 0 {src => retired/src}/opendap/dap4/UInt64.java | 0 {src => retired/src}/opendap/dap4/UInt8.java | 0 {src => retired/src}/opendap/dap4/Variable.java | 0 .../opendap/dap4/XMLReaderWithNamespaceInMyPackageDotInfo.java | 0 21 files changed, 0 insertions(+), 0 deletions(-) rename {src => retired/src}/opendap/dap4/Attribute.java (100%) rename {src => retired/src}/opendap/dap4/Byte.java (100%) rename {src => retired/src}/opendap/dap4/Char.java (100%) rename {src => retired/src}/opendap/dap4/ContainerAttribute.java (100%) rename {src => retired/src}/opendap/dap4/DapString.java (100%) rename {src => retired/src}/opendap/dap4/Dataset.java (100%) rename {src => retired/src}/opendap/dap4/DatasetTest.java (100%) rename {src => retired/src}/opendap/dap4/Dim.java (100%) rename {src => retired/src}/opendap/dap4/Dimension.java (100%) rename {src => retired/src}/opendap/dap4/Float32.java (100%) rename {src => retired/src}/opendap/dap4/Float64.java (100%) rename {src => retired/src}/opendap/dap4/Int16.java (100%) rename {src => retired/src}/opendap/dap4/Int32.java (100%) rename {src => retired/src}/opendap/dap4/Int64.java (100%) rename {src => retired/src}/opendap/dap4/Int8.java (100%) rename {src => retired/src}/opendap/dap4/UInt16.java (100%) rename {src => retired/src}/opendap/dap4/UInt32.java (100%) rename {src => retired/src}/opendap/dap4/UInt64.java (100%) rename {src => retired/src}/opendap/dap4/UInt8.java (100%) rename {src => retired/src}/opendap/dap4/Variable.java (100%) rename {src => retired/src}/opendap/dap4/XMLReaderWithNamespaceInMyPackageDotInfo.java (100%) diff --git a/src/opendap/dap4/Attribute.java b/retired/src/opendap/dap4/Attribute.java similarity index 100% rename from src/opendap/dap4/Attribute.java rename to retired/src/opendap/dap4/Attribute.java diff --git a/src/opendap/dap4/Byte.java b/retired/src/opendap/dap4/Byte.java similarity index 100% rename from src/opendap/dap4/Byte.java rename to retired/src/opendap/dap4/Byte.java diff --git a/src/opendap/dap4/Char.java b/retired/src/opendap/dap4/Char.java similarity index 100% rename from src/opendap/dap4/Char.java rename to retired/src/opendap/dap4/Char.java diff --git a/src/opendap/dap4/ContainerAttribute.java b/retired/src/opendap/dap4/ContainerAttribute.java similarity index 100% rename from src/opendap/dap4/ContainerAttribute.java rename to retired/src/opendap/dap4/ContainerAttribute.java diff --git a/src/opendap/dap4/DapString.java b/retired/src/opendap/dap4/DapString.java similarity index 100% rename from src/opendap/dap4/DapString.java rename to retired/src/opendap/dap4/DapString.java diff --git a/src/opendap/dap4/Dataset.java b/retired/src/opendap/dap4/Dataset.java similarity index 100% rename from src/opendap/dap4/Dataset.java rename to retired/src/opendap/dap4/Dataset.java diff --git a/src/opendap/dap4/DatasetTest.java b/retired/src/opendap/dap4/DatasetTest.java similarity index 100% rename from src/opendap/dap4/DatasetTest.java rename to retired/src/opendap/dap4/DatasetTest.java diff --git a/src/opendap/dap4/Dim.java b/retired/src/opendap/dap4/Dim.java similarity index 100% rename from src/opendap/dap4/Dim.java rename to retired/src/opendap/dap4/Dim.java diff --git a/src/opendap/dap4/Dimension.java b/retired/src/opendap/dap4/Dimension.java similarity index 100% rename from src/opendap/dap4/Dimension.java rename to retired/src/opendap/dap4/Dimension.java diff --git a/src/opendap/dap4/Float32.java b/retired/src/opendap/dap4/Float32.java similarity index 100% rename from src/opendap/dap4/Float32.java rename to retired/src/opendap/dap4/Float32.java diff --git a/src/opendap/dap4/Float64.java b/retired/src/opendap/dap4/Float64.java similarity index 100% rename from src/opendap/dap4/Float64.java rename to retired/src/opendap/dap4/Float64.java diff --git a/src/opendap/dap4/Int16.java b/retired/src/opendap/dap4/Int16.java similarity index 100% rename from src/opendap/dap4/Int16.java rename to retired/src/opendap/dap4/Int16.java diff --git a/src/opendap/dap4/Int32.java b/retired/src/opendap/dap4/Int32.java similarity index 100% rename from src/opendap/dap4/Int32.java rename to retired/src/opendap/dap4/Int32.java diff --git a/src/opendap/dap4/Int64.java b/retired/src/opendap/dap4/Int64.java similarity index 100% rename from src/opendap/dap4/Int64.java rename to retired/src/opendap/dap4/Int64.java diff --git a/src/opendap/dap4/Int8.java b/retired/src/opendap/dap4/Int8.java similarity index 100% rename from src/opendap/dap4/Int8.java rename to retired/src/opendap/dap4/Int8.java diff --git a/src/opendap/dap4/UInt16.java b/retired/src/opendap/dap4/UInt16.java similarity index 100% rename from src/opendap/dap4/UInt16.java rename to retired/src/opendap/dap4/UInt16.java diff --git a/src/opendap/dap4/UInt32.java b/retired/src/opendap/dap4/UInt32.java similarity index 100% rename from src/opendap/dap4/UInt32.java rename to retired/src/opendap/dap4/UInt32.java diff --git a/src/opendap/dap4/UInt64.java b/retired/src/opendap/dap4/UInt64.java similarity index 100% rename from src/opendap/dap4/UInt64.java rename to retired/src/opendap/dap4/UInt64.java diff --git a/src/opendap/dap4/UInt8.java b/retired/src/opendap/dap4/UInt8.java similarity index 100% rename from src/opendap/dap4/UInt8.java rename to retired/src/opendap/dap4/UInt8.java diff --git a/src/opendap/dap4/Variable.java b/retired/src/opendap/dap4/Variable.java similarity index 100% rename from src/opendap/dap4/Variable.java rename to retired/src/opendap/dap4/Variable.java diff --git a/src/opendap/dap4/XMLReaderWithNamespaceInMyPackageDotInfo.java b/retired/src/opendap/dap4/XMLReaderWithNamespaceInMyPackageDotInfo.java similarity index 100% rename from src/opendap/dap4/XMLReaderWithNamespaceInMyPackageDotInfo.java rename to retired/src/opendap/dap4/XMLReaderWithNamespaceInMyPackageDotInfo.java From 5beb31089f3b10451b500648e26f659a9905f8a7 Mon Sep 17 00:00:00 2001 From: ndp-opendap Date: Wed, 11 Mar 2026 14:28:03 -0700 Subject: [PATCH 02/10] Removing unneeded cruft from older WCS work. --- build.xml | 9 ++++++++- dmrppJoinExisiting.xml | 2 +- {lib => retired/libs}/activation-1.1.1.jar | Bin .../libs}/jackson-annotations-2.17.0.jar | Bin {lib => retired/libs}/jackson-core-2.17.0.jar | Bin {lib => retired/libs}/jackson-databind-2.17.0.jar | Bin .../libs}/javax.annotation-api-1.3.2.jar | Bin {lib => retired/libs}/jaxb-api-2.3.1.jar | Bin .../libs}/jaxb-core-2.3.0-b170127.1453.jar | Bin .../libs}/jaxb-impl-2.3.0-b170127.1453.jar | Bin {lib => retired/libs}/jaxb-runtime-2.3.6.jar | Bin .../libs}/jaxb2-basics-runtime-0.11.0.jar | Bin {lib => retired/libs}/xlink-v_1_0-1.4.0.jar | Bin .../opendap/dap4/DefaultNamespacePrefixMapper.java | 0 {src => retired/src}/opendap/dap4/package-info.java | 0 src/opendap/dap4/{ => dmrpp}/DmrppAggException.java | 2 +- .../{ => dmrpp}/DmrppJoinExistingAggregator.java | 2 +- .../dap4/{ => dmrpp}/DmrppJoinNewAggregator.java | 2 +- 18 files changed, 12 insertions(+), 5 deletions(-) rename {lib => retired/libs}/activation-1.1.1.jar (100%) rename {lib => retired/libs}/jackson-annotations-2.17.0.jar (100%) rename {lib => retired/libs}/jackson-core-2.17.0.jar (100%) rename {lib => retired/libs}/jackson-databind-2.17.0.jar (100%) rename {lib => retired/libs}/javax.annotation-api-1.3.2.jar (100%) rename {lib => retired/libs}/jaxb-api-2.3.1.jar (100%) rename {lib => retired/libs}/jaxb-core-2.3.0-b170127.1453.jar (100%) rename {lib => retired/libs}/jaxb-impl-2.3.0-b170127.1453.jar (100%) rename {lib => retired/libs}/jaxb-runtime-2.3.6.jar (100%) rename {lib => retired/libs}/jaxb2-basics-runtime-0.11.0.jar (100%) rename {lib => retired/libs}/xlink-v_1_0-1.4.0.jar (100%) rename {src => retired/src}/opendap/dap4/DefaultNamespacePrefixMapper.java (100%) rename {src => retired/src}/opendap/dap4/package-info.java (100%) rename src/opendap/dap4/{ => dmrpp}/DmrppAggException.java (95%) rename src/opendap/dap4/{ => dmrpp}/DmrppJoinExistingAggregator.java (99%) rename src/opendap/dap4/{ => dmrpp}/DmrppJoinNewAggregator.java (99%) diff --git a/build.xml b/build.xml index 76ab60652..b4dce6a31 100644 --- a/build.xml +++ b/build.xml @@ -300,15 +300,18 @@ + + @@ -358,10 +362,11 @@ + @@ -369,6 +374,7 @@ + diff --git a/retired/libs/jackson-annotations-2.17.0.jar b/lib/jackson-annotations-2.17.0.jar similarity index 100% rename from retired/libs/jackson-annotations-2.17.0.jar rename to lib/jackson-annotations-2.17.0.jar diff --git a/retired/libs/jackson-core-2.17.0.jar b/lib/jackson-core-2.17.0.jar similarity index 100% rename from retired/libs/jackson-core-2.17.0.jar rename to lib/jackson-core-2.17.0.jar diff --git a/retired/libs/jackson-databind-2.17.0.jar b/lib/jackson-databind-2.17.0.jar similarity index 100% rename from retired/libs/jackson-databind-2.17.0.jar rename to lib/jackson-databind-2.17.0.jar From 9aad0e9348342670ee88e22f7cc24ab1b6b253cd Mon Sep 17 00:00:00 2001 From: ndp-opendap Date: Thu, 19 Mar 2026 11:29:05 -0700 Subject: [PATCH 05/10] Refreshed sonar stuff --- .travis.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6be0fa121..eb7aa4a67 100644 --- a/.travis.yml +++ b/.travis.yml @@ -129,7 +129,10 @@ jobs: - stage: scan name: "gradle sonarscan (jdk17)" jdk: openjdk17 - addons: sonarcloud + addons: + sonarcloud: + organization: "OPENDAP" # Replace with your actual SonarCloud org key + token: "$SONAR_TOKEN" # Optional: if you want the addon to handle the token script: - export STAGE=scan - | @@ -241,7 +244,7 @@ deploy: access_key_id: $AWS_ACCESS_KEY_ID secret_access_key: $AWS_SECRET_ACCESS_KEY bucket: opendap.travis.build - skip_cleanup: true + cleanup: false local_dir: $TRAVIS_BUILD_DIR/package on: all_branches: true From 7332e1e671dfa7977b7588b6989f78cad3016daf Mon Sep 17 00:00:00 2001 From: ndp-opendap Date: Thu, 19 Mar 2026 11:36:25 -0700 Subject: [PATCH 06/10] Refreshed sonar stuff 2 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index eb7aa4a67..041c6d33e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -131,7 +131,7 @@ jobs: jdk: openjdk17 addons: sonarcloud: - organization: "OPENDAP" # Replace with your actual SonarCloud org key + organization: "opendap-olfs" # Replace with your actual SonarCloud org key token: "$SONAR_TOKEN" # Optional: if you want the addon to handle the token script: - export STAGE=scan From 5b94821c6a8c4e1b6dc39fd96508a0b22437355b Mon Sep 17 00:00:00 2001 From: ndp-opendap Date: Thu, 19 Mar 2026 11:38:10 -0700 Subject: [PATCH 07/10] Refreshed sonar stuff 3 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 041c6d33e..735a543b5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -139,7 +139,7 @@ jobs: # multiline build instructions incoming! if test -z "$TRAVIS_PULL_REQUEST_BRANCH"; then # If no travis pull request branch was found, this is not a pull request! - travis_wait 30 gradle sonar -Dsonar.token=$SONAR_LOGIN -Dsonar.qualitygate.timeout=1800 -Dsonar.qualitygate.wait=true + travis_wait 30 gradle sonar -Dsonar.token="$SONAR_TOKEN" -Dsonar.qualitygate.timeout=1800 -Dsonar.qualitygate.wait=true else # If that variable *was* found, we need to pass in the three variables that let sonar know this is a pull request # https://docs.sonarsource.com/sonarqube-server/latest/analyzing-source-code/pull-request-analysis/setting-up-the-pull-request-analysis/#setup-pull-request-parameters From 0a0a47ce53e9e8a90e194712a52765ac41effcca Mon Sep 17 00:00:00 2001 From: ndp-opendap Date: Thu, 19 Mar 2026 11:44:45 -0700 Subject: [PATCH 08/10] Refreshed sonar stuff 4 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 735a543b5..332219718 100644 --- a/.travis.yml +++ b/.travis.yml @@ -144,7 +144,7 @@ jobs: # If that variable *was* found, we need to pass in the three variables that let sonar know this is a pull request # https://docs.sonarsource.com/sonarqube-server/latest/analyzing-source-code/pull-request-analysis/setting-up-the-pull-request-analysis/#setup-pull-request-parameters # Because Travis's `TRAVIS_BRANCH` is the name of the target branch **when Travis is triggered by a pull request**, that is the pullrequest.base - travis_wait 30 gradle sonar -Dsonar.token=$SONAR_LOGIN -Dsonar.qualitygate.timeout=1800 -Dsonar.qualitygate.wait=true -Dsonar.pullrequest.key="$TRAVIS_PULL_REQUEST" -Dsonar.pullrequest.branch="$TRAVIS_PULL_REQUEST_BRANCH" -Dsonar.pullrequest.base="$TRAVIS_BRANCH" + travis_wait 30 gradle sonar -Dsonar.token=$SONAR_TOKEN -Dsonar.qualitygate.timeout=1800 -Dsonar.qualitygate.wait=true -Dsonar.pullrequest.key="$TRAVIS_PULL_REQUEST" -Dsonar.pullrequest.branch="$TRAVIS_PULL_REQUEST_BRANCH" -Dsonar.pullrequest.base="$TRAVIS_BRANCH" fi - curl -s https://sonarcloud.io/api/project_badges/quality_gate?project=opendap-olfs | grep "QUALITY GATE PASS" before_install: From 4dcc0d9b78c56937438f3f0343d031fd2ac9909c Mon Sep 17 00:00:00 2001 From: ndp-opendap Date: Thu, 19 Mar 2026 11:51:16 -0700 Subject: [PATCH 09/10] Refreshed sonar stuff 5 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 332219718..0060b1cf3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -144,7 +144,7 @@ jobs: # If that variable *was* found, we need to pass in the three variables that let sonar know this is a pull request # https://docs.sonarsource.com/sonarqube-server/latest/analyzing-source-code/pull-request-analysis/setting-up-the-pull-request-analysis/#setup-pull-request-parameters # Because Travis's `TRAVIS_BRANCH` is the name of the target branch **when Travis is triggered by a pull request**, that is the pullrequest.base - travis_wait 30 gradle sonar -Dsonar.token=$SONAR_TOKEN -Dsonar.qualitygate.timeout=1800 -Dsonar.qualitygate.wait=true -Dsonar.pullrequest.key="$TRAVIS_PULL_REQUEST" -Dsonar.pullrequest.branch="$TRAVIS_PULL_REQUEST_BRANCH" -Dsonar.pullrequest.base="$TRAVIS_BRANCH" + travis_wait 30 gradle --debug sonar -Dsonar.token=$SONAR_TOKEN -Dsonar.qualitygate.timeout=1800 -Dsonar.qualitygate.wait=true -Dsonar.pullrequest.key="$TRAVIS_PULL_REQUEST" -Dsonar.pullrequest.branch="$TRAVIS_PULL_REQUEST_BRANCH" -Dsonar.pullrequest.base="$TRAVIS_BRANCH" fi - curl -s https://sonarcloud.io/api/project_badges/quality_gate?project=opendap-olfs | grep "QUALITY GATE PASS" before_install: From 14642e2ba415dc95b7884c0278f19cf082ba4946 Mon Sep 17 00:00:00 2001 From: ndp-opendap Date: Thu, 19 Mar 2026 12:43:06 -0700 Subject: [PATCH 10/10] Refreshed sonar stuff 6 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0060b1cf3..a0556c9da 100644 --- a/.travis.yml +++ b/.travis.yml @@ -131,7 +131,7 @@ jobs: jdk: openjdk17 addons: sonarcloud: - organization: "opendap-olfs" # Replace with your actual SonarCloud org key + organization: "opendap" # Replace with your actual SonarCloud org key token: "$SONAR_TOKEN" # Optional: if you want the addon to handle the token script: - export STAGE=scan @@ -144,7 +144,7 @@ jobs: # If that variable *was* found, we need to pass in the three variables that let sonar know this is a pull request # https://docs.sonarsource.com/sonarqube-server/latest/analyzing-source-code/pull-request-analysis/setting-up-the-pull-request-analysis/#setup-pull-request-parameters # Because Travis's `TRAVIS_BRANCH` is the name of the target branch **when Travis is triggered by a pull request**, that is the pullrequest.base - travis_wait 30 gradle --debug sonar -Dsonar.token=$SONAR_TOKEN -Dsonar.qualitygate.timeout=1800 -Dsonar.qualitygate.wait=true -Dsonar.pullrequest.key="$TRAVIS_PULL_REQUEST" -Dsonar.pullrequest.branch="$TRAVIS_PULL_REQUEST_BRANCH" -Dsonar.pullrequest.base="$TRAVIS_BRANCH" + travis_wait 30 gradle --info sonar -Dsonar.token=$SONAR_TOKEN -Dsonar.qualitygate.timeout=1800 -Dsonar.qualitygate.wait=true -Dsonar.pullrequest.key="$TRAVIS_PULL_REQUEST" -Dsonar.pullrequest.branch="$TRAVIS_PULL_REQUEST_BRANCH" -Dsonar.pullrequest.base="$TRAVIS_BRANCH" fi - curl -s https://sonarcloud.io/api/project_badges/quality_gate?project=opendap-olfs | grep "QUALITY GATE PASS" before_install: