mirror of
https://github.com/jenkinsci/jenkins.git
synced 2026-11-17 22:12:25 +00:00
Conflicts: maven-plugin/src/main/java/hudson/maven/AbstractMavenBuilder.java maven-plugin/src/main/java/hudson/maven/AbstractMavenProcessFactory.java maven-plugin/src/main/java/hudson/maven/Maven31ProcessFactory.java maven-plugin/src/main/java/hudson/maven/Maven3Builder.java maven-plugin/src/main/java/hudson/maven/Maven3ProcessFactory.java maven-plugin/src/main/java/hudson/maven/MavenBuildProxy.java maven-plugin/src/main/java/hudson/maven/MavenBuilder.java maven-plugin/src/main/java/hudson/maven/MavenProcessFactory.java maven-plugin/src/main/java/hudson/maven/MavenVersionCallable.java maven-plugin/src/main/java/hudson/maven/ProcessCache.java maven-plugin/src/main/java/hudson/maven/RedeployPublisher.java maven-plugin/src/main/java/hudson/maven/SplittableBuildListener.java