Merge remote-tracking branch 'upstream/main'

TexasDigitalLibrary · Oct 23, 2023 · 7b37f15 · 7b37f15
2 parents 1a624e0 + 177c7a0
commit 7b37f15
Show file tree

Hide file tree

Showing 43 changed files with 92 additions and 88 deletions.
diff --git a/auditor/pom.xml b/auditor/pom.xml
@@ -4,14 +4,14 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.duracloud</groupId>
   <artifactId>auditor</artifactId>
-  <version>7.1.2</version>
+  <version>7.1.4</version>
   <name>DuraCloud Auditor</name>
   <url>http://duracloud.org/</url>
 
   <parent>
     <groupId>org.duracloud</groupId>
     <artifactId>duracloud</artifactId>
-    <version>7.1.2</version>
+    <version>7.1.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/chunk/pom.xml b/chunk/pom.xml
@@ -4,13 +4,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.duracloud</groupId>
   <artifactId>chunk</artifactId>
-  <version>7.1.2</version>
+  <version>7.1.4</version>
   <name>Stream Chunking</name>
 
   <parent>
     <artifactId>duracloud</artifactId>
     <groupId>org.duracloud</groupId>
-    <version>7.1.2</version>
+    <version>7.1.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/common-aop/pom.xml b/common-aop/pom.xml
@@ -4,13 +4,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.duracloud</groupId>
   <artifactId>common-aop</artifactId>
-  <version>7.1.2</version>
+  <version>7.1.4</version>
   <name>Common AOP</name>
 
   <parent>
     <artifactId>duracloud</artifactId>
     <groupId>org.duracloud</groupId>
-    <version>7.1.2</version>
+    <version>7.1.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/common-cache/pom.xml b/common-cache/pom.xml
@@ -4,14 +4,14 @@
   <parent>
     <groupId>org.duracloud</groupId>
     <artifactId>duracloud</artifactId>
-    <version>7.1.2</version>
+    <version>7.1.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.duracloud</groupId>
   <artifactId>common-cache</artifactId>
-  <version>7.1.2</version>
+  <version>7.1.4</version>
   <name>Common Event</name>
 
   <dependencies>

diff --git a/common-changenotifier/pom.xml b/common-changenotifier/pom.xml
@@ -4,13 +4,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.duracloud</groupId>
   <artifactId>common-changenotifier</artifactId>
-  <version>7.1.2</version>
+  <version>7.1.4</version>
   <name>Common Change-Notifier</name>
 
   <parent>
     <artifactId>duracloud</artifactId>
     <groupId>org.duracloud</groupId>
-    <version>7.1.2</version>
+    <version>7.1.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/common-cli/pom.xml b/common-cli/pom.xml
@@ -4,14 +4,14 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.duracloud</groupId>
   <artifactId>common-cli</artifactId>
-  <version>7.1.2</version>
+  <version>7.1.4</version>
   <name>DuraCloud Common Command Line Helpers</name>
   <description>Some useful framework classes for building commandline tools</description>
 
   <parent>
     <groupId>org.duracloud</groupId>
     <artifactId>duracloud</artifactId>
-    <version>7.1.2</version>
+    <version>7.1.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/common-db/pom.xml b/common-db/pom.xml
@@ -4,13 +4,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.duracloud</groupId>
   <artifactId>common-db</artifactId>
-  <version>7.1.2</version>
+  <version>7.1.4</version>
   <name>Common DB</name>
 
   <parent>
     <artifactId>duracloud</artifactId>
     <groupId>org.duracloud</groupId>
-    <version>7.1.2</version>
+    <version>7.1.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/common-event/pom.xml b/common-event/pom.xml
@@ -4,14 +4,14 @@
   <parent>
     <groupId>org.duracloud</groupId>
     <artifactId>duracloud</artifactId>
-    <version>7.1.2</version>
+    <version>7.1.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.duracloud</groupId>
   <artifactId>common-event</artifactId>
-  <version>7.1.2</version>
+  <version>7.1.4</version>
   <name>Common Event</name>
 
   <dependencies>

