Fix dependencies for BOM upgrade of JS libs.

jenkinsci · Dec 15, 2022 · ef02ff4 · ef02ff4
1 parent 73032c3
commit ef02ff4
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 88 deletions.
diff --git a/.github/workflows/autograding.yml b/.github/workflows/autograding.yml
diff --git a/pom.xml b/pom.xml
@@ -27,6 +27,7 @@
     <eclipse-collections.version>9.2.0</eclipse-collections.version>
     <testcontainers.version>1.17.6</testcontainers.version>
 
+    <plugin-util-api.version>2.20.0</plugin-util-api.version>
   </properties>
 
   <licenses>
@@ -44,18 +45,29 @@
     </developer>
   </developers>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>io.jenkins.plugins</groupId>
+        <artifactId>commons-text-api</artifactId>
+        <version>1.10.0-27.vb_fa_3896786a_7</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <dependencies>
 
     <dependency>
       <groupId>io.jenkins.plugins</groupId>
       <artifactId>plugin-util-api</artifactId>
+      <version>${plugin-util-api.version}</version>
     </dependency>
 
     <!-- Jenkins Plugin Dependencies -->
     <dependency>
       <groupId>io.jenkins.plugins</groupId>
       <artifactId>font-awesome-api</artifactId>
-      <version>6.2.0-3</version>
+      <version>6.2.1-1</version>
     </dependency>
     <dependency>
       <groupId>io.jenkins.plugins</groupId>
@@ -99,6 +111,7 @@
     <dependency>
       <groupId>io.jenkins.plugins</groupId>
       <artifactId>plugin-util-api</artifactId>
+      <version>${plugin-util-api.version}</version>
       <scope>test</scope>
       <classifier>tests</classifier>
     </dependency>

diff --git a/src/main/resources/forensics/scm.jelly b/src/main/resources/forensics/scm.jelly
@@ -5,7 +5,7 @@
     Provides a text box to select the SCM.
   </st:documentation>
 
-  <f:entry title="${%title.scm}" field="scm" description="${%description.scm}">
+  <f:entry title="${%title.scm}" field="scm" >
     <f:textbox/>
   </f:entry>
 

diff --git a/src/main/resources/forensics/scm.properties b/src/main/resources/forensics/scm.properties
@@ -1,2 +1 @@
 title.scm=SCM Key
-description.scm=Specify the key of your repository (substring is sufficient) if you are using multiple SCMs in your job.
diff --git a/src/test/java/io/jenkins/plugins/forensics/PluginArchitectureTest.java b/src/test/java/io/jenkins/plugins/forensics/PluginArchitectureTest.java
@@ -35,7 +35,7 @@ class PluginArchitectureTest {
     static final ArchRule NO_FORBIDDEN_CLASSES_CALLED = ArchitectureRules.NO_FORBIDDEN_CLASSES_CALLED;
 
     @ArchTest
-    static final ArchRule NO_PUBLIC_ARCHITECTURE_TESTS = ArchitectureRules.NO_PUBLIC_ARCHITECTURE_TESTS;
+    static final ArchRule ONLY_PACKAGE_PRIVATE_ARCHITECTURE_TESTS = ArchitectureRules.ONLY_PACKAGE_PRIVATE_ARCHITECTURE_TESTS;
 
     @ArchTest
     static final ArchRule NO_JENKINS_INSTANCE_CALL = PluginArchitectureRules.NO_JENKINS_INSTANCE_CALL;