You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
* Control versions of indirect dependencies from hadoop (which is needed for parquet at least for now).
* Include specific version of protobuf-java for indirect dependencies.
* Documentation and dependency updates related to the 2.25 release.
* A few more changes to documentation and some changes related to dependency updates (mostly changing test strings to match, but also fixing a deprecated lucene method).
* Add some new files/directories to the exclude list for the build.
* Update docs with links to where the new war file will be.
* Switch back to unpack (instead of unpackWhenChanged) for maven-download-plugin.
Copy file name to clipboardexpand all lines: DEPLOY_INSTALL.md
+11-7
Original file line number
Diff line number
Diff line change
@@ -27,7 +27,7 @@ ERDDAP™ can run on any server that supports Java and Tomcat (and other applica
27
27
28
28
ERDDAP™ works with Java from other sources, but we recommend Adoptium because it is the main, community-supported, free (as in beer and speech) version of Java 21 that offers Long Term Support (free upgrades for many years past the initial release). For security reasons, please update your ERDDAP's version of Java periodically as new versions of Java 21 become available from Adoptium.
29
29
30
-
ERDDAP™ has been tested and used extensively with Java 17 and 21, not other versions. For various reasons, we don't test with nor support other versions of Java.
30
+
ERDDAP™ has been tested and used extensively with 21, not other versions. For various reasons, we don't test with nor support other versions of Java.
@@ -37,7 +37,7 @@ ERDDAP™ can run on any server that supports Java and Tomcat (and other applica
37
37
38
38
39
39
* Download Tomcat and unpack it on your server or PC.
40
-
For security reasons, it is almost always best to use the latest version of Tomcat 10 (version 9 and below are not acceptable) which is designed to work with Java 17 or newer. Below, the Tomcat directory will be referred to as _tomcat_.
40
+
For security reasons, it is almost always best to use the latest version of Tomcat 10 (version 9 and below are not acceptable) which is designed to work with Java 21 or newer. Below, the Tomcat directory will be referred to as _tomcat_.
41
41
42
42
Warning! If you already have a Tomcat running some other web application (especially THREDDS), we recommend that you install ERDDAP™ in [a second Tomcat](#secondTomcat), because ERDDAP™ needs different Tomcat settings and shouldn't have to contend with other applications for memory.
43
43
@@ -173,15 +173,16 @@ ERDDAP™ can run on any server that supports Java and Tomcat (and other applica
173
173
* Or, you can join the [ERDDAP™ Google Group / Mailing List](#ERDDAPMailingList) and post your question there.
174
174
175
175
3.[Set up the _tomcat_/content/erddap configuration files.](#erddapContent)
176
-
On Linux, Mac, and Windows, download [erddapContent.zip](https://github.com/ERDDAP/erddap/releases/download/v2.23/erddapContent.zip) (version 2.23, 19810 bytes, MD5=1E26F62E7A06191EE6868C40B9A29362, dated 2023-02-27) and unzip it into _tomcat_, creating _tomcat_/content/erddap .
176
+
On Linux, Mac, and Windows, download [erddapContent.zip](https://github.com/ERDDAP/erddapContent/releases/download/content1.0.0/erddapContent.zip) (version 1.0.0, 20333 bytes, MD5=2B8D2A5AE5ED73E3A42B529C168C60B5, dated 2024-10-14) and unzip it into _tomcat_, creating _tomcat_/content/erddap .
177
177
178
178
[Other Directory:](#erddapContentDirectory) For Red Hat Enterprise Linux (RHEL) or for other situations where you aren't allowed to modify the Tomcat directory or where you want/need to put the ERDDAP™ content directory in some other location for some other reason (for example, if you use Jetty instead of Tomcat), unzip erddapContent.zip into the desired directory (to which only user=tomcat has access) and set the erddapContentDirectory system property (e.g., erddapContentDirectory=~tomcat/content/erddap) so ERDDAP™ can find this new content directory.
and unzip it into _tomcat_, creating _tomcat_/content/erddap . \]
186
187
187
188
Then,
@@ -210,16 +211,19 @@ ERDDAP™ can run on any server that supports Java and Tomcat (and other applica
210
211
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/).
211
212
212
213
4.[Install the erddap.war file.](#erddap.war)
213
-
On Linux, Mac, and Windows, download [erddap.war](https://github.com/ERDDAP/erddap/releases/download/v2.24/erddap.war) into _tomcat_/webapps .
5.[Use ProxyPass](#ProxyPass) so users don't have to put the port number, e.g., :8080, in the URL.
225
229
On Linux computers, if Tomcat is running in Apache, please modify the Apache httpd.conf file (usually in /etc/httpd/conf/ ) to allow HTTP traffic to/from ERDDAP™ without requiring the port number, e.g., :8080, in the URL. As the root user:
Copy file name to clipboardexpand all lines: DEPLOY_UPDATE.md
+3-3
Original file line number
Diff line number
Diff line change
@@ -3,10 +3,10 @@
3
3
4
4
1. Make the changes listed in [Changes](https://erddap.github.io/changes.html) in the section entitled "Things ERDDAP™ Administrators Need to Know and Do" for all of the ERDDAP™ versions since the version you were using.
5
5
6
-
2. If you are upgrading from ERDDAP™ version 2.18 or below, you need to switch to Java 17 (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.
6
+
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.
7
7
8
-
3. Download [erddap.war](https://github.com/ERDDAP/erddap/releases/download/v2.24/erddap.war) into _tomcat_/webapps .
* 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).
0 commit comments