-
Patch
-
Resolution: Fixed
-
Major
-
None
-
Platform: All, OS: All
-
Powered by SuggestiMate
Code changed in hudson
User: : kohsuke
Path:
trunk/www/changelog.html
http://fisheye4.cenqua.com/changelog/hudson/?cs=16746
Log:
[FIXED JENKINS-3251] Concluding the issue as resolved. Targeted for 1.296.
[JENKINS-3251] move the native maven integration to a plugin
Code changed in hudson
User: : kohsuke
Path:
http://fisheye4.cenqua.com/changelog/hudson/?cs=16729
Log:
Initialized merge tracking via "svnmerge" with revisions "1-16688" from
https://www.dev.java.net/svn/hudson/branches/JENKINS-3251
Code changed in hudson
User: : kohsuke
Path:
trunk/hudson/main/core/pom.xml
trunk/hudson/main/core/src/main/java/hudson/ClassicPluginStrategy.java
trunk/hudson/main/core/src/main/java/hudson/Functions.java
trunk/hudson/main/core/src/main/java/hudson/PluginManager.java
trunk/hudson/main/core/src/main/java/hudson/matrix/MatrixRun.java
trunk/hudson/main/core/src/main/java/hudson/model/AbstractBuild.java
trunk/hudson/main/core/src/main/java/hudson/model/AbstractProject.java
trunk/hudson/main/core/src/main/java/hudson/model/Fingerprint.java
trunk/hudson/main/core/src/main/java/hudson/model/Items.java
trunk/hudson/main/core/src/main/java/hudson/slaves/ComputerListener.java
trunk/hudson/main/core/src/main/java/hudson/slaves/SlaveComputer.java
trunk/hudson/main/core/src/main/java/hudson/tasks/ArtifactArchiver.java
trunk/hudson/main/core/src/main/java/hudson/tasks/BuildWrappers.java
trunk/hudson/main/core/src/main/java/hudson/tasks/Fingerprinter.java
trunk/hudson/main/core/src/main/java/hudson/tasks/JavadocArchiver.java
trunk/hudson/main/core/src/main/java/hudson/tasks/Mailer.java
trunk/hudson/main/core/src/main/java/hudson/tasks/Maven.java
trunk/hudson/main/core/src/main/java/hudson/tasks/Publisher.java
trunk/hudson/main/core/src/main/java/hudson/tasks/junit/JUnitResultArchiver.java
trunk/hudson/main/core/src/main/java/hudson/tasks/test/AggregatedTestResultAction.java
trunk/hudson/main/core/src/main/resources/hudson/matrix/Messages.properties
trunk/hudson/main/core/src/main/resources/hudson/matrix/Messages_de.properties
trunk/hudson/main/core/src/main/resources/hudson/matrix/Messages_ja.properties
trunk/hudson/main/core/src/main/resources/hudson/matrix/Messages_nl.properties
trunk/hudson/main/core/src/main/resources/hudson/matrix/Messages_tr.properties
trunk/hudson/main/pom.xml
trunk/hudson/main/remoting/src/main/java/hudson/remoting/Which.java
trunk/hudson/main/test/pom.xml
trunk/hudson/main/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java
trunk/hudson/main/war/pom.xml
http://fisheye4.cenqua.com/changelog/hudson/?cs=16734
Log:
Merged revisions 16689-16697,16701-16710,16712-16714 via svnmerge from
https://www.dev.java.net/svn/hudson/branches/JENKINS-3251
mvn -f main/war/pom.xml hudson-dev:run
does not load the Maven plugin. Intentional or bug?
mvn -f main/maven-plugin/pom.xml hpi:run
also doesn't seem to work:
[INFO] [hpi:run]
[ERROR] Unable to locate hudson.war. Add the following dependency in your POM:
....
[ERROR] BUILD ERROR
[INFO] ------------------------------------------------------------------------
[INFO] Unable to find hudson.war
> mvn -f main/war/pom.xml hudson-dev:run
> does not load the Maven plugin. Intentional or bug?
This is a bug.
> mvn -f main/maven-plugin/pom.xml hpi:run
> also doesn't seem to work:
There must be some directory sensitivity. They both work if you "cd main/war"
and run Maven without the -f option.
Investigating.
Code changed in hudson
User: : jglick
Path:
trunk/hudson/main/war/pom.xml
http://fisheye4.cenqua.com/changelog/hudson/?cs=16740
Log:
JENKINS-3251 'mvn -f main/war/pom.xml' failed to load maven-plugin due to CWD issue.
Code changed in hudson
User: : kohsuke
Path:
trunk/hudson/main/maven-plugin/src/main/java/hudson/maven/MavenComputerListener.java
http://fisheye4.cenqua.com/changelog/hudson/?cs=16748
Log:
With JENKINS-3251, maven-agent and maven-interceptor are no longer available on WEB-INF/lib, so let's create the jar file on the fly.
Code changed in hudson
User: : kohsuke
Path:
trunk/hudson/plugins/accurev/pom.xml
trunk/hudson/plugins/batch-task/src/main/java/hudson/plugins/batch_task/BatchTaskInvoker.java
trunk/hudson/plugins/build-publisher/pom.xml
trunk/hudson/plugins/checkstyle/pom.xml
trunk/hudson/plugins/ci-game/pom.xml
trunk/hudson/plugins/cobertura/pom.xml
trunk/hudson/plugins/dry/pom.xml
trunk/hudson/plugins/findbugs/pom.xml
trunk/hudson/plugins/groovy/pom.xml
trunk/hudson/plugins/ircbot/pom.xml
trunk/hudson/plugins/javancss/pom.xml
trunk/hudson/plugins/jira/pom.xml
trunk/hudson/plugins/nunit/pom.xml
trunk/hudson/plugins/pmd/pom.xml
trunk/hudson/plugins/pom.xml
trunk/hudson/plugins/promoted-builds/pom.xml
trunk/hudson/plugins/sfee/pom.xml
trunk/hudson/plugins/tasks/pom.xml
trunk/hudson/plugins/violations/pom.xml
trunk/hudson/plugins/warnings/pom.xml
http://fisheye4.cenqua.com/changelog/hudson/?cs=16752
Log:
applied patch (14/18) from JENKINS-3251
Code changed in hudson
User: : kohsuke
Path:
trunk/hudson/plugins/accurev/pom.xml
trunk/hudson/plugins/build-publisher/pom.xml
trunk/hudson/plugins/checkstyle/pom.xml
trunk/hudson/plugins/ci-game/pom.xml
trunk/hudson/plugins/cobertura/pom.xml
trunk/hudson/plugins/dry/pom.xml
trunk/hudson/plugins/findbugs/pom.xml
trunk/hudson/plugins/groovy/pom.xml
trunk/hudson/plugins/ircbot/pom.xml
trunk/hudson/plugins/javancss/pom.xml
trunk/hudson/plugins/jira/pom.xml
trunk/hudson/plugins/nunit/pom.xml
trunk/hudson/plugins/pmd/pom.xml
trunk/hudson/plugins/promoted-builds/pom.xml
trunk/hudson/plugins/sfee/pom.xml
trunk/hudson/plugins/tasks/pom.xml
trunk/hudson/plugins/violations/pom.xml
trunk/hudson/plugins/warnings/pom.xml
http://fisheye4.cenqua.com/changelog/hudson/?cs=16903
Log:
[FIXED JENKINS-3442] Applied patch (14/18) from JENKINS-3251 to fix compilation problems
Am I right in the assumption that the changes for this issue are responsible
for the problem described in issue 3473 ?
OK, merging is now complete, and from what I can tell, all the tests pass.
TODOs:
-> done with MavenModuleSet but still needs to be done for MavenModule.