Release 4.6.3

Unidata · Aug 31, 2015 · 9441eed · 9441eed
1 parent e9e0824
commit 9441eed
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 26 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.3-SNAPSHOT'
+    version = '4.6.3'
     // 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
@@ -21,7 +21,7 @@ change from "1.2.tds.4.6.1-SNAPSHOT" to "1.2.tds.4.6.1", assuming that you prepa
    - gradlew clean publish
    - Check artifacts at http://artifacts.unidata.ucar.edu/content/repositories/unidata-releases/
 
-7. On robin, prepare the FTP directory for the new version of TDS and TDM (best to do from SSH)
+7. On www, prepare the FTP directory for the new version of TDS and TDM (best to do from SSH)
   - cd /web/ftp/pub/thredds/{release.major}
   - mkdir {release.minor}
   - move /web/ftp/pub/thredds/{release.major}/current to point to /web/ftp/pub/thredds/{release.major}/{release.minor}
@@ -68,7 +68,7 @@ change from "1.2.tds.4.6.1-SNAPSHOT" to "1.2.tds.4.6.1", assuming that you prepa
     - chmod 775 .
     - chmod 664 *
 
-14. Release Web Start to robin:/content/software/thredds/v{release.major}/netcdf-java/webstart
+14. Release Web Start to www:/content/software/thredds/v{release.major}/netcdf-java/webstart
     - Make sure that you have the correct gradle.properties (see Christian for info). In particular, you'll need the
       'keystore', 'keystoreAlias', 'keystorePassword', 'webdir', and 'ftpdir' properties defined.
     - Rename old directories
@@ -81,7 +81,7 @@ change from "1.2.tds.4.6.1-SNAPSHOT" to "1.2.tds.4.6.1", assuming that you prepa
     - If there were no errors and the new Web Start looks good, delete the old stuff.
       * rm -r webstartOld
 
-15. Release Javadoc to robin:/content/software/thredds/v{release.major}/netcdf-java/javadoc and javadocAll
+15. Release Javadoc to www:/content/software/thredds/v{release.major}/netcdf-java/javadoc and javadocAll
     - Rename old directories
       * cd /content/software/thredds/v{release.major}/netcdf-java/
       * mv javadoc javadocOld
@@ -104,9 +104,9 @@ change from "1.2.tds.4.6.1-SNAPSHOT" to "1.2.tds.4.6.1", assuming that you prepa
 
 17. Update Unidata download page(s)
     - check http://www.unidata.ucar.edu/downloads/thredds/index.jsp
-      * modify robin:/content/downloads/thredds/toc.xml as needed
+      * modify www:/content/downloads/thredds/toc.xml as needed
     - check http://www.unidata.ucar.edu/downloads/netcdf/netcdf-java-4/index.jsp
-      * modify robin:/content/downloads/netcdf/netcdf-java-4/toc.xml as needed
+      * modify www:/content/downloads/netcdf/netcdf-java-4/toc.xml as needed
 
 18. Commit the changes you've made.
     - At the very least, project.version in the root build script should have been modified.
@@ -124,7 +124,7 @@ change from "1.2.tds.4.6.1-SNAPSHOT" to "1.2.tds.4.6.1", assuming that you prepa
     - Be sure to include the tag you created.
       * In IntelliJ, check the "Push Tags" box in the "Push Commits" dialog.
 
-22. On Robin, edit /web/content/software/thredds/latest.xml to reflect the correct
+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 enteries regarding current stable and development versions
     to give users a heads up of the need update.

diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
@@ -193,7 +193,7 @@ libraries["ncwms"] = dependencies.create("uk.ac.rdg.resc:ncwms:1.2.tds.4.6.1") {
     // 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.
-    exclude group: 'edu.ucar', module: 'cdm'  // version "4.6.0"
+    exclude group: 'edu.ucar', module: 'cdm'  // version "4.6.1"
 }
 
 libraries["geoapi-pending"] = "org.opengis:geoapi-pending:3.1-M04"
