buildr 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87b5141351889a241ae31ca230929aec6e3f7b13
-  data.tar.gz: 239c5207447758eeaa8f4001a2bf09253b1524f2
+  metadata.gz: 930996906bbd79f5b5cda9ed86c4b9175f425a35
+  data.tar.gz: 09911bd611446902912fd051c4ef3b6a94de1841
 SHA512:
-  metadata.gz: 114d0e17f5cf3ed9482fd8a4e2d38a0d72b3908592df9c77a812a1d98ae4ddc4f813bcb01cf6eb901ba07f927306e31ce2441a39882e054c2f7c20f302880991
-  data.tar.gz: a4da025fd7f2db6150941753f334207c4b3f14f37820476fc3f4eaa1ee5c407c1b4d4387e896182c68207694f86f2554b127994ccfbcda51533db9f39b057bad
+  metadata.gz: 5f513bdba3c971e7ee218a3d312756dabb5ef03c9e59f2c25caefe6b4945b2ac0300e0e77758ecb6ed2ae1be0ad16e6c81bc01cebb09e4ab2c8549ab28d605a7
+  data.tar.gz: ba81f0a32c23c775dbe1ba9d627d89a0fa4952a014cc854caec156b19384ad276284bad42b72b3c992e4003fe544975d823adfabb4b6b4ab313751573dc41c3e

data/CHANGELOG

@@ -1,3 +1,26 @@
+1.5.1 (2017-03-11)
+* Change: In the 'buildr/git_auto_version' addon strip out any versions that start with a 'v' character as
+          most projects on git repositories prefix version tags with a "v" to avoid collisions with any branchs
+          named after the version which are typically without the "v" character.
+* Fixed:  GWT Addon: The GWT project publishes invalid jars that can not be included on source path when
+          the javadoc tool is executing. Work around this issue in GWT by removing them from the documentation
+          class path.
+* Change: IDEA: Change the ordering of dependencies in the IDE module descriptor such that test dependencies are
+          first to allow test dependencies to override/shadow compile dependencies.
+* Fixed:  IDEA: Correctly configure the IDE module if the language level differs from the root project language level.
+* 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: Remove orderedhash gem.
+* Change: Update jruby-openssl to 0.9.17
+* Change: Move hoe to the development dependencies
+* Fixed:  BUILDR-728 Snapshots metadata incorrectly created
+* Fixed:  BUILDR-718 Deprecate SVN repository - remove links to SVN
+* Change: BUILDR-724 Use scalamain to call scala projects
+* Change: BUILDR-719 Change User-Agent when uploading artifacts
+* Change: Set the OPEN_IN_BROWSER to false when building idea launch targets via add_glassfish_remote_configuration.
+* Change: BUILDR-709 Integrate `buildr/custom_pom` into core and just make it the default pom generated.
+* Fixed:  BUILDR-563 protobuf addon including source directories to protoc breaks build
+
 1.5.0 (2016-09-23)
 * Change: Update RJB to 1.5.4
 * Change: Update rubyzip to 1.2.0
@@ -51,7 +74,7 @@
 * Change: Update the custom_pom addon to generate poms with exclusions section that excludes
           all transitive dependencies. This is required as buildr dependencies are not
           transitive while Maven's dependencies are transitive by default.
-* Change: Remove the BND aqute maven repository, as it was decomissioned. Use Maven Central instead.
+* Change: Remove the BND aqute maven repository, as it was decommissioned. Use Maven Central instead.
 
 1.4.25 (2016-04-18)
 * Change: BUILDR-712 Update jruby-openssl dependency version or support a range of versions

data/addon/buildr/bnd.rb

@@ -21,8 +21,8 @@ module Buildr
         @@version
       end
 
-      def version=(newVersion)
-        @@version = newVersion
+      def version=(version)
+        @@version = version
       end
 
       # The specs for requirements
@@ -96,19 +96,21 @@ module Buildr
         super
         @params = {}
         enhance do
+          pom.invoke rescue nil if pom && pom != self && classifier.nil?
+
           filename = self.name
           # Generate BND file with same name as target jar but different extension
           bnd_filename = filename.sub /(\.jar)?$/, '.bnd'
 
           params = self.to_params
