Nexus 3.41 compatibility (#20)

* 3.41.0 combatibility * update mockito imports * bump jackson databind in IT * bump nexus version * version bump * bump groovy-all version * version bump * README update
davejab · Nov 28, 2022 · f92b9df · f92b9df
1 parent 9542c54
commit f92b9df
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 43 deletions.
diff --git a/README.md b/README.md
@@ -89,7 +89,8 @@ The table below outlines what version of Nexus Repository the plugin was built a
 | Plugin Version | Nexus Repository Version |
 |----------------|--------------------------|
 | v0.0.1-1       | 3.31.0-01                |
-| v0.0.6         | 3.38.0-01                |
+| v0.0.7         | 3.38.0-01                |
+| v0.0.8         | 3.41.0-01                |
 
 If a new version of Nexus Repository is released and the plugin needs changes, a new release will be made, and this
 table will be updated to indicate which version of Nexus Repository it will function against. This is done on a time 

diff --git a/nexus-repository-terraform-it/pom.xml b/nexus-repository-terraform-it/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.sonatype.nexus.plugins</groupId>
     <artifactId>nexus-repository-terraform-parent</artifactId>
-    <version>0.0.7</version>
+    <version>0.0.8</version>
   </parent>
 
   <artifactId>nexus-repository-terraform-it</artifactId>
@@ -51,12 +51,6 @@
       <groupId>org.sonatype.nexus</groupId>
       <artifactId>nexus-rest-client</artifactId>
     </dependency>
-    <!-- CVE-2020-36518 -->
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-databind</artifactId>
-      <version>2.13.3</version>
-    </dependency>
     <!-- sonatype-2020-0926 -->
     <dependency>
       <groupId>com.google.guava</groupId>
@@ -67,6 +61,23 @@
     Pax-Exam test driver - end
     -->
 
+    <!--
+    CVE-2022-42003
+    CVE-2022-42004
+    -->
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+      <version>2.13.4.1</version>
+    </dependency>
+
+    <!-- CVE-2020-17521 -->
+    <dependency>
+      <groupId>org.codehaus.groovy</groupId>
+      <artifactId>groovy-all</artifactId>
+      <version>2.4.21</version>
+    </dependency>
+
     <!--
     only needed due to testsupport reference to: org.sonatype.nexus.repository.maven.VersionPolicy
     -->

diff --git a/nexus-repository-terraform/pom.xml b/nexus-repository-terraform/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.sonatype.nexus.plugins</groupId>
     <artifactId>nexus-repository-terraform-parent</artifactId>
-    <version>0.0.7</version>
+    <version>0.0.8</version>
   </parent>
 
   <artifactId>nexus-repository-terraform</artifactId>

diff --git a/...ava/org/sonatype/nexus/plugins/terraform/datastore/internal/store/TerraformSearchDAO.java b/...ava/org/sonatype/nexus/plugins/terraform/datastore/internal/store/TerraformSearchDAO.java
diff --git a/...a/org/sonatype/nexus/plugins/terraform/datastore/internal/store/TerraformStoreModule.java b/...a/org/sonatype/nexus/plugins/terraform/datastore/internal/store/TerraformStoreModule.java
@@ -27,8 +27,7 @@ public class TerraformStoreModule
     extends FormatStoreModule<TerraformContentRepositoryDAO,
         TerraformComponentDAO,
         TerraformAssetDAO,
-        TerraformAssetBlobDAO,
-        TerraformSearchDAO>
+        TerraformAssetBlobDAO>
 {
   // nothing to add...
 }
diff --git a/...va/org/sonatype/nexus/plugins/terraform/internal/security/TerraformSecurityFacetTest.java b/...va/org/sonatype/nexus/plugins/terraform/internal/security/TerraformSecurityFacetTest.java
@@ -26,8 +26,8 @@
 import org.mockito.Mock;
 
 import static org.junit.Assert.fail;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 import static org.sonatype.nexus.security.BreadActions.READ;

diff --git a/pom.xml b/pom.xml
@@ -20,11 +20,11 @@
   <parent>
     <groupId>org.sonatype.nexus.plugins</groupId>
     <artifactId>nexus-plugins</artifactId>
-    <version>3.38.0-01</version>
+    <version>3.41.0-01</version>
   </parent>
 
   <artifactId>nexus-repository-terraform-parent</artifactId>
-  <version>0.0.7</version>
+  <version>0.0.8</version>
   <packaging>pom</packaging>
 
   <inceptionYear>2022</inceptionYear>
@@ -46,7 +46,7 @@
   </distributionManagement>
 
   <properties>
-    <nxrm-version>3.38.0-01</nxrm-version>
+    <nxrm-version>3.41.0-01</nxrm-version>
   </properties>
 
   <repositories>