diff --git a/cli/pom.xml b/cli/pom.xml index d1b6aaa8e2..440f7a189b 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -4,7 +4,7 @@ pom org.jvnet.hudson.main - 1.305-SNAPSHOT + 1.307-SNAPSHOT cli Hudson CLI diff --git a/core/pom.xml b/core/pom.xml index 7c8c9a88a6..c5a04ec5d1 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.305-SNAPSHOT + 1.307-SNAPSHOT ../pom.xml diff --git a/core/src/main/java/hudson/model/DownloadService.java b/core/src/main/java/hudson/model/DownloadService.java index 5aa247ab9e..a67f914344 100644 --- a/core/src/main/java/hudson/model/DownloadService.java +++ b/core/src/main/java/hudson/model/DownloadService.java @@ -66,6 +66,15 @@ public class DownloadService extends PageDecorator { return null; } + /** + * Represents a periodically updated JSON data file obtained from a remote URL. + * + *

+ * This meachanism is one of the basis of the update center, which involves in fetching + * up-to-date data file. + * + * @since 1.305 + */ public static abstract class Downloadable implements ExtensionPoint { private final String id; private final String url; diff --git a/core/src/main/java/hudson/security/SecurityRealm.java b/core/src/main/java/hudson/security/SecurityRealm.java index b9c70f7452..d6326d89a3 100644 --- a/core/src/main/java/hudson/security/SecurityRealm.java +++ b/core/src/main/java/hudson/security/SecurityRealm.java @@ -167,6 +167,14 @@ public abstract class SecurityRealm implements Describable, Exten return "login"; } + /** + * Returns true if this {@link SecurityRealm} supports an logout operation. + * @since 1.307 + */ + public boolean canLogOut() { + return true; + } + /** * Returns true if this {@link SecurityRealm} allows online sign-up. * This creates a hyperlink that redirects users to CONTEXT_ROOT/signUp, diff --git a/core/src/main/java/hudson/tools/ZipExtractionInstaller.java b/core/src/main/java/hudson/tools/ZipExtractionInstaller.java index 98adafb6d4..5ed65c0b83 100644 --- a/core/src/main/java/hudson/tools/ZipExtractionInstaller.java +++ b/core/src/main/java/hudson/tools/ZipExtractionInstaller.java @@ -28,10 +28,14 @@ import hudson.Extension; import hudson.FilePath; import hudson.FilePath.FileCallable; import hudson.Util; +import hudson.Functions; import hudson.model.Node; import hudson.model.TaskListener; +import hudson.model.Hudson; import hudson.remoting.VirtualChannel; import hudson.util.FormValidation; +import hudson.util.jna.GNUCLibrary; + import java.io.File; import java.io.IOException; import java.net.HttpURLConnection; @@ -40,6 +44,7 @@ import java.net.URL; import java.net.URLConnection; import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.stapler.QueryParameter; +import org.jvnet.animal_sniffer.IgnoreJRERequirement; /** * Installs a tool into the Hudson working area by downloading and unpacking a ZIP file. @@ -117,12 +122,17 @@ public class ZipExtractionInstaller extends ToolInstaller { private static class ChmodRecAPlusX implements FileCallable { private static final long serialVersionUID = 1L; public Void invoke(File d, VirtualChannel channel) throws IOException { - process(d); + if(!Hudson.isWindows()) + process(d); return null; } + @IgnoreJRERequirement private void process(File f) { if (f.isFile()) { - f.setExecutable(true, false); // XXX JDK 6-specific, use FilePath.chmod instead + if(Functions.isMustangOrAbove()) + f.setExecutable(true, false); + else + GNUCLibrary.LIBC.chmod(f.getAbsolutePath(),0755); } else { File[] kids = f.listFiles(); if (kids != null) { diff --git a/core/src/main/resources/lib/layout/layout.jelly b/core/src/main/resources/lib/layout/layout.jelly index 9d332b23a3..fd7a769225 100644 --- a/core/src/main/resources/lib/layout/layout.jelly +++ b/core/src/main/resources/lib/layout/layout.jelly @@ -155,8 +155,10 @@ THE SOFTWARE. ${app.authentication.name} - | - ${%logout} + + | + ${%logout} + diff --git a/debian/changelog b/debian/changelog index f603d7651c..b580fd98ff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +hudson (1.306) unstable; urgency=low + + * See http://hudson.dev.java.net/changelog.html for more details. + + -- Kohsuke Kawaguchi Sat, 16 May 2009 12:53:45 -0700 + +hudson (1.305) unstable; urgency=low + + * See http://hudson.dev.java.net/changelog.html for more details. + + -- Kohsuke Kawaguchi Sat, 16 May 2009 08:22:53 -0700 + hudson (1.304) unstable; urgency=low * See http://hudson.dev.java.net/changelog.html for more details. diff --git a/maven-agent/pom.xml b/maven-agent/pom.xml index 2b37facda6..a7d82dc426 100644 --- a/maven-agent/pom.xml +++ b/maven-agent/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.305-SNAPSHOT + 1.307-SNAPSHOT ../pom.xml diff --git a/maven-interceptor/pom.xml b/maven-interceptor/pom.xml index 1e937abe76..8621f7111f 100644 --- a/maven-interceptor/pom.xml +++ b/maven-interceptor/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.305-SNAPSHOT + 1.307-SNAPSHOT ../pom.xml diff --git a/maven-interceptor/src/main/resources/META-INF/plexus/components.xml.interception b/maven-interceptor/src/main/resources/META-INF/plexus/components.xml.interception new file mode 100644 index 0000000000..d240bb1afa --- /dev/null +++ b/maven-interceptor/src/main/resources/META-INF/plexus/components.xml.interception @@ -0,0 +1,2 @@ +This file marks components.xml as "interceptor only", so that +Maven embedder won't pick it up. \ No newline at end of file diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index 91886589f7..3242291026 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.305-SNAPSHOT + 1.307-SNAPSHOT maven-plugin @@ -58,7 +58,7 @@ THE SOFTWARE. org.jvnet.hudson maven2.1-interceptor - 1.0 + 1.1 org.apache.maven diff --git a/maven-plugin/src/main/java/hudson/maven/MavenComputerListener.java b/maven-plugin/src/main/java/hudson/maven/MavenComputerListener.java index 2c052f7350..33d712c3dc 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenComputerListener.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenComputerListener.java @@ -54,7 +54,7 @@ public class MavenComputerListener extends ComputerListener { PrintStream logger = listener.getLogger(); copyJar(logger, root, Main.class, "maven-agent"); copyJar(logger, root, PluginManagerInterceptor.class, "maven-interceptor"); - copyJar(logger, root, Maven21Interceptor.class, "maven2.1-interceptor.jar"); + copyJar(logger, root, Maven21Interceptor.class, "maven2.1-interceptor"); } /** diff --git a/maven-plugin/src/main/java/hudson/maven/MavenUtil.java b/maven-plugin/src/main/java/hudson/maven/MavenUtil.java index 26032892ae..6117ed6eb3 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenUtil.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenUtil.java @@ -33,6 +33,7 @@ import org.apache.maven.embedder.MavenEmbedderException; import org.apache.maven.embedder.MavenEmbedderLogger; import org.apache.maven.project.MavenProject; import org.apache.maven.project.ProjectBuildingException; +import org.apache.commons.io.IOUtils; import java.io.File; import java.io.IOException; @@ -42,6 +43,7 @@ import java.util.Enumeration; import java.util.List; import java.util.Map; import java.util.Properties; +import java.util.logging.Logger; /** * @author Kohsuke Kawaguchi @@ -49,7 +51,7 @@ import java.util.Properties; public class MavenUtil { /** * @deprecated - * Use {@link MavenInstallation#createEmbedder(BuildListener, String, Properties)} + * Use {@link #createEmbedder(TaskListener, File, String, Properties)} * or other overloaded versions that infers maven home. */ public static MavenEmbedder createEmbedder(TaskListener listener, String profiles) throws MavenEmbedderException, IOException { @@ -95,6 +97,13 @@ public class MavenUtil { if(debugMavenEmbedder) logger.setThreshold(MavenEmbedderLogger.LEVEL_DEBUG); maven.setLogger(logger); + { + Enumeration e = cl.getResources("META-INF/plexus/components.xml"); + while (e.hasMoreElements()) { + URL url = e.nextElement(); + LOGGER.fine("components.xml from "+url); + } + } // make sure ~/.m2 exists to avoid http://www.nabble.com/BUG-Report-tf3401736.html File m2Home = new File(MavenEmbedder.userHome, ".m2"); m2Home.mkdirs(); @@ -188,10 +197,26 @@ public class MavenUtil { private void fetch() { while(next==null && e.hasMoreElements()) { next = e.nextElement(); - if(next.toExternalForm().contains("maven-plugin-tools-api")) + if(shouldBeIgnored(next)) next = null; } } + + private boolean shouldBeIgnored(URL url) { + String s = url.toExternalForm(); + if(s.contains("maven-plugin-tools-api")) + return true; + if(s.endsWith("plexus/components.xml")) { + try { + // is this designated for interception purpose? If so, don't load them in the MavenEmbedder + IOUtils.closeQuietly(new URL(s + ".interception").openStream()); + return true; + } catch (IOException _) { + // no such resource exists + } + } + return false; + } }; } } @@ -200,4 +225,6 @@ public class MavenUtil { * If set to true, maximize the logging level of Maven embedder. */ public static boolean debugMavenEmbedder = false; + + private static final Logger LOGGER = Logger.getLogger(MavenUtil.class.getName()); } diff --git a/pom.xml b/pom.xml index ffb72448f1..e0d21ae041 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.305-SNAPSHOT + 1.307-SNAPSHOT pom Hudson main module diff --git a/remoting/pom.xml b/remoting/pom.xml index 9ee8ba0097..348eb52b38 100644 --- a/remoting/pom.xml +++ b/remoting/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.305-SNAPSHOT + 1.307-SNAPSHOT ../pom.xml diff --git a/test/pom.xml b/test/pom.xml index 1111d20d41..5c5fe03813 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. pom org.jvnet.hudson.main - 1.305-SNAPSHOT + 1.307-SNAPSHOT 4.0.0 org.jvnet.hudson.main diff --git a/war/pom.xml b/war/pom.xml index 0b89b0e567..7418f7f98a 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.305-SNAPSHOT + 1.307-SNAPSHOT ../pom.xml