-          params["-output"] = filename
+          params['-output'] = filename
           File.open(bnd_filename, 'w') do |f|
             f.print params.collect { |k, v| "#{k}=#{v}" }.join("\n")
           end
 
           Buildr::Bnd.bnd_main( bnd_filename )
           begin
-            Buildr::Bnd.bnd_main( "print", "-verify", filename )
+            Buildr::Bnd.bnd_main('print', '-verify', filename )
           rescue => e
             rm filename
             raise e
@@ -127,7 +129,7 @@ module Buildr
 
       def package_as_bundle(filename)
         project.task('bnd:print' => [filename]) do |task|
-          Buildr::Bnd.bnd_main("print", filename)
+          Buildr::Bnd.bnd_main('print', filename)
         end
 
         dirname = File.dirname(filename)

data/addon/buildr/custom_pom.rb

@@ -13,275 +13,6 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-module Buildr
-  class CustomPom
-    Developer = Struct.new(:id, :name, :email, :roles)
-
-    # Specify the name of the project
-    attr_writer :name
-
-    # Retrieve the name of the project, defaulting to the project description or the name if not specified
-    def name
-      @name || @buildr_project.comment || @buildr_project.name
-    end
-
-    # Specify a project description
-    attr_writer :description
-
-    # Retrieve the project description, defaulting to the name if not specified
-    def description
-      @description || name
-    end
-
-    # Property for the projects url
-    attr_accessor :url
-
-    # Return the map of licenses for project
-    def licenses
-      @licenses ||= {}
-    end
-
-    # Add Apache2 to the list of licenses
-    def add_apache_v2_license
-      self.licenses['The Apache Software License, Version 2.0'] = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-    end
-
-    def add_bsd_2_license
-      self.licenses['The BSD 2-Clause License'] = 'http://opensource.org/licenses/BSD-2-Clause'
-    end
-
-    def add_bsd_3_license
-      self.licenses['The BSD 3-Clause License'] = 'http://opensource.org/licenses/BSD-3-Clause'
-    end
-
-    def add_cddl_v1_license
-      self.licenses['Common Development and Distribution License (CDDL-1.0)'] = 'http://opensource.org/licenses/CDDL-1.0'
-    end
-
-    def add_epl_v1_license
-      self.licenses['Eclipse Public License - v 1.0'] = 'http://www.eclipse.org/legal/epl-v10.html'
-    end
-
-    def add_gpl_v1_license
-      self.licenses['GNU General Public License (GPL) version 1.0'] = 'http://www.gnu.org/licenses/gpl-1.0.html'
-    end
-
-    def add_gpl_v2_license
-      self.licenses['GNU General Public License (GPL) version 2.0'] = 'http://www.gnu.org/licenses/gpl-2.0.html'
-    end
-
-    def add_gpl_v3_license
-      self.licenses['GNU General Public License (GPL) version 3.0'] = 'http://www.gnu.org/licenses/gpl-3.0.html'
-    end
-
-    def add_lgpl_v2_license
-      self.licenses['GNU General Lesser Public License (LGPL) version 2.1'] = 'http://www.gnu.org/licenses/lgpl-2.1.html'
-    end
-
-    def add_lgpl_v3_license
-      self.licenses['GNU General Lesser Public License (LGPL) version 3.0'] = 'http://www.gnu.org/licenses/lgpl-3.0.html'
-    end
-
-    def add_mit_license
-      self.licenses['The MIT License'] = 'http://opensource.org/licenses/MIT'
-    end
-
-    attr_accessor :scm_url
-    attr_accessor :scm_connection
-    attr_accessor :scm_developer_connection
-
-    attr_accessor :issues_url
-    attr_accessor :issues_system
-
-    # Add a project like add_github_project('realityforge/gwt-appcache')
-    def add_github_project(project_spec)
-      git_url = "git@github.com:#{project_spec}.git"
-      self.scm_connection = self.scm_developer_connection = "scm:git:#{git_url}"
-      self.scm_url = git_url
-      web_url = "https://github.com/#{project_spec}"
-      self.url = web_url
-      self.issues_url = "#{web_url}/issues"
-      self.issues_system = 'GitHub Issues'
-    end
-
-    def developers
-      @developers ||= []
-    end
-
-    def add_developer(id, name = nil, email = nil, roles = nil)
-      self.developers << Developer.new(id, name, email, roles)
-    end
-
-    def provided_dependencies
-      @provided_dependencies ||= []
-    end
-
-    def provided_dependencies=(provided_dependencies)
-      @provided_dependencies = provided_dependencies
-    end
-
-    def runtime_dependencies
-      @runtime_dependencies ||= []
-    end
-
-    def runtime_dependencies=(runtime_dependencies)
-      @runtime_dependencies = runtime_dependencies
-    end
-
-    def optional_dependencies
-      @optional_dependencies ||= []
-    end
-
-    def optional_dependencies=(optional_dependencies)
-      @optional_dependencies = optional_dependencies
-    end
-
-    protected
-
-    def associate_project(buildr_project)
-      @buildr_project = buildr_project
-    end
-
-    def self.pom_xml(project, package)
-      Proc.new do
-        xml = Builder::XmlMarkup.new(:indent => 2)
-        xml.instruct!
-        xml.project('xmlns' => 'http://maven.apache.org/POM/4.0.0',
-                    'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
-                    'xsi:schemaLocation' => 'http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd') do
-          xml.modelVersion '4.0.0'
-          xml.parent do
-            xml.groupId 'org.sonatype.oss'
-            xml.artifactId 'oss-parent'
-            xml.version '7'
-          end
-          xml.groupId project.group
-          xml.artifactId project.id
-          xml.version project.version
-          xml.packaging package.type.to_s
-          xml.classifier package.classifier if package.classifier
-
-          xml.name project.pom.name if project.pom.name
-          xml.description project.pom.description if project.pom.description
-          xml.url project.pom.url if project.pom.url
-
-          xml.licenses do
-            project.pom.licenses.each_pair do |name, url|
-              xml.license do
-                xml.name name
-                xml.url url
-                xml.distribution 'repo'
-              end
-            end
-          end
-
-          if project.pom.scm_url || project.pom.scm_connection || project.pom.scm_developer_connection
-            xml.scm do
-              xml.connection project.pom.scm_connection if project.pom.scm_connection
-              xml.developerConnection project.pom.scm_developer_connection if project.pom.scm_developer_connection
-              xml.url project.pom.scm_url if project.pom.scm_url
-            end
-          end
-
-          if project.pom.issues_url
-            xml.issueManagement do
-              xml.url project.pom.issues_url
-              xml.system project.pom.issues_system if project.pom.issues_system
-            end
-          end
-
-          xml.developers do
-            project.pom.developers.each do |developer|
-              xml.developer do
-                xml.id developer.id
-                xml.name developer.name if developer.name
-                xml.email developer.email if developer.email
-                if developer.roles
-                  xml.roles do
-                    developer.roles.each do |role|
-                      xml.role role
-                    end
-                  end
-                end
-              end
-            end
-          end
-
-          xml.dependencies do
-            provided_deps = Buildr.artifacts(project.pom.provided_dependencies).collect { |d| d.to_s }
-            runtime_deps = Buildr.artifacts(project.pom.runtime_dependencies).collect { |d| d.to_s }
-            optional_deps = Buildr.artifacts(project.pom.optional_dependencies).collect { |d| d.to_s }
-            deps =
-              Buildr.artifacts(project.compile.dependencies).
-                select { |d| d.is_a?(ActsAsArtifact) }.
-                collect do |d|
-                f = d.to_s
-                scope = provided_deps.include?(f) ? 'provided' :
-                  runtime_deps.include?(f) ? 'runtime' :
-                    'compile'
-                d.to_hash.merge(:scope => scope, :optional => optional_deps.include?(f))
-              end + Buildr.artifacts(project.test.compile.dependencies).
-                select { |d| d.is_a?(ActsAsArtifact) && !project.compile.dependencies.include?(d) }.collect { |d| d.to_hash.merge(:scope => 'test') }
-            deps.each do |dependency|
-              xml.dependency do
-                xml.groupId dependency[:group]
-                xml.artifactId dependency[:id]
-                xml.version dependency[:version]
-                xml.scope dependency[:scope] unless dependency[:scope] == 'compile'
-                xml.optional true if dependency[:optional]
-                xml.exclusions do
-                  xml.exclusion do
-                    xml.groupId '*'
-                    xml.artifactId '*'
-                  end
-                end
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-  module CPom
-    module ProjectExtension
-      include Extension
-
-      def pom
-        unless @pom
-          @pom = parent ? parent.pom.dup : Buildr::CustomPom.new
-          @pom.send :associate_project, self
-        end
-        @pom
-      end
-
-      after_define do |project|
-        project.packages.each do |pkg|
-          if pkg.type.to_s == 'jar' && pkg.classifier.nil?
-            class << pkg
-              def pom_xml
-                self.pom.content
-              end
-
-              def pom
-                unless @pom
-                  pom_filename = Util.replace_extension(name, 'pom')
-                  spec = {:group => group, :id => id, :version => version, :type => :pom}
-                  @pom = Buildr.artifact(spec, pom_filename)
-                  buildr_project = Buildr.project(self.scope.join(':'))
-                  @pom.content Buildr::CustomPom.pom_xml(buildr_project, self)
-                end
-                @pom
-              end
-            end
-            pkg.instance_variable_set('@pom', nil)
-            pkg.enhance([pkg.pom.to_s])
-          end
-        end
-      end
-    end
-  end
-end
-
-class Buildr::Project
-  include Buildr::CPom::ProjectExtension
-end
+msg = "This extension is now included as part of the core Buildr library"
+raise msg if (Buildr::VERSION >= "1.6")
+warn(msg)

