Merge pull request #492 from yanokwa/update-slug

Update slug

README.md

@@ -2,7 +2,7 @@
 ![Platform](https://img.shields.io/badge/platform-Java-blue.svg)
 [![License](https://img.shields.io/badge/license-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 [![Build status](https://circleci.com/gh/getodk/aggregate.svg?style=shield&circle-token=:circle-token)](https://circleci.com/gh/getodk/aggregate)
-[![Slack status](http://slack.getodk.org/badge.svg)](http://slack.getodk.org)
+[![Slack](https://img.shields.io/badge/chat-on%20slack-brightgreen)](https://slack.getodk.org)
 
 ## ⚠️ Aggregate is no longer actively developed ⚠️
 The recommended ODK server is now [ODK Central](https://docs.getodk.org/central-intro/). Central is fast, actively-developed, and addresses many of the issues that users have had with Aggregate over the years. Fixes and small improvements to Aggregate are welcome, but please discuss in an issue or [on the forum](https://forum.getodk.org/c/development/5) first to make sure that a reviewer will be available.
@@ -20,7 +20,7 @@ ODK Aggregate can be deployed on an Apache Tomcat server, or any servlet 2.5-com
 * ODK website: [https://getodk.org](https://getodk.org)
 * ODK Aggregate usage instructions: [https://docs.getodk.org/aggregate-intro/](https://docs.getodk.org/aggregate-intro/)
 * ODK forum: [https://forum.getodk.org](https://forum.getodk.org)
-* ODK developer Slack chat: [http://slack.getodk.org](http://slack.getodk.org)
+* ODK developer Slack chat: [https://slack.getodk.org](https://slack.getodk.org) 
 
 ## Getting the code
 

build.gradle

@@ -67,7 +67,7 @@ def versions = [
     gson          : '2.8.0',
     kxml2         : '2.3.0',
     odk           : [
-        javarosa: '2.17.0'
+        javarosa: '2.17.2'
     ],
     jdbc          : [
         mysql     : '5.1.44',
@@ -126,7 +126,7 @@ dependencies {
   compile group: 'com.google.apis', name: 'google-api-services-drive', version: versions.googleApi.drive
   compile group: 'com.google.code.gson', name: 'gson', version: versions.gson
   compile group: 'net.sf.kxml', name: 'kxml2', version: versions.kxml2
-  compile group: 'org.opendatakit', name: 'opendatakit-javarosa', version: versions.odk.javarosa
+  compile group: 'org.getodk', name: 'javarosa', version: versions.odk.javarosa
   compile group: 'mysql', name: 'mysql-connector-java', version: versions.jdbc.mysql
   compile group: 'org.postgresql', name: 'postgresql', version: versions.jdbc.postgresql
   compileOnly group: 'javax.servlet', name: 'javax.servlet-api', version: versions.servletApi

installer/project/buildWar.xml

@@ -19,10 +19,10 @@
   <enableRollback>0</enableRollback>
   <enableTimestamp>1</enableTimestamp>
   <height>500</height>
-  <productUrlInfoAbout>http://www.opendatakit.org</productUrlInfoAbout>
+  <productUrlInfoAbout>https://getodk.org</productUrlInfoAbout>
   <requestedExecutionLevel>asInvoker</requestedExecutionLevel>
   <saveRelativePaths>1</saveRelativePaths>
-  <vendor>ODK</vendor>
+  <vendor>Get ODK</vendor>
   <width>700</width>
   <windowsExecutableIcon>files/opendatakit.ico</windowsExecutableIcon>
   <windowsUninstallerExecutableIcon>files/opendatakit.ico</windowsUninstallerExecutableIcon>

installer/project/components/params.xml

@@ -256,11 +256,11 @@ Follow the ODK Aggregate Tomcat Install instructions (link below) to make your c
       <parameterList>
         <linkParameter>
           <name>hostname_how_to</name>
-          <description>http://docs.getodk.org/aggregate-tomcat/#Configure_for_Network_Access</description>
+          <description>https://getodk.org/use/aggregate/tomcat-install/#Configure_for_Network_Access</description>
           <explanation></explanation>
           <clickedActionList>
             <launchBrowser>
-              <url>http://docs.getodk.org/aggregate-tomcat/#Configure_for_Network_Access</url>
+              <url>https://getodk.org/use/aggregate/tomcat-install/#Configure_for_Network_Access</url>
             </launchBrowser>
           </clickedActionList>
         </linkParameter>

installer/project/files/LICENSE.txt

@@ -127,7 +127,7 @@ https://github.com/GoogleCloudPlatform/cloud-sql-mysql-socket-factory    /Apache
 	mysql-socket-factory-core-1.0.2.jar
 https://bitbucket.org/connect2id/oauth-2.0-sdk-with-openid-connect-extensions /Apache 2.0/
 	oauth2-oidc-sdk-5.18.1.jar
-https://opendatakit.org/                                 /Apache 2.0/
+https://getodk.org/                                 /Apache 2.0/
 at: https://github.com/getodk/aggregate-components
     odk-httpclient-gae-4.5.2-1.jar
     odk-tomcatutil-1.0.1.jar
@@ -136,7 +136,7 @@ at: https://github.com/getodk/aggregate-components
 https://github.com/getodk/javarosa                  /Apache 2.0/
 modified from https://bitbucket.org/javarosa/javarosa/wiki/Home
 formerly at: https://bitbucket.org/m.sundt/javarosa/src/
-    opendatakit-javarosa.2.3.0.jar
+    javarosa.jar
 http://www.postgresql.org/   /Modified BSD / MIT Open Source License/
     postgresql-9.4.1211.jre7.jar
 http://www.slf4j.org/                                   /MIT License/

src/main/java/org/opendatakit/aggregate/client/PreferencesSubTab.java

@@ -42,7 +42,7 @@ public class PreferencesSubTab extends AggregateSubTabBase {
   private static final String VERSION_STRING_STYLE = "app_version_string";
 
   private static final String GOOGLE_API_CREDENTIALS_LABEL = "<h2>Google API Credentials</h2>";
-  private static final String GOOGLE_API_CREDENTIALS_INFO = "<p>See <a href=\"http://opendatakit.org/use/aggregate/oauth2-service-account/\" target=\"_blank\">http://opendatakit.org/use/aggregate/oauth2-service-account/</a> for instructions on obtaining and supplying these values.</p>";
+  private static final String GOOGLE_API_CREDENTIALS_INFO = "<p>See <a href=\"https://docs.getodk.org/oauth2-service/\" target=\"_blank\">https://docs.getodk.org/oauth2-service/</a> for instructions on obtaining and supplying these values.</p>";
   private static final String GOOGLE_API_KEY_LABEL = "<h3>Simple API Access Key</h3>";
   private static final String GOOGLE_API_KEY_INFO = "<p>Recommended for accessing Google Maps.</p>";
   private static final String GOOGLE_API_CLIENT_ID_LABEL = "<h3>Google OAuth2 Credentials</h3>";

src/main/java/org/opendatakit/aggregate/servlet/ServiceAccountPrivateKeyUploadServlet.java

@@ -71,7 +71,7 @@ public class ServiceAccountPrivateKeyUploadServlet extends ServletUtilBase {
           + " action=\"";// emit the ADDR
   private static final String UPLOAD_PAGE_BODY_MIDDLE_B4_API_KEY = "\" >"
       + "<div style=\"overflow: auto;\"><h2>Google API Credentials</h2>"
-      + "<p>Please refer to the documentation at <a href=\"http://docs.getodk.org/oauth2-service/\" target=\"_blank\">Service Account Configuration</a>.</p>"
+      + "<p>Please refer to the documentation at <a href=\"https://docs.getodk.org/oauth2-service/\" target=\"_blank\">Service Account Configuration</a>.</p>"
       + "<h2>Google Simple API Key</h2>"
       + "<p>Specifying a Simple API Key is recommended but not required for Google Maps visualizations.</p>"
       + "     <table id=\"uploadTable\">"

src/main/webapp/service-error.html

@@ -23,7 +23,7 @@
 Verify that you have not exceeded your free quota or daily spending limit (if you have set up billing) and that you have also not exceeded your per-minute usage limits.</p>
 <p>If your application's usage limits have not been exceeded, then go to <a href="https://console.cloud.google.com/home/dashboard">Google Cloud Platform - Overview Dashboard</a>
 and confirm that there are no Google infrastructure issues (these will appear in the <em>Google Cloud status</em> box in the top-right of this page.</p>
-<p>If neither of those indicate any problems, then your application's Logs may identify an issue.
+<p>If neither of those indicate any problems, then your application's Logs may identify an issue. 
 See <a href="https://github.com/getodk/getodk/wiki/Aggregate-AppEngine-Troubleshooting">ODK Aggregate Troubleshooting</a> for what to look for.</p></td>
 <td align="LEFT" width="20%"/></tr></table>
 </body>

src/test/java/org/opendatakit/aggregate/format/table/CsvFormatterWithFiltersTest.java

@@ -49,7 +49,7 @@ public void setup() throws ODKDatastoreException {
         (CallingContext)any())).thenReturn(row);
     subs.add(s);
 
-    csv = new CsvFormatterWithFilters(form, "http://opendatakit.org", pr, null);
+    csv = new CsvFormatterWithFilters(form, "https://getodk.org", pr, null);
   }
 
   @Test