dependabot-maven 0.300.0 → 0.301.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93adb93dd331ca018bef68161dac755c5989abd878fac399411aa1be2cfb7ac6
-  data.tar.gz: 7e5a90c73524be5b1dda3c872dd29eb5bb960d732fc4a663af7320bed48e9da2
+  metadata.gz: 25a75887f89638c49c08af65be226d8e6ce50d3f6592c3ab66d3c181d7175959
+  data.tar.gz: 9cd09856c37b8e8791e427df14ee961625c7acebac8dcd360c604aa23f0b28f6
 SHA512:
-  metadata.gz: 60fb3a5e286fad128c3f667bc989dc41a862b4fbb5aa98c50b4f98ece8030f24c2409b08d7f6bfebd0a98999c865f793812cf4a71b299dcc304abf5384e78c32
-  data.tar.gz: 59c4a591d885a44d69295e43d5e7534e4d4ffac00562c4376ecd443352aab83837513399790ea0da047fbcd1b986d530c6426227512d852ced633de730f7f488
+  metadata.gz: 8a665b936f50a5bd8412c04fd2b518b8b9fbde1a95ad1ce41433c4c768ee51bd17947efbea65fb9db8b224f35fc6fc8460f3453291641762476c92df3694e9c2
+  data.tar.gz: dc33ac32d48571874cef02273329638719797ea5b24223f2060e878b33fc4add6c51cf980fa60eecd418015a9f998278441efb84212bef23e147813260f609db

data/lib/dependabot/maven/requirement.rb

@@ -16,6 +16,8 @@ module Dependabot
       OR_SYNTAX = /(?<=\]|\)),/
       PATTERN_RAW = "\\s*(#{quoted})?\\s*(#{Maven::Version::VERSION_PATTERN})\\s*".freeze
       PATTERN = /\A#{PATTERN_RAW}\z/
+      # Like PATTERN, but the leading operator is required
+      RUBY_STYLE_PATTERN = /\A\s*(#{quoted})\s*(#{Maven::Version::VERSION_PATTERN})\s*\z/
 
       def self.parse(obj)
         return ["=", Maven::Version.new(obj.to_s)] if obj.is_a?(Gem::Version)
@@ -71,13 +73,16 @@ module Dependabot
           raise "Can't convert multiple Java reqs to a single Ruby one"
         end
 
-        # NOTE: Support ruby-style version requirements that are created from
-        # PR ignore conditions
         version_reqs = req_string.split(",").map(&:strip)
-        if req_string.include?(",") && !version_reqs.all? { |s| PATTERN.match?(s) }
-          convert_java_range_to_ruby_range(req_string) if req_string.include?(",")
-        else
-          version_reqs.map { |r| convert_java_equals_req_to_ruby(r) }
+        if version_reqs.length > 1 && !version_reqs.all? { |s| PATTERN.match?(s) }
+          return convert_java_range_to_ruby_range(req_string)
+        end
+
+        version_reqs.map do |r|
+          # if an operator is already provided, use it
+          next r if r.match?(RUBY_STYLE_PATTERN)
+
+          convert_java_equals_req_to_ruby(r)
         end
       end
 

data/lib/dependabot/maven/version.rb

@@ -24,7 +24,7 @@ module Dependabot
       VERSION_PATTERN =
         "[0-9a-zA-Z]+" \
         '(?>\.[0-9a-zA-Z]*)*' \
-        '([_\-\+][0-9A-Za-z_-]*(\.[0-9A-Za-z_-]*)*)?'
+        '([_\-\+.][0-9A-Za-z]*)*'
 
       sig { returns(Dependabot::Maven::TokenBucket) }
       attr_accessor :token_bucket

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-maven
 version: !ruby/object:Gem::Version
-  version: 0.300.0
+  version: 0.301.0
 platform: ruby
 authors:
 - Dependabot
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-06 00:00:00.000000000 Z
+date: 2025-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dependabot-common
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.300.0
+        version: 0.301.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.300.0
+        version: 0.301.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -268,7 +268,7 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/dependabot/dependabot-core/issues
-  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.300.0
+  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.301.0
 post_install_message:
 rdoc_options: []
 require_paths: