Merge remote-tracking branch 'upstream/main'

TexasDigitalLibrary · Feb 5, 2024 · 4dcf597 · 4dcf597
2 parents 7b37f15 + 3d8d894
commit 4dcf597
Show file tree

Hide file tree

Showing 75 changed files with 371 additions and 341 deletions.
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
@@ -20,10 +20,10 @@ jobs:
       uses: actions/checkout@v2
 
     # https://github.com/actions/setup-java
-    - name: Install JDK 11
+    - name: Install JDK 17
       uses: actions/setup-java@v2
       with:
-        java-version: 11
+        java-version: 17
         distribution: adopt
 
     # https://github.com/actions/cache
@@ -47,7 +47,7 @@ jobs:
       uses: actions/setup-java@v2
       if: github.ref == 'refs/heads/develop' && github.event_name == 'push'
       with:
-        java-version: 11
+        java-version: 17
         distribution: adopt
         server-id: sonatype-snapshots # Value of the distributionManagement/repository/id field of the pom.xml
         server-username: SONATYPE_USERNAME # env variable for sonatype username
@@ -59,7 +59,7 @@ jobs:
       uses: actions/setup-java@v2
       if: github.ref == 'refs/heads/main' && github.event_name == 'push'
       with:
-        java-version: 11
+        java-version: 17
         distribution: adopt
         server-id: sonatype-releases # Value of the distributionManagement/repository/id field of the pom.xml
         server-username: SONATYPE_USERNAME # env variable for sonatype username

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.4</version>
+  <version>8.0.0</version>
   <name>DuraCloud Auditor</name>
   <url>http://duracloud.org/</url>
 
   <parent>
     <groupId>org.duracloud</groupId>
     <artifactId>duracloud</artifactId>
-    <version>7.1.4</version>
+    <version>8.0.0</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.4</version>
+  <version>8.0.0</version>
   <name>Stream Chunking</name>
 
   <parent>
     <artifactId>duracloud</artifactId>
     <groupId>org.duracloud</groupId>
-    <version>7.1.4</version>
+    <version>8.0.0</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.4</version>
+  <version>8.0.0</version>
   <name>Common AOP</name>
 
   <parent>
     <artifactId>duracloud</artifactId>
     <groupId>org.duracloud</groupId>
-    <version>7.1.4</version>
+    <version>8.0.0</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.4</version>
+    <version>8.0.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.duracloud</groupId>
   <artifactId>common-cache</artifactId>
-  <version>7.1.4</version>
+  <version>8.0.0</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.4</version>
+  <version>8.0.0</version>
   <name>Common Change-Notifier</name>
 
   <parent>
     <artifactId>duracloud</artifactId>
     <groupId>org.duracloud</groupId>
-    <version>7.1.4</version>
+    <version>8.0.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -68,7 +68,6 @@
     <dependency>
       <groupId>com.rabbitmq</groupId>
       <artifactId>amqp-client</artifactId>
-      <version>5.7.0</version>
     </dependency>
 
   </dependencies>

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.4</version>
+  <version>8.0.0</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.4</version>
+    <version>8.0.0</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.4</version>
+  <version>8.0.0</version>
   <name>Common DB</name>
 
   <parent>
     <artifactId>duracloud</artifactId>
     <groupId>org.duracloud</groupId>
-    <version>7.1.4</version>
+    <version>8.0.0</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.4</version>
+    <version>8.0.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.duracloud</groupId>
   <artifactId>common-event</artifactId>
-  <version>7.1.4</version>
+  <version>8.0.0</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.4</version>
+  <version>8.0.0</version>
   <name>Common JSON</name>
 
   <parent>
     <artifactId>duracloud</artifactId>
     <groupId>org.duracloud</groupId>
-    <version>7.1.4</version>
+    <version>8.0.0</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.4</version>
+  <version>8.0.0</version>
   <name>Common Notification</name>
 
   <parent>
     <artifactId>duracloud</artifactId>
     <groupId>org.duracloud</groupId>
-    <version>7.1.4</version>
+    <version>8.0.0</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.4</version>
+  <version>8.0.0</version>
   <name>Common Queue</name>
 
   <parent>
     <artifactId>duracloud</artifactId>
     <groupId>org.duracloud</groupId>
-    <version>7.1.4</version>
+    <version>8.0.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -35,7 +35,6 @@
     <dependency>
       <groupId>com.rabbitmq</groupId>
       <artifactId>amqp-client</artifactId>
-      <version>5.7.0</version>
     </dependency>
 
   </dependencies>

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.4</version>
+  <version>8.0.0</version>
   <name>Common REST</name>
 
   <parent>
     <artifactId>duracloud</artifactId>
     <groupId>org.duracloud</groupId>
-    <version>7.1.4</version>
+    <version>8.0.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -48,6 +48,11 @@
       <scope>test</scope>
     </dependency>
 
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+    </dependency>
+
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-web</artifactId>

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.4</version>
+  <version>8.0.0</version>
   <name>DuraCloud Common Test</name>
 
   <parent>
     <artifactId>duracloud</artifactId>
     <groupId>org.duracloud</groupId>
-    <version>7.1.4</version>
+    <version>8.0.0</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.4</version>
+  <version>8.0.0</version>
   <name>Common XML</name>
 
   <parent>
     <artifactId>duracloud</artifactId>
     <groupId>org.duracloud</groupId>
-    <version>7.1.4</version>
+    <version>8.0.0</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.4</version>
+  <version>8.0.0</version>
   <name>Common</name>
 
   <parent>
     <artifactId>duracloud</artifactId>
     <groupId>org.duracloud</groupId>
-    <version>7.1.4</version>
+    <version>8.0.0</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.4</version>
+  <version>8.0.0</version>
   <name>DuraCloud Administrator</name>
   <url>http://localhost:8080/${project.artifactId}</url>
   <parent>
     <groupId>org.duracloud</groupId>
     <artifactId>duracloud</artifactId>
-    <version>7.1.4</version>
+    <version>8.0.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>