Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into JENKINS-14393
Browse files Browse the repository at this point in the history
  • Loading branch information
Kyle Allan committed Jul 17, 2012
2 parents 14cbdad + 76ac10d commit 9074399
Show file tree
Hide file tree
Showing 14 changed files with 46 additions and 34 deletions.
14 changes: 8 additions & 6 deletions changelog.html
View file
Expand Up @@ -54,6 +54,14 @@

<!-- Record your changes in the trunk here. -->
<div id="trunk" style="display:none"><!--=TRUNK-BEGIN=-->
<ul class=image>
<li class=>
</ul>
</div><!--=TRUNK-END=-->

<!-- these changes are controlled by the release process. DO NOT MODIFY -->
<div id="rc" style="display:none;"><!--=BEGIN=-->
<h3><a name=v1.475>What's new in 1.475</a> <!--=DATE=--></h3>
<ul class=image>
<li class=bug>
Enable/disable GUI for jobs either did not appear, or threw exceptions, for jobs inside folders
Expand All @@ -65,12 +73,6 @@
Incorrect display of list items in project changes for SCMs such as Mercurial.
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-14365">issue 14365</a>)
</ul>
</div><!--=TRUNK-END=-->

<!-- these changes are controlled by the release process. DO NOT MODIFY -->
<div id="rc" style="display:none;"><!--=BEGIN=-->
<h3><a name=v1.475>What's new in 1.475</a> <!--=DATE=--></h3>
<!--=RC-CHANGES=-->
</div><!--=END=-->
<h3><a name=v1.474>What's new in 1.474</a> (2012/07/09)</h3>
<ul class=image>
Expand Down
2 changes: 1 addition & 1 deletion cli/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>pom</artifactId>
<groupId>org.jenkins-ci.main</groupId>
<version>1.475-SNAPSHOT</version>
<version>1.476-SNAPSHOT</version>
</parent>

<artifactId>cli</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion core/pom.xml
View file
Expand Up @@ -29,7 +29,7 @@ THE SOFTWARE.
<parent>
<groupId>org.jenkins-ci.main</groupId>
<artifactId>pom</artifactId>
<version>1.475-SNAPSHOT</version>
<version>1.476-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/hudson/Extension.java
View file
Expand Up @@ -62,7 +62,7 @@
*
* @author Kohsuke Kawaguchi
* @since 1.286
* @see <a href="https://sezpoz.dev.java.net/nonav/">SezPoz</a>
* @see <a href="http://sezpoz.java.net/">SezPoz</a>
* @see ExtensionFinder
* @see ExtensionList
*/
Expand Down
6 changes: 3 additions & 3 deletions core/src/main/java/hudson/Launcher.java
View file
Expand Up @@ -319,9 +319,9 @@ public ProcStarter readStderr() {
}

