diff --git a/build.gradle b/build.gradle index f2f84ec1e8..80d9057449 100644 --- 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 index 8a7564018f..572a513c6a 100644 --- 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 index a87671d610..c61e372b45 100755 --- 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 index f6c60d6dd4..e9f24694f3 100644 --- a/ui/netCDFtools.jnlp +++ b/ui/netCDFtools.jnlp @@ -1,7 +1,7 @@ - NetCDF Tools UI 4.6.2 + NetCDF Tools UI 4.6.3 Unidata Graphical interface to netCDF-Java / Common Data Model @@ -17,7 +17,7 @@ - + diff --git a/ui/netCDFtoolsExtraJars.jnlp b/ui/netCDFtoolsExtraJars.jnlp index 853e06484b..d26d41b8fa 100644 --- a/ui/netCDFtoolsExtraJars.jnlp +++ b/ui/netCDFtoolsExtraJars.jnlp @@ -2,7 +2,7 @@ - NetCDF Tools UI 4.6.1 + NetCDF Tools UI 4.6.3 Unidata Graphical interface to netCDF-Java / Common Data Model @@ -21,27 +21,27 @@ - - - - - - - - - + + + + + + + + - - + + @@ -49,12 +49,13 @@ - - + + + @@ -66,24 +67,30 @@ + - + + + + + +