Skip to content
Permalink
Browse files
[JENKINS-20951] [JENKINS-18410] Did not make it into 1.544 due to val…
…idated merge holdups (mostly randomly failing tests, sigh).

(cherry picked from commit 2a2a7eb)

Conflicts:
	changelog.html
  • Loading branch information
jglick authored and olivergondza committed Jan 9, 2014
1 parent fb0c7db commit 412befcb57d520bb1a5a737329785405c8f2c828
@@ -68,7 +68,7 @@ public TestResultAction(AbstractBuild owner, TestResult result, BuildListener li
setResult(result, listener);
}

/** @since 1.544 */
/** @since 1.545 */
public TestResultAction(TestResult result, BuildListener listener) {
this(null, result, listener);
}
@@ -67,7 +67,7 @@

private Map<String,String> descriptions = new ConcurrentHashMap<String, String>();

/** @since 1.544 */
/** @since 1.545 */
protected AbstractTestResultAction() {}

/** @deprecated Use the default constructor and just call {@link Run#addAction} to associate the build with the action. */
@@ -72,7 +72,7 @@ public AggregatedTestResultAction(AbstractBuild owner) {
super(owner);
}

/** @since 1.544 */
/** @since 1.545 */
public AggregatedTestResultAction() {}

protected void update(List<? extends AbstractTestResultAction> children) {
@@ -44,7 +44,7 @@ public MatrixTestResult(MatrixBuild owner) {
super(owner);
}

/** @since 1.544 */
/** @since 1.545 */
public MatrixTestResult() {}

/**
@@ -40,7 +40,7 @@ protected TrivialTestResultAction(AbstractBuild owner, TrivialTestResult result)
this.result.setParentAction(this);
}

/** @since 1.544 */
/** @since 1.545 */
protected TrivialTestResultAction(TrivialTestResult result) {
this(null, result);
}

3 comments on commit 412befc

@jglick

This comment has been minimized.

Copy link
Member Author

@jglick jglick replied Jan 10, 2014

Backporting this as is makes little sense; should adjust @since or restrict external use.

@olivergondza

This comment has been minimized.

Copy link
Member

@olivergondza olivergondza replied Jan 12, 2014

Seems it is not possible to restrict use of constructors (at least for annotation-indexer:1.4):

[ERROR] Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.0:compile (default-compile) on project jenkins-core: Fatal error compiling: java.lang.AssertionError: CONSTRUCTOR -> [Help 1]
org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.0:compile (default-compile) on project jenkins-core: Fatal error compiling
    at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:216)
    at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:153)
    at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:145)
    at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:84)
    at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:59)
    at org.apache.maven.lifecycle.internal.LifecycleStarter.singleThreadedBuild(LifecycleStarter.java:183)
    at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:161)
    at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:317)
    at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:152)
    at org.apache.maven.cli.MavenCli.execute(MavenCli.java:555)
    at org.apache.maven.cli.MavenCli.doMain(MavenCli.java:214)
    at org.apache.maven.cli.MavenCli.main(MavenCli.java:158)
    at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
    at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
    at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
    at java.lang.reflect.Method.invoke(Method.java:606)
    at org.codehaus.plexus.classworlds.launcher.Launcher.launchEnhanced(Launcher.java:289)
    at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:229)
    at org.codehaus.plexus.classworlds.launcher.Launcher.mainWithExitCode(Launcher.java:415)
    at org.codehaus.plexus.classworlds.launcher.Launcher.main(Launcher.java:356)
Caused by: org.apache.maven.plugin.MojoExecutionException: Fatal error compiling
    at org.apache.maven.plugin.compiler.AbstractCompilerMojo.execute(AbstractCompilerMojo.java:695)
    at org.apache.maven.plugin.compiler.CompilerMojo.execute(CompilerMojo.java:118)
    at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:106)
    at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:208)
    ... 19 more
Caused by: org.codehaus.plexus.compiler.CompilerException: java.lang.AssertionError: CONSTRUCTOR
    at org.codehaus.plexus.compiler.javac.JavaxToolsCompiler.compileInProcess(JavaxToolsCompiler.java:191)
    at org.codehaus.plexus.compiler.javac.JavacCompiler.performCompile(JavacCompiler.java:170)
    at org.apache.maven.plugin.compiler.AbstractCompilerMojo.execute(AbstractCompilerMojo.java:684)
    ... 22 more
Caused by: java.lang.RuntimeException: java.lang.AssertionError: CONSTRUCTOR
    at com.sun.tools.javac.main.Main.compile(Main.java:469)
    at com.sun.tools.javac.api.JavacTaskImpl.call(JavacTaskImpl.java:132)
    at org.codehaus.plexus.compiler.javac.JavaxToolsCompiler.compileInProcess(JavaxToolsCompiler.java:126)
    ... 24 more
Caused by: java.lang.AssertionError: CONSTRUCTOR
    at org.jvnet.hudson.annotation_indexer.AnnotationProcessorImpl$Use.add(AnnotationProcessorImpl.java:85)
    at org.jvnet.hudson.annotation_indexer.AnnotationProcessorImpl.scan(AnnotationProcessorImpl.java:184)
    at org.jvnet.hudson.annotation_indexer.AnnotationProcessorImpl.process(AnnotationProcessorImpl.java:146)
    at com.sun.tools.javac.processing.JavacProcessingEnvironment.callProcessor(JavacProcessingEnvironment.java:793)
    at com.sun.tools.javac.processing.JavacProcessingEnvironment.discoverAndRunProcs(JavacProcessingEnvironment.java:722)
    at com.sun.tools.javac.processing.JavacProcessingEnvironment.access$1700(JavacProcessingEnvironment.java:97)
    at com.sun.tools.javac.processing.JavacProcessingEnvironment$Round.run(JavacProcessingEnvironment.java:1029)
    at com.sun.tools.javac.processing.JavacProcessingEnvironment.doProcessing(JavacProcessingEnvironment.java:1163)
    at com.sun.tools.javac.main.JavaCompiler.processAnnotations(JavaCompiler.java:1108)
    at com.sun.tools.javac.main.JavaCompiler.compile(JavaCompiler.java:824)
    at com.sun.tools.javac.main.Main.compile(Main.java:439)
    ... 26 more
@jglick

This comment has been minimized.

Copy link
Member Author

@jglick jglick replied Jan 13, 2014

Fixing in f9aaeee (submitted to validated merge).

Please sign in to comment.