Merge pull request #227 from ChrisJohnNOAA/Version-2.25.1

Version 2.25.1
ERDDAP · Nov 8, 2024 · 5f2b237 · 5f2b237
2 parents 1ef0d53 + 14f7c19
commit 5f2b237
Show file tree

Hide file tree

Showing 14 changed files with 31 additions and 26 deletions.
diff --git a/DEPLOY_INSTALL.md b/DEPLOY_INSTALL.md
@@ -211,8 +211,8 @@ ERDDAP™ can run on any server that supports Java and Tomcat (and other applica
     ERDDAP™ will not work correctly if the setup.xml or datasets.xml file isn't a well-formed XML file. So, after you edit these files, it is a good idea to verify that the result is well-formed XML by pasting the XML text into an XML checker like [xmlvalidation(https://www.xmlvalidation.com/).  
 
 4.  [Install the erddap.war file.](#erddap.war)  
-    On Linux, Mac, and Windows, download [erddap.war](https://github.com/ERDDAP/erddap/releases/download/v2.25/erddap.war) into _tomcat_/webapps .  
-    (version 2.25, 592,291,920 bytes, MD5=BEEBE386A3514C0FB8898C6EA597F40D, dated 2024-10-31)
+    On Linux, Mac, and Windows, download [erddap.war](https://github.com/ERDDAP/erddap/releases/download/v2.25.1/erddap.war) into _tomcat_/webapps .  
+    (version 2.25_1, 592,292,039 bytes, MD5=0F0C14FD22DF80D0E867A4B96ED7F3FF, dated 2024-11-07)
 
     The .war file is big because it contains high resolution coastline, boundary, and elevation data needed to create maps.
 

diff --git a/DEPLOY_UPDATE.md b/DEPLOY_UPDATE.md
@@ -5,8 +5,8 @@
 
 2.  If you are upgrading from ERDDAP™ version 2.18 or below, you need to switch to Java 21 (or newer) and the related Tomcat 10. See the regular ERDDAP™ installation instructions for [Java](#java) and [Tomcat](#tomcat). You'll also have to copy your _tomcat_/content/erddap directory from your old Tomcat installation to your new Tomcat installation.  
 
-3.  Download [erddap.war](https://github.com/ERDDAP/erddap/releases/download/v2.25/erddap.war) into _tomcat_/webapps .  
-    (version 2.25, 592,291,920 bytes, MD5=BEEBE386A3514C0FB8898C6EA597F40D, dated 2024-10-31)
+3.  Download [erddap.war](https://github.com/ERDDAP/erddap/releases/download/v2.25.1/erddap.war) into _tomcat_/webapps .  
+    (version 2.25_1, 592,292,039 bytes, MD5=0F0C14FD22DF80D0E867A4B96ED7F3FF, dated 2024-11-07)
 
 4.  [messages.xml](#messages.xml)
     *   Common: If you are upgrading from ERDDAP™ version 1.46 (or above) and you just use the standard messages, the new standard messages.xml will be installed automatically (amongst the .class files via erddap.war).  

diff --git a/WEB-INF/classes/gov/noaa/pfel/erddap/util/EDStatic.java b/WEB-INF/classes/gov/noaa/pfel/erddap/util/EDStatic.java
@@ -197,6 +197,7 @@ public class EDStatic {
    * 2.23 released on 2023-02-27 <br>
    * 2.24 released on 2024-06-07 <br>
    * 2.25 first RC on 2024-10-16 released on 2024-10-31 <br>
+   * 2.25_1 RC 2024-11-07
    *
    * <p>For main branch releases, this will be a floating point number with 2 decimal digits, with
    * no additional text. !!! In general, people other than the main ERDDAP developer (Bob) should
@@ -206,7 +207,7 @@ public class EDStatic {
    * anything following it. A request to http.../erddap/version will return just the number (as
    * text). A request to http.../erddap/version_string will return the full string.
    */
-  public static String erddapVersion = "2.25"; // see comment above
+  public static String erddapVersion = "2.25_1"; // see comment above
 
   /**
    * This is almost always false. During development, Bob sets this to true. No one else needs to.

diff --git a/download/AccessToPrivateDatasets.html b/download/AccessToPrivateDatasets.html
@@ -194,7 +194,7 @@ <h2><a class="selfLink" id="contact" href="#contact" rel="bookmark">Contact</a><
 
 <br>&nbsp;
 <hr>
-<p>ERDDAP, Version 2.25
+<p>ERDDAP, Version 2.25_1
 <br><a rel="bookmark" href="https://coastwatch.pfeg.noaa.gov/erddap/legal.html">Disclaimers</a> | 
     <a rel="bookmark" href="https://coastwatch.pfeg.noaa.gov/erddap/legal.html#privacyPolicy">Privacy Policy</a>
 <p>&nbsp;

diff --git a/download/EDDTableFromEML.html b/download/EDDTableFromEML.html
@@ -606,7 +606,7 @@ <h2><a class="selfLink" id="contact" href="#contact" rel="bookmark">Contact</a><
 
 <br>&nbsp;
 <hr>
-<p>ERDDAP, Version 2.25
+<p>ERDDAP, Version 2.25_1
 <br><a rel="bookmark" href="https://coastwatch.pfeg.noaa.gov/erddap/legal.html">Disclaimers</a> | 
     <a rel="bookmark" href="https://coastwatch.pfeg.noaa.gov/erddap/legal.html#privacyPolicy">Privacy Policy</a>
 

diff --git a/download/NCCSV.html b/download/NCCSV.html
@@ -943,7 +943,7 @@ <h2><a class="selfLink" id="contact" href="#contact" rel="bookmark">Contact</a><
 
 <br>&nbsp;
 <hr>
-<p>ERDDAP, Version 2.25
+<p>ERDDAP, Version 2.25_1
 <br><a rel="bookmark" href="https://coastwatch.pfeg.noaa.gov/erddap/legal.html">Disclaimers</a> | 
     <a rel="bookmark" href="https://coastwatch.pfeg.noaa.gov/erddap/legal.html#privacyPolicy">Privacy Policy</a>
 </div>

diff --git a/download/NCCSV_1.00.html b/download/NCCSV_1.00.html
@@ -859,7 +859,7 @@ <h2><a class="selfLink" id="contact" href="#contact" rel="bookmark">Contact</a><
 
 <br>&nbsp;
 <hr>
-<p>ERDDAP, Version 2.25
+<p>ERDDAP, Version 2.25_1
 <br><a rel="bookmark" href="https://coastwatch.pfeg.noaa.gov/erddap/legal.html">Disclaimers</a> | 
     <a rel="bookmark" href="https://coastwatch.pfeg.noaa.gov/erddap/legal.html#privacyPolicy">Privacy Policy</a>
 </div>

diff --git a/download/NCCSV_1.10.html b/download/NCCSV_1.10.html
@@ -930,7 +930,7 @@ <h2><a class="selfLink" id="contact" href="#contact" rel="bookmark">Contact</a><
 
 <br>&nbsp;
 <hr>
-<p>ERDDAP, Version 2.25
+<p>ERDDAP, Version 2.25_1
 <br><a rel="bookmark" href="https://coastwatch.pfeg.noaa.gov/erddap/legal.html">Disclaimers</a> | 
     <a rel="bookmark" href="https://coastwatch.pfeg.noaa.gov/erddap/legal.html#privacyPolicy">Privacy Policy</a>
 </div>

diff --git a/download/changes.html b/download/changes.html
@@ -71,7 +71,7 @@ <h1 style="text-align:center;">ERDDAP™ Changes</h1>
 <!-- ****************************************************************************** -->
 
 <h2><a class="selfLink" id="changes2.25" href="#changes2.25" rel="bookmark">Changes</a>
-  in ERDDAP™ version 2.25 (released TBD)</h2>
+  in ERDDAP™ version 2.25 (released 2024-10-31)</h2>
 <ul>
   <li><strong>New Features and Changes (for users):</strong>
     <ul>
@@ -7162,7 +7162,7 @@ <h2><a class="selfLink" id="contact" href="#contact" rel="bookmark">Contact</a><
 
 <br>&nbsp;
 <hr>
-<p>ERDDAP, Version 2.25
+<p>ERDDAP, Version 2.25_1
 <br><a href="https://coastwatch.pfeg.noaa.gov/erddap/legal.html">Disclaimers</a> | 
     <a href="https://coastwatch.pfeg.noaa.gov/erddap/legal.html#privacyPolicy">Privacy Policy</a>
 

diff --git a/download/grids.html b/download/grids.html
@@ -1248,7 +1248,7 @@ <h3><a class="selfLink" id="RemoteReplicationOfDatasets_Solutions" href="#Remote
 
 <br>&nbsp;
 <hr>
-<p>ERDDAP, Version 2.25
+<p>ERDDAP, Version 2.25_1
 <br><a rel="help" href="https://coastwatch.pfeg.noaa.gov/erddap/legal.html">Disclaimers</a> | 
     <a rel="help" href="https://coastwatch.pfeg.noaa.gov/erddap/legal.html#privacyPolicy">Privacy Policy</a>
 

diff --git a/download/setup.html b/download/setup.html
@@ -4302,7 +4302,7 @@ <h2><a class="selfLink" id="contact" href="#contact" rel="bookmark">Contact</a><
 
 <br>&nbsp;
 <hr>
-<p>ERDDAP, Version 2.25
+<p>ERDDAP, Version 2.25_1
 <br><a rel="bookmark" href="https://coastwatch.pfeg.noaa.gov/erddap/legal.html">Disclaimers</a> | 
     <a rel="bookmark" href="https://coastwatch.pfeg.noaa.gov/erddap/legal.html#privacyPolicy">Privacy Policy</a>
 

diff --git a/download/setupDatasetsXml.html b/download/setupDatasetsXml.html
@@ -15805,7 +15805,7 @@ <h2><a class="selfLink" id="contact" href="#contact" rel="bookmark">Contact</a><
 
 <br>&nbsp;
 <hr>
-<p>ERDDAP, Version 2.25
+<p>ERDDAP, Version 2.25_1
 <br><a rel="bookmark" href="https://coastwatch.pfeg.noaa.gov/erddap/legal.html">Disclaimers</a> | 
     <a rel="bookmark" href="https://coastwatch.pfeg.noaa.gov/erddap/legal.html#privacyPolicy"
     >Privacy Policy</a>

diff --git a/pom.xml b/pom.xml
@@ -35,7 +35,7 @@
 
     <groupId>gov.noaa.pfel.erddap</groupId>
     <artifactId>ERDDAP</artifactId>
-    <version>2.25</version>
+    <version>2.25_1</version>
     <packaging>war</packaging>
 
     <name>erddap</name>
@@ -260,7 +260,7 @@
             <plugin>
                 <groupId>com.googlecode.maven-download-plugin</groupId>
                 <artifactId>download-maven-plugin</artifactId>
-                <version>1.11.1</version>
+                <version>1.11.2</version>
                 <executions>
                     <execution>
                         <id>download-content</id>
@@ -358,7 +358,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.5.1</version>
+                <version>3.5.2</version>
                 <configuration>
                     <additionalClasspathElements>
                         <additionalClasspathElement>${project.basedir}/test-data</additionalClasspathElement>
@@ -369,7 +369,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
-                <version>3.5.1</version>
+                <version>3.5.2</version>
                 <executions>
                     <execution>
                         <goals>
@@ -395,7 +395,7 @@
             <plugin>
                 <groupId>com.github.spotbugs</groupId>
                 <artifactId>spotbugs-maven-plugin</artifactId>
-                <version>4.8.6.4</version>
+                <version>4.8.6.5</version>
                 <configuration>
                     <maxHeap>2048</maxHeap>
                     <includeFilterFile>spotbugs-security-include.xml</includeFilterFile>
@@ -486,7 +486,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-dependency-plugin</artifactId>
-                    <version>3.8.0</version>
+                    <version>3.8.1</version>
                 </plugin>
                 <!-- https://mvnrepository.com/artifact/org.codehaus.plexus/plexus-utils -->
                 <plugin>
@@ -1006,12 +1006,12 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-report-plugin</artifactId>
-                <version>3.5.1</version>
+                <version>3.5.2</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-report-plugin</artifactId>
-                <version>3.5.1</version>
+                <version>3.5.2</version>
                 <reportSets>
                     <reportSet>
                         <id>integration-tests</id>

diff --git a/src/test/java/jetty/JettyTests.java b/src/test/java/jetty/JettyTests.java
@@ -2352,7 +2352,9 @@ void testMetadataIso19115() throws Exception {
             + //
             "      <gmd:maintenanceNote>\n"
             + //
-            "        <gco:CharacterString>This record was created from dataset metadata by ERDDAP Version 2.25</gco:CharacterString>\n"
+            "        <gco:CharacterString>This record was created from dataset metadata by ERDDAP Version "
+            + EDStatic.erddapVersion
+            + "</gco:CharacterString>\n"
             + //
             "      </gmd:maintenanceNote>\n"
             + //
@@ -2441,7 +2443,7 @@ void testMetadataIso19115() throws Exception {
     expected =
         "<tr><td><img class=\"B\" src=\"http://localhost:"
             + PORT
-            + "/erddap/images/fileIcons/xml.gif\" alt=\"[XML]\"></td><td><a rel=\"bookmark\" href=\"erdMH1chlamday&#x5f;iso19115&#x2e;xml\">erdMH1chlamday&#x5f;iso19115&#x2e;xml</a></td><td class=\"R\">DD-MMM-YYYY HH:mm</td><td class=\"R\">53721</td><td>Chlorophyll-a, Aqua MODIS, NPP, L3SMI, Global, 4km, Science Quality, 2003-present (Monthly Composite)</td></tr>";
+            + "/erddap/images/fileIcons/xml.gif\" alt=\"[XML]\"></td><td><a rel=\"bookmark\" href=\"erdMH1chlamday&#x5f;iso19115&#x2e;xml\">erdMH1chlamday&#x5f;iso19115&#x2e;xml</a></td><td class=\"R\">DD-MMM-YYYY HH:mm</td><td class=\"R\">53723</td><td>Chlorophyll-a, Aqua MODIS, NPP, L3SMI, Global, 4km, Science Quality, 2003-present (Monthly Composite)</td></tr>";
     results = results.replaceAll("..-...-.... ..:..", "DD-MMM-YYYY HH:mm");
     Test.ensureTrue(results.indexOf(expected) > 0, "No erdMH1chlamday found, results=" + results);
   }
@@ -2514,7 +2516,9 @@ void testMetadataFgdc() throws Exception {
             + //
             "          <pubplace>Nowhere, AK, USA</pubplace>\n"
             + //
-            "          <publish>ERDDAP, version 2.25, at ERDDAP Jetty Install</publish>\n"
+            "          <publish>ERDDAP, version "
+            + EDStatic.erddapVersion
+            + ", at ERDDAP Jetty Install</publish>\n"
             + //
             "          <publish_cntinfo>\n"
             + //