Merge branch 'maint-5.x' into handle-zero-dimension-2

.github/CONTRIBUTING.md

@@ -237,11 +237,7 @@ Oops missed this one thing. This commit fixes that.
 ...
 ~~~
 
-Edit the two commit messages into a single message that describes the overall change:
-
-~~~
-
-Once you have and exit, you will have a change to change the commit message for the new, squashed, mega commit:
+Edit the two commit messages into a single message that describes the overall change. Once you have and exit, you will have a change to change the commit message for the new, squashed, mega commit:
 
 ~~~bash
 

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,27 +1,17 @@
 name: Bug Report
 description: Non-security related issues regarding this software
-title: "[VERSION]: "
 labels: [bug]
 body:
   - type: markdown
     attributes:
-      value: |
-        :point_up: **Please edit the title above to include the highest version, of which you are aware, of netCDF-Java impacted by this bug in the title of the issue.**
-        
+      value: |        
         Thank you for taking the time to fill out this bug report! If you have a question, suggestion, or feature request, please use the project [GitHub Discussions forum](https://github.com/Unidata/netcdf-java/discussions/).
         
-  - type: dropdown
+  - type: textarea
     id: versions
     attributes:
       label: Versions impacted by the bug
       description: Which version(s) of netCDF-Java are impacted by this bug? If you have only tried with one version, that is ok!
-      multiple: true
-      options:
-        - v5.x
-        - v6.x
-        - v7.x
-    validations:
-      required: true
   - type: textarea
     id: report-details
     attributes:

.github/workflows/tests.yml

@@ -12,7 +12,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Build and test with Gradle (${{ matrix.java-vendor }} ${{ matrix.java-version }})
-        uses: Unidata/thredds-test-action@v1
+        uses: Unidata/thredds-test-action@v2
         with:
           java-vendor: ${{ matrix.java-vendor }}
           java-version: ${{ matrix.java-version }}

LICENSE

@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 1998-2018, University Corporation for Atmospheric Research/Unidata
+Copyright (c) 1998-2023, University Corporation for Atmospheric Research/Unidata
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

README.md

@@ -43,7 +43,7 @@ For potential security issues, please contact [email protected] directly
 
 Are you looking to contribute to the netCDF-Java efforts?
 That's great!
-Please see our [contributors guide](https://github.com/Unidata/netcdf-java/blob/develop/.github/CONTRIBUTING.md) for more information!
+Please see our [contributors guide](https://github.com/Unidata/netcdf-java/blob/maint-5.x/.github/CONTRIBUTING.md) for more information!
 
 ## NetCDF Markup Language (NcML)
 
@@ -66,19 +66,20 @@ These XML documents are how THREDDS-enabled data consumers find out what data is
 
 THREDDS Catalog documentation (including the specification) is available at
 
-* https://docs.unidata.ucar.edu/tds/5.0/userguide/basic_client_catalog.html
+* https://docs.unidata.ucar.edu/tds/current/userguide/basic_client_catalog.html
 
 ## Licensing
 
-netCDF-Java is released under the BSD-3 licence, which can be found [here](https://github.com/Unidata/netcdf-java/blob/develop/LICENSE).
+netCDF-Java is released under the BSD-3 licence, which can be found [here](https://github.com/Unidata/netcdf-java/blob/maint-5.x/LICENSE).
 
 Furthermore, this project includes code from third-party open-source software components:
-* [Gretty](https://github.com/akhikhl/gretty): for details, see `buildSrc/README.md`
+* [Gretty](https://github.com/akhikhl/gretty)
 * [ERDDAP](https://coastwatch.pfeg.noaa.gov/erddap/index.html): for details, see `waterml/README.md`
-* [JUnit](https://github.com/junit-team/junit4): for details, see `testUtil/README.md`
+* [JUnit](https://github.com/junit-team/junit4): for details, see `cdm-test-utils/README.md`
+* Edal (The University of Reading): The CDM calendars are implemented using classes from Jon Blower's `uk.ac.rdg.resc.edal.time` package.
 
 Each of these software components have their own license.
-Please see `docs/src/private/licenses/third-party/`.
+Please see `third-party-licenses/`.
 
 ## How to use
 

bufr/src/main/java/ucar/nc2/iosp/bufr/tables/BufrTables.java

@@ -125,7 +125,7 @@ public enum Format {
 
   static final String RESOURCE_PATH = "/resources/bufrTables/";
   private static final String canonicalLookup = "resource:" + RESOURCE_PATH + "local/tablelookup.csv";
-  private static final int latestVersion = 19;
+  private static final int latestVersion = 37;
 
   private static final boolean showTables = false;
   private static final boolean showReadErrs = true;

bufr/src/main/java/ucar/nc2/iosp/bufr/tables/CodeFlagTables.java

@@ -18,7 +18,7 @@
 /** Read BUFR Code / Flag tables. */
 public class CodeFlagTables {
   private static org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(CodeFlagTables.class);
-  private static final String CodeFlagFilename = "wmo/BUFRCREX_32_0_0_CodeFlag_en.xml";
+  private static final String CodeFlagFilename = "wmo/BUFRCREX_37_0_0_CodeFlag_en.xml";
   static Map<Short, CodeFlagTables> tableMap;
 
   public static CodeFlagTables getTable(short id) {

bufr/src/main/java/ucar/nc2/iosp/bufr/tables/TableA.java

@@ -15,7 +15,7 @@
 /** Read standard WMO Table A (data categories). */
 public class TableA {
   private static org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(TableA.class);
-  private static final String TABLEA_FILENAME = "wmo/BUFR_32_0_0_TableA_en.xml";
+  private static final String TABLEA_FILENAME = "wmo/BUFR_37_0_0_TableA_en.xml";
   private static Map<Integer, String> tableA;
 
   /*

bufr/src/main/resources/resources/bufrTables/local/tablelookup.csv

@@ -30,7 +30,9 @@ WMO.19, 0,     0,        19,    0,    -1,   resource:/resources/bufrTables/wmo/B
 WMO.22, 0,     0,        22,    0,    -1,   resource:/resources/bufrTables/wmo/BUFRCREX_22_0_1_TableB_en.xml, wmo_xml, resource:/resources/bufrTables/wmo/BUFR_22_0_1_TableD_en.xml, wmo_xml
 WMO.25, 0,     0,        25,    0,    -1,   resource:/resources/bufrTables/wmo/BUFRCREX_25_0_0_TableB_en.xml, wmo_xml, resource:/resources/bufrTables/wmo/BUFR_25_0_0_TableD_en.xml, wmo_xml
 WMO.32, 0,     0,        32,    0,    -1,   resource:/resources/bufrTables/wmo/BUFRCREX_32_0_0_TableB_en.xml, wmo_xml, resource:/resources/bufrTables/wmo/BUFR_32_0_0_TableD_en.xml, wmo_xml
-WMO.any,0,     0,        -1,    0,    -1,   resource:/resources/bufrTables/wmo/BUFRCREX_32_0_0_TableB_en.xml, wmo_xml, resource:/resources/bufrTables/wmo/BUFR_32_0_0_TableD_en.xml, wmo_xml
+WMO.33, 0,     0,        33,    0,    -1,   resource:/resources/bufrTables/wmo/BUFRCREX_33_0_0_TableB_en.xml, wmo_xml, resource:/resources/bufrTables/wmo/BUFR_33_0_0_TableD_en.xml, wmo_xml
+WMO.37, 0,     0,        37,    0,    -1,   resource:/resources/bufrTables/wmo/BUFRCREX_37_0_0_TableB_en.xml, wmo_xml, resource:/resources/bufrTables/wmo/BUFR_37_0_0_TableD_en.xml, wmo_xml
+WMO.any,0,     0,        -1,    0,    -1,   resource:/resources/bufrTables/wmo/BUFRCREX_37_0_0_TableB_en.xml, wmo_xml, resource:/resources/bufrTables/wmo/BUFR_37_0_0_TableD_en.xml, wmo_xml
 #
 # NCEP
 # see http://www.emc.ncep.noaa.gov/mmb/data_processing/bufrtab_tablea.htm#1