Release 4.6.4

Unidata · Feb 11, 2016 · 08ed2c4 · 08ed2c4
1 parent 5ab269d
commit 08ed2c4
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 39 deletions.
diff --git a/build.gradle b/build.gradle
@@ -2,7 +2,7 @@ allprojects {
     // Matches Maven's "project.groupId". Used in MANIFEST.MF for "Implementation-Vendor-Id".
     group = "edu.ucar"
     // Matches Maven's "project.version". Used in MANIFEST.MF for "Implementation-Version".
-    version = '4.6.4-SNAPSHOT'
+    version = '4.6.4'
     // Eventually, we'll stop appending "SNAPSHOT" to our versions and just use this.
     status = 'development'
 }

diff --git a/docs/internal/release.txt b/docs/internal/release.txt
@@ -12,13 +12,16 @@ Last edited 2015/08/31
 
 3. Pull all of the latest changes from upstream.
 
-4. Make sure the project's version is correct for the release. It shouldn't contain "SNAPSHOT".
+4. In "/build.gradle", update the project's version for the release.
+   Likely, this means removing the '-SNAPSHOT' prefix, e.g. '4.6.4-SNAPSHOT' to '4.6.4'.
 
-5. Remove any dependencies on SNAPSHOT libraries. For example, the version of "uk.ac.rdg.resc:ncwms" might
-change from "1.2.tds.4.6.1-SNAPSHOT" to "1.2.tds.4.6.1", assuming that you prepared ncWMS in step 1.
+5. In "/gradle/dependencies.gradle", update the "uk.ac.rdg.resc:ncwms" and "EDS:threddsIso" dependencies to the
+   versions deployed in step 1. Also, remove any dependencies on SNAPSHOT versions of libraries.
 
 6. Publish the artifacts to Nexus.
-   - gradlew clean publish
+   - You need the correct "nexus.username" and "nexus.password" properties defined in your
+     "~/.gradle/gradle.properties" file. Ask Christian for those.
+   - ./gradlew clean publish
    - Check artifacts at http://artifacts.unidata.ucar.edu/content/repositories/unidata-releases/
 
 7. On www, prepare the FTP directory for the new version of TDS and TDM (best to do from SSH)
@@ -77,7 +80,7 @@ change from "1.2.tds.4.6.1-SNAPSHOT" to "1.2.tds.4.6.1", assuming that you prepa
     - Update /thredds/ui/netCDFtools.jnlp and /thredds/ui/netCDFtoolsExtraJars.jnlp as needed.
     - Test webstart locally. There are notes above ui/build.gradle/releaseWebstart() about how to do that.
     - Perform release
-      * gradlew :ui:clean :ui:releaseWebstart
+      * ./gradlew :ui:clean :ui:releaseWebstart
     - If there were no errors and the new Web Start looks good, delete the old stuff.
       * rm -r webstartOld
 
@@ -87,8 +90,8 @@ change from "1.2.tds.4.6.1-SNAPSHOT" to "1.2.tds.4.6.1", assuming that you prepa
       * mv javadoc javadocOld
       * mv javadocAll javadocAllOld
     - Perform release
-      * gradlew :cdm:clean :cdm:releaseDocs
-      * gradlew :ui:clean :ui:releaseDocs
+      * ./gradlew :cdm:clean :cdm:releaseDocs
+      * ./gradlew :ui:clean :ui:releaseDocs
     - If there were no errors and the new Javadoc looks good, delete the old stuff.
       * rm -r javadocOld
       * rm -r javadocAllOld
@@ -108,31 +111,31 @@ change from "1.2.tds.4.6.1-SNAPSHOT" to "1.2.tds.4.6.1", assuming that you prepa
     - check http://www.unidata.ucar.edu/downloads/netcdf/netcdf-java-4/index.jsp
       * modify www:/content/downloads/netcdf/netcdf-java-4/toc.xml as needed
 
-18. Commit the changes you've made.
+18. Edit www:/web/content/software/thredds/latest.xml to reflect the correct
+    {release.minor} version for stable and development. This file is read by all
+    TDS > v4.6 to make log entries regarding current stable and development versions
+    to give users a heads-up of the need to update.
+
+19. Commit the changes you've made.
     - At the very least, project.version in the root build script should have been modified.
     - Make the commit message something like "Release {release.minor}".
 
-19. Create a tag for the release: "v{release.minor}".
+20. Create a tag for the release: "v{release.minor}".
 
-20. Prepare for next round of development.
+21. Prepare for next round of development.
     - Update the project version. Increment it and add the "-SNAPSHOT" suffix.
       * For example, if {release.minor}="4.6.1", the next version will be "4.6.2-SNAPSHOT".
     - Commit the change.
       * The commit message should be something like "Begin work on 4.6.2-SNAPSHOT".
 
-21. Push the commits upstream.
+22. Push the commits upstream.
     - Be sure to include the tag you created.
       * In IntelliJ, check the "Push Tags" box in the "Push Commits" dialog.
 
