From 4e4a09e88bffa123265b8a260fff2dce13854dcd Mon Sep 17 00:00:00 2001 From: Yaw Anokwa Date: Mon, 25 May 2020 11:09:27 -0700 Subject: [PATCH 1/2] Update slug --- README.md | 6 +++--- installer/project/buildWar.xml | 4 ++-- installer/project/components/params.xml | 4 ++-- installer/project/files/LICENSE.txt | 2 +- .../org/opendatakit/aggregate/client/PreferencesSubTab.java | 2 +- .../servlet/ServiceAccountPrivateKeyUploadServlet.java | 2 +- src/main/webapp/service-error.html | 2 +- .../aggregate/format/table/CsvFormatterWithFiltersTest.java | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 3a5f2d44b0..237faed7bf 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,8 @@ ![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) + ODK Aggregate provides a ready-to-deploy server and database to: - provide blank forms to ODK Collect (or other OpenRosa clients) @@ -17,7 +17,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 diff --git a/installer/project/buildWar.xml b/installer/project/buildWar.xml index 51c0c7c35d..121511a8a8 100644 --- a/installer/project/buildWar.xml +++ b/installer/project/buildWar.xml @@ -19,10 +19,10 @@ 0 1 500 - http://www.opendatakit.org + https://getodk.org asInvoker 1 - ODK + Get ODK 700 files/opendatakit.ico files/opendatakit.ico diff --git a/installer/project/components/params.xml b/installer/project/components/params.xml index a469e8f1c4..794dba78b6 100644 --- a/installer/project/components/params.xml +++ b/installer/project/components/params.xml @@ -256,11 +256,11 @@ Follow the ODK Aggregate Tomcat Install instructions (link below) to make your c hostname_how_to - http://docs.getodk.org/aggregate-tomcat/#Configure_for_Network_Access + https://getodk.org/use/aggregate/tomcat-install/#Configure_for_Network_Access - http://docs.getodk.org/aggregate-tomcat/#Configure_for_Network_Access + https://getodk.org/use/aggregate/tomcat-install/#Configure_for_Network_Access diff --git a/installer/project/files/LICENSE.txt b/installer/project/files/LICENSE.txt index 9d4ac3971b..d286f2556c 100644 --- a/installer/project/files/LICENSE.txt +++ b/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 diff --git a/src/main/java/org/opendatakit/aggregate/client/PreferencesSubTab.java b/src/main/java/org/opendatakit/aggregate/client/PreferencesSubTab.java index c8cf6568f1..882cf922f4 100644 --- a/src/main/java/org/opendatakit/aggregate/client/PreferencesSubTab.java +++ b/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 = "

Google API Credentials

"; - private static final String GOOGLE_API_CREDENTIALS_INFO = "

See http://opendatakit.org/use/aggregate/oauth2-service-account/ for instructions on obtaining and supplying these values.

"; + private static final String GOOGLE_API_CREDENTIALS_INFO = "

See https://docs.getodk.org/oauth2-service/ for instructions on obtaining and supplying these values.

"; private static final String GOOGLE_API_KEY_LABEL = "

Simple API Access Key

"; private static final String GOOGLE_API_KEY_INFO = "

Recommended for accessing Google Maps.

"; private static final String GOOGLE_API_CLIENT_ID_LABEL = "

Google OAuth2 Credentials

"; diff --git a/src/main/java/org/opendatakit/aggregate/servlet/ServiceAccountPrivateKeyUploadServlet.java b/src/main/java/org/opendatakit/aggregate/servlet/ServiceAccountPrivateKeyUploadServlet.java index c0edb53c20..c29216ba2e 100644 --- a/src/main/java/org/opendatakit/aggregate/servlet/ServiceAccountPrivateKeyUploadServlet.java +++ b/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 = "\" >" + "

Google API Credentials

" - + "

Please refer to the documentation at Service Account Configuration.

" + + "

Please refer to the documentation at Service Account Configuration.

" + "

Google Simple API Key

" + "

Specifying a Simple API Key is recommended but not required for Google Maps visualizations.

" + " " diff --git a/src/main/webapp/service-error.html b/src/main/webapp/service-error.html index da97355fe8..04e5457c68 100644 --- a/src/main/webapp/service-error.html +++ b/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.

If your application's usage limits have not been exceeded, then go to Google Cloud Platform - Overview Dashboard and confirm that there are no Google infrastructure issues (these will appear in the Google Cloud status box in the top-right of this page.

-

If neither of those indicate any problems, then your application's Logs may identify an issue. +

If neither of those indicate any problems, then your application's Logs may identify an issue. See ODK Aggregate Troubleshooting for what to look for.

diff --git a/src/test/java/org/opendatakit/aggregate/format/table/CsvFormatterWithFiltersTest.java b/src/test/java/org/opendatakit/aggregate/format/table/CsvFormatterWithFiltersTest.java index 7662916b3f..c13f9dad72 100644 --- a/src/test/java/org/opendatakit/aggregate/format/table/CsvFormatterWithFiltersTest.java +++ b/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 From 0576763992bebe3f943129f1b59e5c2eddf7dc25 Mon Sep 17 00:00:00 2001 From: Yaw Anokwa Date: Mon, 25 May 2020 11:25:29 -0700 Subject: [PATCH 2/2] Update library --- build.gradle | 4 ++-- installer/project/files/LICENSE.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 159d7ce6f2..d41925ecbf 100644 --- a/build.gradle +++ b/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 diff --git a/installer/project/files/LICENSE.txt b/installer/project/files/LICENSE.txt index d286f2556c..e8bfb60d52 100644 --- a/installer/project/files/LICENSE.txt +++ b/installer/project/files/LICENSE.txt @@ -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/