NOJIRA: Change version to 6.0.

diff --git a/build.properties b/build.properties
index c89ac9380f1afcc3995a5f75cf11e3c6739510ea..ec6a56e31d44c3946cc169871cb7964330e7fe31 100644 (file)
--- 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 64f1b40ad112b6421d35dff5606413abbac71806..8347e0c088ed305c006e436972cc034a8c567e26 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
        <name>services</name>
 
        <properties>
-               <revision>5.3-SNAPSHOT</revision>
+               <revision>6.0-SNAPSHOT</revision>
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
                <cspace.services.version>${revision}</cspace.services.version>
                <cspace.services.client.version>${revision}</cspace.services.client.version>

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 dee12cbc23187ed4abc59d553c8d0b112225353e..eff2a4216e9745b83cb107155cae175fedeb92e5 100644 (file)
--- 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 a88e1b1f6d0a7c71d2ecd31f5a7b0a07aa49080c..ff98d369418eed91afb6c52e4c96e7e292af08f8 100644 (file)
--- 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<PoxPayloadIn, PoxPayloadOut> 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 686a3ed9c692bed8f3da944bdc021ceb57bed694..74b2cde66de237d62dbcbab15c853eb62f561642 100644 (file)
--- 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<PoxPayloadIn, PoxPayloadOut> 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<PoxPayloadIn, PoxPayloadOut> 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<PoxPayloadIn, PoxPayloadOut> 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<PoxPayloadIn, PoxPayloadOut> 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 254edbf3c0d1f63c1b94c64e31b7f2eac112b3a1..07ba009b0794005aea175ba6355b553a6ea46a72 100644 (file)
--- 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<Syst
        try {
                result = new SystemInfoCommon();
                result.setInstanceId(ServiceMain.getInstance().getCspaceInstanceId());
-               result.setDisplayName("CollectionSpace Services v5.3");
+               result.setDisplayName("CollectionSpace Services v6.0");
                Version ver = new Version();
-               ver.setMajor("5");
-               ver.setMinor("3");
+               ver.setMajor("6");
+               ver.setMinor("0");
                ver.setPatch("0");
                ver.setBuild("1");
                result.setVersion(ver);