-22. On www, edit /web/content/software/thredds/latest.xml to reflect the correct
-    {release.minor} version for stable and development. This file is read by all
-    TDS > v4.6 to make log entries regarding current stable and development versions
-    to give users a heads-up of the need update.
-
-NOTE 1: In the Maven build, the maven-release-plugin roughly handled steps 2-6 and 18-21 for us. In the future, we
+NOTE 1: In the Maven build, the maven-release-plugin roughly handled steps 2-6 and 19-22 for us. In the future, we
 should investigate similar Gradle plugins that offer the same functionality.
 
 NOTE 2: In the future, we should be performing many (all?) of these steps from Jenkins, not our local machine.
 
-Note 3: The latest.xml doc in step 22 is very simple and could probably be updated
+Note 3: The latest.xml doc in step 18 is very simple and could probably be updated
         automatically during the release process.
diff --git a/docs/website/tds/faq.html b/docs/website/tds/faq.html
@@ -571,7 +571,8 @@ <h4>Q: <a name="OutOfMemoryError" id="OutOfMemoryError">Im getting the error "ja
 <h4>Q: <a name="permGenOutOfMemoryError">Im getting the error "java.lang.OutOfMemoryError: PermGen space". Whats up?</a></h4>
 <blockquote>
   <p>The good news is that this problem goes away with Java 8, and we recommend that you switch to Java 8 NOW.</p>
-  <p>Before Jaba 8, if you reload the <strong>thredds.war</strong> webapp enough times without restarting Tomcat, you will eventually run into "<strong>java.lang.OutOfMemoryError:
+  <p>Before Java 8, if you reload the <strong>thredds.war</strong> webapp enough times without restarting Tomcat, you
+    will eventually run into "<strong>java.lang.OutOfMemoryError:
     PermGen space</strong>". This is a known bug in JDK/Tomcat. The only thing to do is to stop and restart Tomcat. </p>
 
   <p>You  can  increase PermGen using this JVM option, eg in <a href="reference/ChecklistReference.html">setenv.sh</a>:</p>

diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
@@ -189,7 +189,7 @@ libraries["commons-compress"] = "org.apache.commons:commons-compress:1.8.1"
 
 libraries["oro"] = "oro:oro:2.0.8"
 
