Branch: refs/heads/stable
Home: https://github.com/jenkinsci/jenkins
Commit: e0973026dc03df7fabc5d61dfd28709945d9ee06
https://github.com/jenkinsci/jenkins/commit/e0973026dc03df7fabc5d61dfd28709945d9ee06
Author: Jesse Glick <[email protected]>
Date: 2013-09-19 (Thu, 19 Sep 2013)
Changed paths:
M core/src/main/java/hudson/WebAppMain.java
Log Message:
-----------
[JENKINS-16952] contextDestroyed needs to be changed to match.
(cherry picked from commit e66a94868a8135490673dd4d0e3464000ca11319)
Commit: 63001918f5e2f48222d6747eab70f24eeed0f4e7
https://github.com/jenkinsci/jenkins/commit/63001918f5e2f48222d6747eab70f24eeed0f4e7
Author: Jesse Glick <[email protected]>
Date: 2013-09-19 (Thu, 19 Sep 2013)
Changed paths:
M core/src/main/java/hudson/slaves/SlaveComputer.java
Log Message:
-----------
[JENKINS-16952] [JENKINS-18274] Slave computers should record all log
messages at INFO+, not just those in the hudson.* namespace.
(cherry picked from commit 0ca88a6ceae605e7d2e126a328a196c046a91a12)
Commit: ee888cae3a483017ac3d37f2e4660c876b7e516e
https://github.com/jenkinsci/jenkins/commit/ee888cae3a483017ac3d37f2e4660c876b7e516e
Author: Stefan Wolf <[email protected]>
Date: 2013-09-19 (Thu, 19 Sep 2013)
Changed paths:
M core/src/main/resources/hudson/model/AbstractProject/main.jelly
A
test/src/test/java/hudson/tasks/test/AggregatedTestResultPublisherTest.java
A test/src/test/java/hudson/tasks/test/helper/AbstractPage.java
A test/src/test/java/hudson/tasks/test/helper/AbstractTestResultLink.java
A test/src/test/java/hudson/tasks/test/helper/BuildPage.java
A test/src/test/java/hudson/tasks/test/helper/LatestTestResultLink.java
A test/src/test/java/hudson/tasks/test/helper/ProjectPage.java
A test/src/test/java/hudson/tasks/test/helper/TestResultLink.java
A test/src/test/java/hudson/tasks/test/helper/TestResultsPage.java
A
test/src/test/resources/hudson/tasks/test/AggregatedTestResultPublisherTest.zip
Log Message:
-----------
[FIXED JENKINS-9637] Fixed the 404 when clicking the testResult on the
Project Page when there is only an aggregated test result for a freestyle job.
The name of the link is still wrong.
(cherry picked from commit 629be4ab30d0d046d6839c07ba5de1b31d8e1feb)
Conflicts:
core/src/main/resources/hudson/model/AbstractProject/main.jelly
Commit: 410d1b9e77e07648e81862e31e3ca2db0115520c
https://github.com/jenkinsci/jenkins/commit/410d1b9e77e07648e81862e31e3ca2db0115520c
Author: Stefan Wolf <[email protected]>
Date: 2013-09-19 (Thu, 19 Sep 2013)
Changed paths:
M test/src/test/java/hudson/tasks/test/helper/AbstractTestResultLink.java
Log Message:
-----------
[FIXED JENKINS-9637] Fixed the 404 when clicking the testResult on the
Project Page when there is only an aggregated test result for a freestyle job.
The name of the link is still wrong.
(cherry picked from commit 58e8bd7a2eebe7e283386817ac67ff977b2b8e62)
Commit: fb31f6d8dc77cc9d27d7451e13f8c8d328ecb538
https://github.com/jenkinsci/jenkins/commit/fb31f6d8dc77cc9d27d7451e13f8c8d328ecb538
Author: Kohsuke Kawaguchi <[email protected]>
Date: 2013-09-19 (Thu, 19 Sep 2013)
Changed paths:
M test/src/main/java/org/jvnet/hudson/test/TestExtensionLoader.java
Log Message:
-----------
[JENKINS-18776] Groovy compiler doesn't seem to put the enclosing class
information in the class file.
(cherry picked from commit eec271d76dccfffb5aedb96025cea9b01e159b3c)
Commit: 3d30b3a44134c8ff3d0a7005541c6fa1faa68a18
https://github.com/jenkinsci/jenkins/commit/3d30b3a44134c8ff3d0a7005541c6fa1faa68a18
Author: Kohsuke Kawaguchi <[email protected]>
Date: 2013-09-19 (Thu, 19 Sep 2013)
Changed paths:
M test/pom.xml
Log Message:
-----------
[JENKINS-18776] Fixing a test failure in RelativePathTest
It turns out that Groovy compiler we use to compile src/test/groovy was
not properly generating the 'enclosing class' information inside
*.class, which was causing the load failure of the descriptors marked
by @TestExtension in test code.
To fix this and forestall other possible GMaven related issues, I
decided to bump up the GMaven version. As it turns out, Codehaus GMaven
had ceased the development of the 1.x branch, so I initially tried 2.x
release line.
The 2.x release line got rid of the stub generation functionality, which
we badly need for annotation processing. It instead recommend using
Eclipse compiler to jointly compile Java and Groovy source code
together, but when I tried to compile our tests, it failed to properly
handle nested classes. The compiler quality appears quite premature.
I was then going back to GMaven 1.5, the last 1.x release. I took this
opportunity to rebase my local patches in org.kohsuke.gmaven to the
latest release, which in my mind gets justified now that the upstream
has ceased the development.
My local patch to GMaven is captured in GMAVEN-3 and GMAVEN-4
(see http://jira.codehaus.org/browse/GMAVEN-3 and
http://jira.codehaus.org/browse/GMAVEN-4).
GMAVEN-4 is claimed to be fixed, but when I tried to compile our source
tree I discovered that its handling of nested types breaks the generated
stub code.
In the end, I managed to patch gmaven and posted 1.5-jenkins-1.
The bottom line is, we can now use @TestExtension correctly with Groovy
tests. Also on the upside, we can get rid of org.kohsuke.gmaven and
avoid the current confusion situation of using two GMaven plugins.
I'll make a follow-up change to remove org.kohsuke.gmaven from elsewhere
in our POM.
(cherry picked from commit bd256acda96f1df5bdf55b533545110acb65112d)
Conflicts:
test/pom.xml
Commit: 3559a52e2dc751bcd9fc3b335c17efc9c1b54f2b
https://github.com/jenkinsci/jenkins/commit/3559a52e2dc751bcd9fc3b335c17efc9c1b54f2b
Author: Kohsuke Kawaguchi <[email protected]>
Date: 2013-09-19 (Thu, 19 Sep 2013)
Changed paths:
M test/src/main/java/org/jvnet/hudson/test/TestExtensionLoader.java
Log Message:
-----------
[JENKINS-18776] This work around no longer necessary,
... as the newer Groovy compiler produces the proper enclosing class
infromation.
(cherry picked from commit 92c2503b1a17826681d66bd277b8f24b56cce7ba)
Commit: 998dc0d27cca1ed3183508cd807fc35d76d119bc
https://github.com/jenkinsci/jenkins/commit/998dc0d27cca1ed3183508cd807fc35d76d119bc
Author: Kohsuke Kawaguchi <[email protected]>
Date: 2013-09-19 (Thu, 19 Sep 2013)
Changed paths:
M core/pom.xml
A core/src/test/groovy/hudson/util/SecretRewriterTest.groovy
A core/src/test/groovy/hudson/util/SecretTest.groovy
A core/src/test/groovy/jenkins/security/CryptoConfidentialKeyTest.groovy
A core/src/test/groovy/jenkins/security/DefaultConfidentialStoreTest.groovy
A core/src/test/groovy/jenkins/security/HMACConfidentialKeyTest.groovy
A core/src/test/groovy/jenkins/security/HexStringConfidentialKeyTest.groovy
R core/src/test/java/hudson/util/SecretRewriterTest.groovy
R core/src/test/java/hudson/util/SecretTest.groovy
R core/src/test/java/jenkins/security/CryptoConfidentialKeyTest.groovy
R core/src/test/java/jenkins/security/DefaultConfidentialStoreTest.groovy
R core/src/test/java/jenkins/security/HMACConfidentialKeyTest.groovy
R core/src/test/java/jenkins/security/HexStringConfidentialKeyTest.groovy
M pom.xml
M test/pom.xml
Log Message:
-----------
[JENKINS-18776] Replacing org.kohsuke.gmaven by org.codehaus.gmaven
(cherry picked from commit bf809867342cccb0906ccefec047f7f1e6ac883a)
Conflicts:
core/pom.xml
Commit: 9335c4446faf73a7c58d8189874e1dd2fccf5b5e
https://github.com/jenkinsci/jenkins/commit/9335c4446faf73a7c58d8189874e1dd2fccf5b5e
Author: Oliver Gondža <[email protected]>
Date: 2013-09-19 (Thu, 19 Sep 2013)
Changed paths:
M test/pom.xml
A test/src/test/groovy/hudson/RelativePathTest.groovy
A test/src/test/resources/hudson/RelativePathTest/Model/config.groovy
A test/src/test/resources/hudson/RelativePathTest/index.groovy
Log Message:
-----------
[FIXED JENKINS-18776]
This reverts commit c9eb236d7a09c3a638e2ee4f84879da76c75abab.
Commit: b1267334b97c011f682e6d9b9130757bd8ca1c55
https://github.com/jenkinsci/jenkins/commit/b1267334b97c011f682e6d9b9130757bd8ca1c55
Author: Kohsuke Kawaguchi <[email protected]>
Date: 2013-09-19 (Thu, 19 Sep 2013)
Changed paths:
M core/pom.xml
M core/src/main/java/hudson/ExtensionListView.java
M core/src/main/java/hudson/model/Fingerprint.java
M core/src/main/java/hudson/util/CopyOnWriteList.java
M core/src/main/java/hudson/util/PersistedList.java
Log Message:
-----------
PersistedList now implements List, not just Iterable.
This required bridge method injector that maps boolean->void
(cherry picked from commit 570197fc937a8eb568920ffd04b1195994180fce)
Commit: a31e6b90defee0f5a446511444b08701de9d60a8
https://github.com/jenkinsci/jenkins/commit/a31e6b90defee0f5a446511444b08701de9d60a8
Author: Kohsuke Kawaguchi <[email protected]>
Date: 2013-09-19 (Thu, 19 Sep 2013)
Changed paths:
M core/pom.xml
Log Message:
-----------
forgot to update this as well
(cherry picked from commit 48be96865fcdfc5816b79ca4e1ab9fd2b4274171)
Compare:
https://github.com/jenkinsci/jenkins/compare/4089c79a68cf...a31e6b90defe
--
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 [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
