From 7f8fe215d43b285ac5b722b44e6e2c069dd9beeb Mon Sep 17 00:00:00 2001 From: Nicolas De Loof Date: Mon, 20 Aug 2012 16:57:21 +0200 Subject: [PATCH 1/8] Fix typo : cannon != canon --- core/src/main/java/hudson/model/User.java | 15 ++++++++------- ...r.java => DefaultUserCanonicalIdResolver.java} | 12 ++++++------ 2 files changed, 14 insertions(+), 13 deletions(-) rename core/src/main/java/jenkins/model/{DefaultUserCannonicalIdResolver.java => DefaultUserCanonicalIdResolver.java} (79%) diff --git a/core/src/main/java/hudson/model/User.java b/core/src/main/java/hudson/model/User.java index 87ef372aae..bfcf97c5ad 100644 --- a/core/src/main/java/hudson/model/User.java +++ b/core/src/main/java/hudson/model/User.java @@ -314,15 +314,15 @@ public class User extends AbstractModelObject implements AccessControlled, Descr return null; // sort resolvers by priority - List resolvers = new ArrayList(Jenkins.getInstance().getExtensionList(CannonicalIdResolver.class)); + List resolvers = new ArrayList(Jenkins.getInstance().getExtensionList(CanonicalIdResolver.class)); Collections.sort(resolvers); String id = null; - for (CannonicalIdResolver resolver : resolvers) { - id = resolver.resolveCannonicalId(idOrFullName, context); + for (CanonicalIdResolver resolver : resolvers) { + id = resolver.resolveCanonicalId(idOrFullName, context); if (id != null) break; } - // DefaultUserCannonicalIdResolver will always return a non-null id if all other CannonicalIdResolver failed + // DefaultUserCanonicalIdResolver will always return a non-null id if all other CanonicalIdResolver failed String idkey = id.toLowerCase(Locale.ENGLISH); @@ -658,15 +658,16 @@ public class User extends AbstractModelObject implements AccessControlled, Descr return Collections.unmodifiableList(actions); } - public static abstract class CannonicalIdResolver extends AbstractDescribableImpl implements Comparable { + public static abstract class CanonicalIdResolver extends AbstractDescribableImpl implements Comparable { /** * context key for realm (domain) where idOrFullName has been retreived from. * Can be used (for example) to distinguish ambiguous committer ID using the SCM URL. + * Associated Value is a {@link String} */ public static final String REALM = "realm"; - public int compareTo(CannonicalIdResolver o) { + public int compareTo(CanonicalIdResolver o) { // reverse priority order int i = getPriority(); int j = o.getPriority(); @@ -677,7 +678,7 @@ public class User extends AbstractModelObject implements AccessControlled, Descr * extract user ID from idOrFullName with help from contextual infos. * can return null if no user ID matched the input */ - public abstract @Nullable String resolveCannonicalId(String idOrFullName, Map context); + public abstract @CheckForNull String resolveCanonicalId(String idOrFullName, Map context); public int getPriority() { return 1; diff --git a/core/src/main/java/jenkins/model/DefaultUserCannonicalIdResolver.java b/core/src/main/java/jenkins/model/DefaultUserCanonicalIdResolver.java similarity index 79% rename from core/src/main/java/jenkins/model/DefaultUserCannonicalIdResolver.java rename to core/src/main/java/jenkins/model/DefaultUserCanonicalIdResolver.java index 3d722ecb9c..06b07dad22 100644 --- a/core/src/main/java/jenkins/model/DefaultUserCannonicalIdResolver.java +++ b/core/src/main/java/jenkins/model/DefaultUserCanonicalIdResolver.java @@ -32,16 +32,16 @@ import hudson.model.User; import java.util.Map; /** - * Default User.CannonicalIdResolver to escape unsupported characters and generate user ID. + * Default User.CanonicalIdResolver to escape unsupported characters and generate user ID. * Compared to other implementations, this resolver will always return an ID * - * @author: Nicolas De Loof + * @author Nicolas De Loof */ @Extension -public class DefaultUserCannonicalIdResolver extends User.CannonicalIdResolver { +public class DefaultUserCanonicalIdResolver extends User.CanonicalIdResolver { @Override - public String resolveCannonicalId(String idOrFullName, Map context) { + public String resolveCanonicalId(String idOrFullName, Map context) { String id = idOrFullName.replace('\\', '_').replace('/', '_').replace('<','_') .replace('>', '_'); // 4 replace() still faster than regex if (Functions.isWindows()) id = id.replace(':','_'); @@ -54,11 +54,11 @@ public class DefaultUserCannonicalIdResolver extends User.CannonicalIdResolver { } @Override - public Descriptor getDescriptor() { + public Descriptor getDescriptor() { return DESCRIPTOR; } - public static final Descriptor DESCRIPTOR = new Descriptor() { + public static final Descriptor DESCRIPTOR = new Descriptor() { public String getDisplayName() { return "compute default user ID"; } From 26276d13875e440bf4ebd85036007d8338536805 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Wed, 29 Aug 2012 08:51:07 -0700 Subject: [PATCH 2/8] added a backward compatibility with MethodRule. Without this, I saw: FAILURE: initializationError(hudson.model.CauseTest) [INFO] java.lang.Exception: Field j must implement MethodRule [INFO] at org.junit.runners.BlockJUnit4ClassRunner.validateRuleField(BlockJUnit4ClassRunner.java:188) [INFO] at org.junit.runners.BlockJUnit4ClassRunner.validateFields(BlockJUnit4ClassRunner.java:183) [INFO] at org.junit.runners.BlockJUnit4ClassRunner.collectInitializationErrors(BlockJUnit4ClassRunner.java:123) [INFO] at org.junit.runners.ParentRunner.validate(ParentRunner.java:269) [INFO] at org.junit.runners.ParentRunner.(ParentRunner.java:66) [INFO] at org.junit.runners.BlockJUnit4ClassRunner.(BlockJUnit4ClassRunner.java:58) [INFO] at org.junit.internal.builders.JUnit4Builder.runnerForClass(JUnit4Builder.java:13) [INFO] at org.junit.runners.model.RunnerBuilder.safeRunnerForClass(RunnerBuilder.java:57) [INFO] at org.junit.internal.builders.AllDefaultPossibilitiesBuilder.runnerForClass(AllDefaultPossibilitiesBuilder.java:29) [INFO] at org.junit.runners.model.RunnerBuilder.safeRunnerForClass(RunnerBuilder.java:57) [INFO] at org.junit.internal.requests.ClassRequest.getRunner(ClassRequest.java:24) [INFO] at junit.framework.JUnit4TestAdapter.(JUnit4TestAdapter.java:31) [INFO] at junit.framework.JUnit4TestAdapter.(JUnit4TestAdapter.java:24) [INFO] at com.sun.maven.junit.LocalTestCaseRunner.buildMethodTestCase(LocalTestCaseRunner.java:121) [INFO] at com.sun.maven.junit.LocalTestCaseRunner.buildTestCase(LocalTestCaseRunner.java:83) [INFO] at com.sun.maven.junit.LocalTestCaseRunner.runTestCase(LocalTestCaseRunner.java:62) [INFO] at com.sun.maven.junit.LocalTestCaseRunner.runTestCase(LocalTestCaseRunner.java:58) [INFO] at sun.reflect.GeneratedMethodAccessor334.invoke(Unknown Source) [INFO] at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) [INFO] at java.lang.reflect.Method.invoke(Method.java:597) [INFO] at hudson.remoting.RemoteInvocationHandler$RPCRequest.perform(RemoteInvocationHandler.java:274) [INFO] at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:255) [INFO] at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:215) [INFO] at hudson.remoting.UserRequest.perform(UserRequest.java:118) [INFO] at hudson.remoting.UserRequest.perform(UserRequest.java:48) [INFO] at hudson.remoting.Request$2.run(Request.java:270) [INFO] at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:441) [INFO] at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:303) [INFO] at java.util.concurrent.FutureTask.run(FutureTask.java:138) [INFO] at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886) [INFO] at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908) [INFO] at java.lang.Thread.run(Thread.java:662) --- .../main/java/org/jvnet/hudson/test/JenkinsRule.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/test/src/main/java/org/jvnet/hudson/test/JenkinsRule.java b/test/src/main/java/org/jvnet/hudson/test/JenkinsRule.java index 230d0a3d0f..78fdb8d03b 100644 --- a/test/src/main/java/org/jvnet/hudson/test/JenkinsRule.java +++ b/test/src/main/java/org/jvnet/hudson/test/JenkinsRule.java @@ -132,9 +132,11 @@ import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.resolver.AbstractArtifactResolutionException; import org.codehaus.plexus.component.repository.exception.ComponentLookupException; import org.hamcrest.Matchers; +import org.junit.rules.MethodRule; import org.junit.rules.TemporaryFolder; import org.junit.rules.TestRule; import org.junit.runner.Description; +import org.junit.runners.model.FrameworkMethod; import org.junit.runners.model.Statement; import org.jvnet.hudson.test.recipes.Recipe; import org.jvnet.hudson.test.rhino.JavaScriptDebugger; @@ -220,7 +222,7 @@ import static org.junit.matchers.JUnitMatchers.containsString; * @author Stephen Connolly * @since 1.436 */ -public class JenkinsRule implements TestRule, RootAction { +public class JenkinsRule implements TestRule, MethodRule, RootAction { private final TestEnvironment env = new TestEnvironment(null); @@ -445,6 +447,13 @@ public class JenkinsRule implements TestRule, RootAction { } } + /** + * Backward compatibility with JUnit 4.8. + */ + public Statement apply(Statement base, FrameworkMethod method, Object target) { + return apply(base,Description.createTestDescription(method.getMethod().getDeclaringClass(), method.getName(), method.getAnnotations())); + } + public Statement apply(final Statement base, final Description description) { if (description.getAnnotation(WithoutJenkins.class) != null) { // request has been made to not create the instance for this test method From a30106bedc86a61dc54e4e405c8170c8e3ba30a1 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Wed, 29 Aug 2012 09:15:02 -0700 Subject: [PATCH 3/8] [maven-release-plugin] prepare release jenkins-1.479 --- cli/pom.xml | 2 +- core/pom.xml | 2 +- maven-plugin/pom.xml | 2 +- pom.xml | 2 +- test/pom.xml | 2 +- ui-samples-plugin/pom.xml | 2 +- war/pom.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cli/pom.xml b/cli/pom.xml index 0ac6aea6aa..1ec004265e 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -5,7 +5,7 @@ pom org.jenkins-ci.main - 1.479-SNAPSHOT + 1.479 cli diff --git a/core/pom.xml b/core/pom.xml index 6af19b96e4..cf12521d14 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -29,7 +29,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.479-SNAPSHOT + 1.479 ../pom.xml diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index 6b6aaafe2a..ae38887353 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -29,7 +29,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.479-SNAPSHOT + 1.479 maven-plugin diff --git a/pom.xml b/pom.xml index 17874e84fe..7323b9d82a 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.479-SNAPSHOT + 1.479 pom Jenkins main module diff --git a/test/pom.xml b/test/pom.xml index 266a8957fa..7a770aca80 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -29,7 +29,7 @@ THE SOFTWARE. pom org.jenkins-ci.main - 1.479-SNAPSHOT + 1.479 org.jenkins-ci.main jenkins-test-harness diff --git a/ui-samples-plugin/pom.xml b/ui-samples-plugin/pom.xml index 42f19a384c..d783e7a412 100644 --- a/ui-samples-plugin/pom.xml +++ b/ui-samples-plugin/pom.xml @@ -29,7 +29,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.479-SNAPSHOT + 1.479 ui-samples-plugin diff --git a/war/pom.xml b/war/pom.xml index 8ebcd277a4..c74520a545 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.479-SNAPSHOT + 1.479 ../pom.xml From 2424329605963696e57a97ecad63c43c63a04747 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Wed, 29 Aug 2012 09:15:02 -0700 Subject: [PATCH 4/8] [maven-release-plugin] prepare for next development iteration --- cli/pom.xml | 2 +- core/pom.xml | 2 +- maven-plugin/pom.xml | 2 +- pom.xml | 2 +- test/pom.xml | 2 +- ui-samples-plugin/pom.xml | 2 +- war/pom.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cli/pom.xml b/cli/pom.xml index 1ec004265e..69ce120efb 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -5,7 +5,7 @@ pom org.jenkins-ci.main - 1.479 + 1.480-SNAPSHOT cli diff --git a/core/pom.xml b/core/pom.xml index cf12521d14..f87ab41e23 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -29,7 +29,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.479 + 1.480-SNAPSHOT ../pom.xml diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index ae38887353..9e0caf88f9 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -29,7 +29,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.479 + 1.480-SNAPSHOT maven-plugin diff --git a/pom.xml b/pom.xml index 7323b9d82a..adeda5fa7a 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.479 + 1.480-SNAPSHOT pom Jenkins main module diff --git a/test/pom.xml b/test/pom.xml index 7a770aca80..23d97c14af 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -29,7 +29,7 @@ THE SOFTWARE. pom org.jenkins-ci.main - 1.479 + 1.480-SNAPSHOT org.jenkins-ci.main jenkins-test-harness diff --git a/ui-samples-plugin/pom.xml b/ui-samples-plugin/pom.xml index d783e7a412..e380cd5288 100644 --- a/ui-samples-plugin/pom.xml +++ b/ui-samples-plugin/pom.xml @@ -29,7 +29,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.479 + 1.480-SNAPSHOT ui-samples-plugin diff --git a/war/pom.xml b/war/pom.xml index c74520a545..8f56c640a4 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.479 + 1.480-SNAPSHOT ../pom.xml From 0d317974ec9053dd025d3e0f6996ea452708bf40 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Wed, 29 Aug 2012 09:30:16 -0700 Subject: [PATCH 5/8] updated changelog for release --- changelog.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/changelog.html b/changelog.html index 4e3abaa4b2..b357e5d132 100644 --- a/changelog.html +++ b/changelog.html @@ -61,7 +61,10 @@ Upcoming changes +

