[JENKINS-19141] - Make maven-plugin optional.

jenkinsci · Apr 21, 2017 · 474313b · 474313b · jglick · Apr 24, 2017
1 parent 421b4d9
commit 474313b
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 15 deletions.
diff --git a/pom.xml b/pom.xml
@@ -107,6 +107,7 @@
             <groupId>org.jenkins-ci.main</groupId>
             <artifactId>maven-plugin</artifactId>
             <version>2.0</version>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>junit</groupId>

diff --git a/src/main/java/hudson/plugins/jobConfigHistory/ComputerConfigHistoryAction.java b/src/main/java/hudson/plugins/jobConfigHistory/ComputerConfigHistoryAction.java
@@ -32,9 +32,9 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map.Entry;
+import java.util.SortedMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import java.util.SortedMap;
 
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.StaplerResponse;

diff --git a/src/main/java/hudson/plugins/jobConfigHistory/FileHistoryDao.java b/src/main/java/hudson/plugins/jobConfigHistory/FileHistoryDao.java
@@ -407,17 +407,8 @@ public XmlFile getOldRevision(final AbstractItem item,
 			final String identifier) {
 		final File configFile = item.getConfigFile().getFile();
 		final File historyDir = new File(getHistoryDir(configFile), identifier);
-		boolean isMavenModuleAvailable = false;
-		try {
-			Class.forName("hudson.maven.MavenModule");
-			isMavenModuleAvailable = true;
-		} catch (ClassNotFoundException ex) {
-			LOG.log(Level.FINEST,
-					"MavenModule not available. JobConfigHistory needs MavenModule. ",
-					ex);
-			isMavenModuleAvailable = false;
-		}
-		if (isMavenModuleAvailable && item instanceof MavenModule) {
+		if (PluginUtils.isMavenPluginAvailable()
+				&& item instanceof MavenModule) {
 			final String path = historyDir
 					+ ((MavenModule) item).getParent().getFullName()
 							.replace("/", "/jobs/")

diff --git a/src/main/java/hudson/plugins/jobConfigHistory/JobConfigHistory.java b/src/main/java/hudson/plugins/jobConfigHistory/JobConfigHistory.java
@@ -404,7 +404,6 @@ public String getExcludedUsers() {
 	 * @return true if the item configuration should be saved.
 	 */
 	public boolean isSaveable(final Saveable item, final XmlFile xmlFile) {
-
 		if (item instanceof TopLevelItem) {
 			return true;
 		}
@@ -413,7 +412,8 @@ public boolean isSaveable(final Saveable item, final XmlFile xmlFile) {
 			return checkRegex(xmlFile);
 		}
 
-		if (item instanceof MavenModule && saveModuleConfiguration) {
+		if (PluginUtils.isMavenPluginAvailable() && item instanceof MavenModule
+				&& saveModuleConfiguration) {
 			return true;
 		}
 

diff --git a/src/main/java/hudson/plugins/jobConfigHistory/JobConfigHistoryProjectAction.java b/src/main/java/hudson/plugins/jobConfigHistory/JobConfigHistoryProjectAction.java
@@ -101,10 +101,10 @@ public final String getIconFileName() {
 			return JobConfigHistoryConsts.ICONFILENAME;
 		}
 		if (getPlugin().getSaveModuleConfiguration()
+				&& PluginUtils.isMavenPluginAvailable()
 				&& project instanceof MavenModule) {
 			return JobConfigHistoryConsts.ICONFILENAME;
 		}
-
 		return null;
 	}
 

diff --git a/src/main/java/hudson/plugins/jobConfigHistory/PluginUtils.java b/src/main/java/hudson/plugins/jobConfigHistory/PluginUtils.java
@@ -29,6 +29,7 @@
 import java.util.Date;
 import java.util.regex.Pattern;
 
+import hudson.Plugin;
 import hudson.model.User;
 import jenkins.model.Jenkins;
 
@@ -148,4 +149,16 @@ public static Date parsedDate(final String timeStamp) {
 					"Could not parse Date" + timeStamp, ex);
 		}
 	}
+
+	/**
+	 * @return true, if Maven integration plugin is available and active.
+	 */
+	public static boolean isMavenPluginAvailable() {
+		try {
+			Plugin plugin = Jenkins.getInstance().getPlugin("maven-plugin");
+			return plugin.getWrapper().isActive();
+		} catch (Exception e) {
+			return false;
+		}
+	}
 }
diff --git a/src/test/java/hudson/plugins/jobConfigHistory/JobConfigHistoryProjectActionTest.java b/src/test/java/hudson/plugins/jobConfigHistory/JobConfigHistoryProjectActionTest.java
@@ -20,6 +20,8 @@
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
+import org.jvnet.hudson.test.JenkinsRule;
+import org.jvnet.hudson.test.recipes.WithPlugin;
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.StaplerResponse;
 
@@ -38,6 +40,9 @@
  */
 public class JobConfigHistoryProjectActionTest {
 
+	@Rule
+	public JenkinsRule j = new JenkinsRule();
+
 	@Rule
 	public UnpackResourceZip testConfigs = UnpackResourceZip.create();
 
@@ -90,6 +95,7 @@ public void testGetIconFileNameSaveProjectNonMavenModules() {
 	/**
 	 * Test of getIconFileName method, of class JobConfigHistoryProjectAction.
 	 */
+	@WithPlugin("maven-plugin.hpi")
 	@Test
 	public void testGetIconFileNameSaveMavenModules() {
 		when(mockedMavenModule.hasPermission(AbstractProject.CONFIGURE))

diff --git a/src/test/resources/plugins/maven-plugin.hpi b/src/test/resources/plugins/maven-plugin.hpi