diff --git a/common-json/pom.xml b/common-json/pom.xml
@@ -4,13 +4,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.duracloud</groupId>
   <artifactId>common-json</artifactId>
-  <version>7.1.2</version>
+  <version>7.1.4</version>
   <name>Common JSON</name>
 
   <parent>
     <artifactId>duracloud</artifactId>
     <groupId>org.duracloud</groupId>
-    <version>7.1.2</version>
+    <version>7.1.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/common-notification/pom.xml b/common-notification/pom.xml
@@ -4,13 +4,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.duracloud</groupId>
   <artifactId>common-notification</artifactId>
-  <version>7.1.2</version>
+  <version>7.1.4</version>
   <name>Common Notification</name>
 
   <parent>
     <artifactId>duracloud</artifactId>
     <groupId>org.duracloud</groupId>
-    <version>7.1.2</version>
+    <version>7.1.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/common-queue/pom.xml b/common-queue/pom.xml
@@ -4,13 +4,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.duracloud</groupId>
   <artifactId>common-queue</artifactId>
-  <version>7.1.2</version>
+  <version>7.1.4</version>
   <name>Common Queue</name>
 
   <parent>
     <artifactId>duracloud</artifactId>
     <groupId>org.duracloud</groupId>
-    <version>7.1.2</version>
+    <version>7.1.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/common-rest/pom.xml b/common-rest/pom.xml
@@ -4,13 +4,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.duracloud</groupId>
   <artifactId>common-rest</artifactId>
-  <version>7.1.2</version>
+  <version>7.1.4</version>
   <name>Common REST</name>
 
   <parent>
     <artifactId>duracloud</artifactId>
     <groupId>org.duracloud</groupId>
-    <version>7.1.2</version>
+    <version>7.1.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/common-test/pom.xml b/common-test/pom.xml
@@ -4,13 +4,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.duracloud</groupId>
   <artifactId>common-test</artifactId>
-  <version>7.1.2</version>
+  <version>7.1.4</version>
   <name>DuraCloud Common Test</name>
 
   <parent>
     <artifactId>duracloud</artifactId>
     <groupId>org.duracloud</groupId>
-    <version>7.1.2</version>
+    <version>7.1.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/common-xml/pom.xml b/common-xml/pom.xml
@@ -4,13 +4,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.duracloud</groupId>
   <artifactId>common-xml</artifactId>
-  <version>7.1.2</version>
+  <version>7.1.4</version>
   <name>Common XML</name>
 
   <parent>
     <artifactId>duracloud</artifactId>
     <groupId>org.duracloud</groupId>
-    <version>7.1.2</version>
+    <version>7.1.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/common/pom.xml b/common/pom.xml
@@ -4,13 +4,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.duracloud</groupId>
   <artifactId>common</artifactId>
-  <version>7.1.2</version>
+  <version>7.1.4</version>
   <name>Common</name>
 
   <parent>
     <artifactId>duracloud</artifactId>
     <groupId>org.duracloud</groupId>
-    <version>7.1.2</version>
+    <version>7.1.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/duradmin/pom.xml b/duradmin/pom.xml
@@ -4,13 +4,13 @@
   <groupId>org.duracloud</groupId>
   <artifactId>duradmin</artifactId>
   <packaging>war</packaging>
-  <version>7.1.2</version>
+  <version>7.1.4</version>
   <name>DuraCloud Administrator</name>
   <url>http://localhost:8080/${project.artifactId}</url>
   <parent>
     <groupId>org.duracloud</groupId>
     <artifactId>duracloud</artifactId>
-    <version>7.1.2</version>
+    <version>7.1.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/durastore/pom.xml b/durastore/pom.xml
@@ -4,14 +4,14 @@
   <groupId>org.duracloud</groupId>
   <artifactId>durastore</artifactId>
   <packaging>war</packaging>
-  <version>7.1.2</version>
+  <version>7.1.4</version>
   <name>DuraCloud DuraStore</name>
   <url>http://localhost:8080/${project.artifactId}</url>
 
   <parent>
     <groupId>org.duracloud</groupId>
     <artifactId>duracloud</artifactId>