/**
* Indicates that the caller will directly write to the child process {@code stin} }via
* {@link Proc#getStdin()} (whereas by default you call {@link #stdin(InputStream)}
* and let Jenkins pump your {@link InputStream} of choosing to stdin.
* Indicates that the caller will directly write to the child process {@link #stdin()} via {@link Proc#getStdin()}.
* (Whereas by default you call {@link #stdin(InputStream)}
* and let Jenkins pump your {@link InputStream} of choosing to stdin.)
* @since 1.399
*/
public ProcStarter writeStdin() {
Expand Down
5 changes: 2 additions & 3 deletions core/src/main/java/hudson/model/AbstractBuild.java
View file
Expand Up @@ -359,9 +359,8 @@ public boolean hasParticipant(User user) {
try{
if (e.getAuthor()==user)
return true;
} catch (RuntimeException re) {
// no-op, just remove exception thrown e.g. from git plugin.
// It there's some problem to determine committer, user probably doesn't participate in the build.
} catch (RuntimeException re) {
LOGGER.log(Level.INFO, "Failed to determine author of changelog " + e.getCommitId() + "for " + getParent().getDisplayName() + ", " + getDisplayName(), re);
}
return false;
}
Expand Down
19 changes: 11 additions & 8 deletions core/src/main/java/hudson/model/RunMap.java
View file
Expand Up @@ -24,20 +24,20 @@
package hudson.model;

import com.google.common.collect.Maps;

import java.io.File;
import java.io.FilenameFilter;
import java.io.IOException;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.AbstractMap;
import java.util.Collections;
import java.util.Comparator;
import java.util.Map;
import java.util.Set;
import java.util.SortedMap;
import java.util.TreeMap;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.text.SimpleDateFormat;
import java.text.ParseException;

/**
* {@link Map} from build number to {@link Run}.
Expand Down Expand Up @@ -245,18 +245,21 @@ private boolean isCorrectDate(String name) {
// if the build result file isn't in the directory, ignore it.
try {
R b = cons.create(d);
builds.put( b.getNumber(), b );
R existing = builds.put(b.getNumber(), b);
if (existing != null) {
LOGGER.log(Level.WARNING, "multiple runs claiming to be #{0}; using run from {1}", new Object[] {b.getNumber(), d});
}
} catch (IOException e) {
e.printStackTrace();
LOGGER.log(Level.WARNING, "could not load " + d, e);
} catch (InstantiationError e) {
e.printStackTrace();
LOGGER.log(Level.WARNING, "could not load " + d, e);
}
}
}

// overlay what's currently building on top of what's loaded
builds.putAll(building);
if (false) {
/*
// we probably aren't saving every little changes during the build to disk,
// so it's risky to reload these from disk.
for (R b : building.values()) {
Expand All @@ -268,7 +271,7 @@ private boolean isCorrectDate(String name) {
e.printStackTrace();
}
}
}
*/

reset(builds);

Expand Down
2 changes: 1 addition & 1 deletion maven-plugin/pom.xml
View file
Expand Up @@ -29,7 +29,7 @@ THE SOFTWARE.
<parent>
<groupId>org.jenkins-ci.main</groupId>
<artifactId>pom</artifactId>
<version>1.475-SNAPSHOT</version>
<version>1.476-SNAPSHOT</version>
</parent>

<artifactId>maven-plugin</artifactId>
Expand Down
8 changes: 8 additions & 0 deletions maven-plugin/src/main/java/hudson/maven/reporters/MavenArtifactRecord.java
View file
Expand Up @@ -42,6 +42,8 @@
import org.apache.maven.artifact.installer.ArtifactInstallationException;
import org.apache.maven.artifact.installer.ArtifactInstaller;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.metadata.GroupRepositoryMetadata;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.apache.maven.project.artifact.ProjectArtifactMetadata;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.kohsuke.stapler.export.Exported;
Expand Down Expand Up @@ -172,6 +174,12 @@ public void deploy(MavenEmbedder embedder, ArtifactRepository deploymentReposito
if (!isPOM())
main.addMetadata(new ProjectArtifactMetadata(main, pomArtifact.getFile(parent)));

if (main.getType().equals("maven-plugin")) {
GroupRepositoryMetadata metadata = new GroupRepositoryMetadata(main.getGroupId());
String goalPrefix = PluginDescriptor.getGoalPrefixFromArtifactId(main.getArtifactId());
metadata.addPluginMapping(goalPrefix, main.getArtifactId(), null);
main.addMetadata(metadata);
}

ArtifactDeployer deployer = embedder.lookup(ArtifactDeployer.class, uniqueVersion ? "default" : "maven2");
logger.println(
Expand Down
12 changes: 6 additions & 6 deletions plugins/pom.xml
View file
Expand Up @@ -10,7 +10,7 @@
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<name>Jenkins plugin POM</name>
<version>1.475-SNAPSHOT</version>
<version>1.476-SNAPSHOT</version>
<packaging>pom</packaging>

<!--
Expand All @@ -33,7 +33,7 @@
<dependency><!-- if a plugin wants to depend on the maven plugin, choose the right version automatically -->
<groupId>org.jenkins-ci.main</groupId>
<artifactId>maven-plugin</artifactId>
<version>1.475-SNAPSHOT</version>
<version>1.476-SNAPSHOT</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand All @@ -43,25 +43,25 @@
<groupId>org.jenkins-ci.main</groupId>
<artifactId>jenkins-war</artifactId>
<type>war</type>
<version>1.475-SNAPSHOT</version>
<version>1.476-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.main</groupId>
<artifactId>jenkins-core</artifactId>
<version>1.475-SNAPSHOT</version>
<version>1.476-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.main</groupId>
<artifactId>jenkins-test-harness</artifactId>
<version>1.475-SNAPSHOT</version>
<version>1.476-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.main</groupId>
<artifactId>ui-samples-plugin</artifactId>
<version>1.475-SNAPSHOT</version>
<version>1.476-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Expand Up @@ -33,7 +33,7 @@ THE SOFTWARE.

<groupId>org.jenkins-ci.main</groupId>
<artifactId>pom</artifactId>
<version>1.475-SNAPSHOT</version>
<version>1.476-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Jenkins main module</name>
Expand Down
2 changes: 1 addition & 1 deletion test/pom.xml
View file
Expand Up @@ -29,7 +29,7 @@ THE SOFTWARE.
<parent>
<artifactId>pom</artifactId>
<groupId>org.jenkins-ci.main</groupId>
<version>1.475-SNAPSHOT</version>
<version>1.476-SNAPSHOT</version>
</parent>
<groupId>org.jenkins-ci.main</groupId>
<artifactId>jenkins-test-harness</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion ui-samples-plugin/pom.xml
View file
Expand Up @@ -29,7 +29,7 @@ THE SOFTWARE.
<parent>
<groupId>org.jenkins-ci.main</groupId>
<artifactId>pom</artifactId>
<version>1.475-SNAPSHOT</version>
<version>1.476-SNAPSHOT</version>
</parent>

<artifactId>ui-samples-plugin</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion war/pom.xml
View file
Expand Up @@ -28,7 +28,7 @@ THE SOFTWARE.
<parent>
<groupId>org.jenkins-ci.main</groupId>
<artifactId>pom</artifactId>
<version>1.475-SNAPSHOT</version>
<version>1.476-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down

0 comments on commit 9074399

Please sign in to comment.