Branch: refs/heads/master
  Home:   https://github.com/jenkinsci/maven-plugin
  Commit: e2b723509bd13e1bc7dda4d194432bca352e5fea
      
https://github.com/jenkinsci/maven-plugin/commit/e2b723509bd13e1bc7dda4d194432bca352e5fea
  Author: Jesse Glick <jgl...@cloudbees.com>
  Date:   2014-09-26 (Fri, 26 Sep 2014)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Preparing for 2.6.1.


  Commit: 3a4b06f1fd8e317af2926bab6be137feb19e7895
      
https://github.com/jenkinsci/maven-plugin/commit/3a4b06f1fd8e317af2926bab6be137feb19e7895
  Author: Kohsuke Kawaguchi <k...@kohsuke.org>
  Date:   2014-09-26 (Fri, 26 Sep 2014)

  Changed paths:
    M pom.xml
    M src/main/java/hudson/maven/AbstractMavenBuilder.java
    M src/main/java/hudson/maven/AbstractMavenProcessFactory.java
    M src/main/java/hudson/maven/Maven31ProcessFactory.java
    M src/main/java/hudson/maven/Maven3ProcessFactory.java
    M src/main/java/hudson/maven/MavenBuild.java
    M src/main/java/hudson/maven/MavenBuildProxy.java
    M src/main/java/hudson/maven/MavenModuleSetBuild.java
    M src/main/java/hudson/maven/MavenProcessFactory.java
    M src/main/java/hudson/maven/MavenVersionCallable.java
    M src/main/java/hudson/maven/ProcessCache.java
    M src/main/java/hudson/maven/RedeployPublisher.java
    M src/main/java/hudson/maven/SplittableBuildListener.java

  Log Message:
  -----------
  [SECURITY-144] Updated the plugin to declare direction of Callables

(cherry picked from commit 1028db2cccb282d3cd53298b246aa6bb0b7fda68)

Conflicts:
        src/main/java/hudson/maven/SplittableBuildListener.java


  Commit: 95f2561d696c1a7185306708190ae6f4f469265d
      
https://github.com/jenkinsci/maven-plugin/commit/95f2561d696c1a7185306708190ae6f4f469265d
  Author: Jesse Glick <jgl...@cloudbees.com>
  Date:   2014-09-26 (Fri, 26 Sep 2014)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Changing artifactId.

(cherry picked from commit f6a51b70e2660106275735380bf4bc05b2de909d)


  Commit: 456b40f9e0a472cb7d270481809b9d28a5ce954c
      
https://github.com/jenkinsci/maven-plugin/commit/456b40f9e0a472cb7d270481809b9d28a5ce954c
  Author: Jesse Glick <jgl...@cloudbees.com>
  Date:   2014-10-16 (Thu, 16 Oct 2014)

  Changed paths:
    M pom.xml
    M src/main/java/hudson/maven/AbstractMavenBuild.java
    M src/main/java/hudson/maven/AbstractMavenProject.java
    M src/main/java/hudson/maven/Maven3Builder.java
    M src/main/java/hudson/maven/MavenBuild.java
    M src/main/java/hudson/maven/MavenModuleSet.java
    M src/main/java/hudson/maven/MavenModuleSetBuild.java
    M src/main/java/hudson/maven/reporters/MavenMailer.java
    M src/main/resources/hudson/maven/MavenBuild/actions_sv_SE.properties
    A src/main/resources/hudson/maven/MavenBuild/executedMojos_sv_SE.properties
    M src/main/resources/hudson/maven/MavenModuleSet/configure-entries.jelly
    M 
src/main/resources/hudson/maven/MavenModuleSet/configure-entries_de.properties
    M 
src/main/resources/hudson/maven/MavenModuleSet/newJobDetail_sv_SE.properties
    M src/main/resources/hudson/maven/Messages.properties
    M src/main/resources/hudson/maven/Messages_de.properties
    A src/main/webapp/blockTriggerWhenBuilding.html
    A src/main/webapp/blockTriggerWhenBuilding_de.html
    M src/main/webapp/downstreamDisabled.html
    M src/main/webapp/downstreamDisabled_de.html
    A src/main/webapp/fingerprintingDisabled_de.html
    M src/main/webapp/run-headless_de.html
    M src/test/java/hudson/maven/AbstractMaven3xBuildTest.java
    A 
src/test/java/hudson/maven/MavenEnvironmentContributingActionFromBuilderTest.java
    M src/test/java/hudson/maven/MavenModuleSetTest.java
    M src/test/java/hudson/maven/RedeployPublisherTest.java
    M src/test/java/hudson/maven/reporters/SurefireArchiverUnitTest.java

  Log Message:
  -----------
  Merge tag 'maven-plugin-2.7' into SECURITY-144-trunk

[maven-release-plugin]  copy for tag maven-plugin-2.7

Conflicts:
        pom.xml
        src/main/java/hudson/maven/MavenBuild.java


  Commit: 0963b19fef1cb3fbc9da2fa10649c9970b12f4a7
      
https://github.com/jenkinsci/maven-plugin/commit/0963b19fef1cb3fbc9da2fa10649c9970b12f4a7
  Author: Kohsuke Kawaguchi <k...@kohsuke.org>
  Date:   2014-10-29 (Wed, 29 Oct 2014)

  Changed paths:
    M pom.xml
    M src/main/java/hudson/maven/AbstractMavenBuilder.java
    M src/main/java/hudson/maven/AbstractMavenProcessFactory.java
    M src/main/java/hudson/maven/Maven31ProcessFactory.java
    M src/main/java/hudson/maven/Maven3ProcessFactory.java
    M src/main/java/hudson/maven/MavenBuild.java
    M src/main/java/hudson/maven/MavenBuildProxy.java
    M src/main/java/hudson/maven/MavenModuleSetBuild.java
    M src/main/java/hudson/maven/MavenProcessFactory.java
    M src/main/java/hudson/maven/MavenVersionCallable.java
    M src/main/java/hudson/maven/ProcessCache.java
    M src/main/java/hudson/maven/RedeployPublisher.java
    M src/main/java/hudson/maven/SplittableBuildListener.java

  Log Message:
  -----------
  Merge branch 'SECURITY-144-trunk'

Conflicts:
        pom.xml


Compare: 
https://github.com/jenkinsci/maven-plugin/compare/12ba0e31d7c0...0963b19fef1c

-- 
You received this message because you are subscribed to the Google Groups 
"Jenkins Commits" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to jenkinsci-commits+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Reply via email to