-libraries["ncwms"] = dependencies.create("uk.ac.rdg.resc:ncwms:1.2.tds.4.6.4-SNAPSHOT") {
+libraries["ncwms"] = dependencies.create("uk.ac.rdg.resc:ncwms:1.2.tds.4.6.4") {
     // This is an external dependency on an old artifact of ours.
     // The "cdm" artifact that we build in this project will take its place.
     // This needs to be a local exclusion; globally excluding "edu.ucar:cdm" would be very bad.
@@ -208,7 +208,7 @@ libraries["hibernate-validator"] = "org.hibernate:hibernate-validator:4.3.1.Fina
 
 libraries["jaxen"] = "jaxen:jaxen:1.1.4"
 
-libraries["threddsIso"] = "EDS:threddsIso:2.2.7"
+libraries["threddsIso"] = "EDS:threddsIso:2.2.8"
 
 libraries["aws-java-sdk-s3"] = "com.amazonaws:aws-java-sdk-s3:1.10.11"
 

diff --git a/ui/build.gradle b/ui/build.gradle
@@ -31,6 +31,12 @@ dependencies {
 
 //////////////////////////////////////////////////////////
 
+task showDependencies << {
+    for (file in configurations.runtime.resolve()) {
+        println " " + file
+    }
+}
+
 jar {
     manifest {
         attributes 'Main-Class': 'ucar.nc2.ui.ToolsUI',
@@ -58,7 +64,7 @@ ext {
     toolsUIjar = 'toolsUI-' + version + '.jar'
     webstartWorkingDir = "build/signed"
     if (project.hasProperty("webdir")) {
-        webstartDir = webdir + "webstart"
+        webstartDir = new File(webdir, "webstart")
     }
 
     depsToRejar = ['xmlbeans-2.6.0.jar', 'Saxon-HE-9.4.0.6.jar']

diff --git a/ui/netCDFtools.jnlp b/ui/netCDFtools.jnlp
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <jnlp spec="1.0+" codebase="http://www.unidata.ucar.edu/software/thredds/v4.6/netcdf-java/webstart" href="netCDFtools.jnlp">
   <information>
-    <title>NetCDF Tools UI 4.6.3</title>
+    <title>NetCDF Tools UI 4.6.4</title>
     <vendor>Unidata</vendor>
     <homepage href="http://www.unidata.ucar.edu/software/thredds/current/netcdf-java/documentation.htm"/>
     <description kind="short">Graphical interface to netCDF-Java / Common Data Model</description>
@@ -17,7 +17,7 @@
 
   <resources>
     <j2se version="1.7+" max-heap-size="1500m"/>
-    <jar href="ui-4.6.3.jar"/>
+    <jar href="ui-4.6.4.jar"/>
     <extension name="netcdfUI Extra" href="netCDFtoolsExtraJars.jnlp"/>
   </resources>
 

diff --git a/ui/netCDFtoolsExtraJars.jnlp b/ui/netCDFtoolsExtraJars.jnlp
@@ -2,7 +2,7 @@
 <jnlp spec="1.0+" codebase="http://www.unidata.ucar.edu/software/thredds/v4.6/netcdf-java/webstart"
       href="netCDFtools.jnlp">
     <information>
-        <title>NetCDF Tools UI 4.6.3</title>
+        <title>NetCDF Tools UI 4.6.4</title>
         <vendor>Unidata</vendor>
         <homepage href="http://www.unidata.ucar.edu/software/thredds/current/netcdf-java/documentation.htm"/>
         <description kind="short">Graphical interface to netCDF-Java / Common Data Model</description>
@@ -21,35 +21,35 @@
     <!-- In particular, all of these jars should have the download="lazy" attribute. -->
     <resources>
         <j2se version="1.7+" max-heap-size="1500m"/>
-        <!-- Updated by hand for 4.6.3, using :ui:showDependencies to print the deps.
+        <!-- Updated by hand for 4.6.4, using :ui:showDependencies to print the deps.
         In the future, we should be generating this file in Gradle. -->
 
         <!-- In theory, Webstart will use these in conjunction with ui.jar/META-INF/INDEX.LIST to download
              the minimum number of dependencies when running the application. -->
-        <jar href="cdm-4.6.3.jar" download="lazy"/>
-        <jar href="clcommon-4.6.3.jar" download="lazy"/>
-        <jar href="bufr-4.6.3.jar" download="lazy"/>
-        <jar href="grib-4.6.3.jar" download="lazy"/>
-        <jar href="netcdf4-4.6.3.jar" download="lazy"/>
-        <jar href="opendap-4.6.3.jar" download="lazy"/>
-        <jar href="waterml-4.6.3.jar" download="lazy"/>
-        <jar href="httpservices-4.6.3.jar" download="lazy"/>
+        <jar href="cdm-4.6.4.jar" download="lazy"/>
+        <jar href="clcommon-4.6.4.jar" download="lazy"/>
+        <jar href="bufr-4.6.4.jar" download="lazy"/>
+        <jar href="grib-4.6.4.jar" download="lazy"/>
+        <jar href="netcdf4-4.6.4.jar" download="lazy"/>
+        <jar href="opendap-4.6.4.jar" download="lazy"/>
+        <jar href="waterml-4.6.4.jar" download="lazy"/>
+        <jar href="httpservices-4.6.4.jar" download="lazy"/>
         <jar href="ehcache-core-2.6.2.jar" download="lazy"/>
         <jar href="jdom2-2.0.4.jar" download="lazy"/>
         <jar href="spring-context-4.1.6.RELEASE.jar" download="lazy"/>
         <jar href="jcommon-1.0.23.jar" download="lazy"/>
         <jar href="jfreechart-1.0.19.jar" download="lazy"/>
         <jar href="jgoodies-forms-1.6.0.jar" download="lazy"/>
-        <jar href="httpclient-4.4.1.jar" download="lazy"/>
-        <jar href="httpcore-4.4.1.jar" download="lazy"/>
+        <jar href="httpclient-4.5.1.jar" download="lazy"/>
+        <jar href="httpcore-4.4.4.jar" download="lazy"/>
         <jar href="bounce-0.14.jar" download="lazy"/>
         <jar href="imgscalr-lib-4.2.jar" download="lazy"/>
         <jar href="commons-lang3-3.3.2.jar" download="lazy"/>
         <jar href="52n-oxf-xmlbeans-2.0.0-alpha.3.3.jar" download="lazy"/>
         <jar href="guava-18.0.jar" download="lazy"/>
         <jar href="slf4j-api-1.7.7.jar" download="lazy"/>
         <jar href="slf4j-jdk14-1.7.7.jar" download="lazy"/>
-        <jar href="udunits-4.6.3.jar" download="lazy"/>
+        <jar href="udunits-4.6.4.jar" download="lazy"/>
         <jar href="joda-time-2.8.1.jar" download="lazy"/>
         <jar href="jcip-annotations-1.0.jar" download="lazy"/>
         <jar href="quartz-2.2.0.jar" download="lazy"/>
@@ -67,7 +67,7 @@
         <jar href="52n-xml-sweCommon-v20-2.1.0.jar" download="lazy"/>
         <jar href="52n-xml-om-v20-2.1.0.jar" download="lazy"/>
         <jar href="52n-xml-sampling-v20-2.1.0.jar" download="lazy"/>
-        <jar href="httpmime-4.4.1.jar" download="lazy"/>
+        <jar href="httpmime-4.5.1.jar" download="lazy"/>
         <jar href="spring-aop-4.1.6.RELEASE.jar" download="lazy"/>
         <jar href="spring-beans-4.1.6.RELEASE.jar" download="lazy"/>
         <jar href="spring-core-4.1.6.RELEASE.jar" download="lazy"/>