data/addon/buildr/git_auto_version.rb

@@ -22,7 +22,9 @@ module Buildr
         unless project.version
           version_suffix = ENV['BUILD_NUMBER'] ? "-#{ENV['BUILD_NUMBER']}" : ''
           version_prefix = ENV['VERSION_PREFIX'] ? "#{ENV['VERSION_PREFIX']}-" : ''
-          project.version = version_prefix + `git describe --tags --always`.strip + version_suffix
+          git_version = `git describe --tags --always`.strip
+          git_version = git_version.gsub(/^v([0-9])/, '\1')
+          project.version = version_prefix + git_version + version_suffix
         end
       end
     end

data/addon/buildr/gwt.rb

@@ -15,7 +15,6 @@
 
 module Buildr
   module GWT
-
     class << self
 
       def version=(version)
@@ -23,7 +22,7 @@ module Buildr
       end
 
       def version
-        @version || Buildr.settings.build['gwt'] || '2.7.0'
+        @version || Buildr.settings.build['gwt'] || '2.8.0'
       end
 
       # The specs for requirements
@@ -34,18 +33,56 @@ module Buildr
         gwt_dev_jar = "com.google.gwt:gwt-dev:jar:#{v}"
         if v <= '2.6.1'
           [gwt_dev_jar] + validation_deps
