license_finder 7.2.0 → 7.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea2f57657f8f3dba53174ad258ba5110faea56db4bc43053d0534758dae68cf6
-  data.tar.gz: b4f8e8a5a1f079f0a0d72cf204136c90146d5e769e39a892b7400ad5df1b5fbd
+  metadata.gz: 6753425b30d14b5409622dce5ce465cabec8431e9a2b1f7eedcc039cabac98b4
+  data.tar.gz: 7581c236bf05854f1972e3ae1b85f24842dbfb41560a25481e19153a8173b493
 SHA512:
-  metadata.gz: c22e4175e51437d7be9b3a0fda548fe71df5f7620e78ffbfe855eb26c81b6f6add55a9358e845f3d312b51ba077804f951c830339c7364b33426b5aa7658b06d
-  data.tar.gz: 74189994406c098243463a2d2da803453f6ad8550eb0b77df294158add2cd1694051b2e26f224eceb2a6719f6e66d0e7c9b90cf8d5a502404c035fe8677279bf
+  metadata.gz: 91a8359b666caf7d9648397f833293729beea3a26cd61ec257f8587b45337244b2236c93c8484bbdddc454f0bc2b1a64befe6b78ce2031c847030dd78f8a8a04
+  data.tar.gz: b883240ffb86286ab2e8a76f12250bbd0f6f0c412a3ddb9f7fd415a777ca949b285523ed11804dfba69566a0ed4108390a15025414d0b8aeb710f029e811f297

data/CHANGELOG.md

@@ -1,6 +1,12 @@
+# [7.2.1] / 2024-05-08
+
 # [7.2.0] / 2024-05-07
 
 ### Added
