Merge branch 'Unidata:maint-5.x' into develop

.github/CODEOWNERS

@@ -15,30 +15,30 @@
 # users just like we do for commit author emails.
 # docs/*  [email protected]
 
-* @tdrwenski
+* @lesserwhirls
 
 #####################
 # top level modules #
 #####################
 
-httpservices/** @DennisHeimbigner @tdrwenski
-netcdf4/** @DennisHeimbigner @tdrwenski
+httpservices/** @DennisHeimbigner @lesserwhirls
+netcdf4/** @DennisHeimbigner @lesserwhirls
 
 ###########################################
 # classpath / not module specific matches #
 ###########################################
 
-**/iosp/nids/** @dopplershift @tdrwenski
+**/iosp/nids/** @dopplershift @lesserwhirls
 
-**/opendap/** @DennisHeimbigner @tdrwenski
-**/dap4/** @DennisHeimbigner @tdrwenski
+**/opendap/** @DennisHeimbigner @lesserwhirls
+**/dap4/** @DennisHeimbigner @lesserwhirls
 
 ######################
 # general file types #
 ######################
 
 *.py @dopplershift
-**/test/**/*.py @tdrwenski
+**/test/**/*.py @lesserwhirls
 
 ####################
 # individual files #

.github/workflows/deps.yml

@@ -7,9 +7,9 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
         with:
-          distribution: 'adopt'
+          distribution: 'temurin'
           java-version: '11'
       - name: Build with Gradle (refresh dependencies)
         run: ./gradlew clean classes testClasses assemble --refresh-dependencies

.github/workflows/docs-tutorials.yml

@@ -8,15 +8,18 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Setup Java 8
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
         with:
-          distribution: 'zulu'
+          distribution: 'temurin'
           java-version: '8'
       - name: Cache Gradle packages
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
-          path: ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
-          restore-keys: ${{ runner.os }}-gradle
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
       - name: Check netCDF-Java documentation for deprecations warnings
         run: './gradlew :docs:testClasses |& (! grep -F "warning: [deprecation]")'

.github/workflows/docs.yml

@@ -12,16 +12,19 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
         with:
-          distribution: 'adopt'
+          distribution: 'temurin'
           java-version: '11'
       - name: Cache Gradle packages
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
-          path: ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
-          restore-keys: ${{ runner.os }}-gradle
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
       - name: Build docs using Gradle
         run: ./gradlew buildJekyllSite
       - if: success()

.github/workflows/style.yml

@@ -7,15 +7,18 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
         with:
-          distribution: 'adopt'
+          distribution: 'temurin'
           java-version: '11'
       - name: Cache Gradle packages
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
-          path: ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
-          restore-keys: ${{ runner.os }}-gradle
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
       - name: Code Style Check with Gradle and Spotless
         run: ./gradlew clean spotlessCheck

opendap/src/test/java/ucar/nc2/dods/TestDodsV.java

@@ -6,6 +6,8 @@
 import opendap.dap.DConnect2;
 import opendap.dap.DDS;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import ucar.unidata.util.test.category.NotPullRequest;
 
 public class TestDodsV {
 
@@ -30,11 +32,9 @@ private static void doit(String urlName) throws IOException, DAP2Exception {
   }
 
   @Test
+  @Category(NotPullRequest.class)
   public void testStuff() throws IOException, DAP2Exception {
     // doit("http://localhost:8080/thredds/dodsC/ncdodsTest/conventions/zebra/SPOL_3Volumes.nc");
-    doit("http://iridl.ldeo.columbia.edu/SOURCES/.CAYAN/dods");
+    doit("https://iridl.ldeo.columbia.edu/SOURCES/.CAYAN/dods");
   }
-
-
-
 }