Merge branch 'main' into bump-to-v0.351.0

Author: markhallen

gradle/Dockerfile

@@ -3,7 +3,7 @@ FROM ghcr.io/dependabot/dependabot-updater-core
 
 # Install Java
 RUN apt-get update && apt-get install -y --no-install-recommends \
-    openjdk-21-jdk \
+    openjdk-21-jdk-headless \
     ca-certificates-java \
     wget \
     && rm -rf /var/lib/apt/lists/*

maven/Dockerfile

@@ -5,7 +5,7 @@ FROM maven:3.9.9 as maven
 FROM ghcr.io/dependabot/dependabot-updater-core
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
-    openjdk-21-jdk \
+    openjdk-21-jdk-headless \
     ca-certificates-java \
     && rm -rf /var/lib/apt/lists/*
 
@@ -18,7 +18,7 @@ RUN ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn
 USER dependabot
 
 ENV PATH=$JAVA_HOME/bin:$PATH
-ENV MAVEN_CONFIG "$DEPENDABOT_HOME/.m2"
+ENV MAVEN_ARGS="-Dmaven.repo.local=$DEPENDABOT_HOME/.m2"
 
 COPY --chown=dependabot:dependabot --parents maven common $DEPENDABOT_HOME/
 COPY --chown=dependabot:dependabot updater $DEPENDABOT_HOME/dependabot-updater

npm_and_yarn/lib/dependabot/npm_and_yarn/constraint_helper.rb

@@ -261,9 +261,16 @@ def self.to_ruby_constraint_with_version(constraint, dependabot_versions = [])
 
           full_version = Regexp.last_match(1)
 
-          # Normalize version: if full_version does not have patch version, add ".0"
+          # Normalize version: ensure it has major.minor.patch format
           version_parts = T.must(full_version).split(".")
-          full_version = "#{full_version}.0" if version_parts.length == 2
+          full_version = case version_parts.length
+                         when 1
+                           "#{full_version}.0.0" # major only -> major.0.0
+                         when 2
+                           "#{full_version}.0"   # major.minor -> major.minor.0
+                         else
+                           full_version          # already major.minor.patch
+                         end
 
           _, major, minor = version_components(full_version)
           return nil if major.nil?

npm_and_yarn/spec/dependabot/npm_and_yarn/package_manager_helper_spec.rb

@@ -141,6 +141,16 @@
       end
     end
 
+    context "with engines field for package manager with '^' constraint and missing minor/patch version" do
+      let(:lockfiles) { {} }
+      let(:package_json) { { "engines" => { "npm" => "^10" } } }
+
+      it "returns a NpmPackageManager instance from engines field" do
+        expect(helper.package_manager).to be_a(Dependabot::NpmAndYarn::NpmPackageManager)
+        expect(helper.package_manager.detected_version).to eq("10")
+      end
+    end
+
     context "with engines field for npm >=11.0.0" do
       let(:lockfiles) { {} }
       let(:package_json) { { "engines" => { "npm" => ">=11.0.0" } } }