buildr 1.5.3-java → 1.5.4-java

data/addon/buildr/org/apache/buildr/Jetty6Wrapper.java

@@ -0,0 +1,144 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership.  The ASF
+ * licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.apache.buildr;
+
+import org.mortbay.jetty.Server;
+import org.mortbay.jetty.Request;
+import org.mortbay.jetty.Handler;
+import org.mortbay.jetty.handler.AbstractHandler;
+import org.mortbay.jetty.handler.ContextHandler;
+import org.mortbay.jetty.handler.ContextHandlerCollection;
+import org.mortbay.jetty.webapp.WebAppContext;
+import org.mortbay.jetty.webapp.WebAppClassLoader;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.ServletException;
+import java.io.IOException;
+import java.util.HashMap;
+
+/**
+ * @author Matthieu Riou <mriou at apache dot org>
+ */
+public class Jetty6Wrapper {
+
+    private Server _server;
+    private ContextHandlerCollection _handlerColl;
+
+    public Jetty6Wrapper(int port) throws Exception {
+        _server = new Server(port);
+        // Adding the buildr handler to control our server lifecycle
+        ContextHandler context = new ContextHandler();
+        context.setContextPath("/buildr");
+        Handler handler = new BuildrHandler();
+        context.setHandler(handler);
+
+        _handlerColl = new ContextHandlerCollection();
+        _handlerColl.setHandlers(new Handler[] {context});
+
+        _server.addHandler(_handlerColl);
+        _server.start();
+    }
+
+/*
+    public void join() {
+        try {
+            _server.join();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+*/
+
+    private class BuildrHandler extends AbstractHandler {
+
+        private HashMap _apps = new HashMap();
+
+        public void handle(String string, HttpServletRequest request,
+                           HttpServletResponse response, int i) throws IOException, ServletException {
+            response.setContentType("text/html");
+            if (request.getPathInfo().equals("/")) {
+                response.getWriter().println("Alive");
+                ((Request)request).setHandled(true);
+                return;
+            } else if (request.getPathInfo().equals("/deploy")) {
+                try {
+                    String webapp = request.getParameter("webapp");
+                    String path = request.getParameter("path");
+                    System.out.println("Deploying " + webapp + " in " + path);
+                    WebAppContext context;
+
+                    context = (WebAppContext) _apps.get(path);
+                    if (context != null) {
+                        context.stop();
+                        _handlerColl.removeHandler(context);
+                        _apps.remove(path);
+                    }
+
+                    context = new WebAppContext(webapp, path);
+                    context.setConfigurationClasses(new String[] {
+                        "org.mortbay.jetty.webapp.WebInfConfiguration",
+                        "org.mortbay.jetty.webapp.WebXmlConfiguration"});
+                    context.setClassLoader(new WebAppClassLoader(context));
+
+                    _handlerColl.addHandler(context);
+                    context.start();
+                    _apps.put(path, context);
+                    response.getWriter().println("Deployed");
+                    response.getWriter().println(context.getTempDirectory());
+                    ((Request)request).setHandled(true);
+                } catch (Throwable e) {
+                    e.printStackTrace();
+                    response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+                    ((Request)request).setHandled(true);
+                    return;
+                }
+            } else if (request.getPathInfo().equals("/undeploy")) {
+                try {
+                    String path = request.getParameter("path");
+                    WebAppContext context = (WebAppContext) _apps.get(path);
+                    if (context != null) {
+                        System.out.println("Undeploying app at " + path);
+                        context.stop();
+                        _handlerColl.removeHandler(context);
+                        _apps.remove(path);
+                    }
+                    response.getWriter().println("Undeployed");
+                    ((Request)request).setHandled(true);
+                } catch (Throwable e) {
+                    e.printStackTrace();
+                    response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+                    ((Request)request).setHandled(true);
+                    return;
+                }
+            } else if (request.getPathInfo().equals("/stop")) {
+                try {
+                    _server.stop();
+                    _server.destroy();
+                    // Brute force
+                    System.exit(0);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+            response.getWriter().println("OK " + request.getPathInfo());
+            ((Request)request).setHandled(true);
+        }
+
+    }
+}

data/addon/buildr/org/apache/buildr/JettyWrapper.java

@@ -17,14 +17,14 @@
 
 package org.apache.buildr;
 
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.Request;
-import org.mortbay.jetty.Handler;
-import org.mortbay.jetty.handler.AbstractHandler;
-import org.mortbay.jetty.handler.ContextHandler;
-import org.mortbay.jetty.handler.ContextHandlerCollection;
-import org.mortbay.jetty.webapp.WebAppContext;
-import org.mortbay.jetty.webapp.WebAppClassLoader;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.Handler;
+import org.eclipse.jetty.server.handler.AbstractHandler;
+import org.eclipse.jetty.server.handler.ContextHandler;
+import org.eclipse.jetty.server.handler.ContextHandlerCollection;
+import org.eclipse.jetty.webapp.WebAppContext;
+import org.eclipse.jetty.webapp.WebAppClassLoader;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -51,7 +51,7 @@ public class JettyWrapper {
         _handlerColl = new ContextHandlerCollection();
         _handlerColl.setHandlers(new Handler[] {context});
 
-        _server.addHandler(_handlerColl);
+        _server.setHandler(_handlerColl);
         _server.start();
     }
 
@@ -69,8 +69,8 @@ public class JettyWrapper {
 
         private HashMap _apps = new HashMap();
 
-        public void handle(String string, HttpServletRequest request,
-                           HttpServletResponse response, int i) throws IOException, ServletException {
+        public void handle(String string, Request req, HttpServletRequest request,
+                           HttpServletResponse response) throws IOException, ServletException {
             response.setContentType("text/html");
             if (request.getPathInfo().equals("/")) {
                 response.getWriter().println("Alive");
@@ -92,8 +92,8 @@ public class JettyWrapper {
 
                     context = new WebAppContext(webapp, path);
                     context.setConfigurationClasses(new String[] {
-                        "org.mortbay.jetty.webapp.WebInfConfiguration",
-                        "org.mortbay.jetty.webapp.WebXmlConfiguration"});
+                        "org.eclipse.jetty.webapp.WebInfConfiguration",
+                        "org.eclipse.jetty.webapp.WebXmlConfiguration"});
                     context.setClassLoader(new WebAppClassLoader(context));
 
                     _handlerColl.addHandler(context);

data/buildr.buildfile

@@ -15,8 +15,10 @@
 
 $LOADED_FEATURES << 'jruby' unless RUBY_PLATFORM =~ /java/ # Pretend to have JRuby, keeps Nailgun happy.
 require 'buildr/jetty'
+require 'buildr/jetty6'
 require 'buildr/nailgun'
 require 'buildr/scala'
+require 'buildr/kotlin'
 repositories.remote << 'http://repo1.maven.org/maven2'
 
 repositories.remote << 'https://oss.sonatype.org/content/groups/scala-tools'
@@ -31,10 +33,14 @@ define 'buildr' do
   define 'scala' do
     compile.using(:javac).from(FileList['lib/buildr/scala/**/*.java']).into('lib/buildr/scala')
   end
+  
+  define 'kotlin' do
+    compile.using(:javac).from(FileList['lib/buildr/kotlin/**/*.java']).into('lib/buildr/kotlin').with(Buildr::Kotlin::Kotlinc.dependencies)
+  end
 
   desc 'Buildr extra packages (Antlr, Cobertura, Hibernate, Javacc, JDepend, Jetty, OpenJPA, XmlBeans)'
   define 'extra', :version=>'1.0' do
-    compile.using(:javac).from(FileList['addon/buildr/**/*.java']).into('addon/buildr').with(Buildr::Jetty::REQUIRES, Buildr::Nailgun::ARTIFACT_SPEC)
+    compile.using(:javac).from(FileList['addon/buildr/**/*.java']).into('addon/buildr').with(Buildr::Jetty::REQUIRES, Buildr::Jetty6::REQUIRES, Buildr::Nailgun::ARTIFACT_SPEC)
     # Legals included in source code and show in RDoc.
     legal = 'LICENSE', 'NOTICE'
     package(:gem).include(legal).path('lib').include('addon/buildr')

data/doc/contributing.textile

@@ -99,25 +99,6 @@ The _install_ task creates a Gem in your working directory (_pkg/_) and install
 
 Both _setup_ and _install_ tasks use the @sudo@ command on platforms that require it (i.e. not Windows), so there's no need to run @sudo rake@ when working with the Buildr source code.
 
-
-h3. Using development build
-
-Occasionally we'll make development builds from the current code in trunk/head. We appreciate if you can take the time to test those out and report any bugs. To install development builds, use the Gem repository at @people.apache.org/~assaf/buildr/snapshot@:
-
-{% highlight sh %}
-gem source --add http://people.apache.org/~assaf/buildr/snapshot/
-{% endhighlight %}
-
-Since Ruby Gems uses version numbers to detect new releases, if you installed Buildr from a snapshot and want to upgrade to a newer snapshot or the latest official release, you need to use @gem install buildr@ rather than @gem upgrade@.
-
-If you want to go back to using the RubyForge releases:
-
-{% highlight sh %}
-gem source --remove http://people.apache.org/~assaf/buildr/snapshot/
-gem install buildr
-{% endhighlight %}
-
-
 h2(#testing).  Tested and Documented
 
 Two things we definitely encourage!

data/doc/download.textile

@@ -18,16 +18,28 @@ The source code is included in both source and binary distribution, the Gem dist
 
 h2(#dist).  Binaries and Source Code
 
+h3. buildr 1.5.3 (2017-05-17)
+
+|_. Package |_. MD5 Checksum |_. PGP |
+| "buildr-1.5.3-java.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.5.3/buildr-1.5.3-java.gem | "873c2bfe3060f4d074dc7464c68af837":http://www.apache.org/dist/buildr/1.5.3/buildr-1.5.3-java.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.5.3/buildr-1.5.3-java.gem.asc |
+| "buildr-1.5.3-x86-mswin32.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.5.3/buildr-1.5.3-x86-mswin32.gem | "5b1bb8a17b55743910c34e5f20a75b7a":http://www.apache.org/dist/buildr/1.5.3/buildr-1.5.3-x86-mswin32.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.5.3/buildr-1.5.3-x86-mswin32.gem.asc |
+| "buildr-1.5.3.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.5.3/buildr-1.5.3.gem | "84c063a3e5f96cd4ea614fe60fb28eac":http://www.apache.org/dist/buildr/1.5.3/buildr-1.5.3.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.5.3/buildr-1.5.3.gem.asc |
+| "buildr-1.5.3.tgz":http://www.apache.org/dyn/closer.cgi/buildr/1.5.3/buildr-1.5.3.tgz | "1bb3198d0f8396c02539f6620dedc098":http://www.apache.org/dist/buildr/1.5.3/buildr-1.5.3.tgz.md5 | "Sig":http://www.apache.org/dist/buildr/1.5.3/buildr-1.5.3.tgz.asc |
+| "buildr-1.5.3.zip":http://www.apache.org/dyn/closer.cgi/buildr/1.5.3/buildr-1.5.3.zip | "f8a54f02bac10e714f6f38daca00d7e1":http://www.apache.org/dist/buildr/1.5.3/buildr-1.5.3.zip.md5 | "Sig":http://www.apache.org/dist/buildr/1.5.3/buildr-1.5.3.zip.asc |
+
+p>. ("Release signing keys":http://www.apache.org/dist/buildr/1.5.3/KEYS)
+
+
 h3. buildr 1.5.2 (2017-04-03)
 
 |_. Package |_. MD5 Checksum |_. PGP |
-| "buildr-1.5.2-java.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.5.2/buildr-1.5.2-java.gem | "72ac9122e057112f5699b39ba237432f":http://www.apache.org/dist/buildr/1.5.2/buildr-1.5.2-java.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.5.2/buildr-1.5.2-java.gem.asc |
-| "buildr-1.5.2-x86-mswin32.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.5.2/buildr-1.5.2-x86-mswin32.gem | "0b34fd2fc14236bcecc877901d58080d":http://www.apache.org/dist/buildr/1.5.2/buildr-1.5.2-x86-mswin32.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.5.2/buildr-1.5.2-x86-mswin32.gem.asc |
-| "buildr-1.5.2.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.5.2/buildr-1.5.2.gem | "6645bfa5380490233affa9adb9e388a1":http://www.apache.org/dist/buildr/1.5.2/buildr-1.5.2.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.5.2/buildr-1.5.2.gem.asc |
-| "buildr-1.5.2.tgz":http://www.apache.org/dyn/closer.cgi/buildr/1.5.2/buildr-1.5.2.tgz | "77e4ef6ce1b408943d98c848f86feb10":http://www.apache.org/dist/buildr/1.5.2/buildr-1.5.2.tgz.md5 | "Sig":http://www.apache.org/dist/buildr/1.5.2/buildr-1.5.2.tgz.asc |
-| "buildr-1.5.2.zip":http://www.apache.org/dyn/closer.cgi/buildr/1.5.2/buildr-1.5.2.zip | "793d86899fd3c3eb326a0ea920b1275a":http://www.apache.org/dist/buildr/1.5.2/buildr-1.5.2.zip.md5 | "Sig":http://www.apache.org/dist/buildr/1.5.2/buildr-1.5.2.zip.asc |
+| "buildr-1.5.2-java.gem":http://archive.apache.org/dist/buildr/1.5.2/buildr-1.5.2-java.gem | "72ac9122e057112f5699b39ba237432f":http://archive.apache.org/dist/buildr/1.5.2/buildr-1.5.2-java.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.5.2/buildr-1.5.2-java.gem.asc |
+| "buildr-1.5.2-x86-mswin32.gem":http://archive.apache.org/dist/buildr/1.5.2/buildr-1.5.2-x86-mswin32.gem | "0b34fd2fc14236bcecc877901d58080d":http://archive.apache.org/dist/buildr/1.5.2/buildr-1.5.2-x86-mswin32.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.5.2/buildr-1.5.2-x86-mswin32.gem.asc |
+| "buildr-1.5.2.gem":http://archive.apache.org/dist/buildr/1.5.2/buildr-1.5.2.gem | "6645bfa5380490233affa9adb9e388a1":http://archive.apache.org/dist/buildr/1.5.2/buildr-1.5.2.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.5.2/buildr-1.5.2.gem.asc |
+| "buildr-1.5.2.tgz":http://archive.apache.org/dist/buildr/1.5.2/buildr-1.5.2.tgz | "77e4ef6ce1b408943d98c848f86feb10":http://archive.apache.org/dist/buildr/1.5.2/buildr-1.5.2.tgz.md5 | "Sig":http://archive.apache.org/dist/buildr/1.5.2/buildr-1.5.2.tgz.asc |
+| "buildr-1.5.2.zip":http://archive.apache.org/dist/buildr/1.5.2/buildr-1.5.2.zip | "793d86899fd3c3eb326a0ea920b1275a":http://archive.apache.org/dist/buildr/1.5.2/buildr-1.5.2.zip.md5 | "Sig":http://archive.apache.org/dist/buildr/1.5.2/buildr-1.5.2.zip.asc |
 
-p>. ("Release signing keys":http://www.apache.org/dist/buildr/1.5.2/KEYS)
+p>. ("Release signing keys":http://archive.apache.org/dist/buildr/1.5.2/KEYS)
 
 
 h3. buildr 1.5.1 (2017-03-11)

data/doc/index.textile

@@ -46,23 +46,31 @@ So let's get started.  You can "read the documentation online":quick_start.html,
 
 h2(#news).  What's New
 
+Highlights from Buildr 1.5.4 (2017-11-29)
+* Added:  Findbugs Addon: Upgrade to version 3.0.1 of findbugs.
+* Added:  GPG Addon: Add boolean configuration setting `project.gpg` that can be set to false via
+          `project.gpg = false` to avoid signing and uploading packages. This is useful when some
+          projects are not intended for publishing.
+* Fixed:  JaCoCo Addon: Projects that have jacoco disabled will no longer appear in the JaCoCo reports.
+* Change: JaCoCo Addon: Update JaCoCo version to 0.7.9.
+* Fixed:  BUILDR-733 - Escape classpath entries in the pathing jar manifest. Submitted by Glenn Croes.
+* Fixed:  Ensure that the pom is attached to the jar artifact with empty classifier rather than the last
+          artifact of a type defined. Otherwise a project that defines multiple artifacts of the same type
+          (i.e. `package(:jar)` and `package(:jar, :classifier => :gwt)`) could have the pom named after
+          the package with the classifier rather than the package without a classifer. (i.e. the pom could
+          be incorrectly defined as `mypackage-1.0.0-gwt.pom` rather than `mypackage-1.0.0.pom`).
+* Added:  GWT Addon: Add support for GWT 2.8.2 release and make it the default version unless otherwise specified.
+* Added:  BUILDR-732 - Support bnd version 2.1.0 or more. Submitted By Eric Bruneton.
+* Added:  Support to compiling Kotlin
+* Added:  New way to concatenate file contents when merging several archives together.
+* Added:  New way to transform file contents when merging several archives together.
+* Added:  Support both Jetty 6 and Jetty 9 as addons. Added integration tests to cover their use.
+
 Highlights from Buildr 1.5.3 (2017-05-17)
 * Change: Add support for gwt 2.8.1 to gwt addon.
 * Fixed:  Avoid error "undefined local variable or method `pom'" when invoking the `JarTask` without it being
   registered through the `package` helper`. Reported by Dieter Vrancken.
 
-Highlights from Buildr 1.5.2 (2017-04-03)
-* Change: Update TestNG version to 6.11.
-* Change: BUILDR-731 - Enhance Sonar addon to support configuration of the project version. Submitted by Ross Mahony.
-* Fixed:  Fix pom generation to eliminate invalid `classifier` element from being added to POM.
-
-Highlights from Buildr 1.5.1 (2017-03-11)
-* Change: Add css2gss task to gwt addon to support conveting from deprecated css syntax to modern gss syntax.
-* Change: Add support for gwt 2.8.0 to gwt addon.
-* Change: Update jruby-openssl to 0.9.17
-* Change: BUILDR-719 Change User-Agent when uploading artifacts
-* Change: BUILDR-709 Integrate `buildr/custom_pom` into core and just make it the default pom generated.
-
 This is a partial list -- see the "CHANGELOG":CHANGELOG for full details.
 
 h2(#notices).  Credits & Notices

data/doc/languages.textile

@@ -490,6 +490,29 @@ end
 
 The @doc@ task is *not* joint-compilation aware.  Thus, it will only generate ScalaDoc for mixed-source projects, it will not attempt to generate both JavaDoc and ScalaDoc.
 
+h2(#kotlin). Kotlin
+
+h3. Compiling Kotlin
+
+To start using Kotlin, you must first require it on your Buildfile:
+
+{% highlight ruby %}
+require 'buildr/kotlin'
+{% endhighlight %}
+
+Any project with a .kt file under the @src/main/kotlin@ directory (by default), compiling them into @target/classes@.
+
+If the project has any java files, they will be compiled using javac.
+
+|_. Option        |_. Usage |
+| @verbose@           | Asks the compiler for verbose output, true when running in verbose mode. |
+| @fork@              | Whether to execute groovyc using a spawned instance of the JVM.  Defaults to no. |
+| @warnings@          | Issue warnings when compiling.  True when running in verbose mode. |
+| @debug@             | Generates bytecode with debugging information.  Set from the debug environment variable/global option. |
+| @optimize@          | Generates faster bytecode by applying optimisations to the program. |
+| @noStdlib@          | Include the Kotlin runtime libraries from KOTLIN_HOME in the classpath of the compiler. |
+| @target@            | Bytecode compatibility. |
+| @javac@             | Hash of options passed to the ant javac task. |
 
 h2(#groovy). Groovy
 
@@ -527,7 +550,6 @@ The Groovy compiler supports the following options:
 | @target@            | Bytecode compatibility. |
 | @javac@             | Hash of options passed to the ant javac task. |
 
-
 h3. Testing with Groovy
 
 h4. EasyB

data/doc/packaging.textile

@@ -142,6 +142,8 @@ For example, when you use @package :jar@, under the hood it specifies to include
 
 If you need to get rid of all the included files, call the @clean@ method. Some packaging types default to adding various files and directories, for example, JAR packaging will include all the compiled classes and resources.
 
+h2(#merging). Merging archives
+
 You can also merge two ZIP files together, expanding the content of one ZIP into the other.  For example:
 
 {% highlight ruby %}
@@ -155,6 +157,25 @@ If you need to be more selective, you can apply the include/exclude pattern to t
 package(:zip).merge(_('bigbad.war')).exclude('libs/**/*')
 {% endhighlight %}
 
+h3(#transforming). Transforming files while merging them
+
+You may need to have special treatment for files that you are merging from multiple locations.
+
+If you wish to concatenate the file contents, you can perform the following:
+
+{% highlight ruby %}
+package(:zip).merge(_('part1.zip'), _('part2.zip')).concatenate('META-INF/services/spring.providers')
+{% endhighlight %}
+
+If you need to transform the file contents to assemble the final output, you can work with the @transform@ method.
+The transform method takes a block to process the contents of all the matching paths, as the zip file is assembled.
+
+{% highlight ruby %}
+package(:zip).merge(_('part1.zip'), _('part2.zip')).transform('plugin.xml') do |plugin_xml_files|
+  return "<plugin>#{plugin_xml_files.map {|xml| xml.match('<plugin>(.*)</plugin>')[1]}}</plugin>"
+end
+{% endhighlight %}
+
 
 h2(#jar). Packaging JARs
 

data/lib/buildr/ide/idea.rb

@@ -997,11 +997,13 @@ module Buildr #:nodoc:
           xml.option(:name => 'RUN_PAGE', :value => launch_page) if launch_page
           xml.option(:name => 'GWT_MODULE', :value => gwt_module) if gwt_module
 
+          # noinspection RubySimplifyBooleanInspection
+          xml.option(:name => 'OPEN_IN_BROWSER', :value => false) if options[:open_in_browser] == false
           xml.option(:name => 'START_JAVASCRIPT_DEBUGGER', :value => start_javascript_debugger)
           xml.option(:name => 'USE_SUPER_DEV_MODE', :value => super_dev)
           xml.option(:name => 'SHELL_PARAMETERS', :value => shell_parameters) if shell_parameters
 
-          xml.RunnerSettings(:RunnerId => 'Debug') do |xml|
+          xml.RunnerSettings(:RunnerId => 'Debug') do
             xml.option(:name => 'DEBUG_PORT', :value => '')
             xml.option(:name => 'TRANSPORT', :value => 0)
             xml.option(:name => 'LOCAL', :value => true)
@@ -1010,7 +1012,7 @@ module Buildr #:nodoc:
           xml.RunnerSettings(:RunnerId => 'Run')
           xml.ConfigurationWrapper(:RunnerId => 'Run')
           xml.ConfigurationWrapper(:RunnerId => 'Debug')
-          xml.method()
+          xml.method
         end
       end
 

data/lib/buildr/java/commands.rb

@@ -73,7 +73,7 @@ module Java
               path = File.directory?(c) && !c.end_with?('/') ? "#{c}/" : c.to_s
               Buildr::Util.win_os? ? "/#{path}" : path
             end
-            manifest = Buildr::Packaging::Java::Manifest.new([{'Class-Path' => paths.join(" ")}])
+            manifest = Buildr::Packaging::Java::Manifest.new([{'Class-Path' => paths.map{|p| URI.encode(p)}.join(" ")}])
             tjar = Tempfile.new(['javacmd', '.jar'])
             Zip::OutputStream.open(tjar.path) do |zos|
               zos.put_next_entry('META-INF/MANIFEST.MF')