-        else
+        elsif v == '2.7.0'
           [
             gwt_dev_jar,
             'org.ow2.asm:asm:jar:5.0.3'
           ] + validation_deps
+        elsif v == '2.8.0'
+          %w(
+              com.google.jsinterop:jsinterop-annotations:jar:1.0.1
+              com.google.jsinterop:jsinterop-annotations:jar:sources:1.0.1
+              org.w3c.css:sac:jar:1.3
+              com.google.gwt:gwt-dev:jar:2.8.0
+              com.google.gwt:gwt-user:jar:2.8.0
+              com.google.code.gson:gson:jar:2.6.2
+              org.ow2.asm:asm:jar:5.0.3
+              org.ow2.asm:asm-util:jar:5.0.3
+              org.ow2.asm:asm-tree:jar:5.0.3
+              org.ow2.asm:asm-commons:jar:5.0.3
+              colt:colt:jar:1.2.0
+              ant:ant:jar:1.6.5
+              commons-collections:commons-collections:jar:3.2.2
+              commons-io:commons-io:jar:2.4
+              com.ibm.icu:icu4j:jar:50.1.1
+              tapestry:tapestry:jar:4.0.2
+
+              javax.annotation:javax.annotation-api:jar:1.2
+              javax.servlet:javax.servlet-api:jar:3.1.0
+              org.eclipse.jetty:jetty-annotations:jar:9.2.14.v20151106
+              org.eclipse.jetty:jetty-continuation:jar:9.2.14.v20151106
+              org.eclipse.jetty:jetty-http:jar:9.2.14.v20151106
+              org.eclipse.jetty:jetty-io:jar:9.2.14.v20151106
+              org.eclipse.jetty:jetty-jndi:jar:9.2.14.v20151106
+              org.eclipse.jetty:jetty-plus:jar:9.2.14.v20151106
+              org.eclipse.jetty:jetty-security:jar:9.2.14.v20151106
+              org.eclipse.jetty:jetty-server:jar:9.2.14.v20151106
+              org.eclipse.jetty:jetty-servlet:jar:9.2.14.v20151106
+              org.eclipse.jetty:jetty-servlets:jar:9.2.14.v20151106
+              org.eclipse.jetty:jetty-util:jar:9.2.14.v20151106
+              org.eclipse.jetty:jetty-webapp:jar:9.2.14.v20151106
+              org.eclipse.jetty:jetty-xml:jar:9.2.14.v20151106
+              org.eclipse.jetty.toolchain:jetty-schemas:jar:3.1.M0
+          ) + validation_deps
+        else
+          raise "Unknown GWT version #{v}"
         end
       end
 
       def gwtc_main(modules, source_artifacts, output_dir, unit_cache_dir, options = {})
         base_dependencies = self.dependencies(options[:version])
         cp = Buildr.artifacts(base_dependencies).each(&:invoke).map(&:to_s) + Buildr.artifacts(source_artifacts).each(&:invoke).map(&:to_s)