+* Support for Ruby 3.3.x - [3bbe12f7](https://github.com/pivotal/LicenseFinder/commit/3bbe12f76d5305879df89d856d90f0b9eaf967d4)
+* Support of latest Conan v1.6 - [ef81af38](https://github.com/pivotal/LicenseFinder/commit/ef81af387fa8c6577d85387e354a491da93f5a47) - melter2m
+* Support NPM 7 and up and include NodeJS 17 in the Docker image (NPM 8) - [420c5444](https://github.com/pivotal/LicenseFinder/commit/420c5444223443277e4301badd58ee0ba0a82ec4) - rhuitl
+* Maven: extract LICENSE and NOTICE texts from JAR file and summary, description and URL from POM file - [0da6d30b](https://github.com/pivotal/LicenseFinder/commit/0da6d30b9a306cc8a7c88cc55f13acd0eb3f10b3) - rhuitl
 * Add more license detection - [b3dde46e](https://github.com/pivotal/LicenseFinder/commit/b3dde46e2018aef9b6436a04777ec33d40a134e4) - Simon Warren
 * Unlicense - [6fb571ca](https://github.com/pivotal/LicenseFinder/commit/6fb571cad9b5ee856c0984ca79aa7604afdd818b) - Jim Kane
 
@@ -11,8 +17,14 @@
 * Fix 'unknown' Yarn 2 licenses - [f57745be](https://github.com/pivotal/LicenseFinder/commit/f57745be34bb7774577ea577671ea7b5c3246576) - Simon Warren
 * Print subproject paths when logging - [add2f969](https://github.com/pivotal/LicenseFinder/commit/add2f9698a0f3c02d3148655a4b538e2f557d2be) - Simon Warren
 
+### Changed
+* Use Ubuntu 22.04 (Jammy) for Docker image - [da637b83](https://github.com/pivotal/LicenseFinder/commit/da637b83877b4ec3f054d787d68b90c8fa7a8b41) - rhuitl
+* Use Maven 3.6.3 instead of 3.6.0 which now throws an error. - [1d3326d3](https://github.com/pivotal/LicenseFinder/commit/1d3326d350bebdf575ef64af7436a9f043d88920) - rhuitl
+
+
 ### Deprecated
-* - Remove Dep package manager for jammy release - [42bed10d](https://github.com/pivotal/LicenseFinder/commit/42bed10d80e4b0e6fac1c62dd5eca2097ffc3517) 
+* Remove Ruby 2.6 tests- [c48ddb74](https://github.com/pivotal/LicenseFinder/commit/c48ddb745bb85971fc14e21d2c3c308c849ef2a3)
+* Remove Dep package manager for jammy release - [42bed10d](https://github.com/pivotal/LicenseFinder/commit/42bed10d80e4b0e6fac1c62dd5eca2097ffc3517) 
 
 # [7.1.0] / 2022-11-28
 
@@ -1051,3 +1063,4 @@ Bugfixes:
 [7.0.1]: https://github.com/pivotal/LicenseFinder/compare/v7.0.0...v7.0.1
 [7.1.0]: https://github.com/pivotal/LicenseFinder/compare/v7.0.1...v7.1.0
 [7.2.0]: https://github.com/pivotal/LicenseFinder/compare/v7.1.0...v7.2.0
+[7.2.1]: https://github.com/pivotal/LicenseFinder/compare/v7.2.0...v7.2.1

data/VERSION

@@ -1 +1 @@
-7.2.0
+7.2.1

data/lib/license_finder/package_manager.rb

@@ -147,6 +147,8 @@ module LicenseFinder
   end
 end
 
+require 'license_finder/package'
+
 require 'license_finder/package_managers/bower'
 require 'license_finder/package_managers/go_workspace'
 require 'license_finder/package_managers/go_15vendorexperiment'
@@ -179,5 +181,3 @@ require 'license_finder/package_managers/cargo'
 require 'license_finder/package_managers/composer'
 require 'license_finder/package_managers/conda'
 require 'license_finder/package_managers/pub'
-
-require 'license_finder/package'

data/lib/license_finder/package_managers/rebar.rb

@@ -41,7 +41,7 @@ module LicenseFinder
         .each_line
         .reject { |line| line.start_with?('=') || line.include?('project app') }
         .map do |line|
-          matches = line.match(/(?<name>\w+)─(?<version>[\S.]+)\s*/)
+          matches = line.match(/(?<name>\w+)─(?<version>\S+)\s*/)
           [matches[:name], matches[:version]] if matches
         end.compact
     end

data/lib/license_finder/package_utils/maven_dependency_finder.rb

@@ -33,7 +33,7 @@ module LicenseFinder
       # Basic support for Maven classifiers. So far, only "jakarta" is supported. Unfortunately,
       # we do not have access to the "classifier" field here (licenses.xml does not have it).
       jar_file = m2_artifact_dir.join("#{artifact_basename}.jar")
-      jar_file = m2_artifact_dir.join("#{artifact_basename}-jakarta.jar") unless File.exist?(jar_file)
+      jar_file = m2_artifact_dir.join("#{artifact_basename}-jakarta.jar") unless File.exist?(jar_file) || !File.exist?(m2_artifact_dir.join("#{artifact_basename}-jakarta.jar"))
 
       dep.store('jarFile', jar_file)
 

data/lib/license_finder/packages/go_package.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'license_finder/package'
-
 module LicenseFinder
   class GoPackage < Package
     def package_manager

data/lib/license_finder/packages/npm_package.rb

@@ -120,7 +120,7 @@ module LicenseFinder
     end
 
     def author_name_from_combined(author)
-      matches = author.match /^(.*?)\s*(<.*?>)?\s*(\(.*?\))?\s*$/
+      matches = author.match(/^(.*?)\s*(<.*?>)?\s*(\(.*?\))?\s*$/)
       matches[1]
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: license_finder
 version: !ruby/object:Gem::Version
-  version: 7.2.0
+  version: 7.2.1
 platform: ruby
 authors:
 - Ryan Collins
@@ -27,7 +27,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-07 00:00:00.000000000 Z
+date: 2024-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler