From 14ce6f02d38ea26e37fbde1262dcc7d4f8832122 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 03 2016 06:07:34 +0000 Subject: import maven-3.0.5-17.el7 --- diff --git a/SOURCES/0001-default-to-ssl-for-central.patch b/SOURCES/0001-default-to-ssl-for-central.patch new file mode 100644 index 0000000..a89645c --- /dev/null +++ b/SOURCES/0001-default-to-ssl-for-central.patch @@ -0,0 +1,35 @@ +diff --git a/maven-core/src/main/java/org/apache/maven/repository/RepositorySystem.java b/maven-core/src/main/java/org/apache/maven/repository/RepositorySystem.java +index f8f4f22..a16e0a2 100644 +--- a/maven-core/src/main/java/org/apache/maven/repository/RepositorySystem.java ++++ b/maven-core/src/main/java/org/apache/maven/repository/RepositorySystem.java +@@ -51,7 +51,7 @@ public interface RepositorySystem + + final String DEFAULT_REMOTE_REPO_ID = "central"; + +- final String DEFAULT_REMOTE_REPO_URL = "http://repo.maven.apache.org/maven2"; ++ final String DEFAULT_REMOTE_REPO_URL = "https://repo.maven.apache.org/maven2"; + + Artifact createArtifact( String groupId, String artifactId, String version, String packaging ); + +diff --git a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml b/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml +index 1e70e8a..66b4d27 100644 +--- a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml ++++ b/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml +@@ -27,7 +27,7 @@ under the License. + + central + Central Repository +- http://repo.maven.apache.org/maven2 ++ https://repo.maven.apache.org/maven2 + default + + false +@@ -39,7 +39,7 @@ under the License. + + central + Central Repository +- http://repo.maven.apache.org/maven2 ++ https://repo.maven.apache.org/maven2 + default + + false diff --git a/SPECS/maven.spec b/SPECS/maven.spec index ab52a67..e36aee1 100644 --- a/SPECS/maven.spec +++ b/SPECS/maven.spec @@ -2,7 +2,7 @@ Name: maven Version: 3.0.5 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Java project management and project comprehension tool Group: Development/Tools @@ -22,6 +22,9 @@ Patch100: 0005-Use-generics-in-modello-generated-code.patch # Fixes MNG-5402 (patch from upstream commit f95ab2e) Patch200: 0001-MNG-5402-Better-build-number-for-git.patch +# Access Maven Central via HTTPS by default +Patch300: 0001-default-to-ssl-for-central.patch + BuildArch: noarch BuildRequires: maven-local @@ -129,6 +132,7 @@ Group: Documentation %setup -q -n apache-%{name}-%{version}%{?ver_add} %patch100 -p1 %patch200 -p1 +%patch300 -p1 # Generate build number based on package release number %pom_remove_plugin :buildnumber-maven-plugin maven-core @@ -268,6 +272,10 @@ ln -sf $(build-classpath plexus/classworlds) \ %changelog +* Tue Jul 21 2015 Michal Srb - 3.0.5-17 +- Access Maven Central via HTTPS by default +- Resolves: rhbz#1198561 + * Mon Jan 6 2014 Mikolaj Izdebski - 3.0.5-16 - BuildRequire xmvn >= 1.3.0-5