-        style = options[:style] || 'OBFUSCATED,' # 'PRETTY', 'DETAILED'
+        style = options[:style] || 'OBFUSCATED' # 'PRETTY', 'DETAILED'
         log_level = options[:log_level] #  ERROR, WARN, INFO, TRACE, DEBUG, SPAM, or ALL
         workers = options[:workers] || 2
 
@@ -55,8 +92,10 @@ module Buildr
           args << log_level
         end
         args << '-strict'
-        args << '-style'
-        args << style
+        unless style == 'OBFUSCATED'
+          args << '-style'
+          args << style
+        end
         args << '-localWorkers'
         args << workers
         args << '-war'
@@ -71,7 +110,7 @@ module Buildr
           args << '-draftCompile'
         end
 
-        if options[:enable_closure_compiler].nil? || options[:enable_closure_compiler]
+        if options[:enable_closure_compiler] && options[:version] == '2.7.0'
           args << '-XenableClosureCompiler'
         end
 
@@ -106,11 +145,31 @@ module Buildr
 
         Java::Commands.java 'com.google.gwt.dev.codeserver.CodeServer', *(args + [{:classpath => cp, :properties => properties, :java_args => java_args, :pathing_jar => false}])
       end
+
+      def gwt_css2gss(filenames, options = {})
+        cp = Buildr.artifacts(self.dependencies(options[:version])).each(&:invoke).map(&:to_s)
+        properties = options[:properties] ? options[:properties].dup : {}
+        java_args = options[:java_args] ? options[:java_args].dup : {}
+        Java::Commands.java 'com.google.gwt.resources.converter.Css2Gss', *([filenames] + [{ :classpath => cp, :properties => properties, :java_args => java_args, :pathing_jar => false }])
+      end
     end
 
     module ProjectExtension
       include Extension
 
+      after_define(:doc) do |project|
+        # Remove gwt artifacts when performing javadocs as the gwt jars have invalid source files
+        project.doc.classpath.delete_if { |f| f.to_s =~ /.*\/com\/google\/gwt\/gwt-.*/ }
+      end
+
+      first_time do
+        desc 'Run C22 to GSS converter. Set css files via environment variable CSS_FILES'
+        task('css2gss') do
+          raise 'Please specify css files or directory via variable CSS_FILES' unless ENV['CSS_FILES']
+          Buildr::GWT.gwt_css2gss(ENV['CSS_FILES'].to_s.split(' '))
+        end
+      end
+
       def gwt(module_names, options = {})
         p = options[:target_project]
         target_project = p.nil? ? project : p.is_a?(String) ? project(p) : p