diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e74e8d7..af24759 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,24 +9,28 @@ on: jobs: ci: - runs-on: ubuntu-24.04 + runs-on: ubuntu-latest strategy: fail-fast: false matrix: - ruby: [jruby-9.4.9.0, 3.3] - java: [8] + ruby: ['jruby-10', 'jruby-9.4', '4.0', '3.4', '3.3'] + java: [8, 25] + exclude: + - ruby: 'jruby-10' # JRuby 10 requires Java 21+ + java: 8 steps: - name: checkout - uses: actions/checkout@v2 + uses: actions/checkout@v5 - name: Set up java - uses: actions/setup-java@v2 + uses: actions/setup-java@v5 with: - distribution: zulu java-version: ${{ matrix.java }} + distribution: 'temurin' + cache: maven - name: Set up ruby uses: ruby/setup-ruby@v1 diff --git a/.gitignore b/.gitignore index e8268ed..51290cf 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ Gemfile.lock *.gem .ruby-version pom.maven-tools.gemspec.xml +.idea diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar deleted file mode 100644 index 5fd4d50..0000000 Binary files a/.mvn/wrapper/maven-wrapper.jar and /dev/null differ diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index 11213b0..8dea6c2 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -1 +1,3 @@ -distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip +wrapperVersion=3.3.4 +distributionType=only-script +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.12/apache-maven-3.9.12-bin.zip diff --git a/Gemfile b/Gemfile index 79cd378..75896e1 100644 --- a/Gemfile +++ b/Gemfile @@ -3,6 +3,4 @@ source 'https://rubygems.org' gemspec -gem "copyright-header", "1.0.8", :platform => :mri, :group => :copyright - # vim: syntax=Ruby diff --git a/Rakefile b/Rakefile index fdcb7cf..43a773f 100644 --- a/Rakefile +++ b/Rakefile @@ -1,32 +1,23 @@ #-*- mode: ruby -*- - task :default => [ :specs ] desc 'generate licenses data from internet' task :licenses do require 'open-uri' - require 'ostruct' - + require 'json' + File.open( 'lib/maven/tools/licenses.rb', 'w' ) do |f| - url = 'http://opensource.org' - f.puts "require 'ostruct'" + url = 'https://opensource.org' f.puts 'module Maven' f.puts ' module Tools' + f.puts ' SpdxLicenseMeta = Struct.new(:short, :name, :url, keyword_init: true)' f.puts ' LICENSES = {}' - open( url + '/licenses/alphabetical' ).each_line do |line| - - if line =~ /.*"\/licenses\// and line =~ /
  • / - l = OpenStruct.new - line.sub!( /.*"(\/licenses\/([^"]*))">/ ) do - l.url = "http://opensource.org#{$1}" - l.short = $1.sub( /\/licenses\//, '' ) - '' - end - line.sub!( /\ \(.*$/, '' ) - f.puts " LICENSES[ #{l.short.downcase.inspect} ] = OpenStruct.new :short => #{l.short.inspect}, :name => #{line.strip.inspect}, :url => #{l.url.inspect}" - end - end + JSON.parse(URI.open( url + '/api/licenses' ).read) + .select { |l| l["spdx_id"].size > 0 && l["name"].size > 0 } + .sort_by { |l| l["spdx_id"].downcase } + .each { |l| f.puts(" LICENSES[ #{l["spdx_id"].downcase.inspect} ] = SpdxLicenseMeta.new( short: #{l["spdx_id"].inspect}, name: #{l["name"].inspect}, url: #{l["_links"]["html"]["href"].inspect} ).freeze") } + f.puts ' LICENSES.freeze' f.puts ' end' f.puts 'end' @@ -48,23 +39,4 @@ task :specs do Dir['spec/**/*_spec.rb'].each { |f| require f.sub(/spec\//, '') } end -task :headers do - require 'copyright_header' - - s = Gem::Specification.load( Dir["*gemspec"].first ) - - args = { - :license => s.license, - :copyright_software => s.name, - :copyright_software_description => s.description, - :copyright_holders => s.authors, - :copyright_years => [Time.now.year], - :add_path => "lib:src", - :output_dir => './' - } - - command_line = CopyrightHeader::CommandLine.new( args ) - command_line.execute -end - # vim: syntax=Ruby diff --git a/lib/maven/tools/dsl.rb b/lib/maven/tools/dsl.rb index 7dadbed..14ea74b 100644 --- a/lib/maven/tools/dsl.rb +++ b/lib/maven/tools/dsl.rb @@ -43,9 +43,6 @@ def model @model end - # TODO remove me - def needs_torquebox= t - end # TODO remove me def current @current diff --git a/lib/maven/tools/licenses.rb b/lib/maven/tools/licenses.rb index ab47e85..dd21f67 100644 --- a/lib/maven/tools/licenses.rb +++ b/lib/maven/tools/licenses.rb @@ -1,77 +1,121 @@ -require 'ostruct' module Maven module Tools + SpdxLicenseMeta = Struct.new(:short, :name, :url, keyword_init: true) LICENSES = {} - LICENSES[ "afl-3.0" ] = OpenStruct.new :short => "AFL-3.0", :name => "Academic Free License 3.0", :url => "http://opensource.org/licenses/AFL-3.0" - LICENSES[ "agpl-3.0" ] = OpenStruct.new :short => "AGPL-3.0", :name => "GNU Affero General Public License 3.0", :url => "http://opensource.org/licenses/AGPL-3.0" - LICENSES[ "apl-1.0" ] = OpenStruct.new :short => "APL-1.0", :name => "Adaptive Public License", :url => "http://opensource.org/licenses/APL-1.0" - LICENSES[ "apache-2.0" ] = OpenStruct.new :short => "Apache-2.0", :name => "Apache License 2.0", :url => "http://opensource.org/licenses/Apache-2.0" - LICENSES[ "apsl-2.0" ] = OpenStruct.new :short => "APSL-2.0", :name => "Apple Public Source License", :url => "http://opensource.org/licenses/APSL-2.0" - LICENSES[ "artistic-2.0" ] = OpenStruct.new :short => "Artistic-2.0", :name => "Artistic license 2.0", :url => "http://opensource.org/licenses/Artistic-2.0" - LICENSES[ "aal" ] = OpenStruct.new :short => "AAL", :name => "Attribution Assurance Licenses", :url => "http://opensource.org/licenses/AAL" - LICENSES[ "bsd-3-clause" ] = OpenStruct.new :short => "BSD-3-Clause", :name => "BSD 3-Clause \"New\" or \"Revised\" License", :url => "http://opensource.org/licenses/BSD-3-Clause" - LICENSES[ "bsd-2-clause" ] = OpenStruct.new :short => "BSD-2-Clause", :name => "BSD 2-Clause \"Simplified\" or \"FreeBSD\" License", :url => "http://opensource.org/licenses/BSD-2-Clause" - LICENSES[ "bsl-1.0" ] = OpenStruct.new :short => "BSL-1.0", :name => "Boost Software License", :url => "http://opensource.org/licenses/BSL-1.0" - LICENSES[ "cecill-2.1" ] = OpenStruct.new :short => "CECILL-2.1", :name => "CeCILL License 2.1", :url => "http://opensource.org/licenses/CECILL-2.1" - LICENSES[ "catosl-1.1" ] = OpenStruct.new :short => "CATOSL-1.1", :name => "Computer Associates Trusted Open Source License 1.1", :url => "http://opensource.org/licenses/CATOSL-1.1" - LICENSES[ "cddl-1.0" ] = OpenStruct.new :short => "CDDL-1.0", :name => "Common Development and Distribution License 1.0", :url => "http://opensource.org/licenses/CDDL-1.0" - LICENSES[ "cpal-1.0" ] = OpenStruct.new :short => "CPAL-1.0", :name => "Common Public Attribution License 1.0", :url => "http://opensource.org/licenses/CPAL-1.0" - LICENSES[ "cua-opl-1.0" ] = OpenStruct.new :short => "CUA-OPL-1.0", :name => "CUA Office Public License Version 1.0", :url => "http://opensource.org/licenses/CUA-OPL-1.0" - LICENSES[ "eudatagrid" ] = OpenStruct.new :short => "EUDatagrid", :name => "EU DataGrid Software License", :url => "http://opensource.org/licenses/EUDatagrid" - LICENSES[ "epl-1.0" ] = OpenStruct.new :short => "EPL-1.0", :name => "Eclipse Public License 1.0", :url => "http://opensource.org/licenses/EPL-1.0" - LICENSES[ "ecl-2.0" ] = OpenStruct.new :short => "ECL-2.0", :name => "Educational Community License, Version 2.0", :url => "http://opensource.org/licenses/ECL-2.0" - LICENSES[ "efl-2.0" ] = OpenStruct.new :short => "EFL-2.0", :name => "Eiffel Forum License V2.0", :url => "http://opensource.org/licenses/EFL-2.0" - LICENSES[ "entessa" ] = OpenStruct.new :short => "Entessa", :name => "Entessa Public License", :url => "http://opensource.org/licenses/Entessa" - LICENSES[ "eupl-1.1" ] = OpenStruct.new :short => "EUPL-1.1", :name => "European Union Public License, Version 1.1", :url => "http://opensource.org/licenses/EUPL-1.1" - LICENSES[ "fair" ] = OpenStruct.new :short => "Fair", :name => "Fair License", :url => "http://opensource.org/licenses/Fair" - LICENSES[ "frameworx-1.0" ] = OpenStruct.new :short => "Frameworx-1.0", :name => "Frameworx License", :url => "http://opensource.org/licenses/Frameworx-1.0" - LICENSES[ "agpl-3.0" ] = OpenStruct.new :short => "AGPL-3.0", :name => "GNU Affero General Public License v3", :url => "http://opensource.org/licenses/AGPL-3.0" - LICENSES[ "gpl-2.0" ] = OpenStruct.new :short => "GPL-2.0", :name => "GNU General Public License version 2.0", :url => "http://opensource.org/licenses/GPL-2.0" - LICENSES[ "gpl-3.0" ] = OpenStruct.new :short => "GPL-3.0", :name => "GNU General Public License version 3.0", :url => "http://opensource.org/licenses/GPL-3.0" - LICENSES[ "lgpl-2.1" ] = OpenStruct.new :short => "LGPL-2.1", :name => "GNU Library or \"Lesser\" General Public License version 2.1", :url => "http://opensource.org/licenses/LGPL-2.1" - LICENSES[ "lgpl-3.0" ] = OpenStruct.new :short => "LGPL-3.0", :name => "GNU Library or \"Lesser\" General Public License version 3.0", :url => "http://opensource.org/licenses/LGPL-3.0" - LICENSES[ "hpnd" ] = OpenStruct.new :short => "HPND", :name => "Historical Permission Notice and Disclaimer", :url => "http://opensource.org/licenses/HPND" - LICENSES[ "ipl-1.0" ] = OpenStruct.new :short => "IPL-1.0", :name => "IBM Public License 1.0", :url => "http://opensource.org/licenses/IPL-1.0" - LICENSES[ "ipa" ] = OpenStruct.new :short => "IPA", :name => "IPA Font License", :url => "http://opensource.org/licenses/IPA" - LICENSES[ "isc" ] = OpenStruct.new :short => "ISC", :name => "ISC License", :url => "http://opensource.org/licenses/ISC" - LICENSES[ "lppl-1.3c" ] = OpenStruct.new :short => "LPPL-1.3c", :name => "LaTeX Project Public License 1.3c", :url => "http://opensource.org/licenses/LPPL-1.3c" - LICENSES[ "lpl-1.02" ] = OpenStruct.new :short => "LPL-1.02", :name => "Lucent Public License Version 1.02", :url => "http://opensource.org/licenses/LPL-1.02" - LICENSES[ "miros" ] = OpenStruct.new :short => "MirOS", :name => "MirOS Licence", :url => "http://opensource.org/licenses/MirOS" - LICENSES[ "ms-pl" ] = OpenStruct.new :short => "MS-PL", :name => "Microsoft Public License", :url => "http://opensource.org/licenses/MS-PL" - LICENSES[ "ms-rl" ] = OpenStruct.new :short => "MS-RL", :name => "Microsoft Reciprocal License", :url => "http://opensource.org/licenses/MS-RL" - LICENSES[ "mit" ] = OpenStruct.new :short => "MIT", :name => "MIT license", :url => "http://opensource.org/licenses/MIT" - LICENSES[ "motosoto" ] = OpenStruct.new :short => "Motosoto", :name => "Motosoto License", :url => "http://opensource.org/licenses/Motosoto" - LICENSES[ "mpl-2.0" ] = OpenStruct.new :short => "MPL-2.0", :name => "Mozilla Public License 2.0", :url => "http://opensource.org/licenses/MPL-2.0" - LICENSES[ "multics" ] = OpenStruct.new :short => "Multics", :name => "Multics License", :url => "http://opensource.org/licenses/Multics" - LICENSES[ "nasa-1.3" ] = OpenStruct.new :short => "NASA-1.3", :name => "NASA Open Source Agreement 1.3", :url => "http://opensource.org/licenses/NASA-1.3" - LICENSES[ "ntp" ] = OpenStruct.new :short => "NTP", :name => "NTP License", :url => "http://opensource.org/licenses/NTP" - LICENSES[ "naumen" ] = OpenStruct.new :short => "Naumen", :name => "Naumen Public License", :url => "http://opensource.org/licenses/Naumen" - LICENSES[ "ngpl" ] = OpenStruct.new :short => "NGPL", :name => "Nethack General Public License", :url => "http://opensource.org/licenses/NGPL" - LICENSES[ "nokia" ] = OpenStruct.new :short => "Nokia", :name => "Nokia Open Source License", :url => "http://opensource.org/licenses/Nokia" - LICENSES[ "nposl-3.0" ] = OpenStruct.new :short => "NPOSL-3.0", :name => "Non-Profit Open Software License 3.0", :url => "http://opensource.org/licenses/NPOSL-3.0" - LICENSES[ "oclc-2.0" ] = OpenStruct.new :short => "OCLC-2.0", :name => "OCLC Research Public License 2.0", :url => "http://opensource.org/licenses/OCLC-2.0" - LICENSES[ "ofl-1.1" ] = OpenStruct.new :short => "OFL-1.1", :name => "Open Font License 1.1", :url => "http://opensource.org/licenses/OFL-1.1" - LICENSES[ "ogtsl" ] = OpenStruct.new :short => "OGTSL", :name => "Open Group Test Suite License", :url => "http://opensource.org/licenses/OGTSL" - LICENSES[ "osl-3.0" ] = OpenStruct.new :short => "OSL-3.0", :name => "Open Software License 3.0", :url => "http://opensource.org/licenses/OSL-3.0" - LICENSES[ "php-3.0" ] = OpenStruct.new :short => "PHP-3.0", :name => "PHP License 3.0", :url => "http://opensource.org/licenses/PHP-3.0" - LICENSES[ "postgresql" ] = OpenStruct.new :short => "PostgreSQL", :name => "The PostgreSQL License", :url => "http://opensource.org/licenses/PostgreSQL" - LICENSES[ "python-2.0" ] = OpenStruct.new :short => "Python-2.0", :name => "Python License", :url => "http://opensource.org/licenses/Python-2.0" - LICENSES[ "cnri-python" ] = OpenStruct.new :short => "CNRI-Python", :name => "CNRI Python license", :url => "http://opensource.org/licenses/CNRI-Python" - LICENSES[ "qpl-1.0" ] = OpenStruct.new :short => "QPL-1.0", :name => "Q Public License", :url => "http://opensource.org/licenses/QPL-1.0" - LICENSES[ "rpsl-1.0" ] = OpenStruct.new :short => "RPSL-1.0", :name => "RealNetworks Public Source License V1.0", :url => "http://opensource.org/licenses/RPSL-1.0" - LICENSES[ "rpl-1.5" ] = OpenStruct.new :short => "RPL-1.5", :name => "Reciprocal Public License 1.5", :url => "http://opensource.org/licenses/RPL-1.5" - LICENSES[ "rscpl" ] = OpenStruct.new :short => "RSCPL", :name => "Ricoh Source Code Public License", :url => "http://opensource.org/licenses/RSCPL" - LICENSES[ "simpl-2.0" ] = OpenStruct.new :short => "SimPL-2.0", :name => "Simple Public License 2.0", :url => "http://opensource.org/licenses/SimPL-2.0" - LICENSES[ "sleepycat" ] = OpenStruct.new :short => "Sleepycat", :name => "Sleepycat License", :url => "http://opensource.org/licenses/Sleepycat" - LICENSES[ "spl-1.0" ] = OpenStruct.new :short => "SPL-1.0", :name => "Sun Public License 1.0", :url => "http://opensource.org/licenses/SPL-1.0" - LICENSES[ "watcom-1.0" ] = OpenStruct.new :short => "Watcom-1.0", :name => "Sybase Open Watcom Public License 1.0", :url => "http://opensource.org/licenses/Watcom-1.0" - LICENSES[ "ncsa" ] = OpenStruct.new :short => "NCSA", :name => "University of Illinois/NCSA Open Source License", :url => "http://opensource.org/licenses/NCSA" - LICENSES[ "vsl-1.0" ] = OpenStruct.new :short => "VSL-1.0", :name => "Vovida Software License v. 1.0", :url => "http://opensource.org/licenses/VSL-1.0" - LICENSES[ "w3c" ] = OpenStruct.new :short => "W3C", :name => "W3C License", :url => "http://opensource.org/licenses/W3C" - LICENSES[ "wxwindows" ] = OpenStruct.new :short => "WXwindows", :name => "wxWindows Library License", :url => "http://opensource.org/licenses/WXwindows" - LICENSES[ "xnet" ] = OpenStruct.new :short => "Xnet", :name => "X.Net License", :url => "http://opensource.org/licenses/Xnet" - LICENSES[ "zpl-2.0" ] = OpenStruct.new :short => "ZPL-2.0", :name => "Zope Public License 2.0", :url => "http://opensource.org/licenses/ZPL-2.0" - LICENSES[ "zlib" ] = OpenStruct.new :short => "Zlib", :name => "zlib/libpng license", :url => "http://opensource.org/licenses/Zlib" + LICENSES[ "0bsd" ] = SpdxLicenseMeta.new( short: "0BSD", name: "Zero-Clause BSD", url: "https://opensource.org/license/0bsd" ).freeze + LICENSES[ "aal" ] = SpdxLicenseMeta.new( short: "AAL", name: "Attribution Assurance License", url: "https://opensource.org/license/attribution-php" ).freeze + LICENSES[ "afl-3.0" ] = SpdxLicenseMeta.new( short: "AFL-3.0", name: "Academic Free License v. 3.0", url: "https://opensource.org/license/afl-3-0-php" ).freeze + LICENSES[ "agpl-3.0-only" ] = SpdxLicenseMeta.new( short: "AGPL-3.0-only", name: "GNU Affero General Public License version 3", url: "https://opensource.org/license/agpl-v3" ).freeze + LICENSES[ "apache-1.1" ] = SpdxLicenseMeta.new( short: "Apache-1.1", name: "Apache Software License, version 1.1", url: "https://opensource.org/license/apache-1-1" ).freeze + LICENSES[ "apache-2.0" ] = SpdxLicenseMeta.new( short: "Apache-2.0", name: "Apache License, Version 2.0", url: "https://opensource.org/license/apache-2-0" ).freeze + LICENSES[ "apl-1.0" ] = SpdxLicenseMeta.new( short: "APL-1.0", name: "Adaptive Public License 1.0", url: "https://opensource.org/license/apl1-0-php" ).freeze + LICENSES[ "apsl-2.0" ] = SpdxLicenseMeta.new( short: "APSL-2.0", name: "Apple Public Source License 2.0", url: "https://opensource.org/license/apsl-2-0" ).freeze + LICENSES[ "artistic-1.0" ] = SpdxLicenseMeta.new( short: "Artistic-1.0", name: "Artistic License 1.0", url: "https://opensource.org/license/artistic-1-0" ).freeze + LICENSES[ "artistic-1.0-perl" ] = SpdxLicenseMeta.new( short: "Artistic-1.0-Perl", name: "Artistic License (Perl) 1.0", url: "https://opensource.org/license/artistic-perl-1-0-2" ).freeze + LICENSES[ "artistic-2.0" ] = SpdxLicenseMeta.new( short: "Artistic-2.0", name: "Artistic License 2.0", url: "https://opensource.org/license/artistic-2-0" ).freeze + LICENSES[ "blueoak-1.0.0" ] = SpdxLicenseMeta.new( short: "BlueOak-1.0.0", name: "Blue Oak Model License", url: "https://opensource.org/license/blue-oak-model-license" ).freeze + LICENSES[ "bsd-1-clause" ] = SpdxLicenseMeta.new( short: "BSD-1-Clause", name: "1-clause BSD License", url: "https://opensource.org/license/bsd-1-clause" ).freeze + LICENSES[ "bsd-2-clause" ] = SpdxLicenseMeta.new( short: "BSD-2-Clause", name: "The 2-Clause BSD License", url: "https://opensource.org/license/bsd-2-clause" ).freeze + LICENSES[ "bsd-2-clause-patent" ] = SpdxLicenseMeta.new( short: "BSD-2-Clause-Patent", name: "BSD+Patent", url: "https://opensource.org/license/bsdpluspatent" ).freeze + LICENSES[ "bsd-3-clause" ] = SpdxLicenseMeta.new( short: "BSD-3-Clause", name: "The 3-Clause BSD License", url: "https://opensource.org/license/bsd-3-clause" ).freeze + LICENSES[ "bsd-3-clause-lbnl" ] = SpdxLicenseMeta.new( short: "BSD-3-Clause-LBNL", name: "Lawrence Berkeley National Labs BSD Variant License", url: "https://opensource.org/license/bsd-3-clause-lbnl" ).freeze + LICENSES[ "bsd-3-clause-open-mpi" ] = SpdxLicenseMeta.new( short: "BSD-3-Clause-Open-MPI", name: "BSD-3-Clause-Open-MPI", url: "https://opensource.org/license/bsd-3-clause-open-mpi" ).freeze + LICENSES[ "bsl-1.0" ] = SpdxLicenseMeta.new( short: "BSL-1.0", name: "Boost Software License 1.0", url: "https://opensource.org/license/bsl-1-0" ).freeze + LICENSES[ "cal-1.0" ] = SpdxLicenseMeta.new( short: "CAL-1.0", name: "Cryptographic Autonomy License", url: "https://opensource.org/license/cal-1-0" ).freeze + LICENSES[ "catosl-1.1" ] = SpdxLicenseMeta.new( short: "CATOSL-1.1", name: "Computer Associates Trusted Open Source License 1.1", url: "https://opensource.org/license/ca-tosl1-1-php" ).freeze + LICENSES[ "cddl-1.0" ] = SpdxLicenseMeta.new( short: "CDDL-1.0", name: "Common Development and Distribution License 1.0", url: "https://opensource.org/license/cddl-1-0" ).freeze + LICENSES[ "cddl-1.1" ] = SpdxLicenseMeta.new( short: "CDDL-1.1", name: "COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL)", url: "https://opensource.org/license/cddl-1-1" ).freeze + LICENSES[ "cecill-2.1" ] = SpdxLicenseMeta.new( short: "CECILL-2.1", name: "Cea Cnrs Inria Logiciel Libre License, version 2.1", url: "https://opensource.org/license/cecill-2-1" ).freeze + LICENSES[ "cern-ohl-p-2.0" ] = SpdxLicenseMeta.new( short: "CERN-OHL-P-2.0", name: "CERN Open Hardware Licence Version 2 - Permissive", url: "https://opensource.org/license/cern-ohl-p" ).freeze + LICENSES[ "cern-ohl-s-2.0 " ] = SpdxLicenseMeta.new( short: "CERN-OHL-S-2.0 ", name: "CERN Open Hardware Licence Version 2 - Strongly Reciprocal", url: "https://opensource.org/license/cern-ohl-s" ).freeze + LICENSES[ "cern-ohl-w-2.0" ] = SpdxLicenseMeta.new( short: "CERN-OHL-W-2.0", name: "CERN Open Hardware Licence Version 2 - Weakly Reciprocal", url: "https://opensource.org/license/cern-ohl-w" ).freeze + LICENSES[ "cnri-python" ] = SpdxLicenseMeta.new( short: "CNRI-Python", name: "The CNRI portion of the multi-part Python License", url: "https://opensource.org/license/cnri-python" ).freeze + LICENSES[ "cpal-1.0" ] = SpdxLicenseMeta.new( short: "CPAL-1.0", name: "Common Public Attribution License Version 1.0", url: "https://opensource.org/license/cpal-1-0" ).freeze + LICENSES[ "cpl-1.0" ] = SpdxLicenseMeta.new( short: "CPL-1.0", name: "Common Public License Version 1.0", url: "https://opensource.org/license/cpl1-0-txt" ).freeze + LICENSES[ "cua-opl-1.0" ] = SpdxLicenseMeta.new( short: "CUA-OPL-1.0", name: "CUA Office Public License", url: "https://opensource.org/license/cuaoffice-php" ).freeze + LICENSES[ "ecl-1.0" ] = SpdxLicenseMeta.new( short: "ECL-1.0", name: "Educational Community License, Version 1.0", url: "https://opensource.org/license/ecl-1-0" ).freeze + LICENSES[ "ecl-2.0" ] = SpdxLicenseMeta.new( short: "ECL-2.0", name: "Educational Community License, Version 2.0", url: "https://opensource.org/license/ecl-2-0" ).freeze + LICENSES[ "ecos-2.0" ] = SpdxLicenseMeta.new( short: "eCos-2.0", name: "eCos License version 2.0", url: "https://opensource.org/license/ecos-2-0" ).freeze + LICENSES[ "efl-1.0" ] = SpdxLicenseMeta.new( short: "EFL-1.0", name: "Eiffel Forum License, version 1", url: "https://opensource.org/license/efl-1-0" ).freeze + LICENSES[ "efl-2.0" ] = SpdxLicenseMeta.new( short: "EFL-2.0", name: "Eiffel Forum License, Version 2", url: "https://opensource.org/license/ver2_eiffel-php" ).freeze + LICENSES[ "entessa" ] = SpdxLicenseMeta.new( short: "Entessa", name: "Entessa Public License Version. 1.0", url: "https://opensource.org/license/entessa" ).freeze + LICENSES[ "epl-1.0" ] = SpdxLicenseMeta.new( short: "EPL-1.0", name: "Eclipse Public License -v 1.0", url: "https://opensource.org/license/epl-1-0" ).freeze + LICENSES[ "epl-2.0" ] = SpdxLicenseMeta.new( short: "EPL-2.0", name: "Eclipse Public License version 2.0", url: "https://opensource.org/license/epl-2-0" ).freeze + LICENSES[ "eudatagrid" ] = SpdxLicenseMeta.new( short: "EUDatagrid", name: "EU DataGrid Software License", url: "https://opensource.org/license/eudatagrid-php" ).freeze + LICENSES[ "eupl-1.1" ] = SpdxLicenseMeta.new( short: "EUPL-1.1", name: "The European Union Public License, version 1.1", url: "https://opensource.org/license/eupl-1-1" ).freeze + LICENSES[ "eupl-1.2" ] = SpdxLicenseMeta.new( short: "EUPL-1.2", name: "European Union Public Licence, version 1.2", url: "https://opensource.org/license/eupl-1-2" ).freeze + LICENSES[ "fair" ] = SpdxLicenseMeta.new( short: "Fair", name: "Fair License", url: "https://opensource.org/license/fair" ).freeze + LICENSES[ "frameworx-1.0" ] = SpdxLicenseMeta.new( short: "Frameworx-1.0", name: "Frameworx License 1.0", url: "https://opensource.org/license/frameworx-php" ).freeze + LICENSES[ "gpl-2.0" ] = SpdxLicenseMeta.new( short: "GPL-2.0", name: "GNU General Public License version 2", url: "https://opensource.org/license/gpl-2-0" ).freeze + LICENSES[ "gpl-3.0-only" ] = SpdxLicenseMeta.new( short: "GPL-3.0-only", name: "GNU General Public License version 3", url: "https://opensource.org/license/gpl-3-0" ).freeze + LICENSES[ "hpnd" ] = SpdxLicenseMeta.new( short: "HPND", name: "Historical Permission Notice and Disclaimer", url: "https://opensource.org/license/historical-php" ).freeze + LICENSES[ "icu" ] = SpdxLicenseMeta.new( short: "ICU", name: "ICU License", url: "https://opensource.org/license/icu-license" ).freeze + LICENSES[ "intel" ] = SpdxLicenseMeta.new( short: "Intel", name: "Intel Open Source License", url: "https://opensource.org/license/intel" ).freeze + LICENSES[ "ipa" ] = SpdxLicenseMeta.new( short: "IPA", name: "IPA Font License", url: "https://opensource.org/license/ipafont-html" ).freeze + LICENSES[ "ipl-1.0" ] = SpdxLicenseMeta.new( short: "IPL-1.0", name: "IBM Public License Version 1.0", url: "https://opensource.org/license/ibmpl-php" ).freeze + LICENSES[ "isc" ] = SpdxLicenseMeta.new( short: "ISC", name: "ISC License", url: "https://opensource.org/license/isc-license-txt" ).freeze + LICENSES[ "jam" ] = SpdxLicenseMeta.new( short: "Jam", name: "JAM License", url: "https://opensource.org/license/jam" ).freeze + LICENSES[ "lgpl-2.0-only" ] = SpdxLicenseMeta.new( short: "LGPL-2.0-only", name: "GNU Library General Public License version 2", url: "https://opensource.org/license/lgpl-2-0" ).freeze + LICENSES[ "lgpl-2.1" ] = SpdxLicenseMeta.new( short: "LGPL-2.1", name: "GNU Lesser General Public License version 2.1", url: "https://opensource.org/license/lgpl-2-1" ).freeze + LICENSES[ "lgpl-3.0-only" ] = SpdxLicenseMeta.new( short: "LGPL-3.0-only", name: "GNU Lesser General Public License version 3", url: "https://opensource.org/license/lgpl-3-0" ).freeze + LICENSES[ "liliq-p-1.1" ] = SpdxLicenseMeta.new( short: "LiLiQ-P-1.1", name: "Licence Libre du Québec – Permissive version 1.1", url: "https://opensource.org/license/liliq-p-1-1" ).freeze + LICENSES[ "liliq-r-1.1" ] = SpdxLicenseMeta.new( short: "LiLiQ-R-1.1", name: "Licence Libre du Québec – Réciprocité version 1.1", url: "https://opensource.org/license/liliq-r-1-1" ).freeze + LICENSES[ "liliq-rplus-1.1" ] = SpdxLicenseMeta.new( short: "LiLiQ-Rplus-1.1", name: "Licence Libre du Québec – Réciprocité forte version 1.1", url: "https://opensource.org/license/liliq-rplus-1-1" ).freeze + LICENSES[ "lpl-1.0" ] = SpdxLicenseMeta.new( short: "LPL-1.0", name: "Lucent Public License, Plan 9, version 1.0", url: "https://opensource.org/license/lpl-1-0" ).freeze + LICENSES[ "lpl-1.02" ] = SpdxLicenseMeta.new( short: "LPL-1.02", name: "Lucent Public License Version 1.02", url: "https://opensource.org/license/lucent1-02-php" ).freeze + LICENSES[ "lppl-1.3c" ] = SpdxLicenseMeta.new( short: "LPPL-1.3c", name: "LaTeX Project Public License, Version 1.3c", url: "https://opensource.org/license/lppl" ).freeze + LICENSES[ "miros" ] = SpdxLicenseMeta.new( short: "MirOS", name: "MirOS Licence", url: "https://opensource.org/license/miros-html" ).freeze + LICENSES[ "mit" ] = SpdxLicenseMeta.new( short: "MIT", name: "The MIT License", url: "https://opensource.org/license/mit" ).freeze + LICENSES[ "mit-0" ] = SpdxLicenseMeta.new( short: "MIT-0", name: "MIT No Attribution License", url: "https://opensource.org/license/mit-0" ).freeze + LICENSES[ "mit-cmu" ] = SpdxLicenseMeta.new( short: "MIT-CMU", name: "CMU License", url: "https://opensource.org/license/cmu-license" ).freeze + LICENSES[ "motosoto" ] = SpdxLicenseMeta.new( short: "Motosoto", name: "Motosoto Open Source License", url: "https://opensource.org/license/motosoto" ).freeze + LICENSES[ "mpl-1.0" ] = SpdxLicenseMeta.new( short: "MPL-1.0", name: "Mozilla Public License, version 1.0", url: "https://opensource.org/license/mpl-1-0" ).freeze + LICENSES[ "mpl-1.1" ] = SpdxLicenseMeta.new( short: "MPL-1.1", name: "Mozilla Public License 1.1", url: "https://opensource.org/license/mpl-1-1" ).freeze + LICENSES[ "mpl-2.0" ] = SpdxLicenseMeta.new( short: "MPL-2.0", name: "Mozilla Public License 2.0", url: "https://opensource.org/license/mpl-2-0" ).freeze + LICENSES[ "ms-pl" ] = SpdxLicenseMeta.new( short: "MS-PL", name: "Microsoft Public License", url: "https://opensource.org/license/ms-pl-html" ).freeze + LICENSES[ "ms-rl" ] = SpdxLicenseMeta.new( short: "MS-RL", name: "Microsoft Reciprocal License", url: "https://opensource.org/license/ms-rl-html" ).freeze + LICENSES[ "mulanpsl-2.0" ] = SpdxLicenseMeta.new( short: "MulanPSL-2.0", name: "Mulan Permissive Software License v2", url: "https://opensource.org/license/mulanpsl-2-0" ).freeze + LICENSES[ "multics" ] = SpdxLicenseMeta.new( short: "Multics", name: "Multics License", url: "https://opensource.org/license/multics-txt" ).freeze + LICENSES[ "nasa-1.3" ] = SpdxLicenseMeta.new( short: "NASA-1.3", name: "NASA Open Source Agreement v1.3", url: "https://opensource.org/license/nasa1-3-php" ).freeze + LICENSES[ "naumen" ] = SpdxLicenseMeta.new( short: "Naumen", name: "NAUMEN Public License", url: "https://opensource.org/license/naumen-php" ).freeze + LICENSES[ "ncsa" ] = SpdxLicenseMeta.new( short: "NCSA", name: "The University of Illinois/NCSA Open Source License", url: "https://opensource.org/license/uoi-ncsa-php" ).freeze + LICENSES[ "ngpl" ] = SpdxLicenseMeta.new( short: "NGPL", name: "The Nethack General Public License", url: "https://opensource.org/license/nethack" ).freeze + LICENSES[ "nokia" ] = SpdxLicenseMeta.new( short: "NOKIA", name: "Nokia Open Source License Version 1.0a", url: "https://opensource.org/license/nokia" ).freeze + LICENSES[ "nposl-3.0" ] = SpdxLicenseMeta.new( short: "NPOSL-3.0", name: "Non-Profit Open Software License version 3.0", url: "https://opensource.org/license/nposl-3-0" ).freeze + LICENSES[ "ntp" ] = SpdxLicenseMeta.new( short: "NTP", name: "NTP License", url: "https://opensource.org/license/ntp-license-php" ).freeze + LICENSES[ "ofl-1.1" ] = SpdxLicenseMeta.new( short: "OFL-1.1", name: "SIL OPEN FONT LICENSE", url: "https://opensource.org/license/ofl-1-1" ).freeze + LICENSES[ "ogtsl" ] = SpdxLicenseMeta.new( short: "OGTSL", name: "Open Group Test Suite License", url: "https://opensource.org/license/opengroup-php" ).freeze + LICENSES[ "oldap-2.8" ] = SpdxLicenseMeta.new( short: "OLDAP-2.8", name: "OpenLDAP Public License Version 2.8", url: "https://opensource.org/license/oldap-2-8" ).freeze + LICENSES[ "olfl-1.3" ] = SpdxLicenseMeta.new( short: "OLFL-1.3", name: "Open Logistics Foundation License v1.3", url: "https://opensource.org/license/olfl-1-3" ).freeze + LICENSES[ "oset-pl-2.1" ] = SpdxLicenseMeta.new( short: "OSET-PL-2.1", name: "OSET Public License version 2.1", url: "https://opensource.org/license/opl-2-1" ).freeze + LICENSES[ "osl-1.0" ] = SpdxLicenseMeta.new( short: "OSL-1.0", name: "Open Software License, version 1.0", url: "https://opensource.org/license/osl-1-0" ).freeze + LICENSES[ "osl-2.1" ] = SpdxLicenseMeta.new( short: "OSL-2.1", name: "Open Software License 2.1", url: "https://opensource.org/license/osl-2-1" ).freeze + LICENSES[ "osl-3.0" ] = SpdxLicenseMeta.new( short: "OSL-3.0", name: "The Open Software License 3.0", url: "https://opensource.org/license/osl-3-0-php" ).freeze + LICENSES[ "php-3.0" ] = SpdxLicenseMeta.new( short: "PHP-3.0", name: "PHP License 3.0", url: "https://opensource.org/license/php-3-0" ).freeze + LICENSES[ "php-3.01" ] = SpdxLicenseMeta.new( short: "PHP-3.01", name: "PHP License 3.01", url: "https://opensource.org/license/php-3-01" ).freeze + LICENSES[ "postgresql" ] = SpdxLicenseMeta.new( short: "PostgreSQL", name: "The PostgreSQL License", url: "https://opensource.org/license/postgresql" ).freeze + LICENSES[ "psf-2.0" ] = SpdxLicenseMeta.new( short: "PSF-2.0", name: "Python License, Version 2", url: "https://opensource.org/license/python-2-0" ).freeze + LICENSES[ "qpl-1.0" ] = SpdxLicenseMeta.new( short: "QPL-1.0", name: "The Q Public License Version", url: "https://opensource.org/license/qpl-1-0" ).freeze + LICENSES[ "rpl-1.1" ] = SpdxLicenseMeta.new( short: "RPL-1.1", name: "Reciprocal Public License, version 1.1", url: "https://opensource.org/license/rpl-1-1" ).freeze + LICENSES[ "rpl-1.5" ] = SpdxLicenseMeta.new( short: "RPL-1.5", name: "Reciprocal Public License 1.5", url: "https://opensource.org/license/rpl-1-5" ).freeze + LICENSES[ "rpsl-1.0" ] = SpdxLicenseMeta.new( short: "RPSL-1.0", name: "RealNetworks Public Source License Version 1.0", url: "https://opensource.org/license/real-php" ).freeze + LICENSES[ "rscpl" ] = SpdxLicenseMeta.new( short: "RSCPL", name: "The Ricoh Source Code Public License", url: "https://opensource.org/license/ricohpl-php" ).freeze + LICENSES[ "simpl-2.0" ] = SpdxLicenseMeta.new( short: "SimPL-2.0", name: "Simple Public License", url: "https://opensource.org/license/simpl-2-0-html" ).freeze + LICENSES[ "sissl" ] = SpdxLicenseMeta.new( short: "SISSL", name: "Sun Industry Standards Source License", url: "https://opensource.org/license/sissl" ).freeze + LICENSES[ "sleepycat" ] = SpdxLicenseMeta.new( short: "Sleepycat", name: "The Sleepycat License", url: "https://opensource.org/license/sleepycat-php" ).freeze + LICENSES[ "spl-1.0" ] = SpdxLicenseMeta.new( short: "SPL-1.0", name: "Sun Public License, Version 1.0", url: "https://opensource.org/license/sunpublic-php" ).freeze + LICENSES[ "ucl-1.0" ] = SpdxLicenseMeta.new( short: "UCL-1.0", name: "Upstream Compatibility License v1.0", url: "https://opensource.org/license/ucl-1-0" ).freeze + LICENSES[ "unicode-dfs-2015" ] = SpdxLicenseMeta.new( short: "Unicode-DFS-2015", name: "Unicode, Inc. License Agreement - Data Files and Software", url: "https://opensource.org/license/unicode-inc-license-agreement-data-files-and-software" ).freeze + LICENSES[ "unlicense" ] = SpdxLicenseMeta.new( short: "Unlicense", name: "The Unlicense", url: "https://opensource.org/license/unlicense" ).freeze + LICENSES[ "upl-1.0" ] = SpdxLicenseMeta.new( short: "UPL-1.0", name: "The Universal Permissive License Version 1.0", url: "https://opensource.org/license/upl" ).freeze + LICENSES[ "vsl-0.1" ] = SpdxLicenseMeta.new( short: "VSL-0.1", name: "The Vovida Software License v. 1.0", url: "https://opensource.org/license/vovidapl-php" ).freeze + LICENSES[ "w3c-20150513" ] = SpdxLicenseMeta.new( short: "W3C-20150513", name: "The W3C® Software and Document license", url: "https://opensource.org/license/w3c" ).freeze + LICENSES[ "watcom-1.0" ] = SpdxLicenseMeta.new( short: "Watcom-1.0", name: "The Sybase Open Source Licence", url: "https://opensource.org/license/sybase-php" ).freeze + LICENSES[ "wxwindows" ] = SpdxLicenseMeta.new( short: "wxWindows", name: "The wxWindows Library Licence", url: "https://opensource.org/license/wxwindows-php" ).freeze + LICENSES[ "xnet" ] = SpdxLicenseMeta.new( short: "Xnet", name: "The X.Net, Inc. License", url: "https://opensource.org/license/xnet" ).freeze + LICENSES[ "zlib" ] = SpdxLicenseMeta.new( short: "Zlib", name: "The zlib/libpng License", url: "https://opensource.org/license/zlib" ).freeze + LICENSES[ "zpl-2.0" ] = SpdxLicenseMeta.new( short: "ZPL-2.0", name: "Zope Public License 2.0", url: "https://opensource.org/license/zpl-2-0" ).freeze + LICENSES[ "zpl-2.1" ] = SpdxLicenseMeta.new( short: "ZPL-2.1", name: "Zope Public License 2.1", url: "https://opensource.org/license/zpl-2-1" ).freeze LICENSES.freeze end end diff --git a/lib/maven/tools/version.rb b/lib/maven/tools/version.rb index 3ee83ec..d64033c 100644 --- a/lib/maven/tools/version.rb +++ b/lib/maven/tools/version.rb @@ -20,6 +20,6 @@ # module Maven module Tools - VERSION = '1.2.3'.freeze + VERSION = '1.2.4'.freeze end end diff --git a/lib/maven/tools/versions.rb b/lib/maven/tools/versions.rb index add9e6b..a172a88 100644 --- a/lib/maven/tools/versions.rb +++ b/lib/maven/tools/versions.rb @@ -22,14 +22,14 @@ module Maven module Tools unless defined? VERSIONS VERSIONS = { - :jar_plugin => "2.4", - :clean_plugin => "2.4", - :jruby_plugins => "3.0.0", + :clean_plugin => "3.5.0", + :jar_plugin => "3.5.0", + :jruby_plugins => "3.0.6", :jruby9_plugins => "0.3.0", :bundler_version => "1.10.6", - :jruby_version => "9.1.2.0", - :polyglot_version => "0.1.18", - :mavengem_wagon => "2.0.0" + :jruby_version => "9.4.14.0", + :polyglot_version => "0.8.1", + :mavengem_wagon => "2.0.2" }.freeze end end diff --git a/maven-tools.gemspec b/maven-tools.gemspec index f924d62..3682076 100644 --- a/maven-tools.gemspec +++ b/maven-tools.gemspec @@ -7,7 +7,7 @@ Gem::Specification.new do |s| s.summary = 'helpers for maven related tasks' s.description = 'adds versions conversion from rubygems to maven and vice versa, ruby DSL for POM (Project Object Model from maven), pom generators, etc' - s.homepage = 'http://github.com/torquebox/maven-tools' + s.homepage = 'https://github.com/jruby/maven-tools' s.authors = ['Christian Meier'] s.email = ['m.kristian@web.de'] @@ -29,10 +29,10 @@ Gem::Specification.new do |s| s.test_files += Dir['spec/**/*gem'] s.add_runtime_dependency 'virtus', '~> 1.0' + s.add_runtime_dependency 'bigdecimal' # virtus is EOL, but depends on axiom-types which has a bigdecimal dependency + s.add_runtime_dependency 'ostruct' # virtus is EOL, but depends on ostruct usage -# get them out from here until jruby-maven-plugin installs test gems somewhere else then runtime gems - - s.add_development_dependency 'rake', '~> 10.0' + s.add_development_dependency 'rake', '~> 13.0' s.add_development_dependency 'minitest', '~> 5.3' end diff --git a/mvnw b/mvnw index fc7efd1..bd8896b 100755 --- a/mvnw +++ b/mvnw @@ -19,216 +19,277 @@ # ---------------------------------------------------------------------------- # ---------------------------------------------------------------------------- -# Maven2 Start Up Batch script -# -# Required ENV vars: -# ------------------ -# JAVA_HOME - location of a JDK home dir +# Apache Maven Wrapper startup batch script, version 3.3.4 # # Optional ENV vars # ----------------- -# M2_HOME - location of maven2's installed home dir -# MAVEN_OPTS - parameters passed to the Java VM when running Maven -# e.g. to debug Maven itself, use -# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# JAVA_HOME - location of a JDK home dir, required when download maven via java source +# MVNW_REPOURL - repo url base for downloading maven distribution +# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output # ---------------------------------------------------------------------------- -if [ -z "$MAVEN_SKIP_RC" ] ; then +set -euf +[ "${MVNW_VERBOSE-}" != debug ] || set -x - if [ -f /etc/mavenrc ] ; then - . /etc/mavenrc - fi +# OS specific support. +native_path() { printf %s\\n "$1"; } +case "$(uname)" in +CYGWIN* | MINGW*) + [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")" + native_path() { cygpath --path --windows "$1"; } + ;; +esac + +# set JAVACMD and JAVACCMD +set_java_home() { + # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched + if [ -n "${JAVA_HOME-}" ]; then + if [ -x "$JAVA_HOME/jre/sh/java" ]; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACCMD="$JAVA_HOME/jre/sh/javac" + else + JAVACMD="$JAVA_HOME/bin/java" + JAVACCMD="$JAVA_HOME/bin/javac" - if [ -f "$HOME/.mavenrc" ] ; then - . "$HOME/.mavenrc" + if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then + echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2 + echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2 + return 1 + fi + fi + else + JAVACMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v java + )" || : + JAVACCMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v javac + )" || : + + if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then + echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2 + return 1 + fi fi +} -fi +# hash string like Java String::hashCode +hash_string() { + str="${1:-}" h=0 + while [ -n "$str" ]; do + char="${str%"${str#?}"}" + h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296)) + str="${str#?}" + done + printf %x\\n $h +} -# OS specific support. $var _must_ be set to either true or false. -cygwin=false; -darwin=false; -mingw=false -case "`uname`" in - CYGWIN*) cygwin=true ;; - MINGW*) mingw=true;; - Darwin*) darwin=true - # - # Look for the Apple JDKs first to preserve the existing behaviour, and then look - # for the new JDKs provided by Oracle. - # - if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK ] ; then - # - # Apple JDKs - # - export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home - fi - - if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Java/JavaVirtualMachines/CurrentJDK ] ; then - # - # Apple JDKs - # - export JAVA_HOME=/System/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home - fi - - if [ -z "$JAVA_HOME" ] && [ -L "/Library/Java/JavaVirtualMachines/CurrentJDK" ] ; then - # - # Oracle JDKs - # - export JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home - fi - - if [ -z "$JAVA_HOME" ] && [ -x "/usr/libexec/java_home" ]; then - # - # Apple JDKs - # - export JAVA_HOME=`/usr/libexec/java_home` - fi - ;; -esac +verbose() { :; } +[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; } -if [ -z "$JAVA_HOME" ] ; then - if [ -r /etc/gentoo-release ] ; then - JAVA_HOME=`java-config --jre-home` - fi -fi +die() { + printf %s\\n "$1" >&2 + exit 1 +} -if [ -z "$M2_HOME" ] ; then - ## resolve links - $0 may be a link to maven's home - PRG="$0" +trim() { + # MWRAPPER-139: + # Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds. + # Needed for removing poorly interpreted newline sequences when running in more + # exotic environments such as mingw bash on Windows. + printf "%s" "${1}" | tr -d '[:space:]' +} - # need this for relative symlinks - while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG="`dirname "$PRG"`/$link" - fi - done +scriptDir="$(dirname "$0")" +scriptName="$(basename "$0")" - saveddir=`pwd` +# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties +while IFS="=" read -r key value; do + case "${key-}" in + distributionUrl) distributionUrl=$(trim "${value-}") ;; + distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;; + esac +done <"$scriptDir/.mvn/wrapper/maven-wrapper.properties" +[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" - M2_HOME=`dirname "$PRG"`/.. +case "${distributionUrl##*/}" in +maven-mvnd-*bin.*) + MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ + case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in + *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;; + :Darwin*x86_64) distributionPlatform=darwin-amd64 ;; + :Darwin*arm64) distributionPlatform=darwin-aarch64 ;; + :Linux*x86_64*) distributionPlatform=linux-amd64 ;; + *) + echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2 + distributionPlatform=linux-amd64 + ;; + esac + distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip" + ;; +maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;; +*) MVN_CMD="mvn${scriptName#mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; +esac + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}" +distributionUrlName="${distributionUrl##*/}" +distributionUrlNameMain="${distributionUrlName%.*}" +distributionUrlNameMain="${distributionUrlNameMain%-bin}" +MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}" +MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")" - # make it fully qualified - M2_HOME=`cd "$M2_HOME" && pwd` +exec_maven() { + unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || : + exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD" +} - cd "$saveddir" - # echo Using m2 at $M2_HOME +if [ -d "$MAVEN_HOME" ]; then + verbose "found existing MAVEN_HOME at $MAVEN_HOME" + exec_maven "$@" fi -# For Cygwin, ensure paths are in UNIX format before anything is touched -if $cygwin ; then - [ -n "$M2_HOME" ] && - M2_HOME=`cygpath --unix "$M2_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --unix "$JAVA_HOME"` - [ -n "$CLASSPATH" ] && - CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +case "${distributionUrl-}" in +*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;; +*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;; +esac + +# prepare tmp dir +if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then + clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; } + trap clean HUP INT TERM EXIT +else + die "cannot create temp dir" fi -# For Migwn, ensure paths are in UNIX format before anything is touched -if $mingw ; then - [ -n "$M2_HOME" ] && - M2_HOME="`(cd "$M2_HOME"; pwd)`" - [ -n "$JAVA_HOME" ] && - JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" - # TODO classpath? +mkdir -p -- "${MAVEN_HOME%/*}" + +# Download and Install Apache Maven +verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +verbose "Downloading from: $distributionUrl" +verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +# select .zip or .tar.gz +if ! command -v unzip >/dev/null; then + distributionUrl="${distributionUrl%.zip}.tar.gz" + distributionUrlName="${distributionUrl##*/}" fi -if [ -z "$JAVA_HOME" ]; then - javaExecutable="`which javac`" - if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then - # readlink(1) is not available as standard on Solaris 10. - readLink=`which readlink` - if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then - if $darwin ; then - javaHome="`dirname \"$javaExecutable\"`" - javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" - else - javaExecutable="`readlink -f \"$javaExecutable\"`" - fi - javaHome="`dirname \"$javaExecutable\"`" - javaHome=`expr "$javaHome" : '\(.*\)/bin'` - JAVA_HOME="$javaHome" - export JAVA_HOME - fi - fi +# verbose opt +__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR='' +[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v + +# normalize http auth +case "${MVNW_PASSWORD:+has-password}" in +'') MVNW_USERNAME='' MVNW_PASSWORD='' ;; +has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;; +esac + +if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then + verbose "Found wget ... using wget" + wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl" +elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then + verbose "Found curl ... using curl" + curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl" +elif set_java_home; then + verbose "Falling back to use Java to download" + javaSource="$TMP_DOWNLOAD_DIR/Downloader.java" + targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName" + cat >"$javaSource" <<-END + public class Downloader extends java.net.Authenticator + { + protected java.net.PasswordAuthentication getPasswordAuthentication() + { + return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() ); + } + public static void main( String[] args ) throws Exception + { + setDefault( new Downloader() ); + java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() ); + } + } + END + # For Cygwin/MinGW, switch paths to Windows format before running javac and java + verbose " - Compiling Downloader.java ..." + "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java" + verbose " - Running Downloader.java ..." + "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")" fi -if [ -z "$JAVACMD" ] ; then - if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" +# If specified, validate the SHA-256 sum of the Maven distribution zip file +if [ -n "${distributionSha256Sum-}" ]; then + distributionSha256Result=false + if [ "$MVN_CMD" = mvnd.sh ]; then + echo "Checksum validation is not supported for maven-mvnd." >&2 + echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + elif command -v sha256sum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c - >/dev/null 2>&1; then + distributionSha256Result=true + fi + elif command -v shasum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then + distributionSha256Result=true fi else - JAVACMD="`which java`" + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2 + echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + fi + if [ $distributionSha256Result = false ]; then + echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2 + echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2 + exit 1 fi fi -if [ ! -x "$JAVACMD" ] ; then - echo "Error: JAVA_HOME is not defined correctly." >&2 - echo " We cannot execute $JAVACMD" >&2 - exit 1 -fi - -if [ -z "$JAVA_HOME" ] ; then - echo "Warning: JAVA_HOME environment variable is not set." +# unzip and move +if command -v unzip >/dev/null; then + unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip" +else + tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar" fi -CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher +# Find the actual extracted directory name (handles snapshots where filename != directory name) +actualDistributionDir="" -# For Cygwin, switch paths to Windows format before running java -if $cygwin; then - [ -n "$M2_HOME" ] && - M2_HOME=`cygpath --path --windows "$M2_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` - [ -n "$CLASSPATH" ] && - CLASSPATH=`cygpath --path --windows "$CLASSPATH"` +# First try the expected directory name (for regular distributions) +if [ -d "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" ]; then + if [ -f "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/bin/$MVN_CMD" ]; then + actualDistributionDir="$distributionUrlNameMain" + fi fi -# traverses directory structure from process work directory to filesystem root -# first directory with .mvn subdirectory is considered project base directory -find_maven_basedir() { - local basedir=$(pwd) - local wdir=$(pwd) - while [ "$wdir" != '/' ] ; do - if [ -d "$wdir"/.mvn ] ; then - basedir=$wdir - break +# If not found, search for any directory with the Maven executable (for snapshots) +if [ -z "$actualDistributionDir" ]; then + # enable globbing to iterate over items + set +f + for dir in "$TMP_DOWNLOAD_DIR"/*; do + if [ -d "$dir" ]; then + if [ -f "$dir/bin/$MVN_CMD" ]; then + actualDistributionDir="$(basename "$dir")" + break + fi fi - wdir=$(cd "$wdir/.."; pwd) done - echo "${basedir}" -} - -# concatenates all lines of a file -concat_lines() { - if [ -f "$1" ]; then - echo "$(tr -s '\n' ' ' < "$1")" - fi -} - -export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-$(find_maven_basedir)} -MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" - -# Provide a "standardized" way to retrieve the CLI args that will -# work with both Windows and non-Windows executions. -MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" -export MAVEN_CMD_LINE_ARGS + set -f +fi -WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain +if [ -z "$actualDistributionDir" ]; then + verbose "Contents of $TMP_DOWNLOAD_DIR:" + verbose "$(ls -la "$TMP_DOWNLOAD_DIR")" + die "Could not find Maven distribution directory in extracted archive" +fi -exec "$JAVACMD" \ - $MAVEN_OPTS \ - -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ - "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ - ${WRAPPER_LAUNCHER} $MAVEN_CMD_LINE_ARGS +verbose "Found extracted Maven distribution directory: $actualDistributionDir" +printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$actualDistributionDir/mvnw.url" +mv -- "$TMP_DOWNLOAD_DIR/$actualDistributionDir" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" +clean || : +exec_maven "$@" diff --git a/mvnw.cmd b/mvnw.cmd index 0010480..92450f9 100644 --- a/mvnw.cmd +++ b/mvnw.cmd @@ -1,3 +1,4 @@ +<# : batch portion @REM ---------------------------------------------------------------------------- @REM Licensed to the Apache Software Foundation (ASF) under one @REM or more contributor license agreements. See the NOTICE file @@ -18,128 +19,171 @@ @REM ---------------------------------------------------------------------------- @REM ---------------------------------------------------------------------------- -@REM Maven2 Start Up Batch script -@REM -@REM Required ENV vars: -@REM JAVA_HOME - location of a JDK home dir +@REM Apache Maven Wrapper startup batch script, version 3.3.4 @REM @REM Optional ENV vars -@REM M2_HOME - location of maven2's installed home dir -@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands -@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending -@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven -@REM e.g. to debug Maven itself, use -@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM MVNW_REPOURL - repo url base for downloading maven distribution +@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output @REM ---------------------------------------------------------------------------- -@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' -@echo off -@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on' -@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% - -@REM set %HOME% to equivalent of $HOME -if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") - -@REM Execute a user defined script before this one -if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre -@REM check for pre script, once with legacy .bat ending and once with .cmd ending -if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" -if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" -:skipRcPre - -@setlocal - -set ERROR_CODE=0 - -@REM To isolate internal variables from possible post scripts, we use another setlocal -@setlocal - -@REM ==== START VALIDATION ==== -if not "%JAVA_HOME%" == "" goto OkJHome - -echo. -echo Error: JAVA_HOME not found in your environment. >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -:OkJHome -if exist "%JAVA_HOME%\bin\java.exe" goto init - -echo. -echo Error: JAVA_HOME is set to an invalid directory. >&2 -echo JAVA_HOME = "%JAVA_HOME%" >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -@REM ==== END VALIDATION ==== - -:init - -set MAVEN_CMD_LINE_ARGS=%MAVEN_CONFIG% %* - -@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". -@REM Fallback to current working directory if not found. - -set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% -IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir - -set EXEC_DIR=%CD% -set WDIR=%EXEC_DIR% -:findBaseDir -IF EXIST "%WDIR%"\.mvn goto baseDirFound -cd .. -IF "%WDIR%"=="%CD%" goto baseDirNotFound -set WDIR=%CD% -goto findBaseDir - -:baseDirFound -set MAVEN_PROJECTBASEDIR=%WDIR% -cd "%EXEC_DIR%" -goto endDetectBaseDir - -:baseDirNotFound -set MAVEN_PROJECTBASEDIR=%EXEC_DIR% -cd "%EXEC_DIR%" - -:endDetectBaseDir - -IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig - -@setlocal EnableExtensions EnableDelayedExpansion -for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a -@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% - -:endReadAdditionalConfig - -SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" - -set WRAPPER_JAR=""%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"" -set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain - -%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CMD_LINE_ARGS% -if ERRORLEVEL 1 goto error -goto end - -:error -set ERROR_CODE=1 - -:end -@endlocal & set ERROR_CODE=%ERROR_CODE% - -if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost -@REM check for post script, once with legacy .bat ending and once with .cmd ending -if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" -if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" -:skipRcPost - -@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' -if "%MAVEN_BATCH_PAUSE%" == "on" pause - -if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% - -exit /B %ERROR_CODE% +@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0) +@SET __MVNW_CMD__= +@SET __MVNW_ERROR__= +@SET __MVNW_PSMODULEP_SAVE=%PSModulePath% +@SET PSModulePath= +@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @( + IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B) +) +@SET PSModulePath=%__MVNW_PSMODULEP_SAVE% +@SET __MVNW_PSMODULEP_SAVE= +@SET __MVNW_ARG0_NAME__= +@SET MVNW_USERNAME= +@SET MVNW_PASSWORD= +@IF NOT "%__MVNW_CMD__%"=="" ("%__MVNW_CMD__%" %*) +@echo Cannot start maven from wrapper >&2 && exit /b 1 +@GOTO :EOF +: end batch / begin powershell #> + +$ErrorActionPreference = "Stop" +if ($env:MVNW_VERBOSE -eq "true") { + $VerbosePreference = "Continue" +} + +# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties +$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl +if (!$distributionUrl) { + Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" +} + +switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) { + "maven-mvnd-*" { + $USE_MVND = $true + $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip" + $MVN_CMD = "mvnd.cmd" + break + } + default { + $USE_MVND = $false + $MVN_CMD = $script -replace '^mvnw','mvn' + break + } +} + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +if ($env:MVNW_REPOURL) { + $MVNW_REPO_PATTERN = if ($USE_MVND -eq $False) { "/org/apache/maven/" } else { "/maven/mvnd/" } + $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace "^.*$MVNW_REPO_PATTERN",'')" +} +$distributionUrlName = $distributionUrl -replace '^.*/','' +$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$','' + +$MAVEN_M2_PATH = "$HOME/.m2" +if ($env:MAVEN_USER_HOME) { + $MAVEN_M2_PATH = "$env:MAVEN_USER_HOME" +} + +if (-not (Test-Path -Path $MAVEN_M2_PATH)) { + New-Item -Path $MAVEN_M2_PATH -ItemType Directory | Out-Null +} + +$MAVEN_WRAPPER_DISTS = $null +if ((Get-Item $MAVEN_M2_PATH).Target[0] -eq $null) { + $MAVEN_WRAPPER_DISTS = "$MAVEN_M2_PATH/wrapper/dists" +} else { + $MAVEN_WRAPPER_DISTS = (Get-Item $MAVEN_M2_PATH).Target[0] + "/wrapper/dists" +} + +$MAVEN_HOME_PARENT = "$MAVEN_WRAPPER_DISTS/$distributionUrlNameMain" +$MAVEN_HOME_NAME = ([System.Security.Cryptography.SHA256]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join '' +$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME" + +if (Test-Path -Path "$MAVEN_HOME" -PathType Container) { + Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME" + Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" + exit $? +} + +if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) { + Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl" +} + +# prepare tmp dir +$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile +$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir" +$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null +trap { + if ($TMP_DOWNLOAD_DIR.Exists) { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } + } +} + +New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null + +# Download and Install Apache Maven +Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +Write-Verbose "Downloading from: $distributionUrl" +Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +$webclient = New-Object System.Net.WebClient +if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) { + $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD) +} +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 +$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum +if ($distributionSha256Sum) { + if ($USE_MVND) { + Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." + } + Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash + if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) { + Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property." + } +} + +# unzip and move +Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null + +# Find the actual extracted directory name (handles snapshots where filename != directory name) +$actualDistributionDir = "" + +# First try the expected directory name (for regular distributions) +$expectedPath = Join-Path "$TMP_DOWNLOAD_DIR" "$distributionUrlNameMain" +$expectedMvnPath = Join-Path "$expectedPath" "bin/$MVN_CMD" +if ((Test-Path -Path $expectedPath -PathType Container) -and (Test-Path -Path $expectedMvnPath -PathType Leaf)) { + $actualDistributionDir = $distributionUrlNameMain +} + +# If not found, search for any directory with the Maven executable (for snapshots) +if (!$actualDistributionDir) { + Get-ChildItem -Path "$TMP_DOWNLOAD_DIR" -Directory | ForEach-Object { + $testPath = Join-Path $_.FullName "bin/$MVN_CMD" + if (Test-Path -Path $testPath -PathType Leaf) { + $actualDistributionDir = $_.Name + } + } +} + +if (!$actualDistributionDir) { + Write-Error "Could not find Maven distribution directory in extracted archive" +} + +Write-Verbose "Found extracted Maven distribution directory: $actualDistributionDir" +Rename-Item -Path "$TMP_DOWNLOAD_DIR/$actualDistributionDir" -NewName $MAVEN_HOME_NAME | Out-Null +try { + Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null +} catch { + if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) { + Write-Error "fail to move MAVEN_HOME" + } +} finally { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } +} + +Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" diff --git a/pom.xml b/pom.xml index aa4ad76..4c50084 100644 --- a/pom.xml +++ b/pom.xml @@ -2,10 +2,10 @@ 4.0.0 rubygems maven-tools - 1.2.2 + 1.2.4 gem helpers for maven related tasks - http://github.com/jruby/maven-tools + https://github.com/jruby/maven-tools adds versions conversion from rubygems to maven and vice versa, ruby DSL for POM (Project Object Model from maven), pom generators, etc @@ -15,7 +15,7 @@ https://github.com/jruby/maven-tools.git - http://github.com/jruby/maven-tools + https://github.com/jruby/maven-tools @@ -45,8 +45,8 @@ utf-8 - 3.0.0 - 2.0.0 + 3.0.6 + 2.0.2 @@ -55,10 +55,22 @@ [1.0,1.99999] gem + + rubygems + bigdecimal + [0,) + gem + + + rubygems + ostruct + [0,) + gem + rubygems rake - [10.0,10.99999] + [13.0,13.99999] gem test @@ -75,7 +87,7 @@ org.jruby.maven mavengem-wagon - ${mavengem.plugins.version} + ${mavengem.wagon.version} org.jruby.maven diff --git a/spec/dsl/gemspec_spec/jars_and_poms.gemspec b/spec/dsl/gemspec_spec/jars_and_poms.gemspec index 1de54ac..09495e7 100644 --- a/spec/dsl/gemspec_spec/jars_and_poms.gemspec +++ b/spec/dsl/gemspec_spec/jars_and_poms.gemspec @@ -6,7 +6,7 @@ Gem::Specification.new do |s| s.summary = 'helpers for maven related tasks' s.description = 'adds versions conversion from rubygems to maven and vice versa, ruby DSL for POM (Project Object Model from maven), pom generators, etc' - s.homepage = 'http://github.com/torquebox/maven-tools' + s.homepage = 'https://github.com/jruby/maven-tools' s.authors = ['Christian Meier'] s.email = ['m.kristian@web.de'] diff --git a/spec/dsl/gemspec_spec/jars_and_poms.xml b/spec/dsl/gemspec_spec/jars_and_poms.xml index 71d8fe8..0e2720f 100644 --- a/spec/dsl/gemspec_spec/jars_and_poms.xml +++ b/spec/dsl/gemspec_spec/jars_and_poms.xml @@ -5,8 +5,8 @@ 0.0.0 gemspec_spec - 3.0.0 - 2.0.0 + 3.0.6 + 2.0.2 diff --git a/spec/dsl/gemspec_spec/jars_and_poms_include_jars.xml b/spec/dsl/gemspec_spec/jars_and_poms_include_jars.xml index e7ff193..9bdde6a 100644 --- a/spec/dsl/gemspec_spec/jars_and_poms_include_jars.xml +++ b/spec/dsl/gemspec_spec/jars_and_poms_include_jars.xml @@ -5,8 +5,8 @@ 0.0.0 gemspec_spec - 3.0.0 - 2.0.0 + 3.0.6 + 2.0.2 diff --git a/spec/dsl/gemspec_spec/maven-tools.gemspec b/spec/dsl/gemspec_spec/maven-tools.gemspec index dfdebc7..62e1699 100644 --- a/spec/dsl/gemspec_spec/maven-tools.gemspec +++ b/spec/dsl/gemspec_spec/maven-tools.gemspec @@ -24,20 +24,48 @@ dependencies: - - ~> - !ruby/object:Gem::Version version: '1.0' +- !ruby/object:Gem::Dependency + name: bigdecimal + requirement: !ruby/object:Gem::Requirement + requirements: + - - '>=' + - !ruby/object:Gem::Version + version: '0' + type: :runtime + prerelease: false + version_requirements: !ruby/object:Gem::Requirement + requirements: + - - '>=' + - !ruby/object:Gem::Version + version: '0' +- !ruby/object:Gem::Dependency + name: ostruct + requirement: !ruby/object:Gem::Requirement + requirements: + - - '>=' + - !ruby/object:Gem::Version + version: '0' + type: :runtime + prerelease: false + version_requirements: !ruby/object:Gem::Requirement + requirements: + - - '>=' + - !ruby/object:Gem::Version + version: '0' - !ruby/object:Gem::Dependency name: rake requirement: !ruby/object:Gem::Requirement requirements: - - ~> - !ruby/object:Gem::Version - version: '10.0' + version: '13.0' type: :development prerelease: false version_requirements: !ruby/object:Gem::Requirement requirements: - - ~> - !ruby/object:Gem::Version - version: '10.0' + version: '13.0' - !ruby/object:Gem::Dependency name: minitest requirement: !ruby/object:Gem::Requirement @@ -239,7 +267,7 @@ files: - spec/gemspec_with_extras/bouncy-castle-java.gemspec - spec/gemspec_with_source_and_no_jar/bouncy-castle-java.gemspec - spec/gemfile_with_extras/bouncy-castle-java.gemspec -homepage: http://github.com/torquebox/maven-tools +homepage: https://github.com/jruby/maven-tools licenses: - MIT metadata: {} diff --git a/spec/dsl/gemspec_spec/maven-tools.xml b/spec/dsl/gemspec_spec/maven-tools.xml index 922dda7..4213c9c 100644 --- a/spec/dsl/gemspec_spec/maven-tools.xml +++ b/spec/dsl/gemspec_spec/maven-tools.xml @@ -5,8 +5,8 @@ 0.0.0 BASEDIR - 3.0.0 - 2.0.0 + 3.0.6 + 2.0.2 @@ -15,10 +15,22 @@ [1.0,1.99999] gem + + rubygems + bigdecimal + [0,) + gem + + + rubygems + ostruct + [0,) + gem + rubygems rake - [10.0,10.99999] + [13.0,13.99999] gem test diff --git a/spec/dsl/profile_gemspec_spec/jars_and_poms.gemspec b/spec/dsl/profile_gemspec_spec/jars_and_poms.gemspec index f455206..92aea7f 100644 --- a/spec/dsl/profile_gemspec_spec/jars_and_poms.gemspec +++ b/spec/dsl/profile_gemspec_spec/jars_and_poms.gemspec @@ -6,7 +6,7 @@ Gem::Specification.new do |s| s.summary = 'helpers for maven related tasks' s.description = 'adds versions conversion from rubygems to maven and vice versa, ruby DSL for POM (Project Object Model from maven), pom generators, etc' - s.homepage = 'http://github.com/torquebox/maven-tools' + s.homepage = 'https://github.com/jruby/maven-tools' s.authors = ['Christian Meier'] s.email = ['m.kristian@web.de'] diff --git a/spec/dsl/profile_gemspec_spec/jars_and_poms.xml b/spec/dsl/profile_gemspec_spec/jars_and_poms.xml index 751a801..7e2bb11 100644 --- a/spec/dsl/profile_gemspec_spec/jars_and_poms.xml +++ b/spec/dsl/profile_gemspec_spec/jars_and_poms.xml @@ -6,8 +6,8 @@ profile_gemspec_spec utf-8 - 3.0.0 - 2.0.0 + 3.0.6 + 2.0.2 diff --git a/spec/dsl/profile_gemspec_spec/jars_and_poms_include_jars.xml b/spec/dsl/profile_gemspec_spec/jars_and_poms_include_jars.xml index 3317832..3d0202e 100644 --- a/spec/dsl/profile_gemspec_spec/jars_and_poms_include_jars.xml +++ b/spec/dsl/profile_gemspec_spec/jars_and_poms_include_jars.xml @@ -6,8 +6,8 @@ profile_gemspec_spec utf-8 - 3.0.0 - 2.0.0 + 3.0.6 + 2.0.2 diff --git a/spec/dsl/profile_gemspec_spec/maven-tools.gemspec b/spec/dsl/profile_gemspec_spec/maven-tools.gemspec index dfdebc7..62e1699 100644 --- a/spec/dsl/profile_gemspec_spec/maven-tools.gemspec +++ b/spec/dsl/profile_gemspec_spec/maven-tools.gemspec @@ -24,20 +24,48 @@ dependencies: - - ~> - !ruby/object:Gem::Version version: '1.0' +- !ruby/object:Gem::Dependency + name: bigdecimal + requirement: !ruby/object:Gem::Requirement + requirements: + - - '>=' + - !ruby/object:Gem::Version + version: '0' + type: :runtime + prerelease: false + version_requirements: !ruby/object:Gem::Requirement + requirements: + - - '>=' + - !ruby/object:Gem::Version + version: '0' +- !ruby/object:Gem::Dependency + name: ostruct + requirement: !ruby/object:Gem::Requirement + requirements: + - - '>=' + - !ruby/object:Gem::Version + version: '0' + type: :runtime + prerelease: false + version_requirements: !ruby/object:Gem::Requirement + requirements: + - - '>=' + - !ruby/object:Gem::Version + version: '0' - !ruby/object:Gem::Dependency name: rake requirement: !ruby/object:Gem::Requirement requirements: - - ~> - !ruby/object:Gem::Version - version: '10.0' + version: '13.0' type: :development prerelease: false version_requirements: !ruby/object:Gem::Requirement requirements: - - ~> - !ruby/object:Gem::Version - version: '10.0' + version: '13.0' - !ruby/object:Gem::Dependency name: minitest requirement: !ruby/object:Gem::Requirement @@ -239,7 +267,7 @@ files: - spec/gemspec_with_extras/bouncy-castle-java.gemspec - spec/gemspec_with_source_and_no_jar/bouncy-castle-java.gemspec - spec/gemfile_with_extras/bouncy-castle-java.gemspec -homepage: http://github.com/torquebox/maven-tools +homepage: https://github.com/jruby/maven-tools licenses: - MIT metadata: {} diff --git a/spec/dsl/profile_gemspec_spec/maven-tools.xml b/spec/dsl/profile_gemspec_spec/maven-tools.xml index a7dc096..f32c5e3 100644 --- a/spec/dsl/profile_gemspec_spec/maven-tools.xml +++ b/spec/dsl/profile_gemspec_spec/maven-tools.xml @@ -6,8 +6,8 @@ BASEDIR utf-8 - 3.0.0 - 2.0.0 + 3.0.6 + 2.0.2 @@ -16,10 +16,22 @@ [1.0,1.99999] gem + + rubygems + bigdecimal + [0,) + gem + + + rubygems + ostruct + [0,) + gem + rubygems rake - [10.0,10.99999] + [13.0,13.99999] gem test diff --git a/spec/dsl/profile_gemspec_spec/no_gems.xml b/spec/dsl/profile_gemspec_spec/no_gems.xml index 6217594..666b354 100644 --- a/spec/dsl/profile_gemspec_spec/no_gems.xml +++ b/spec/dsl/profile_gemspec_spec/no_gems.xml @@ -6,8 +6,8 @@ profile_gemspec_spec utf-8 - 3.0.0 - 2.0.0 + 3.0.6 + 2.0.2 diff --git a/spec/dsl/profile_gemspec_spec/snapshot.gemspec b/spec/dsl/profile_gemspec_spec/snapshot.gemspec index 21f5b2d..b7ffe6e 100644 --- a/spec/dsl/profile_gemspec_spec/snapshot.gemspec +++ b/spec/dsl/profile_gemspec_spec/snapshot.gemspec @@ -6,7 +6,7 @@ Gem::Specification.new do |s| s.summary = 'helpers for maven related tasks' s.description = 'adds versions conversion from rubygems to maven and vice versa, ruby DSL for POM (Project Object Model from maven), pom generators, etc' - s.homepage = 'http://github.com/torquebox/maven-tools' + s.homepage = 'https://github.com/jruby/maven-tools' s.authors = ['Christian Meier'] s.email = ['m.kristian@web.de'] diff --git a/spec/dsl/profile_gemspec_spec/snapshot.xml b/spec/dsl/profile_gemspec_spec/snapshot.xml index edc5def..33b9977 100644 --- a/spec/dsl/profile_gemspec_spec/snapshot.xml +++ b/spec/dsl/profile_gemspec_spec/snapshot.xml @@ -6,8 +6,8 @@ profile_gemspec_spec utf-8 - 3.0.0 - 2.0.0 + 3.0.6 + 2.0.2 diff --git a/spec/dsl/profile_gemspec_spec/unknown_license.gemspec b/spec/dsl/profile_gemspec_spec/unknown_license.gemspec index 73294da..b842ca2 100644 --- a/spec/dsl/profile_gemspec_spec/unknown_license.gemspec +++ b/spec/dsl/profile_gemspec_spec/unknown_license.gemspec @@ -6,7 +6,7 @@ Gem::Specification.new do |s| s.summary = 'helpers for maven related tasks' s.description = 'adds versions conversion from rubygems to maven and vice versa, ruby DSL for POM (Project Object Model from maven), pom generators, etc' - s.homepage = 'http://github.com/torquebox/maven-tools' + s.homepage = 'https://github.com/jruby/maven-tools' s.authors = ['Christian Meier'] s.email = ['m.kristian@web.de'] diff --git a/spec/dsl/profile_gemspec_spec/unknown_license.xml b/spec/dsl/profile_gemspec_spec/unknown_license.xml index 5d28835..dc98a5c 100644 --- a/spec/dsl/profile_gemspec_spec/unknown_license.xml +++ b/spec/dsl/profile_gemspec_spec/unknown_license.xml @@ -6,8 +6,8 @@ profile_gemspec_spec utf-8 - 3.0.0 - 2.0.0 + 3.0.6 + 2.0.2 diff --git a/spec/dsl/project_gemspec_spec/extended.gemspec b/spec/dsl/project_gemspec_spec/extended.gemspec index ebc8f1d..c01d0a6 100644 --- a/spec/dsl/project_gemspec_spec/extended.gemspec +++ b/spec/dsl/project_gemspec_spec/extended.gemspec @@ -6,7 +6,7 @@ Gem::Specification.new do |s| s.summary = 'helpers for maven related tasks' s.description = 'adds versions conversion from rubygems to maven and vice versa, ruby DSL for POM (Project Object Model from maven), pom generators, etc' - s.homepage = 'http://github.com/torquebox/maven-tools' + s.homepage = 'https://github.com/jruby/maven-tools' s.authors = ['Christian Meier'] s.email = ['m.kristian@web.de'] diff --git a/spec/dsl/project_gemspec_spec/extended.xml b/spec/dsl/project_gemspec_spec/extended.xml index 475fbfd..541a4ea 100644 --- a/spec/dsl/project_gemspec_spec/extended.xml +++ b/spec/dsl/project_gemspec_spec/extended.xml @@ -5,13 +5,13 @@ 123 gem helpers for maven related tasks - http://github.com/torquebox/maven-tools + https://github.com/jruby/maven-tools adds versions conversion from rubygems to maven and vice versa, ruby DSL for POM (Project Object Model from maven), pom generators, etc MIT - http://opensource.org/licenses/MIT - MIT license + https://opensource.org/license/mit + The MIT License @@ -21,13 +21,13 @@ - https://github.com/torquebox/maven-tools.git - http://github.com/torquebox/maven-tools + https://github.com/jruby/maven-tools.git + https://github.com/jruby/maven-tools utf-8 - 3.0.0 - 2.0.0 + 3.0.6 + 2.0.2 diff --git a/spec/dsl/project_gemspec_spec/jars_and_poms.gemspec b/spec/dsl/project_gemspec_spec/jars_and_poms.gemspec index f455206..92aea7f 100644 --- a/spec/dsl/project_gemspec_spec/jars_and_poms.gemspec +++ b/spec/dsl/project_gemspec_spec/jars_and_poms.gemspec @@ -6,7 +6,7 @@ Gem::Specification.new do |s| s.summary = 'helpers for maven related tasks' s.description = 'adds versions conversion from rubygems to maven and vice versa, ruby DSL for POM (Project Object Model from maven), pom generators, etc' - s.homepage = 'http://github.com/torquebox/maven-tools' + s.homepage = 'https://github.com/jruby/maven-tools' s.authors = ['Christian Meier'] s.email = ['m.kristian@web.de'] diff --git a/spec/dsl/project_gemspec_spec/jars_and_poms.xml b/spec/dsl/project_gemspec_spec/jars_and_poms.xml index 2694beb..fbca3c2 100644 --- a/spec/dsl/project_gemspec_spec/jars_and_poms.xml +++ b/spec/dsl/project_gemspec_spec/jars_and_poms.xml @@ -5,13 +5,13 @@ 123 gem helpers for maven related tasks - http://github.com/torquebox/maven-tools + https://github.com/jruby/maven-tools adds versions conversion from rubygems to maven and vice versa, ruby DSL for POM (Project Object Model from maven), pom generators, etc MIT - http://opensource.org/licenses/MIT - MIT license + https://opensource.org/license/mit + The MIT License @@ -21,13 +21,13 @@ - https://github.com/torquebox/maven-tools.git - http://github.com/torquebox/maven-tools + https://github.com/jruby/maven-tools.git + https://github.com/jruby/maven-tools utf-8 - 3.0.0 - 2.0.0 + 3.0.6 + 2.0.2 diff --git a/spec/dsl/project_gemspec_spec/jars_and_poms_include_jars.xml b/spec/dsl/project_gemspec_spec/jars_and_poms_include_jars.xml index f76f6ce..0263465 100644 --- a/spec/dsl/project_gemspec_spec/jars_and_poms_include_jars.xml +++ b/spec/dsl/project_gemspec_spec/jars_and_poms_include_jars.xml @@ -5,13 +5,13 @@ 123 gem helpers for maven related tasks - http://github.com/torquebox/maven-tools + https://github.com/jruby/maven-tools adds versions conversion from rubygems to maven and vice versa, ruby DSL for POM (Project Object Model from maven), pom generators, etc MIT - http://opensource.org/licenses/MIT - MIT license + https://opensource.org/license/mit + The MIT License @@ -21,13 +21,13 @@ - https://github.com/torquebox/maven-tools.git - http://github.com/torquebox/maven-tools + https://github.com/jruby/maven-tools.git + https://github.com/jruby/maven-tools utf-8 - 3.0.0 - 2.0.0 + 3.0.6 + 2.0.2 diff --git a/spec/dsl/project_gemspec_spec/maven-tools.gemspec b/spec/dsl/project_gemspec_spec/maven-tools.gemspec index dfdebc7..62e1699 100644 --- a/spec/dsl/project_gemspec_spec/maven-tools.gemspec +++ b/spec/dsl/project_gemspec_spec/maven-tools.gemspec @@ -24,20 +24,48 @@ dependencies: - - ~> - !ruby/object:Gem::Version version: '1.0' +- !ruby/object:Gem::Dependency + name: bigdecimal + requirement: !ruby/object:Gem::Requirement + requirements: + - - '>=' + - !ruby/object:Gem::Version + version: '0' + type: :runtime + prerelease: false + version_requirements: !ruby/object:Gem::Requirement + requirements: + - - '>=' + - !ruby/object:Gem::Version + version: '0' +- !ruby/object:Gem::Dependency + name: ostruct + requirement: !ruby/object:Gem::Requirement + requirements: + - - '>=' + - !ruby/object:Gem::Version + version: '0' + type: :runtime + prerelease: false + version_requirements: !ruby/object:Gem::Requirement + requirements: + - - '>=' + - !ruby/object:Gem::Version + version: '0' - !ruby/object:Gem::Dependency name: rake requirement: !ruby/object:Gem::Requirement requirements: - - ~> - !ruby/object:Gem::Version - version: '10.0' + version: '13.0' type: :development prerelease: false version_requirements: !ruby/object:Gem::Requirement requirements: - - ~> - !ruby/object:Gem::Version - version: '10.0' + version: '13.0' - !ruby/object:Gem::Dependency name: minitest requirement: !ruby/object:Gem::Requirement @@ -239,7 +267,7 @@ files: - spec/gemspec_with_extras/bouncy-castle-java.gemspec - spec/gemspec_with_source_and_no_jar/bouncy-castle-java.gemspec - spec/gemfile_with_extras/bouncy-castle-java.gemspec -homepage: http://github.com/torquebox/maven-tools +homepage: https://github.com/jruby/maven-tools licenses: - MIT metadata: {} diff --git a/spec/dsl/project_gemspec_spec/maven-tools.xml b/spec/dsl/project_gemspec_spec/maven-tools.xml index 0230a41..19d4dcf 100644 --- a/spec/dsl/project_gemspec_spec/maven-tools.xml +++ b/spec/dsl/project_gemspec_spec/maven-tools.xml @@ -5,13 +5,13 @@ VERSION gem helpers for maven related tasks - http://github.com/torquebox/maven-tools + https://github.com/jruby/maven-tools adds versions conversion from rubygems to maven and vice versa, ruby DSL for POM (Project Object Model from maven), pom generators, etc MIT - http://opensource.org/licenses/MIT - MIT license + https://opensource.org/license/mit + The MIT License @@ -21,13 +21,13 @@ - https://github.com/torquebox/maven-tools.git - http://github.com/torquebox/maven-tools + https://github.com/jruby/maven-tools.git + https://github.com/jruby/maven-tools utf-8 - 3.0.0 - 2.0.0 + 3.0.6 + 2.0.2 @@ -36,10 +36,22 @@ [1.0,1.99999] gem + + rubygems + bigdecimal + [0,) + gem + + + rubygems + ostruct + [0,) + gem + rubygems rake - [10.0,10.99999] + [13.0,13.99999] gem test diff --git a/spec/dsl/project_gemspec_spec/no_gems.xml b/spec/dsl/project_gemspec_spec/no_gems.xml index 6a5b4e3..340310a 100644 --- a/spec/dsl/project_gemspec_spec/no_gems.xml +++ b/spec/dsl/project_gemspec_spec/no_gems.xml @@ -5,13 +5,13 @@ VERSION gem helpers for maven related tasks - http://github.com/torquebox/maven-tools + https://github.com/jruby/maven-tools adds versions conversion from rubygems to maven and vice versa, ruby DSL for POM (Project Object Model from maven), pom generators, etc MIT - http://opensource.org/licenses/MIT - MIT license + https://opensource.org/license/mit + The MIT License @@ -21,13 +21,13 @@ - https://github.com/torquebox/maven-tools.git - http://github.com/torquebox/maven-tools + https://github.com/jruby/maven-tools.git + https://github.com/jruby/maven-tools utf-8 - 3.0.0 - 2.0.0 + 3.0.6 + 2.0.2 diff --git a/spec/dsl/project_gemspec_spec/profile.xml b/spec/dsl/project_gemspec_spec/profile.xml index f3636a9..fb676dc 100644 --- a/spec/dsl/project_gemspec_spec/profile.xml +++ b/spec/dsl/project_gemspec_spec/profile.xml @@ -5,13 +5,13 @@ VERSION gem helpers for maven related tasks - http://github.com/torquebox/maven-tools + https://github.com/jruby/maven-tools adds versions conversion from rubygems to maven and vice versa, ruby DSL for POM (Project Object Model from maven), pom generators, etc MIT - http://opensource.org/licenses/MIT - MIT license + https://opensource.org/license/mit + The MIT License @@ -21,13 +21,13 @@ - https://github.com/torquebox/maven-tools.git - http://github.com/torquebox/maven-tools + https://github.com/jruby/maven-tools.git + https://github.com/jruby/maven-tools utf-8 - 3.0.0 - 2.0.0 + 3.0.6 + 2.0.2 @@ -70,10 +70,22 @@ [1.0,1.99999] gem + + rubygems + bigdecimal + [0,) + gem + + + rubygems + ostruct + [0,) + gem + rubygems rake - [10.0,10.99999] + [13.0,13.99999] gem test diff --git a/spec/dsl/project_gemspec_spec/snapshot.gemspec b/spec/dsl/project_gemspec_spec/snapshot.gemspec index 21f5b2d..b7ffe6e 100644 --- a/spec/dsl/project_gemspec_spec/snapshot.gemspec +++ b/spec/dsl/project_gemspec_spec/snapshot.gemspec @@ -6,7 +6,7 @@ Gem::Specification.new do |s| s.summary = 'helpers for maven related tasks' s.description = 'adds versions conversion from rubygems to maven and vice versa, ruby DSL for POM (Project Object Model from maven), pom generators, etc' - s.homepage = 'http://github.com/torquebox/maven-tools' + s.homepage = 'https://github.com/jruby/maven-tools' s.authors = ['Christian Meier'] s.email = ['m.kristian@web.de'] diff --git a/spec/dsl/project_gemspec_spec/snapshot.xml b/spec/dsl/project_gemspec_spec/snapshot.xml index 3b1da80..d4d27c6 100644 --- a/spec/dsl/project_gemspec_spec/snapshot.xml +++ b/spec/dsl/project_gemspec_spec/snapshot.xml @@ -5,13 +5,13 @@ VERSION gem helpers for maven related tasks - http://github.com/torquebox/maven-tools + https://github.com/jruby/maven-tools adds versions conversion from rubygems to maven and vice versa, ruby DSL for POM (Project Object Model from maven), pom generators, etc MIT - http://opensource.org/licenses/MIT - MIT license + https://opensource.org/license/mit + The MIT License @@ -21,13 +21,13 @@ - https://github.com/torquebox/maven-tools.git - http://github.com/torquebox/maven-tools + https://github.com/jruby/maven-tools.git + https://github.com/jruby/maven-tools utf-8 - 3.0.0 - 2.0.0 + 3.0.6 + 2.0.2 diff --git a/spec/dsl/project_gemspec_spec/unknown_license.gemspec b/spec/dsl/project_gemspec_spec/unknown_license.gemspec index 73294da..b842ca2 100644 --- a/spec/dsl/project_gemspec_spec/unknown_license.gemspec +++ b/spec/dsl/project_gemspec_spec/unknown_license.gemspec @@ -6,7 +6,7 @@ Gem::Specification.new do |s| s.summary = 'helpers for maven related tasks' s.description = 'adds versions conversion from rubygems to maven and vice versa, ruby DSL for POM (Project Object Model from maven), pom generators, etc' - s.homepage = 'http://github.com/torquebox/maven-tools' + s.homepage = 'https://github.com/jruby/maven-tools' s.authors = ['Christian Meier'] s.email = ['m.kristian@web.de'] diff --git a/spec/dsl/project_gemspec_spec/unknown_license.xml b/spec/dsl/project_gemspec_spec/unknown_license.xml index f912b66..762bcdb 100644 --- a/spec/dsl/project_gemspec_spec/unknown_license.xml +++ b/spec/dsl/project_gemspec_spec/unknown_license.xml @@ -5,7 +5,7 @@ 123 gem helpers for maven related tasks - http://github.com/torquebox/maven-tools + https://github.com/jruby/maven-tools adds versions conversion from rubygems to maven and vice versa, ruby DSL for POM (Project Object Model from maven), pom generators, etc @@ -19,13 +19,13 @@ - https://github.com/torquebox/maven-tools.git - http://github.com/torquebox/maven-tools + https://github.com/jruby/maven-tools.git + https://github.com/jruby/maven-tools utf-8 - 3.0.0 - 2.0.0 + 3.0.6 + 2.0.2 diff --git a/spec/gemfile/pom.xml b/spec/gemfile/pom.xml index ff44ca1..68f545f 100644 --- a/spec/gemfile/pom.xml +++ b/spec/gemfile/pom.xml @@ -30,8 +30,8 @@ utf-8 - 3.0.0 - 2.0.0 + 3.0.6 + 2.0.2 diff --git a/spec/gemfile_include_jars/pom.xml b/spec/gemfile_include_jars/pom.xml index 3018ffb..57ab1b7 100644 --- a/spec/gemfile_include_jars/pom.xml +++ b/spec/gemfile_include_jars/pom.xml @@ -30,8 +30,8 @@ utf-8 - 3.0.0 - 2.0.0 + 3.0.6 + 2.0.2 diff --git a/spec/gemfile_with_access_to_model/pom.xml b/spec/gemfile_with_access_to_model/pom.xml index 6a0bb5a..d11216b 100644 --- a/spec/gemfile_with_access_to_model/pom.xml +++ b/spec/gemfile_with_access_to_model/pom.xml @@ -30,8 +30,8 @@ utf-8 - 3.0.0 - 2.0.0 + 3.0.6 + 2.0.2 1.5.0 diff --git a/spec/gemfile_with_custom_source/pom.xml b/spec/gemfile_with_custom_source/pom.xml index a609c30..a38a228 100644 --- a/spec/gemfile_with_custom_source/pom.xml +++ b/spec/gemfile_with_custom_source/pom.xml @@ -30,8 +30,8 @@ utf-8 - 3.0.0 - 2.0.0 + 3.0.6 + 2.0.2 @@ -72,7 +72,7 @@ maven-jar-plugin - 2.4 + 3.5.0 prepare-package @@ -88,7 +88,7 @@ maven-clean-plugin - 2.4 + 3.5.0 diff --git a/spec/gemfile_with_custom_source_and_custom_jarname/pom.xml b/spec/gemfile_with_custom_source_and_custom_jarname/pom.xml index 8d25a0e..706c5ca 100644 --- a/spec/gemfile_with_custom_source_and_custom_jarname/pom.xml +++ b/spec/gemfile_with_custom_source_and_custom_jarname/pom.xml @@ -30,8 +30,8 @@ utf-8 - 3.0.0 - 2.0.0 + 3.0.6 + 2.0.2 @@ -72,7 +72,7 @@ maven-jar-plugin - 2.4 + 3.5.0 prepare-package @@ -88,7 +88,7 @@ maven-clean-plugin - 2.4 + 3.5.0 diff --git a/spec/gemfile_with_extras/pom.xml b/spec/gemfile_with_extras/pom.xml index db0aeb1..c419f4d 100644 --- a/spec/gemfile_with_extras/pom.xml +++ b/spec/gemfile_with_extras/pom.xml @@ -30,8 +30,8 @@ utf-8 - 3.0.0 - 2.0.0 + 3.0.6 + 2.0.2 pom.xml true diff --git a/spec/gemfile_with_groups/pom.xml b/spec/gemfile_with_groups/pom.xml index 2b437cc..b0f96aa 100644 --- a/spec/gemfile_with_groups/pom.xml +++ b/spec/gemfile_with_groups/pom.xml @@ -17,8 +17,8 @@ gemfile_with_groups utf-8 - 3.0.0 - 2.0.0 + 3.0.6 + 2.0.2 diff --git a/spec/gemfile_with_groups_and_lockfile/pom.xml b/spec/gemfile_with_groups_and_lockfile/pom.xml index 83732b6..fd0ecdd 100644 --- a/spec/gemfile_with_groups_and_lockfile/pom.xml +++ b/spec/gemfile_with_groups_and_lockfile/pom.xml @@ -17,8 +17,8 @@ gemfile_with_groups_and_lockfile utf-8 - 3.0.0 - 2.0.0 + 3.0.6 + 2.0.2 diff --git a/spec/gemfile_with_jars_lock/pom.xml b/spec/gemfile_with_jars_lock/pom.xml index 20156fa..d72b96c 100644 --- a/spec/gemfile_with_jars_lock/pom.xml +++ b/spec/gemfile_with_jars_lock/pom.xml @@ -17,8 +17,8 @@ gemfile_with_jars_lock utf-8 - 3.0.0 - 2.0.0 + 3.0.6 + 2.0.2 diff --git a/spec/gemfile_with_lock/pom.xml b/spec/gemfile_with_lock/pom.xml index b1720a6..ce950bc 100644 --- a/spec/gemfile_with_lock/pom.xml +++ b/spec/gemfile_with_lock/pom.xml @@ -30,8 +30,8 @@ utf-8 - 3.0.0 - 2.0.0 + 3.0.6 + 2.0.2 diff --git a/spec/gemfile_with_path/pom.xml b/spec/gemfile_with_path/pom.xml index 1082890..94f8e84 100644 --- a/spec/gemfile_with_path/pom.xml +++ b/spec/gemfile_with_path/pom.xml @@ -17,8 +17,8 @@ gemfile_with_path utf-8 - 3.0.0 - 2.0.0 + 3.0.6 + 2.0.2 diff --git a/spec/gemfile_with_platforms/pom.xml b/spec/gemfile_with_platforms/pom.xml index 18b69d0..acba918 100644 --- a/spec/gemfile_with_platforms/pom.xml +++ b/spec/gemfile_with_platforms/pom.xml @@ -17,8 +17,8 @@ gemfile_with_platforms utf-8 - 3.0.0 - 2.0.0 + 3.0.6 + 2.0.2 diff --git a/spec/gemfile_with_source/pom.xml b/spec/gemfile_with_source/pom.xml index 6c550bc..8983853 100644 --- a/spec/gemfile_with_source/pom.xml +++ b/spec/gemfile_with_source/pom.xml @@ -30,8 +30,8 @@ utf-8 - 3.0.0 - 2.0.0 + 3.0.6 + 2.0.2 @@ -78,7 +78,7 @@ maven-jar-plugin - 2.4 + 3.5.0 prepare-package @@ -94,7 +94,7 @@ maven-clean-plugin - 2.4 + 3.5.0 diff --git a/spec/gemfile_with_source_and_custom_jarname/pom.xml b/spec/gemfile_with_source_and_custom_jarname/pom.xml index 1600efc..32a842e 100644 --- a/spec/gemfile_with_source_and_custom_jarname/pom.xml +++ b/spec/gemfile_with_source_and_custom_jarname/pom.xml @@ -30,8 +30,8 @@ utf-8 - 3.0.0 - 2.0.0 + 3.0.6 + 2.0.2 @@ -71,7 +71,7 @@ maven-jar-plugin - 2.4 + 3.5.0 prepare-package @@ -87,7 +87,7 @@ maven-clean-plugin - 2.4 + 3.5.0 diff --git a/spec/gemfile_with_source_and_no_jar/pom.xml b/spec/gemfile_with_source_and_no_jar/pom.xml index 58282ab..d1b3659 100644 --- a/spec/gemfile_with_source_and_no_jar/pom.xml +++ b/spec/gemfile_with_source_and_no_jar/pom.xml @@ -30,8 +30,8 @@ utf-8 - 3.0.0 - 2.0.0 + 3.0.6 + 2.0.2 diff --git a/spec/gemfile_with_test_group/pom.xml b/spec/gemfile_with_test_group/pom.xml index 945a7cf..c663d84 100644 --- a/spec/gemfile_with_test_group/pom.xml +++ b/spec/gemfile_with_test_group/pom.xml @@ -8,8 +8,8 @@ gemfile_with_test_group utf-8 - 3.0.0 - 2.0.0 + 3.0.6 + 2.0.2 diff --git a/spec/gemfile_with_two_sources/pom.xml b/spec/gemfile_with_two_sources/pom.xml index d5686df..a8b873a 100644 --- a/spec/gemfile_with_two_sources/pom.xml +++ b/spec/gemfile_with_two_sources/pom.xml @@ -17,8 +17,8 @@ gemfile_with_two_sources utf-8 - 3.0.0 - 2.0.0 + 3.0.6 + 2.0.2 diff --git a/spec/gemfile_without_gemspec/pom.xml b/spec/gemfile_without_gemspec/pom.xml index 9f57e72..f8273b7 100644 --- a/spec/gemfile_without_gemspec/pom.xml +++ b/spec/gemfile_without_gemspec/pom.xml @@ -17,8 +17,8 @@ gemfile_without_gemspec utf-8 - 3.0.0 - 2.0.0 + 3.0.6 + 2.0.2 diff --git a/spec/gemspec/pom.xml b/spec/gemspec/pom.xml index 7cde42a..876b9fc 100644 --- a/spec/gemspec/pom.xml +++ b/spec/gemspec/pom.xml @@ -21,18 +21,18 @@ EPL-1.0 - http://opensource.org/licenses/EPL-1.0 - Eclipse Public License 1.0 + https://opensource.org/license/epl-1-0 + Eclipse Public License -v 1.0 GPL-2.0 - http://opensource.org/licenses/GPL-2.0 - GNU General Public License version 2.0 + https://opensource.org/license/gpl-2-0 + GNU General Public License version 2 LGPL-2.1 - http://opensource.org/licenses/LGPL-2.1 - GNU Library or "Lesser" General Public License version 2.1 + https://opensource.org/license/lgpl-2-1 + GNU Lesser General Public License version 2.1 @@ -47,8 +47,8 @@ utf-8 - 3.0.0 - 2.0.0 + 3.0.6 + 2.0.2 diff --git a/spec/gemspec_dependencies_spec.rb b/spec/gemspec_dependencies_spec.rb index 59cbc30..8e80528 100644 --- a/spec/gemspec_dependencies_spec.rb +++ b/spec/gemspec_dependencies_spec.rb @@ -8,7 +8,7 @@ s.add_dependency 'thor', '>= 0.14.6', '< 2.0' s.add_dependency 'maven-tools', "~> 0.32.3" s.add_development_dependency 'minitest', '~> 5.3' - s.add_development_dependency 'rake', '~> 10.0' + s.add_development_dependency 'rake', '~> 13.0' s.requirements << 'jar sdas:das:tes, 123' s.requirements << 'jar sdas:das, 123' s.requirements << 'jar sdas.asd:das, 123, [fds:fre]' @@ -26,7 +26,7 @@ it 'should setup artifact' do _(subject.runtime).must_equal ["rubygems:thor:[0.14.6,2.0)", "rubygems:maven-tools:[0.32.3,0.32.99999]"] - _(subject.development).must_equal ["rubygems:minitest:[5.3,5.99999]", "rubygems:rake:[10.0,10.99999]"] + _(subject.development).must_equal ["rubygems:minitest:[5.3,5.99999]", "rubygems:rake:[13.0,13.99999]"] _(subject.java_runtime).must_equal [ ["sdas", "das", "jar", "tes", "123"], ["sdas", "das", "jar", "123"], ["sdas.asd", "das", "jar", "123", ["fds:fre"]], diff --git a/spec/gemspec_in_profile/pom.xml b/spec/gemspec_in_profile/pom.xml index 8e1038c..4c6f2b1 100644 --- a/spec/gemspec_in_profile/pom.xml +++ b/spec/gemspec_in_profile/pom.xml @@ -41,8 +41,8 @@ utf-8 - 3.0.0 - 2.0.0 + 3.0.6 + 2.0.2 diff --git a/spec/gemspec_include_jars/pom.xml b/spec/gemspec_include_jars/pom.xml index 3018ffb..57ab1b7 100644 --- a/spec/gemspec_include_jars/pom.xml +++ b/spec/gemspec_include_jars/pom.xml @@ -30,8 +30,8 @@ utf-8 - 3.0.0 - 2.0.0 + 3.0.6 + 2.0.2 diff --git a/spec/gemspec_no_rubygems_repo/pom.xml b/spec/gemspec_no_rubygems_repo/pom.xml index 2c518af..a1755bb 100644 --- a/spec/gemspec_no_rubygems_repo/pom.xml +++ b/spec/gemspec_no_rubygems_repo/pom.xml @@ -30,8 +30,8 @@ utf-8 - 3.0.0 - 2.0.0 + 3.0.6 + 2.0.2 diff --git a/spec/gemspec_prerelease/pom.xml b/spec/gemspec_prerelease/pom.xml index 64792ef..c675f7b 100644 --- a/spec/gemspec_prerelease/pom.xml +++ b/spec/gemspec_prerelease/pom.xml @@ -30,8 +30,8 @@ utf-8 - 3.0.0 - 2.0.0 + 3.0.6 + 2.0.2 diff --git a/spec/gemspec_prerelease_snapshot/pom.xml b/spec/gemspec_prerelease_snapshot/pom.xml index 64792ef..c675f7b 100644 --- a/spec/gemspec_prerelease_snapshot/pom.xml +++ b/spec/gemspec_prerelease_snapshot/pom.xml @@ -30,8 +30,8 @@ utf-8 - 3.0.0 - 2.0.0 + 3.0.6 + 2.0.2 diff --git a/spec/gemspec_with_access_to_model/pom.xml b/spec/gemspec_with_access_to_model/pom.xml index 6a0bb5a..d11216b 100644 --- a/spec/gemspec_with_access_to_model/pom.xml +++ b/spec/gemspec_with_access_to_model/pom.xml @@ -30,8 +30,8 @@ utf-8 - 3.0.0 - 2.0.0 + 3.0.6 + 2.0.2 1.5.0 diff --git a/spec/gemspec_with_custom_source/pom.xml b/spec/gemspec_with_custom_source/pom.xml index a609c30..a38a228 100644 --- a/spec/gemspec_with_custom_source/pom.xml +++ b/spec/gemspec_with_custom_source/pom.xml @@ -30,8 +30,8 @@ utf-8 - 3.0.0 - 2.0.0 + 3.0.6 + 2.0.2 @@ -72,7 +72,7 @@ maven-jar-plugin - 2.4 + 3.5.0 prepare-package @@ -88,7 +88,7 @@ maven-clean-plugin - 2.4 + 3.5.0 diff --git a/spec/gemspec_with_custom_source_and_custom_jarname/pom.xml b/spec/gemspec_with_custom_source_and_custom_jarname/pom.xml index 8d25a0e..706c5ca 100644 --- a/spec/gemspec_with_custom_source_and_custom_jarname/pom.xml +++ b/spec/gemspec_with_custom_source_and_custom_jarname/pom.xml @@ -30,8 +30,8 @@ utf-8 - 3.0.0 - 2.0.0 + 3.0.6 + 2.0.2 @@ -72,7 +72,7 @@ maven-jar-plugin - 2.4 + 3.5.0 prepare-package @@ -88,7 +88,7 @@ maven-clean-plugin - 2.4 + 3.5.0 diff --git a/spec/gemspec_with_extras/pom.xml b/spec/gemspec_with_extras/pom.xml index db0aeb1..c419f4d 100644 --- a/spec/gemspec_with_extras/pom.xml +++ b/spec/gemspec_with_extras/pom.xml @@ -30,8 +30,8 @@ utf-8 - 3.0.0 - 2.0.0 + 3.0.6 + 2.0.2 pom.xml true diff --git a/spec/gemspec_with_jar_dependencies/pom.xml b/spec/gemspec_with_jar_dependencies/pom.xml index d273859..89adb90 100644 --- a/spec/gemspec_with_jar_dependencies/pom.xml +++ b/spec/gemspec_with_jar_dependencies/pom.xml @@ -21,18 +21,18 @@ EPL-1.0 - http://opensource.org/licenses/EPL-1.0 - Eclipse Public License 1.0 + https://opensource.org/license/epl-1-0 + Eclipse Public License -v 1.0 GPL-2.0 - http://opensource.org/licenses/GPL-2.0 - GNU General Public License version 2.0 + https://opensource.org/license/gpl-2-0 + GNU General Public License version 2 LGPL-2.1 - http://opensource.org/licenses/LGPL-2.1 - GNU Library or "Lesser" General Public License version 2.1 + https://opensource.org/license/lgpl-2-1 + GNU Lesser General Public License version 2.1 @@ -47,8 +47,8 @@ utf-8 - 3.0.0 - 2.0.0 + 3.0.6 + 2.0.2 diff --git a/spec/gemspec_with_jars_lock/pom.xml b/spec/gemspec_with_jars_lock/pom.xml index 0f659f6..146716b 100644 --- a/spec/gemspec_with_jars_lock/pom.xml +++ b/spec/gemspec_with_jars_lock/pom.xml @@ -21,18 +21,18 @@ EPL-1.0 - http://opensource.org/licenses/EPL-1.0 - Eclipse Public License 1.0 + https://opensource.org/license/epl-1-0 + Eclipse Public License -v 1.0 GPL-2.0 - http://opensource.org/licenses/GPL-2.0 - GNU General Public License version 2.0 + https://opensource.org/license/gpl-2-0 + GNU General Public License version 2 LGPL-2.1 - http://opensource.org/licenses/LGPL-2.1 - GNU Library or "Lesser" General Public License version 2.1 + https://opensource.org/license/lgpl-2-1 + GNU Lesser General Public License version 2.1 @@ -47,8 +47,8 @@ utf-8 - 3.0.0 - 2.0.0 + 3.0.6 + 2.0.2 diff --git a/spec/gemspec_with_prereleased_dependency/pom.xml b/spec/gemspec_with_prereleased_dependency/pom.xml index 6dbe236..aecdb0e 100644 --- a/spec/gemspec_with_prereleased_dependency/pom.xml +++ b/spec/gemspec_with_prereleased_dependency/pom.xml @@ -30,8 +30,8 @@ utf-8 - 3.0.0 - 2.0.0 + 3.0.6 + 2.0.2 diff --git a/spec/gemspec_with_prereleased_dependency_and_no_repo/pom.xml b/spec/gemspec_with_prereleased_dependency_and_no_repo/pom.xml index 2c518af..a1755bb 100644 --- a/spec/gemspec_with_prereleased_dependency_and_no_repo/pom.xml +++ b/spec/gemspec_with_prereleased_dependency_and_no_repo/pom.xml @@ -30,8 +30,8 @@ utf-8 - 3.0.0 - 2.0.0 + 3.0.6 + 2.0.2 diff --git a/spec/gemspec_with_source/pom.xml b/spec/gemspec_with_source/pom.xml index f4efafe..ca8d11a 100644 --- a/spec/gemspec_with_source/pom.xml +++ b/spec/gemspec_with_source/pom.xml @@ -30,8 +30,8 @@ utf-8 - 3.0.0 - 2.0.0 + 3.0.6 + 2.0.2 @@ -68,7 +68,7 @@ maven-jar-plugin - 2.4 + 3.5.0 prepare-package @@ -84,7 +84,7 @@ maven-clean-plugin - 2.4 + 3.5.0 diff --git a/spec/gemspec_with_source_and_custom_jarname/pom.xml b/spec/gemspec_with_source_and_custom_jarname/pom.xml index 1600efc..32a842e 100644 --- a/spec/gemspec_with_source_and_custom_jarname/pom.xml +++ b/spec/gemspec_with_source_and_custom_jarname/pom.xml @@ -30,8 +30,8 @@ utf-8 - 3.0.0 - 2.0.0 + 3.0.6 + 2.0.2 @@ -71,7 +71,7 @@ maven-jar-plugin - 2.4 + 3.5.0 prepare-package @@ -87,7 +87,7 @@ maven-clean-plugin - 2.4 + 3.5.0 diff --git a/spec/gemspec_with_source_and_no_jar/pom.xml b/spec/gemspec_with_source_and_no_jar/pom.xml index 58282ab..d1b3659 100644 --- a/spec/gemspec_with_source_and_no_jar/pom.xml +++ b/spec/gemspec_with_source_and_no_jar/pom.xml @@ -30,8 +30,8 @@ utf-8 - 3.0.0 - 2.0.0 + 3.0.6 + 2.0.2 diff --git a/spec/mavenfile/Mavenfile b/spec/mavenfile/Mavenfile index 0db9b91..d64e38f 100644 --- a/spec/mavenfile/Mavenfile +++ b/spec/mavenfile/Mavenfile @@ -56,10 +56,10 @@ prerequisites :maven => '3.0.5' modules 'part1', 'part2' scm do - connection 'scm:git:git://github.com/torquebox/maven-tools.git' - developer_connection 'scm:git:ssh://git@github.com/torquebox/maven-tools.git' + connection 'scm:git:git://github.com/jruby/maven-tools.git' + developer_connection 'scm:git:ssh://git@github.com/jruby/maven-tools.git' tag 'first' - url 'http://github.com/torquebox/maven-tools' + url 'https://github.com/jruby/maven-tools' end issue_management do @@ -265,7 +265,7 @@ plugin 'org.codehaus.mojo:exec-maven-plugin' do end plugin_management do - jruby_plugin( :gem, '3.0.0', :scope => :compile, + jruby_plugin( :gem, '3.0.6', :scope => :compile, :gems => { 'thread_safe' => '0.3.3', 'jdbc-mysql' => '5.1.30' diff --git a/spec/pom.xml b/spec/pom.xml index 2a1bd83..6936d16 100644 --- a/spec/pom.xml +++ b/spec/pom.xml @@ -91,10 +91,10 @@ part2 - scm:git:git://github.com/torquebox/maven-tools.git - scm:git:ssh://git@github.com/torquebox/maven-tools.git + scm:git:git://github.com/jruby/maven-tools.git + scm:git:ssh://git@github.com/jruby/maven-tools.git first - http://github.com/torquebox/maven-tools + https://github.com/jruby/maven-tools jira @@ -317,7 +317,7 @@ org.jruby.maven gem-maven-plugin - 3.0.0 + 3.0.6 compile diff --git a/spec/pom_maven_alternative_style/pom.rb b/spec/pom_maven_alternative_style/pom.rb index 39e85c3..20e67ed 100644 --- a/spec/pom_maven_alternative_style/pom.rb +++ b/spec/pom_maven_alternative_style/pom.rb @@ -51,9 +51,9 @@ modules 'part1', 'part2' - scm( 'scm:git:git://github.com/torquebox/maven-tools.git', - 'scm:git:ssh://git@github.com/torquebox/maven-tools.git', - 'http://github.com/torquebox/maven-tools', + scm( 'scm:git:git://github.com/jruby/maven-tools.git', + 'scm:git:ssh://git@github.com/jruby/maven-tools.git', + 'https://github.com/jruby/maven-tools', :tag => 'first' ) issue_management( 'https://issues.sonatype.org/', :system => 'jira' ) @@ -207,7 +207,7 @@ end overrides do - jruby_plugin( :gem, '3.0.0', :scope => :compile, + jruby_plugin( :gem, '3.0.6', :scope => :compile, :gems => { 'thread_safe' => '0.3.3', 'jdbc-mysql' => '5.1.30' diff --git a/spec/pom_maven_hash_style/pom.rb b/spec/pom_maven_hash_style/pom.rb index 90949df..187130a 100644 --- a/spec/pom_maven_hash_style/pom.rb +++ b/spec/pom_maven_hash_style/pom.rb @@ -55,10 +55,10 @@ modules 'part1', 'part2' - scm( :connection => 'scm:git:git://github.com/torquebox/maven-tools.git', - :developer_connection => 'scm:git:ssh://git@github.com/torquebox/maven-tools.git', + scm( :connection => 'scm:git:git://github.com/jruby/maven-tools.git', + :developer_connection => 'scm:git:ssh://git@github.com/jruby/maven-tools.git', :tag => 'first', - :url => 'http://github.com/torquebox/maven-tools' ) + :url => 'https://github.com/jruby/maven-tools' ) issue_management( :system => 'jira', :url => 'https://issues.sonatype.org/' ) ci_management( :system => 'travis', @@ -227,7 +227,7 @@ end plugin_management do - jruby_plugin( :gem, '3.0.0', :scope => :compile, + jruby_plugin( :gem, '3.0.6', :scope => :compile, :gems => { 'thread_safe' => '0.3.3', 'jdbc-mysql' => '5.1.30' diff --git a/spec/pom_maven_style/pom.rb b/spec/pom_maven_style/pom.rb index d7ca7ea..fbae1e8 100644 --- a/spec/pom_maven_style/pom.rb +++ b/spec/pom_maven_style/pom.rb @@ -77,10 +77,10 @@ modules 'part1', 'part2' scm do - connection 'scm:git:git://github.com/torquebox/maven-tools.git' - developer_connection 'scm:git:ssh://git@github.com/torquebox/maven-tools.git' + connection 'scm:git:git://github.com/jruby/maven-tools.git' + developer_connection 'scm:git:ssh://git@github.com/jruby/maven-tools.git' tag 'first' - url 'http://github.com/torquebox/maven-tools' + url 'https://github.com/jruby/maven-tools' end issue_management do system 'jira' @@ -307,7 +307,7 @@ plugin_management do plugins do - jruby_plugin( :gem, '3.0.0') do + jruby_plugin( :gem, '3.0.6') do configuration( :scope => :compile, :gems => { 'thread_safe' => '0.3.3', diff --git a/spec/pom_with_execute/pom.xml b/spec/pom_with_execute/pom.xml index badceb3..da4c553 100644 --- a/spec/pom_with_execute/pom.xml +++ b/spec/pom_with_execute/pom.xml @@ -20,7 +20,7 @@ io.takari.polyglot polyglot-maven-plugin - 0.1.18 + 0.8.1 validate @@ -80,7 +80,7 @@ io.takari.polyglot polyglot-ruby - 0.1.18 + 0.8.1