From 8872edcaab23309de539246a298af0044a94c322 Mon Sep 17 00:00:00 2001 From: Ray Lee Date: Fri, 13 Mar 2020 22:22:54 -0700 Subject: [PATCH] NOJIRA: Change version to 6.0. --- build.properties | 2 +- pom.xml | 2 +- .../db/postgresql/authentication.sql | 2 +- .../services/batch/BatchResource.java | 4 ++-- .../services/report/ReportResource.java | 20 +++++++++---------- .../systeminfo/SystemInfoResource.java | 6 +++--- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/build.properties b/build.properties index c89ac9380..ec6a56e31 100644 --- a/build.properties +++ b/build.properties @@ -9,7 +9,7 @@ host=127.0.0.1 # # Release version info # -release.version=5.3 +release.version=6.0 cspace.release=${release.version}-SNAPSHOT cspace.instance.id=${env.CSPACE_INSTANCE_ID} diff --git a/pom.xml b/pom.xml index 64f1b40ad..8347e0c08 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ services - 5.3-SNAPSHOT + 6.0-SNAPSHOT UTF-8 ${revision} ${revision} diff --git a/services/authentication/pstore/src/main/resources/db/postgresql/authentication.sql b/services/authentication/pstore/src/main/resources/db/postgresql/authentication.sql index dee12cbc2..eff2a4216 100644 --- a/services/authentication/pstore/src/main/resources/db/postgresql/authentication.sql +++ b/services/authentication/pstore/src/main/resources/db/postgresql/authentication.sql @@ -7,7 +7,7 @@ CREATE TABLE IF NOT EXISTS users ( updated_at TIMESTAMP ); --- Upgrade older users tables to 5.3 +-- Upgrade older users tables to 6.0 ALTER TABLE users ADD COLUMN IF NOT EXISTS lastlogin TIMESTAMP; ALTER TABLE users ADD COLUMN IF NOT EXISTS salt VARCHAR(128); diff --git a/services/batch/service/src/main/java/org/collectionspace/services/batch/BatchResource.java b/services/batch/service/src/main/java/org/collectionspace/services/batch/BatchResource.java index a88e1b1f6..ff98d3694 100644 --- a/services/batch/service/src/main/java/org/collectionspace/services/batch/BatchResource.java +++ b/services/batch/service/src/main/java/org/collectionspace/services/batch/BatchResource.java @@ -222,7 +222,7 @@ public class BatchResource extends NuxeoBasedResource { */ private boolean isAuthorizedToInvokeBatchJobs(ServiceContext ctx) { boolean result = true; - + // // Until we enforce a user having POST perms on "/batch/*/invoke", we will continue to allow users with // POST perms on "/batch" to run reports -see JIRA issue https://collectionspace.atlassian.net/browse/DRYD-732 @@ -239,7 +239,7 @@ public class BatchResource extends NuxeoBasedResource { } /* - * This method is deprecated as of CollectionSpace v5.3. POST/invoke requests should be made to the + * This method is deprecated as of CollectionSpace v6.0. POST/invoke requests should be made to the * '/reports/{csid}/invoke' endpoint */ @POST diff --git a/services/report/service/src/main/java/org/collectionspace/services/report/ReportResource.java b/services/report/service/src/main/java/org/collectionspace/services/report/ReportResource.java index 686a3ed9c..74b2cde66 100644 --- a/services/report/service/src/main/java/org/collectionspace/services/report/ReportResource.java +++ b/services/report/service/src/main/java/org/collectionspace/services/report/ReportResource.java @@ -128,13 +128,13 @@ public class ReportResource extends NuxeoBasedResource { try { ServiceContext ctx = createServiceContext(); ReportDocumentModelHandler handler = (ReportDocumentModelHandler)createDocumentHandler(ctx); - + return handler.getSupportMIMETypes(ctx); } catch (Exception e) { throw bigReThrow(e, ServiceMessages.LIST_MIMETYPES_FAILED); - } + } } - + /* * TODO: provide a static utility that will load a report, interrogate it * for information about the properties, and return that information. @@ -178,7 +178,7 @@ public class ReportResource extends NuxeoBasedResource { StringBuffer outMimeType = new StringBuffer(); StringBuffer outReportFileName = new StringBuffer(); ServiceContext ctx = createServiceContext(); - + if (isAuthorizedToInvokeReports(ctx) == true) { InputStream reportInputStream = invokeReport(ctx, csid, invContext, outMimeType, outReportFileName); response = PublicItemUtil.publishToRepository( @@ -199,13 +199,13 @@ public class ReportResource extends NuxeoBasedResource { return response; } - + /* * This method allows backward compatibility with the old API for running reports. */ private boolean isAuthorizedToInvokeReports(ServiceContext ctx) { boolean result = true; - + // // Until we enforce a user having POST perms on "/reports/*/invoke", we will continue to allow users with // POST perms on "/reports" to run reports -see JIRA issue https://collectionspace.atlassian.net/browse/DRYD-732 @@ -224,7 +224,7 @@ public class ReportResource extends NuxeoBasedResource { } /** - * This method is deprecated at of CollectionSpace v5.3. + * This method is deprecated at of CollectionSpace v6.0. * @param ui * @param csid * @param invContext @@ -243,7 +243,7 @@ public class ReportResource extends NuxeoBasedResource { StringBuffer outMimeType = new StringBuffer(); StringBuffer outFileName = new StringBuffer(); ServiceContext ctx = createServiceContext(); - + if (isAuthorizedToInvokeReports(ctx) == true) { InputStream reportInputStream = invokeReport(ctx, csid, invContext, outMimeType, outFileName); // Need to set response type for what is requested... @@ -261,7 +261,7 @@ public class ReportResource extends NuxeoBasedResource { return response; } - + @POST @Path("{csid}/invoke") public Response invokeReport( @@ -298,7 +298,7 @@ public class ReportResource extends NuxeoBasedResource { return result; } - + /* * Does the actual report generation and returns an InputStream with the results. */ diff --git a/services/systeminfo/service/src/main/java/org/collectionspace/services/systeminfo/SystemInfoResource.java b/services/systeminfo/service/src/main/java/org/collectionspace/services/systeminfo/SystemInfoResource.java index 254edbf3c..07ba009b0 100644 --- a/services/systeminfo/service/src/main/java/org/collectionspace/services/systeminfo/SystemInfoResource.java +++ b/services/systeminfo/service/src/main/java/org/collectionspace/services/systeminfo/SystemInfoResource.java @@ -59,10 +59,10 @@ public class SystemInfoResource extends AbstractCollectionSpaceResourceImpl