Merge pull request jenkinsci#4242 from daniel-beck/unbundle-maven-plugin

Unbundle Maven Plugin and Subversion Plugin
timeticktick · Oct 5, 2019 · 40dfc89 · 40dfc89
2 parents 092757d + f1c2e85
commit 40dfc89
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 19 deletions.
diff --git a/pom.xml b/pom.xml
@@ -91,7 +91,6 @@ THE SOFTWARE.
     <project.patchManagement.url>https://api.github.com</project.patchManagement.url>
     <patch.tracker.serverId>jenkins-jira</patch.tracker.serverId>
 
-    <maven-plugin.version>2.14</maven-plugin.version>
     <matrix-auth.version>2.3</matrix-auth.version>
     <matrix-project.version>1.14</matrix-project.version>
     <sorcerer.version>0.11</sorcerer.version>

diff --git a/test-pom/pom.xml b/test-pom/pom.xml
@@ -95,7 +95,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>maven-plugin</artifactId>
-      <version>${maven-plugin.version}</version>
+      <version>2.14</version>
       <exclusions>
         <exclusion> <!-- perhaps unnecessary as of JENKINS-35445? -->
           <groupId>org.apache.httpcomponents</groupId>

diff --git a/test/src/test/java/hudson/model/AbstractProjectTest.java b/test/src/test/java/hudson/model/AbstractProjectTest.java
@@ -34,7 +34,7 @@
 import hudson.FilePath;
 import hudson.Functions;
 import hudson.Launcher;
-import hudson.maven.MavenModuleSet;
+import hudson.matrix.MatrixProject;
 import hudson.scm.NullSCM;
 import hudson.scm.SCM;
 import hudson.scm.SCMDescriptor;
@@ -410,20 +410,24 @@ public void addTriggerDifferentType() throws Exception {
     @Test
     public void configDotXmlSubmissionToDifferentType() throws Exception {
         TestPluginManager tpm = (TestPluginManager) j.jenkins.pluginManager;
-        tpm.installDetachedPlugin("javadoc");
-        tpm.installDetachedPlugin("maven-plugin");
+        tpm.installDetachedPlugin("structs");
+        tpm.installDetachedPlugin("workflow-step-api");
+        tpm.installDetachedPlugin("scm-api");
+        tpm.installDetachedPlugin("workflow-api");
+        tpm.installDetachedPlugin("junit");
+        tpm.installDetachedPlugin("matrix-project");
 
         j.jenkins.setCrumbIssuer(null);
         FreeStyleProject p = j.createFreeStyleProject();
 
-        HttpURLConnection con = postConfigDotXml(p, "<maven2-moduleset />");
+        HttpURLConnection con = postConfigDotXml(p, "<matrix-project />");
 
         // this should fail with a type mismatch error
         // the error message should report both what was submitted and what was expected
         assertEquals(500, con.getResponseCode());
         String msg = IOUtils.toString(con.getErrorStream());
         System.out.println(msg);
-        assertThat(msg, allOf(containsString(FreeStyleProject.class.getName()), containsString(MavenModuleSet.class.getName())));
+        assertThat(msg, allOf(containsString(FreeStyleProject.class.getName()), containsString(MatrixProject.class.getName())));
 
         // control. this should work
         con = postConfigDotXml(p, "<project />");

diff --git a/war/pom.xml b/war/pom.xml
@@ -294,18 +294,6 @@ THE SOFTWARE.
                 <!--
                     Detached plugins and their dependencies - detached plugins that used to be bundled plugins
                 -->
-                <artifactItem>
-                  <groupId>${project.groupId}</groupId>
-                  <artifactId>maven-plugin</artifactId>
-                  <version>${maven-plugin.version}</version>
-                  <type>hpi</type>
-                </artifactItem>
-                <artifactItem>
-                  <groupId>org.jenkins-ci.plugins</groupId>
-                  <artifactId>subversion</artifactId>
-                  <version>1.54</version>
-                  <type>hpi</type>
-                </artifactItem>
                 <artifactItem>
                   <groupId>org.jenkins-ci.plugins</groupId>
                   <artifactId>cvs</artifactId>