From 0b824f699fa2fc17a4ceb395aa4f3058cce6456b Mon Sep 17 00:00:00 2001 From: Dmitry Brant Date: Sat, 13 Jul 2024 10:58:25 -0400 Subject: [PATCH 1/2] Treat `-pre` version suffix as prerelease. --- maven/lib/dependabot/maven/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maven/lib/dependabot/maven/version.rb b/maven/lib/dependabot/maven/version.rb index 20056941e51..0cd26fe8f81 100644 --- a/maven/lib/dependabot/maven/version.rb +++ b/maven/lib/dependabot/maven/version.rb @@ -22,7 +22,7 @@ class Version < Dependabot::Version "a" => 1, "alpha" => 1, "b" => 2, "beta" => 2, "m" => 3, "milestone" => 3, - "rc" => 4, "cr" => 4, "pr" => 4, + "rc" => 4, "cr" => 4, "pr" => 4, "pre" => 4, "snapshot" => 5, "dev" => 5, "ga" => 6, "" => 6, "final" => 6, "sp" => 7 From e518cdfdc304b9afbd5d93eb3994204056777ec3 Mon Sep 17 00:00:00 2001 From: Dmitry Brant Date: Sat, 13 Jul 2024 12:26:02 -0400 Subject: [PATCH 2/2] Apply to both gradle and maven, and add tests. --- gradle/lib/dependabot/gradle/version.rb | 2 +- gradle/spec/dependabot/gradle/version_spec.rb | 8 +++++++- maven/spec/dependabot/maven/version_spec.rb | 8 +++++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/gradle/lib/dependabot/gradle/version.rb b/gradle/lib/dependabot/gradle/version.rb index c74c043e581..cf0cbdfa070 100644 --- a/gradle/lib/dependabot/gradle/version.rb +++ b/gradle/lib/dependabot/gradle/version.rb @@ -22,7 +22,7 @@ class Version < Dependabot::Version "a" => 1, "alpha" => 1, "b" => 2, "beta" => 2, "m" => 3, "milestone" => 3, - "rc" => 4, "cr" => 4, "pr" => 4, + "rc" => 4, "cr" => 4, "pr" => 4, "pre" => 4, "snapshot" => 5, "dev" => 5, "ga" => 6, "" => 6, "final" => 6, "sp" => 7 diff --git a/gradle/spec/dependabot/gradle/version_spec.rb b/gradle/spec/dependabot/gradle/version_spec.rb index 6f6207de112..8dcf33d6132 100644 --- a/gradle/spec/dependabot/gradle/version_spec.rb +++ b/gradle/spec/dependabot/gradle/version_spec.rb @@ -92,12 +92,18 @@ it { is_expected.to be(false) } end - context "with a pre-release" do + context "with a 'pr' pre-release separated with a ." do let(:version_string) { "2.10.0.pr3" } it { is_expected.to be(true) } end + context "with a 'pre' pre-release separated with a -" do + let(:version_string) { "2.10.0-pre0" } + + it { is_expected.to be(true) } + end + context "with a release" do let(:version_string) { "1.0.0" } diff --git a/maven/spec/dependabot/maven/version_spec.rb b/maven/spec/dependabot/maven/version_spec.rb index 5e3308340c3..934c90779ea 100644 --- a/maven/spec/dependabot/maven/version_spec.rb +++ b/maven/spec/dependabot/maven/version_spec.rb @@ -116,12 +116,18 @@ it { is_expected.to be(false) } end - context "with a pre-release" do + context "with a 'pr' pre-release separated with a ." do let(:version_string) { "2.10.0.pr3" } it { is_expected.to be(true) } end + context "with a 'pre' pre-release separated with a -" do + let(:version_string) { "2.10.0-pre0" } + + it { is_expected.to be(true) } + end + context "with a dev token" do let(:version_string) { "1.2.1-dev-65" }