@@ -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.6"
+libraries["threddsIso"] = "EDS:threddsIso:2.2.7"
 
 libraries["aws-java-sdk-s3"] = "com.amazonaws:aws-java-sdk-s3:1.10.11"
 

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.2</title>
+    <title>NetCDF Tools UI 4.6.3</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.2.jar"/>
+    <jar href="ui-4.6.3.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.1</title>
+        <title>NetCDF Tools UI 4.6.3</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,40 +21,41 @@
     <!-- 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.2, using :ui:showDependencies to print the deps.
+        <!-- Updated by hand for 4.6.3, 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.2.jar" download="lazy"/>
-        <jar href="clcommon-4.6.2.jar" download="lazy"/>
-        <jar href="bufr-4.6.2.jar" download="lazy"/>
-        <jar href="grib-4.6.2.jar" download="lazy"/>
-        <jar href="netcdf4-4.6.2.jar" download="lazy"/>
-        <jar href="opendap-4.6.2.jar" download="lazy"/>
-        <jar href="waterml-4.6.2.jar" download="lazy"/>
-        <jar href="httpservices-4.6.2.jar" download="lazy"/>
+        <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="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.3.6.jar" download="lazy"/>
-        <jar href="httpcore-4.3.3.jar" download="lazy"/>
+        <jar href="httpclient-4.4.1.jar" download="lazy"/>
+        <jar href="httpcore-4.4.1.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.2.jar" download="lazy"/>
-        <jar href="joda-time-2.2.jar" download="lazy"/>
+        <jar href="udunits-4.6.3.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"/>
         <jar href="protobuf-java-2.5.0.jar" download="lazy"/>
         <jar href="jcommander-1.35.jar" download="lazy"/>
+        <jar href="aws-java-sdk-s3-1.10.11.jar" download="lazy"/>
         <jar href="je-4.0.92.jar" download="lazy"/>
         <jar href="jsoup-1.7.2.jar" download="lazy"/>
         <jar href="jj2000-5.3.jar" download="lazy"/>
@@ -66,24 +67,30 @@
         <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="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"/>
         <jar href="spring-expression-4.1.6.RELEASE.jar" download="lazy"/>
         <jar href="jgoodies-common-1.4.0.jar" download="lazy"/>
         <jar href="jcl-over-slf4j-1.7.7.jar" download="lazy"/>
-        <jar href="commons-codec-1.6.jar" download="lazy"/>
+        <jar href="commons-codec-1.9.jar" download="lazy"/>
         <jar href="52n-xml-soap-v12-2.0.0.jar" download="lazy"/>
         <jar href="52n-xml-swes-v20-2.0.0.jar" download="lazy"/>
         <jar href="xmlbeans-xpath-2.6.0.jar" download="lazy"/>
         <jar href="oxf-third-party-saxon-2.0.0-alpha.3.3.jar" download="lazy"/>
         <jar href="c3p0-0.9.1.1.jar" download="lazy"/>
+        <jar href="aws-java-sdk-kms-1.10.11.jar" download="lazy"/>
+        <jar href="aws-java-sdk-core-1.10.11.jar" download="lazy"/>
         <jar href="52n-xml-ows-v110-2.1.0.jar" download="lazy"/>
         <jar href="52n-xml-xlink-v110-2.1.0.jar" download="lazy"/>
         <jar href="aopalliance-1.0.jar" download="lazy"/>
         <jar href="52n-xml-wsa-v10-2.0.0.jar" download="lazy"/>
         <jar href="52n-xml-wsn-v13-2.0.0.jar" download="lazy"/>
         <jar href="Saxon-HE-9.4.0.6.jar" download="lazy"/>
+        <jar href="jackson-databind-2.5.3.jar" download="lazy"/>
         <jar href="52n-xml-wsrf-v12-2.0.0.jar" download="lazy"/>
+        <jar href="jackson-annotations-2.5.0.jar" download="lazy"/>
+        <jar href="jackson-core-2.5.3.jar" download="lazy"/>
     </resources>
 </jnlp>