diff --git a/.gitignore b/.gitignore index e69de29..692b87a 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1,29 @@ +/results_* +/*.src.rpm + +/apache-maven-3.0-src.tar.gz +/apache-maven-3.0.2-src.tar.gz +/apache-maven-3.0.3-RC1-src.tar.gz +/apache-maven-3.0.3-src.tar.gz +/apache-maven-3.0.4-src.tar.gz +/apache-maven-3.0.5-src.tar.gz +/apache-maven-3.1.0-src.tar.gz +/apache-maven-3.1.1-src.tar.gz +/apache-maven-3.2.0-src.tar.gz +/apache-maven-3.2.1-src.tar.gz +/apache-maven-3.2.2-src.tar.gz +/apache-maven-3.2.3-src.tar.gz +/apache-maven-3.2.5-src.tar.gz +/apache-maven-3.3.0-src.tar.gz +/apache-maven-3.3.1-src.tar.gz +/apache-maven-3.3.3-src.tar.gz +/apache-maven-3.3.8-src.tar.gz +/apache-maven-3.3.9-src.tar.gz +/apache-maven-3.4.0-SNAPSHOT-src.tar.gz +/apache-maven-3.5.0-src.tar.gz +/apache-maven-3.5.2-src.tar.gz +/apache-maven-3.5.3-src.tar.gz +/apache-maven-3.5.4-src.tar.gz +/apache-maven-3.6.1-src.tar.gz +/apache-maven-3.6.2-src.tar.gz +/apache-maven-3.6.3-src.tar.gz diff --git a/0001-adapt-mvn-script.patch b/0001-adapt-mvn-script.patch new file mode 100644 index 0000000..9f8a75e --- /dev/null +++ b/0001-adapt-mvn-script.patch @@ -0,0 +1,60 @@ +From 405e23d53b66a688082ed8c22385c5174e212be4 Mon Sep 17 00:00:00 2001 +From: Michael Simacek +Date: Mon, 25 May 2020 12:10:33 +0200 +Subject: [PATCH 1/4] adapt mvn script + +--- + apache-maven/src/bin/mvn | 17 +++++++++++++++-- + 1 file changed, 15 insertions(+), 2 deletions(-) + +diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn +index a554c66..0c07ba6 100644 +--- a/apache-maven/src/bin/mvn ++++ b/apache-maven/src/bin/mvn +@@ -22,7 +22,7 @@ + # + # Environment Variable Prerequisites + # +-# JAVA_HOME Must point at your Java Development Kit installation. ++# JAVA_HOME (Optional) Must point at your Java Development Kit installation. + # MAVEN_OPTS (Optional) Java runtime options used when Maven is executed. + # MAVEN_SKIP_RC (Optional) Flag to disable loading of mavenrc files. + # ----------------------------------------------------------------------------- +@@ -33,12 +33,24 @@ if [ -z "$MAVEN_SKIP_RC" ] ; then + . /etc/mavenrc + fi + ++ if [ -f /etc/java/maven.conf ] ; then ++ . /etc/java/maven.conf ++ fi ++ + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + + fi + ++if [ -f /usr/share/java-utils/java-functions ] ; then ++ . /usr/share/java-utils/java-functions ++ set_jvm ++ set_javacmd ++fi ++export JAVA_HOME ++export JAVACMD ++ + # OS specific support. $var _must_ be set to either true or false. + cygwin=false; + mingw=false; +@@ -63,7 +75,8 @@ done + + saveddir=`pwd` + +-MAVEN_HOME=`dirname "$PRG"`/.. ++MAVEN_HOME="${_FEDORA_MAVEN_HOME:-`dirname "$PRG"`/..}" ++unset _FEDORA_MAVEN_HOME + + # make it fully qualified + MAVEN_HOME=`cd "$MAVEN_HOME" && pwd` +-- +2.26.2 + diff --git a/0002-invoke-logback-via-reflection.patch b/0002-invoke-logback-via-reflection.patch new file mode 100644 index 0000000..0570159 --- /dev/null +++ b/0002-invoke-logback-via-reflection.patch @@ -0,0 +1,53 @@ +From 3ce790eaafcf42e8720c778b712345f100064f38 Mon Sep 17 00:00:00 2001 +From: Michael Simacek +Date: Mon, 25 May 2020 12:12:15 +0200 +Subject: [PATCH 2/4] invoke logback via reflection + +--- + .../logging/impl/LogbackConfiguration.java | 19 ++++++++++++++----- + 1 file changed, 14 insertions(+), 5 deletions(-) + +diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/LogbackConfiguration.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/LogbackConfiguration.java +index d16eaa9..51274eb 100644 +--- a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/LogbackConfiguration.java ++++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/LogbackConfiguration.java +@@ -35,22 +35,31 @@ public class LogbackConfiguration + @Override + public void setRootLoggerLevel( Level level ) + { +- ch.qos.logback.classic.Level value; ++ String value; + switch ( level ) + { + case DEBUG: +- value = ch.qos.logback.classic.Level.DEBUG; ++ value = "DEBUG"; + break; + + case INFO: +- value = ch.qos.logback.classic.Level.INFO; ++ value = "INFO"; + break; + + default: +- value = ch.qos.logback.classic.Level.ERROR; ++ value = "ERROR"; + break; + } +- ( (ch.qos.logback.classic.Logger) LoggerFactory.getLogger( Logger.ROOT_LOGGER_NAME ) ).setLevel( value ); ++ Logger logger = LoggerFactory.getLogger( Logger.ROOT_LOGGER_NAME ); ++ try { ++ Class levelClass = Class.forName("ch.qos.logback.classic.Level"); ++ Object logbackLevel = levelClass.getField(value).get(null); ++ Class loggerClass = Class.forName("ch.qos.logback.classic.Logger"); ++ loggerClass.getMethod("setLevel", new Class[] {levelClass}) ++ .invoke(logger, new Object[] {logbackLevel}); ++ } catch (Exception e) { ++ throw new RuntimeException("Failed to initialize logback configuration", e); ++ } + } + + @Override +-- +2.26.2 + diff --git a/0003-use-non-shaded-HTTP-wagon.patch b/0003-use-non-shaded-HTTP-wagon.patch new file mode 100644 index 0000000..b841134 --- /dev/null +++ b/0003-use-non-shaded-HTTP-wagon.patch @@ -0,0 +1,51 @@ +From 1a5ab44597d81d4001c70b425736754dc8a6b663 Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Mon, 25 May 2020 12:13:20 +0200 +Subject: [PATCH 3/4] use non-shaded HTTP wagon + +--- + apache-maven/pom.xml | 15 --------------- + pom.xml | 1 - + 2 files changed, 16 deletions(-) + +diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml +index 82e12a3..f02a45e 100644 +--- a/apache-maven/pom.xml ++++ b/apache-maven/pom.xml +@@ -63,21 +63,6 @@ under the License. + + org.apache.maven.wagon + wagon-http +- shaded +- +- +- org.apache.httpcomponents +- httpclient +- +- +- org.apache.httpcomponents +- httpcore +- +- +- org.apache.maven.wagon +- wagon-http-shared +- +- + + +