-    <version>7.1.2</version>
+    <version>7.1.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/durastore/src/test/java/org/duracloud/durastore/util/ACLStorageProviderTest.java b/durastore/src/test/java/org/duracloud/durastore/util/ACLStorageProviderTest.java
@@ -64,14 +64,13 @@ public class ACLStorageProviderTest {
 
     @Before
     public void setUp() throws Exception {
-
+        SecurityContextHolder.clearContext();
         requestContextUtil = createMock("DuraCloudRequestContextUtil", DuraCloudRequestContextUtil.class);
         notifier = createMock("AccountChangeNotifier", AccountChangeNotifier.class);
         context = createMock("SecurityContext", SecurityContext.class);
 
-        authorities = new GrantedAuthority[] {new SimpleGrantedAuthority(
-            "ROLE_USER")};
-        groups = new ArrayList<String>();
+        authorities = new GrantedAuthority[] {new SimpleGrantedAuthority("ROLE_USER")};
+        groups = new ArrayList<>();
         groups.add(groupA);
     }
 

diff --git a/glacierstorageprovider/pom.xml b/glacierstorageprovider/pom.xml
@@ -3,13 +3,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.duracloud</groupId>
   <artifactId>glacierstorageprovider</artifactId>
-  <version>7.1.2</version>
+  <version>7.1.4</version>
   <name>Glacier Storage Provider</name>
 
   <parent>
     <artifactId>duracloud</artifactId>
     <groupId>org.duracloud</groupId>
-    <version>7.1.2</version>
+    <version>7.1.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/integration/pom.xml b/integration/pom.xml
@@ -6,13 +6,13 @@
   <groupId>org.duracloud</groupId>
   <artifactId>integration</artifactId>
   <packaging>jar</packaging>
-  <version>7.1.2</version>
+  <version>7.1.4</version>
   <name>Integration</name>
 
   <parent>
     <artifactId>duracloud</artifactId>
     <groupId>org.duracloud</groupId>
-    <version>7.1.2</version>
+    <version>7.1.4</version>
   </parent>
 
   <profiles>

diff --git a/manifest/pom.xml b/manifest/pom.xml
@@ -3,14 +3,14 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.duracloud</groupId>
   <artifactId>manifest</artifactId>
-  <version>7.1.2</version>
+  <version>7.1.4</version>
   <name>DuraCloud Content Manifest</name>
   <url>http://localhost:8080/${project.artifactId}</url>
 
   <parent>
     <groupId>org.duracloud</groupId>
     <artifactId>duracloud</artifactId>
-    <version>7.1.2</version>
+    <version>7.1.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/manifeststitch/pom.xml b/manifeststitch/pom.xml
@@ -3,14 +3,14 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.duracloud</groupId>
   <artifactId>manifeststitch</artifactId>
-  <version>7.1.2</version>
+  <version>7.1.4</version>
   <name>DuraCloud Manifest Stitch Utility</name>
   <url>http://localhost:8080/${project.artifactId}</url>
 
   <parent>
     <groupId>org.duracloud</groupId>
     <artifactId>duracloud</artifactId>
-    <version>7.1.2</version>
+    <version>7.1.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/notification-amazon/pom.xml b/notification-amazon/pom.xml
@@ -4,13 +4,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.duracloud</groupId>
   <artifactId>notification-amazon</artifactId>
-  <version>7.1.2</version>
+  <version>7.1.4</version>
   <name>Email Amazon</name>
 
   <parent>
     <artifactId>duracloud</artifactId>
     <groupId>org.duracloud</groupId>
-    <version>7.1.2</version>
+    <version>7.1.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/notification-smtp/pom.xml b/notification-smtp/pom.xml
@@ -6,13 +6,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.duracloud</groupId>
   <artifactId>notification-smtp</artifactId>
-  <version>7.1.2</version>
+  <version>7.1.4</version>
   <name>Email SMTP</name>
 
   <parent>
     <artifactId>duracloud</artifactId>
     <groupId>org.duracloud</groupId>
-    <version>7.1.2</version>
+    <version>7.1.4</version>
   </parent>
 
   <dependencies>