What's new in 1.479 (2012/08/29)

  • "Ping-pong" builds store excessively large CauseAction. @@ -84,7 +87,6 @@ Upcoming changes Parameter values disappear if user is not logged in (issue 7894)
-

What's new in 1.478 (2012/08/20)

  • From 58d167b449ce9cff72e21b5da2a11503ef21c8cb Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Wed, 29 Aug 2012 09:30:16 -0700 Subject: [PATCH 6/8] releasing a new plugin parent POM --- plugins/pom.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/pom.xml b/plugins/pom.xml index 30c5e54f88..af877b0ca8 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -10,7 +10,7 @@ org.jenkins-ci.plugins plugin Jenkins plugin POM - 1.479-SNAPSHOT + 1.479 pom org.jenkins-ci.main maven-plugin - 1.479-SNAPSHOT + 1.479 @@ -43,25 +43,25 @@ org.jenkins-ci.main jenkins-war war - 1.479-SNAPSHOT + 1.479 test org.jenkins-ci.main jenkins-core - 1.479-SNAPSHOT + 1.479 provided org.jenkins-ci.main jenkins-test-harness - 1.479-SNAPSHOT + 1.479 test org.jenkins-ci.main ui-samples-plugin - 1.479-SNAPSHOT + 1.479 test From ac446ee957667a83ea4686a2dc70832bb7f38742 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Wed, 29 Aug 2012 09:30:26 -0700 Subject: [PATCH 7/8] toward the next release --- plugins/pom.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/pom.xml b/plugins/pom.xml index af877b0ca8..688ea9f280 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -10,7 +10,7 @@ org.jenkins-ci.plugins plugin Jenkins plugin POM - 1.479 + 1.480-SNAPSHOT pom org.jenkins-ci.main maven-plugin - 1.479 + 1.480-SNAPSHOT @@ -43,25 +43,25 @@ org.jenkins-ci.main jenkins-war war - 1.479 + 1.480-SNAPSHOT test org.jenkins-ci.main jenkins-core - 1.479 + 1.480-SNAPSHOT provided org.jenkins-ci.main jenkins-test-harness - 1.479 + 1.480-SNAPSHOT test org.jenkins-ci.main ui-samples-plugin - 1.479 + 1.480-SNAPSHOT test From ed020eee210ea82b3afb14d3bd374f6e00ca2f25 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Wed, 29 Aug 2012 10:03:30 -0700 Subject: [PATCH 8/8] updated changelog as a part of the release --- debian/debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/debian/changelog b/debian/debian/changelog index 2ab0847d9f..98d1a58a9f 100644 --- a/debian/debian/changelog +++ b/debian/debian/changelog @@ -1,3 +1,9 @@ +jenkins (1.479) unstable; urgency=low + + * See http://jenkins-ci.org/changelog for more details. + + -- Kohsuke Kawaguchi Wed, 29 Aug 2012 09:45:34 -0700 + jenkins (1.478) unstable; urgency=low * See http://jenkins-ci.org/changelog for more details.