Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[FIXED JENKINS-22131] Merged deconstructing-AbstractProject branch from
  • Loading branch information
jglick committed Mar 14, 2014
1 parent 2b67262 commit 17c4c1f
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 5 deletions.
3 changes: 3 additions & 0 deletions changelog.html
Expand Up @@ -58,6 +58,9 @@
<li class=rfe>
Access through API token and SSH key login now fully retains group memberships.
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-20064">issue 20064</a>)
<li class=rfe>
API changes allowing more flexibility in unusual job types.
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-22131">issue 22131</a>)
<li class=rfe>
Job can be reloaded individually from disk with "job/FOO/reload" URL or "reload-job" CLI command
</ul>
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/hudson/model/ParameterValue.java
Expand Up @@ -166,7 +166,7 @@ public void buildEnvVars(AbstractBuild<?,?> build, EnvVars env) {
* never null.
* @param build
* The build for which this parameter is being used. Never null.
* @since TODO
* @since 1.556
*/
public void buildEnvironment(Run<?,?> build, EnvVars env) {
if (build instanceof AbstractBuild) {
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/java/hudson/model/Run.java
Expand Up @@ -770,7 +770,7 @@ public int getNumber() {
/**
* Called by {@link RunMap} to obtain a reference to this run.
* @see jenkins.model.lazy.LazyBuildMixIn.RunMixIn#createReference
* @since TODO
* @since 1.556
*/
protected BuildReference<RunT> createReference() {
return new BuildReference<RunT>(getId(), _this());
Expand All @@ -780,7 +780,7 @@ protected BuildReference<RunT> createReference() {
* Called by {@link RunMap} to drop bi-directional links in preparation for
* deleting a build.
* @see jenkins.model.lazy.LazyBuildMixIn.RunMixIn#dropLinks
* @since TODO
* @since 1.556
*/
protected void dropLinks() {
if(nextBuild!=null)
Expand Down
Expand Up @@ -65,7 +65,7 @@
/**
* Allows a {@link Job} to make use of {@link ParametersDefinitionProperty} and be scheduled in various ways.
* Stateless so there is no need to keep an instance of it in a field.
* @since TODO
* @since 1.556
*/
@SuppressWarnings("unchecked") // AbstractItem.getParent does not correctly override; scheduleBuild2 inherently untypable
public abstract class ParameterizedJobMixIn<JobT extends Job<JobT, RunT> & ParameterizedJobMixIn.ParameterizedJob & Queue.Task, RunT extends Run<JobT, RunT> & Queue.Executable> {
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/jenkins/model/lazy/LazyBuildMixIn.java
Expand Up @@ -51,7 +51,7 @@
* Provides method implementations for some abstract {@link Job} methods,
* as well as some methods which are not abstract but which you should override.
* <p>Should be kept in a {@code transient} field in the job.
* @since TODO
* @since 1.556
*/
@SuppressWarnings({"unchecked", "rawtypes"}) // BuildHistoryWidget, and AbstractItem.getParent
public abstract class LazyBuildMixIn<JobT extends Job<JobT,RunT> & Queue.Task & LazyBuildMixIn.LazyLoadingJob<JobT,RunT>, RunT extends Run<JobT,RunT> & LazyBuildMixIn.LazyLoadingRun<JobT,RunT>> {
Expand Down

0 comments on commit 17c4c1f

Please sign in to comment.