Skip to content

Commit 5f2b237

Browse files
ChrisJohnNOAAChrisJohnNOAA
authored
Merge pull request #227 from ChrisJohnNOAA/Version-2.25.1
Version 2.25.1
2 parents 1ef0d53 + 14f7c19 commit 5f2b237

14 files changed

+31
-26
lines changed

Diff for: ‎DEPLOY_INSTALL.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -211,8 +211,8 @@ ERDDAP™ can run on any server that supports Java and Tomcat (and other applica
211211
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/).
212212

213213
4. [Install the erddap.war file.](#erddap.war)
214-
On Linux, Mac, and Windows, download [erddap.war](https://github.com/ERDDAP/erddap/releases/download/v2.25/erddap.war) into _tomcat_/webapps .
215-
(version 2.25, 592,291,920 bytes, MD5=BEEBE386A3514C0FB8898C6EA597F40D, dated 2024-10-31)
214+
On Linux, Mac, and Windows, download [erddap.war](https://github.com/ERDDAP/erddap/releases/download/v2.25.1/erddap.war) into _tomcat_/webapps .
215+
(version 2.25_1, 592,292,039 bytes, MD5=0F0C14FD22DF80D0E867A4B96ED7F3FF, dated 2024-11-07)
216216

217217
The .war file is big because it contains high resolution coastline, boundary, and elevation data needed to create maps.
218218

Diff for: ‎DEPLOY_UPDATE.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
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.
77

8-
3. Download [erddap.war](https://github.com/ERDDAP/erddap/releases/download/v2.25/erddap.war) into _tomcat_/webapps .
9-
(version 2.25, 592,291,920 bytes, MD5=BEEBE386A3514C0FB8898C6EA597F40D, dated 2024-10-31)
8+
3. Download [erddap.war](https://github.com/ERDDAP/erddap/releases/download/v2.25.1/erddap.war) into _tomcat_/webapps .
9+
(version 2.25_1, 592,292,039 bytes, MD5=0F0C14FD22DF80D0E867A4B96ED7F3FF, dated 2024-11-07)
1010

1111
4. [messages.xml](#messages.xml)
1212
* 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 for: ‎WEB-INF/classes/gov/noaa/pfel/erddap/util/EDStatic.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@ public class EDStatic {
197197
* 2.23 released on 2023-02-27 <br>
198198
* 2.24 released on 2024-06-07 <br>
199199
* 2.25 first RC on 2024-10-16 released on 2024-10-31 <br>
200+
* 2.25_1 RC 2024-11-07
200201
*
201202
* <p>For main branch releases, this will be a floating point number with 2 decimal digits, with
202203
* no additional text. !!! In general, people other than the main ERDDAP developer (Bob) should
@@ -206,7 +207,7 @@ public class EDStatic {
206207
* anything following it. A request to http.../erddap/version will return just the number (as
207208
* text). A request to http.../erddap/version_string will return the full string.
208209
*/
209-
public static String erddapVersion = "2.25"; // see comment above
210+
public static String erddapVersion = "2.25_1"; // see comment above
210211

211212
/**
212213
* This is almost always false. During development, Bob sets this to true. No one else needs to.

Diff for: ‎download/AccessToPrivateDatasets.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ <h2><a class="selfLink" id="contact" href="#contact" rel="bookmark">Contact</a><
194194

195195
<br>&nbsp;
196196
<hr>
197-
<p>ERDDAP, Version 2.25
197+
<p>ERDDAP, Version 2.25_1
198198
<br><a rel="bookmark" href="https://coastwatch.pfeg.noaa.gov/erddap/legal.html">Disclaimers</a> |
199199
<a rel="bookmark" href="https://coastwatch.pfeg.noaa.gov/erddap/legal.html#privacyPolicy">Privacy Policy</a>
200200
<p>&nbsp;

Diff for: ‎download/EDDTableFromEML.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -606,7 +606,7 @@ <h2><a class="selfLink" id="contact" href="#contact" rel="bookmark">Contact</a><
606606

607607
<br>&nbsp;
608608
<hr>
609-
<p>ERDDAP, Version 2.25
609+
<p>ERDDAP, Version 2.25_1
610610
<br><a rel="bookmark" href="https://coastwatch.pfeg.noaa.gov/erddap/legal.html">Disclaimers</a> |
611611
<a rel="bookmark" href="https://coastwatch.pfeg.noaa.gov/erddap/legal.html#privacyPolicy">Privacy Policy</a>
612612

Diff for: ‎download/NCCSV.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -943,7 +943,7 @@ <h2><a class="selfLink" id="contact" href="#contact" rel="bookmark">Contact</a><
943943

944944
<br>&nbsp;
945945
<hr>
946-
<p>ERDDAP, Version 2.25
946+
<p>ERDDAP, Version 2.25_1
947947
<br><a rel="bookmark" href="https://coastwatch.pfeg.noaa.gov/erddap/legal.html">Disclaimers</a> |
948948
<a rel="bookmark" href="https://coastwatch.pfeg.noaa.gov/erddap/legal.html#privacyPolicy">Privacy Policy</a>
949949
</div>

Diff for: ‎download/NCCSV_1.00.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -859,7 +859,7 @@ <h2><a class="selfLink" id="contact" href="#contact" rel="bookmark">Contact</a><
859859

860860
<br>&nbsp;
861861
<hr>
862-
<p>ERDDAP, Version 2.25
862+
<p>ERDDAP, Version 2.25_1
863863
<br><a rel="bookmark" href="https://coastwatch.pfeg.noaa.gov/erddap/legal.html">Disclaimers</a> |
864864
<a rel="bookmark" href="https://coastwatch.pfeg.noaa.gov/erddap/legal.html#privacyPolicy">Privacy Policy</a>
865865
</div>

Diff for: ‎download/NCCSV_1.10.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -930,7 +930,7 @@ <h2><a class="selfLink" id="contact" href="#contact" rel="bookmark">Contact</a><
930930

931931
<br>&nbsp;
932932
<hr>
933-
<p>ERDDAP, Version 2.25
933+
<p>ERDDAP, Version 2.25_1
934934
<br><a rel="bookmark" href="https://coastwatch.pfeg.noaa.gov/erddap/legal.html">Disclaimers</a> |
935935
<a rel="bookmark" href="https://coastwatch.pfeg.noaa.gov/erddap/legal.html#privacyPolicy">Privacy Policy</a>
936936
</div>

Diff for: ‎download/changes.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ <h1 style="text-align:center;">ERDDAP™ Changes</h1>
7171
<!-- ****************************************************************************** -->
7272

7373
<h2><a class="selfLink" id="changes2.25" href="#changes2.25" rel="bookmark">Changes</a>
74-
in ERDDAP™ version 2.25 (released TBD)</h2>
74+
in ERDDAP™ version 2.25 (released 2024-10-31)</h2>
7575
<ul>
7676
<li><strong>New Features and Changes (for users):</strong>
7777
<ul>
@@ -7162,7 +7162,7 @@ <h2><a class="selfLink" id="contact" href="#contact" rel="bookmark">Contact</a><
71627162

71637163
<br>&nbsp;
71647164
<hr>
7165-
<p>ERDDAP, Version 2.25
7165+
<p>ERDDAP, Version 2.25_1
71667166
<br><a href="https://coastwatch.pfeg.noaa.gov/erddap/legal.html">Disclaimers</a> |
71677167
<a href="https://coastwatch.pfeg.noaa.gov/erddap/legal.html#privacyPolicy">Privacy Policy</a>
71687168

Diff for: ‎download/grids.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1248,7 +1248,7 @@ <h3><a class="selfLink" id="RemoteReplicationOfDatasets_Solutions" href="#Remote
12481248

12491249
<br>&nbsp;
12501250
<hr>
1251-
<p>ERDDAP, Version 2.25
1251+
<p>ERDDAP, Version 2.25_1
12521252
<br><a rel="help" href="https://coastwatch.pfeg.noaa.gov/erddap/legal.html">Disclaimers</a> |
12531253
<a rel="help" href="https://coastwatch.pfeg.noaa.gov/erddap/legal.html#privacyPolicy">Privacy Policy</a>
12541254

Diff for: ‎download/setup.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -4302,7 +4302,7 @@ <h2><a class="selfLink" id="contact" href="#contact" rel="bookmark">Contact</a><
43024302

43034303
<br>&nbsp;
43044304
<hr>
4305-
<p>ERDDAP, Version 2.25
4305+
<p>ERDDAP, Version 2.25_1
43064306
<br><a rel="bookmark" href="https://coastwatch.pfeg.noaa.gov/erddap/legal.html">Disclaimers</a> |
43074307
<a rel="bookmark" href="https://coastwatch.pfeg.noaa.gov/erddap/legal.html#privacyPolicy">Privacy Policy</a>
43084308

Diff for: ‎download/setupDatasetsXml.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -15805,7 +15805,7 @@ <h2><a class="selfLink" id="contact" href="#contact" rel="bookmark">Contact</a><
1580515805

1580615806
<br>&nbsp;
1580715807
<hr>
15808-
<p>ERDDAP, Version 2.25
15808+
<p>ERDDAP, Version 2.25_1
1580915809
<br><a rel="bookmark" href="https://coastwatch.pfeg.noaa.gov/erddap/legal.html">Disclaimers</a> |
1581015810
<a rel="bookmark" href="https://coastwatch.pfeg.noaa.gov/erddap/legal.html#privacyPolicy"
1581115811
>Privacy Policy</a>

Diff for: ‎pom.xml

+8-8
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535

3636
<groupId>gov.noaa.pfel.erddap</groupId>
3737
<artifactId>ERDDAP</artifactId>
38-
<version>2.25</version>
38+
<version>2.25_1</version>
3939
<packaging>war</packaging>
4040

4141
<name>erddap</name>
@@ -260,7 +260,7 @@
260260
<plugin>
261261
<groupId>com.googlecode.maven-download-plugin</groupId>
262262
<artifactId>download-maven-plugin</artifactId>
263-
<version>1.11.1</version>
263+
<version>1.11.2</version>
264264
<executions>
265265
<execution>
266266
<id>download-content</id>
@@ -358,7 +358,7 @@
358358
</plugin>
359359
<plugin>
360360
<artifactId>maven-surefire-plugin</artifactId>
361-
<version>3.5.1</version>
361+
<version>3.5.2</version>
362362
<configuration>
363363
<additionalClasspathElements>
364364
<additionalClasspathElement>${project.basedir}/test-data</additionalClasspathElement>
@@ -369,7 +369,7 @@
369369
<plugin>
370370
<groupId>org.apache.maven.plugins</groupId>
371371
<artifactId>maven-failsafe-plugin</artifactId>
372-
<version>3.5.1</version>
372+
<version>3.5.2</version>
373373
<executions>
374374
<execution>
375375
<goals>
@@ -395,7 +395,7 @@
395395
<plugin>
396396
<groupId>com.github.spotbugs</groupId>
397397
<artifactId>spotbugs-maven-plugin</artifactId>
398-
<version>4.8.6.4</version>
398+
<version>4.8.6.5</version>
399399
<configuration>
400400
<maxHeap>2048</maxHeap>
401401
<includeFilterFile>spotbugs-security-include.xml</includeFilterFile>
@@ -486,7 +486,7 @@
486486
<plugin>
487487
<groupId>org.apache.maven.plugins</groupId>
488488
<artifactId>maven-dependency-plugin</artifactId>
489-
<version>3.8.0</version>
489+
<version>3.8.1</version>
490490
</plugin>
491491
<!-- https://mvnrepository.com/artifact/org.codehaus.plexus/plexus-utils -->
492492
<plugin>
@@ -1006,12 +1006,12 @@
10061006
<plugin>
10071007
<groupId>org.apache.maven.plugins</groupId>
10081008
<artifactId>maven-surefire-report-plugin</artifactId>
1009-
<version>3.5.1</version>
1009+
<version>3.5.2</version>
10101010
</plugin>
10111011
<plugin>
10121012
<groupId>org.apache.maven.plugins</groupId>
10131013
<artifactId>maven-surefire-report-plugin</artifactId>
1014-
<version>3.5.1</version>
1014+
<version>3.5.2</version>
10151015
<reportSets>
10161016
<reportSet>
10171017
<id>integration-tests</id>

Diff for: ‎src/test/java/jetty/JettyTests.java

+7-3
Original file line numberDiff line numberDiff line change
@@ -2352,7 +2352,9 @@ void testMetadataIso19115() throws Exception {
23522352
+ //
23532353
" <gmd:maintenanceNote>\n"
23542354
+ //
2355-
" <gco:CharacterString>This record was created from dataset metadata by ERDDAP Version 2.25</gco:CharacterString>\n"
2355+
" <gco:CharacterString>This record was created from dataset metadata by ERDDAP Version "
2356+
+ EDStatic.erddapVersion
2357+
+ "</gco:CharacterString>\n"
23562358
+ //
23572359
" </gmd:maintenanceNote>\n"
23582360
+ //
@@ -2441,7 +2443,7 @@ void testMetadataIso19115() throws Exception {
24412443
expected =
24422444
"<tr><td><img class=\"B\" src=\"http://localhost:"
24432445
+ PORT
2444-
+ "/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>";
2446+
+ "/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>";
24452447
results = results.replaceAll("..-...-.... ..:..", "DD-MMM-YYYY HH:mm");
24462448
Test.ensureTrue(results.indexOf(expected) > 0, "No erdMH1chlamday found, results=" + results);
24472449
}
@@ -2514,7 +2516,9 @@ void testMetadataFgdc() throws Exception {
25142516
+ //
25152517
" <pubplace>Nowhere, AK, USA</pubplace>\n"
25162518
+ //
2517-
" <publish>ERDDAP, version 2.25, at ERDDAP Jetty Install</publish>\n"
2519+
" <publish>ERDDAP, version "
2520+
+ EDStatic.erddapVersion
2521+
+ ", at ERDDAP Jetty Install</publish>\n"
25182522
+ //
25192523
" <publish_cntinfo>\n"
25202524
+ //

0 commit comments

Comments
 (0)