[JENKINS-28298] Targets Jenkins-1.625.

jenkinsci · Mar 19, 2016 · fa7ca0d · fa7ca0d
1 parent acf5125
commit fa7ca0d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 14 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,8 +3,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>1.532</version><!-- QueueItemAuthenticator is since 1.520 -->
-    <!--<version>1.580.1</version>--><!-- When you test the integration with workflow -->
+    <version>1.625</version><!-- for JENKINS-28298 -->
   </parent>
 
   <groupId>org.jenkins-ci.plugins</groupId>
@@ -44,8 +43,6 @@
   </properties>
 
   <dependencies>
-    <!-- When you test the integration with workflow -->
-    <!--
     <dependency>
       <groupId>org.jenkins-ci.plugins.workflow</groupId>
       <artifactId>workflow-job</artifactId>
@@ -64,7 +61,6 @@
       <version>${workflow.version}</version>
       <scope>test</scope>
     </dependency>
-    -->
   </dependencies>
 
   <build>

diff --git a/src/test/java/org/jenkinsci/plugins/authorizeproject/ProjectQueueItemAuthenticatorTest.java b/src/test/java/org/jenkinsci/plugins/authorizeproject/ProjectQueueItemAuthenticatorTest.java
@@ -61,8 +61,6 @@
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
 import com.gargoylesoftware.htmlunit.html.HtmlTextInput;
 
-/*
-// classes for workflowTest
 import java.io.IOException;
 import jenkins.tasks.SimpleBuildStep;
 import hudson.FilePath;
@@ -76,8 +74,6 @@
 import org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition;
 import org.jenkinsci.plugins.workflow.job.WorkflowJob;
 import org.jenkinsci.plugins.workflow.job.WorkflowRun;
-import org.kohsuke.stapler.DataBoundConstructor;
-*/
 
 /**
  *
@@ -511,10 +507,6 @@ public void testOldSignature() throws Exception {
         assertEquals("test1", checker.authentication.getName());
     }
 
-    /*
-    // A test for workflow plugin (which extends Job, not AbstractProject).
-    // This is disabled as workflow requires Jenkins >= 1.580.1
-    // but authorize-project targets Jenkins >= 1.532.
     public static class AuthorizationRecordAction extends InvisibleAction {
         public final Authentication authentication;
 
@@ -580,5 +572,4 @@ public void testWorkflow() throws Exception {
             assertEquals(User.get("test1").impersonate(), b.getAction(AuthorizationRecordAction.class).authentication);
         }
     }
-    */
 }