From 0658bcedbfcccac27003137540c8aeab65554e11 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Tue, 8 Jun 2021 20:17:56 +0200
Subject: [PATCH] Bootstrap Maven as non-modular packages

Resolves: rhbz#1951482
---
 ...cript.patch => 0001-Adapt-mvn-script.patch |  28 +-
 ...> 0002-Invoke-logback-via-reflection.patch |  84 +++---
 ...ch => 0003-Use-non-shaded-HTTP-wagon.patch |  64 ++---
 ... 0004-Remove-dependency-on-powermock.patch | 164 ++++++------
 maven.spec                                    | 241 ++++++++++--------
 5 files changed, 297 insertions(+), 284 deletions(-)
 rename 0001-adapt-mvn-script.patch => 0001-Adapt-mvn-script.patch (65%)
 rename 0002-invoke-logback-via-reflection.patch => 0002-Invoke-logback-via-reflection.patch (87%)
 rename 0003-use-non-shaded-HTTP-wagon.patch => 0003-Use-non-shaded-HTTP-wagon.patch (88%)
 rename 0004-remove-dependency-on-powermock.patch => 0004-Remove-dependency-on-powermock.patch (93%)

diff --git a/0001-adapt-mvn-script.patch b/0001-Adapt-mvn-script.patch
similarity index 65%
rename from 0001-adapt-mvn-script.patch
rename to 0001-Adapt-mvn-script.patch
index 9f8a75e..a05e573 100644
--- a/0001-adapt-mvn-script.patch
+++ b/0001-Adapt-mvn-script.patch
@@ -1,14 +1,14 @@
-From 405e23d53b66a688082ed8c22385c5174e212be4 Mon Sep 17 00:00:00 2001
+From 247eafd819d6092661ebc57c54815acd20abd3de Mon Sep 17 00:00:00 2001
 From: Michael Simacek <msimacek@redhat.com>
-Date: Mon, 25 May 2020 12:10:33 +0200
-Subject: [PATCH 1/4] adapt mvn script
+Date: Wed, 1 Feb 2017 14:54:26 +0100
+Subject: [PATCH 1/4] Adapt mvn script
 
 ---
- apache-maven/src/bin/mvn | 17 +++++++++++++++--
- 1 file changed, 15 insertions(+), 2 deletions(-)
+ apache-maven/src/bin/mvn | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
 
 diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
-index a554c66..0c07ba6 100644
+index a554c6617..739501af4 100755
 --- a/apache-maven/src/bin/mvn
 +++ b/apache-maven/src/bin/mvn
 @@ -22,7 +22,7 @@
@@ -20,13 +20,11 @@ index a554c66..0c07ba6 100644
  #   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
+@@ -33,12 +33,16 @@ if [ -z "$MAVEN_SKIP_RC" ] ; then
      . /etc/mavenrc
    fi
  
-+  if [ -f /etc/java/maven.conf ] ; then
-+    . /etc/java/maven.conf
-+  fi
++  . /etc/java/maven.conf
 +
    if [ -f "$HOME/.mavenrc" ] ; then
      . "$HOME/.mavenrc"
@@ -34,18 +32,12 @@ index a554c66..0c07ba6 100644
  
  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
+@@ -63,7 +67,8 @@ done
  
  saveddir=`pwd`
  
@@ -56,5 +48,5 @@ index a554c66..0c07ba6 100644
  # make it fully qualified
  MAVEN_HOME=`cd "$MAVEN_HOME" && pwd`
 -- 
-2.26.2
+2.21.0
 
diff --git a/0002-invoke-logback-via-reflection.patch b/0002-Invoke-logback-via-reflection.patch
similarity index 87%
rename from 0002-invoke-logback-via-reflection.patch
rename to 0002-Invoke-logback-via-reflection.patch
index 0570159..863977d 100644
--- a/0002-invoke-logback-via-reflection.patch
+++ b/0002-Invoke-logback-via-reflection.patch
@@ -1,53 +1,53 @@
-From 3ce790eaafcf42e8720c778b712345f100064f38 Mon Sep 17 00:00:00 2001
+From 7610a10691e680db00edcbd4ce6767a30641cd71 Mon Sep 17 00:00:00 2001
 From: Michael Simacek <msimacek@redhat.com>
-Date: Mon, 25 May 2020 12:12:15 +0200
-Subject: [PATCH 2/4] invoke logback via reflection
+Date: Tue, 6 Jun 2017 13:47:43 +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
+index 5d9fab744..ced38cb5a 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
+@@ -35,22 +35,31 @@
+     @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
+2.21.0
 
diff --git a/0003-use-non-shaded-HTTP-wagon.patch b/0003-Use-non-shaded-HTTP-wagon.patch
similarity index 88%
rename from 0003-use-non-shaded-HTTP-wagon.patch
rename to 0003-Use-non-shaded-HTTP-wagon.patch
index b841134..d61abb3 100644
--- a/0003-use-non-shaded-HTTP-wagon.patch
+++ b/0003-Use-non-shaded-HTTP-wagon.patch
@@ -1,7 +1,7 @@
-From 1a5ab44597d81d4001c70b425736754dc8a6b663 Mon Sep 17 00:00:00 2001
+From c8933d155694ce37b1d4be59a744c8f7cbde6bb5 Mon Sep 17 00:00:00 2001
 From: Mikolaj Izdebski <mizdebsk@redhat.com>
-Date: Mon, 25 May 2020 12:13:20 +0200
-Subject: [PATCH 3/4] use non-shaded HTTP wagon
+Date: Mon, 1 Jul 2019 09:51:56 +0200
+Subject: [PATCH 4/4] Use non-shaded HTTP wagon
 
 ---
  apache-maven/pom.xml | 15 ---------------
@@ -13,39 +13,39 @@ index 82e12a3..f02a45e 100644
 --- a/apache-maven/pom.xml
 +++ b/apache-maven/pom.xml
 @@ -63,21 +63,6 @@ under the License.
-     <dependency>
-       <groupId>org.apache.maven.wagon</groupId>
-       <artifactId>wagon-http</artifactId>
--      <classifier>shaded</classifier>
--      <exclusions>
--        <exclusion>
--          <groupId>org.apache.httpcomponents</groupId>
--          <artifactId>httpclient</artifactId>
--        </exclusion>
--        <exclusion>
--          <groupId>org.apache.httpcomponents</groupId>
--          <artifactId>httpcore</artifactId>
--        </exclusion>
--        <exclusion>
--          <groupId>org.apache.maven.wagon</groupId>
--          <artifactId>wagon-http-shared</artifactId>
--        </exclusion>
--      </exclusions>
-     </dependency>
-     <dependency>
-       <!-- this is included in Wagon Http
+     <dependency>
+       <groupId>org.apache.maven.wagon</groupId>
+       <artifactId>wagon-http</artifactId>
+-      <classifier>shaded</classifier>
+-      <exclusions>
+-        <exclusion>
+-          <groupId>org.apache.httpcomponents</groupId>
+-          <artifactId>httpclient</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>org.apache.httpcomponents</groupId>
+-          <artifactId>httpcore</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>org.apache.maven.wagon</groupId>
+-          <artifactId>wagon-http-shared</artifactId>
+-        </exclusion>
+-      </exclusions>
+     </dependency>
+     <dependency>
+       <!-- this is included in Wagon Http
 diff --git a/pom.xml b/pom.xml
 index 44e287a..cdef69c 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -328,7 +328,6 @@ under the License.
-         <groupId>org.apache.maven.wagon</groupId>
-         <artifactId>wagon-http</artifactId>
-         <version>${wagonVersion}</version>
--        <classifier>shaded</classifier>
-         <exclusions>
-           <exclusion>
-             <groupId>commons-logging</groupId>
+         <groupId>org.apache.maven.wagon</groupId>
+         <artifactId>wagon-http</artifactId>
+         <version>${wagonVersion}</version>
+-        <classifier>shaded</classifier>
+         <exclusions>
+           <exclusion>
+             <groupId>commons-logging</groupId>
 -- 
-2.26.2
+2.24.1
 
diff --git a/0004-remove-dependency-on-powermock.patch b/0004-Remove-dependency-on-powermock.patch
similarity index 93%
rename from 0004-remove-dependency-on-powermock.patch
rename to 0004-Remove-dependency-on-powermock.patch
index d3b7855..fef675c 100644
--- a/0004-remove-dependency-on-powermock.patch
+++ b/0004-Remove-dependency-on-powermock.patch
@@ -1,7 +1,7 @@
-From 36e88235cc6cb2bdd335f004cae0356662f2d22b Mon Sep 17 00:00:00 2001
+From f6eb583525c7f777bde16182c57a47345fd53cb0 Mon Sep 17 00:00:00 2001
 From: Marian Koncek <mkoncek@redhat.com>
-Date: Mon, 25 May 2020 12:14:29 +0200
-Subject: [PATCH 4/4] remove dependency on powermock
+Date: Thu, 5 Sep 2019 15:21:04 +0200
+Subject: [PATCH] Remove dependency on powermock
 
 ---
  .../StringSearchModelInterpolatorTest.java    | 66 -------------------
@@ -12,85 +12,85 @@ index 45800d6..fbf3b23 100644
 --- a/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringSearchModelInterpolatorTest.java
 +++ b/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringSearchModelInterpolatorTest.java
 @@ -36,8 +36,6 @@ import java.util.concurrent.FutureTask;
- import static org.hamcrest.CoreMatchers.anyOf;
- import static org.hamcrest.CoreMatchers.is;
- import static org.junit.Assert.assertThat;
--import static org.powermock.reflect.Whitebox.getField;
--import static org.powermock.reflect.Whitebox.getInternalState;
- 
- /**
-  * @author jdcasey
+ import static org.hamcrest.CoreMatchers.anyOf;
+ import static org.hamcrest.CoreMatchers.is;
+ import static org.junit.Assert.assertThat;
+-import static org.powermock.reflect.Whitebox.getField;
+-import static org.powermock.reflect.Whitebox.getInternalState;
+ 
+ /**
+  * @author jdcasey
 @@ -374,70 +372,6 @@ public class StringSearchModelInterpolatorTest
-         ) ) );
-     }
- 
--    public void testNotInterpolateObjectWithFile()
--            throws Exception
--    {
--        Model model = new Model();
--
--        File baseDir = new File( System.getProperty( "user.dir" ) );
--
--        Properties p = new Properties();
--
--        ObjectWithNotInterpolatedFile obj = new ObjectWithNotInterpolatedFile( baseDir );
--
--        StringSearchModelInterpolator interpolator = (StringSearchModelInterpolator) createInterpolator();
--
--        ModelBuildingRequest config = createModelBuildingRequest( p );
--
--        SimpleProblemCollector collector = new SimpleProblemCollector();
--        interpolator.interpolateObject( obj, model, new File( "." ), config, collector );
--        assertProblemFree( collector );
--
--        //noinspection unchecked
--        Map<Class<?>, ?> cache =
--                (Map<Class<?>, ?>) getField( StringSearchModelInterpolator.class, "CACHED_ENTRIES" )
--                        .get( null );
--
--        Object objCacheItem = cache.get( Object.class );
--        Object fileCacheItem = cache.get( File.class );
--
--        assertNotNull( objCacheItem );
--        assertNotNull( fileCacheItem );
--
--        assertThat( ( (Object[]) getInternalState( objCacheItem, "fields" ) ).length, is( 0 ) );
--        assertThat( ( (Object[]) getInternalState( fileCacheItem, "fields" ) ).length, is( 0 ) );
--    }
--
--    public void testNotInterpolateFile()
--            throws Exception
--    {
--        Model model = new Model();
--
--        File baseDir = new File( System.getProperty( "user.dir" ) );
--
--        Properties p = new Properties();
--
--        StringSearchModelInterpolator interpolator = (StringSearchModelInterpolator) createInterpolator();
--
--        ModelBuildingRequest config = createModelBuildingRequest( p );
--
--        SimpleProblemCollector collector = new SimpleProblemCollector();
--        interpolator.interpolateObject( baseDir, model, new File( "." ), config, collector );
--        assertProblemFree( collector );
--
--        //noinspection unchecked
--        Map<Class<?>, ?> cache =
--                (Map<Class<?>, ?>) getField( StringSearchModelInterpolator.class, "CACHED_ENTRIES" )
--                        .get( null );
--
--        Object fileCacheItem = cache.get( File.class );
--
--        assertNotNull( fileCacheItem );
--
--        assertThat( ( (Object[]) getInternalState( fileCacheItem, "fields" ) ).length, is( 0 ) );
--    }
--
--
-     public void testConcurrentInterpolation()
-         throws Exception
-     {
+         ) ) );
+     }
+ 
+-    public void testNotInterpolateObjectWithFile()
+-            throws Exception
+-    {
+-        Model model = new Model();
+-
+-        File baseDir = new File( System.getProperty( "user.dir" ) );
+-
+-        Properties p = new Properties();
+-
+-        ObjectWithNotInterpolatedFile obj = new ObjectWithNotInterpolatedFile( baseDir );
+-
+-        StringSearchModelInterpolator interpolator = (StringSearchModelInterpolator) createInterpolator();
+-
+-        ModelBuildingRequest config = createModelBuildingRequest( p );
+-
+-        SimpleProblemCollector collector = new SimpleProblemCollector();
+-        interpolator.interpolateObject( obj, model, new File( "." ), config, collector );
+-        assertProblemFree( collector );
+-
+-        //noinspection unchecked
+-        Map<Class<?>, ?> cache =
+-                (Map<Class<?>, ?>) getField( StringSearchModelInterpolator.class, "CACHED_ENTRIES" )
+-                        .get( null );
+-
+-        Object objCacheItem = cache.get( Object.class );
+-        Object fileCacheItem = cache.get( File.class );
+-
+-        assertNotNull( objCacheItem );
+-        assertNotNull( fileCacheItem );
+-
+-        assertThat( ( (Object[]) getInternalState( objCacheItem, "fields" ) ).length, is( 0 ) );
+-        assertThat( ( (Object[]) getInternalState( fileCacheItem, "fields" ) ).length, is( 0 ) );
+-    }
+-
+-    public void testNotInterpolateFile()
+-            throws Exception
+-    {
+-        Model model = new Model();
+-
+-        File baseDir = new File( System.getProperty( "user.dir" ) );
+-
+-        Properties p = new Properties();
+-
+-        StringSearchModelInterpolator interpolator = (StringSearchModelInterpolator) createInterpolator();
+-
+-        ModelBuildingRequest config = createModelBuildingRequest( p );
+-
+-        SimpleProblemCollector collector = new SimpleProblemCollector();
+-        interpolator.interpolateObject( baseDir, model, new File( "." ), config, collector );
+-        assertProblemFree( collector );
+-
+-        //noinspection unchecked
+-        Map<Class<?>, ?> cache =
+-                (Map<Class<?>, ?>) getField( StringSearchModelInterpolator.class, "CACHED_ENTRIES" )
+-                        .get( null );
+-
+-        Object fileCacheItem = cache.get( File.class );
+-
+-        assertNotNull( fileCacheItem );
+-
+-        assertThat( ( (Object[]) getInternalState( fileCacheItem, "fields" ) ).length, is( 0 ) );
+-    }
+-
+-
+     public void testConcurrentInterpolation()
+         throws Exception
+     {
 -- 
-2.26.2
+2.24.1
 
diff --git a/maven.spec b/maven.spec
index 257ac82..bedf39f 100644
--- a/maven.spec
+++ b/maven.spec
@@ -1,4 +1,8 @@
-%bcond_with logback
+# Workaround for rhbz#1969370: __bootstrap macro is not defined in
+# CentOS Stream, See https://bugzilla.redhat.com/1969370
+%global __bootstrap ~bootstrap
+
+%bcond_without bootstrap
 
 %global bundled_slf4j_version 1.7.30
 %global homedir %{_datadir}/%{name}%{?maven_version_suffix}
@@ -7,28 +11,29 @@
 Name:           maven
 Epoch:          1
 Version:        3.6.3
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Java project management and project comprehension tool
 # maven itself is ASL 2.0
 # bundled slf4j is MIT
 License:        ASL 2.0 and MIT
+URL:            https://maven.apache.org/
+BuildArch:      noarch
 
-URL:            http://maven.apache.org/
-
-Source0:        http://archive.apache.org/dist/%{name}/%{name}-3/%{version}/source/apache-%{name}-%{version}-src.tar.gz
+Source0:        https://archive.apache.org/dist/%{name}/%{name}-3/%{version}/source/apache-%{name}-%{version}-src.tar.gz
 Source1:        maven-bash-completion
 Source2:        mvn.1
 
-Patch1:         0001-adapt-mvn-script.patch
+Patch1:         0001-Adapt-mvn-script.patch
 # Downstream-specific, avoids dependency on logback
 # Used only when %%without logback is in effect
-Patch2:         0002-invoke-logback-via-reflection.patch
-Patch3:         0003-use-non-shaded-HTTP-wagon.patch
-Patch4:         0004-remove-dependency-on-powermock.patch
+Patch2:         0002-Invoke-logback-via-reflection.patch
+Patch3:         0003-Use-non-shaded-HTTP-wagon.patch
+Patch4:         0004-Remove-dependency-on-powermock.patch
 
-BuildArch:      noarch
-
-BuildRequires:  maven-local
+BuildRequires:  maven-local-openjdk8
+%if %{with bootstrap}
+BuildRequires:  javapackages-bootstrap
+%else
 BuildRequires:  mvn(com.google.inject:guice::no_aop:)
 BuildRequires:  mvn(commons-cli:commons-cli)
 BuildRequires:  mvn(commons-jxpath:commons-jxpath)
@@ -50,20 +55,18 @@ BuildRequires:  mvn(org.apache.maven.shared:maven-shared-utils)
 BuildRequires:  mvn(org.apache.maven.wagon:wagon-file)
 BuildRequires:  mvn(org.apache.maven.wagon:wagon-http)
 BuildRequires:  mvn(org.apache.maven.wagon:wagon-provider-api)
-BuildRequires:  mvn(org.codehaus.modello:modello-maven-plugin) >= 1.11
+BuildRequires:  mvn(org.codehaus.modello:modello-maven-plugin)
 BuildRequires:  mvn(org.codehaus.mojo:build-helper-maven-plugin)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-classworlds)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-component-annotations)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-component-metadata)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-interpolation)
-BuildRequires:  mvn(org.codehaus.plexus:plexus-utils) >= 3.2.0
+BuildRequires:  mvn(org.codehaus.plexus:plexus-utils)
 BuildRequires:  mvn(org.eclipse.sisu:org.eclipse.sisu.inject)
 BuildRequires:  mvn(org.eclipse.sisu:org.eclipse.sisu.plexus)
 BuildRequires:  mvn(org.eclipse.sisu:sisu-maven-plugin)
-BuildRequires:  mvn(org.fusesource.jansi:jansi:1)
-BuildRequires:  mvn(org.hamcrest:hamcrest-library)
-BuildRequires:  mvn(org.jsoup:jsoup)
-BuildRequires:  mvn(org.mockito:mockito-core) >= 2
+BuildRequires:  mvn(org.fusesource.jansi:jansi)
+BuildRequires:  mvn(org.mockito:mockito-core)
 BuildRequires:  mvn(org.slf4j:jcl-over-slf4j)
 BuildRequires:  mvn(org.slf4j:slf4j-api)
 BuildRequires:  mvn(org.slf4j:slf4j-simple)
@@ -71,101 +74,73 @@ BuildRequires:  mvn(org.sonatype.plexus:plexus-cipher)
 BuildRequires:  mvn(org.sonatype.plexus:plexus-sec-dispatcher)
 BuildRequires:  mvn(org.xmlunit:xmlunit-core)
 BuildRequires:  mvn(org.xmlunit:xmlunit-matchers)
-
-BuildRequires:  slf4j-sources = %{bundled_slf4j_version}
-
-%if %{with logback}
-BuildRequires:  mvn(ch.qos.logback:logback-classic)
 %endif
 
-Requires:       %{name}-lib = %{epoch}:%{version}-%{release}
+# XXX
+#BuildRequires:  mvn(org.slf4j:slf4j-simple::sources:) = %{bundled_slf4j_version}
+%if %{without bootstrap}
+BuildRequires:  mvn(org.slf4j:slf4j-simple::sources:)
+%endif
 
-Requires(post): /usr/sbin/update-alternatives
-Requires(postun): /usr/sbin/update-alternatives
+Requires: %{name}-lib = %{epoch}:%{version}-%{release}
+Requires: %{name}-jdk-binding
+Suggests: %{name}-openjdk11 = %{epoch}:%{version}-%{release}
 
-# Theoretically Maven might be usable with just JRE, but typical Maven
-# workflow requires full JDK, so we recommend it here.
-%{?fedora:Recommends}%{!?fedora:Requires}: java-devel
-
-# XMvn does generate auto-requires, but explicit requires are still
-# needed because some symlinked JARs are not present in Maven POMs or
-# their dependency scope prevents them from being added automatically
-# by XMvn.  It would be possible to explicitly specify only
-# dependencies which are not generated automatically, but adding
-# everything seems to be easier.
-Requires:       aopalliance
-Requires:       apache-commons-cli
-Requires:       apache-commons-codec
-Requires:       apache-commons-io
-Requires:       apache-commons-lang3
-Requires:       atinject
-Requires:       cdi-api
-Requires:       jakarta-annotations
-Requires:       google-guice
-Requires:       guava
-Requires:       hawtjni-runtime
-Requires:       httpcomponents-client
-Requires:       httpcomponents-core
-Requires:       jansi1
-Requires:       jansi-native
-Requires:       jcl-over-slf4j
-Requires:       maven-resolver-api
-Requires:       maven-resolver-connector-basic
-Requires:       maven-resolver-impl
-Requires:       maven-resolver-spi
-Requires:       maven-resolver-transport-wagon
-Requires:       maven-resolver-util
-Requires:       maven-shared-utils
-Requires:       maven-wagon-file
-Requires:       maven-wagon-http
-Requires:       maven-wagon-http-shared
-Requires:       maven-wagon-provider-api
-Requires:       plexus-cipher
-Requires:       plexus-classworlds
-Requires:       plexus-containers-component-annotations
-Requires:       plexus-interpolation
-Requires:       plexus-sec-dispatcher
-Requires:       plexus-utils
-Requires:       sisu-inject
-Requires:       sisu-plexus
-Requires:       slf4j
+Requires(post): alternatives
+Requires(postun): alternatives
 
 %description
 Maven is a software project management and comprehension tool. Based on the
 concept of a project object model (POM), Maven can manage a project's build,
 reporting and documentation from a central piece of information.
 
-
-%package        lib
+%package lib
 Summary:        Core part of Maven
 # If XMvn is part of the same RPM transaction then it should be
 # installed first to avoid triggering rhbz#1014355.
 OrderWithRequires: xmvn-minimal
 
-# Require full javapackages-tools since maven-script uses
-# /usr/share/java-utils/java-functions
-Requires:       javapackages-tools
 # Maven upstream uses patched version of SLF4J.  They unpack
 # slf4j-simple-sources.jar, apply non-upstreamable, Maven-specific
 # patch (using a script written in Groovy), compile and package as
 # maven-slf4j-provider.jar, together with Maven-specific additions.
 Provides:       bundled(slf4j) = %{bundled_slf4j_version}
 
-%description    lib
+%description lib
 Core part of Apache Maven that can be used as a library.
 
+%package openjdk8
+Summary:        OpenJDK 8 binding for Maven
+RemovePathPostfixes: -openjdk8
+Provides: maven-jdk-binding = %{epoch}:%{version}-%{release}
+Requires: maven = %{epoch}:%{version}-%{release}
+Requires: java-1.8.0-openjdk-devel
+Conflicts: maven-jdk-binding
 
-%package        javadoc
-Summary:        API documentation for %{name}
+%description openjdk8
+Configures Maven to run with OpenJDK 8.
 
-%description    javadoc
-%{summary}.
+%package openjdk11
+Summary:        OpenJDK 11 binding for Maven
+RemovePathPostfixes: -openjdk11
+Provides: maven-jdk-binding = %{epoch}:%{version}-%{release}
+Requires: maven = %{epoch}:%{version}-%{release}
+Requires: java-11-openjdk-devel
+Conflicts: maven-jdk-binding
 
+%description openjdk11
+Configures Maven to run with OpenJDK 11.
+
+%{?javadoc_package}
 
 %prep
 %setup -q -n apache-%{name}-%{version}
 
+find -name '*.java' -exec sed -i 's/\r//' {} +
+find -name 'pom.xml' -exec sed -i 's/\r//' {} +
+
 %patch1 -p1
+%patch2 -p1
 %patch3 -p1
 %patch4 -p1
 
@@ -197,24 +172,17 @@ sed -i "
 
 %mvn_package :apache-maven __noinstall
 
-%if %{without logback}
+%pom_change_dep :jansi :::runtime maven-embedder
 %pom_remove_dep -r :logback-classic
-%patch2 -p1
-%endif
 
 %mvn_alias :maven-resolver-provider :maven-aether-provider
 
-# inject missing sisu-maven-plugin in maven-model-builder
 %pom_xpath_inject 'pom:build/pom:plugins' '
 <plugin>
-    <groupId>org.eclipse.sisu</groupId>
-    <artifactId>sisu-maven-plugin</artifactId>
+	<groupId>org.eclipse.sisu</groupId>
+	<artifactId>sisu-maven-plugin</artifactId>
 </plugin>' maven-model-builder/pom.xml
 
-# Update required version of jansi 1.x
-%pom_xpath_set "//pom:dependency[pom:artifactId='jansi']/pom:version" 1.18
-
-
 %build
 %mvn_build -- -Dproject.build.sourceEncoding=UTF-8
 
@@ -234,18 +202,9 @@ install -d -m 755 %{buildroot}%{confdir}
 install -d -m 755 %{buildroot}%{_datadir}/bash-completion/completions/
 
 cp -a $M2_HOME/{bin,lib,boot} %{buildroot}%{homedir}/
-xmvn-subst -R %{buildroot} -s %{buildroot}%{homedir}
-
-# Transitive deps of wagon-http, missing because of unshading
-build-jar-repository -s -p %{buildroot}%{homedir}/lib \
-    httpcomponents/{httpclient,httpcore} maven-wagon/http-shared
-
-# Transitive deps of cdi-api that should have been excluded
-rm %{buildroot}%{homedir}/lib/jakarta.interceptor-api*.jar
-rm %{buildroot}%{homedir}/lib/javax.el-api*.jar
-
-# Native lib whose extraction we suppressed
-ln -s %{_jnidir}/jansi-native/jansi-linux.jar %{buildroot}%{homedir}/lib/
+%if %{without bootstrap}
+xmvn-subst -s -R %{buildroot} -s %{buildroot}%{homedir}
+%endif
 
 install -p -m 644 %{SOURCE2} %{buildroot}%{homedir}/bin/
 gzip -9 %{buildroot}%{homedir}/bin/mvn.1
@@ -263,6 +222,19 @@ install -d -m 755 %{buildroot}%{_mandir}/man1/
 touch %{buildroot}%{_bindir}/{mvn,mvnDebug}
 touch %{buildroot}%{_mandir}/man1/{mvn,mvnDebug}.1
 
+# Versioned commands and manpages
+%if 0%{?maven_version_suffix:1}
+ln -s %{homedir}/bin/mvn %{buildroot}%{_bindir}/mvn%{maven_version_suffix}
+ln -s %{homedir}/bin/mvnDebug %{buildroot}%{_bindir}/mvnDebug%{maven_version_suffix}
+ln -s %{homedir}/bin/mvn.1.gz %{buildroot}%{_mandir}/man1/mvn%{maven_version_suffix}.1.gz
+ln -s %{homedir}/bin/mvnDebug.1.gz %{buildroot}%{_mandir}/man1/mvnDebug%{maven_version_suffix}.1.gz
+%endif
+
+# JDK bindings
+install -d -m 755 %{buildroot}%{_javaconfdir}/
+echo JAVA_HOME=%{_jvmlibdir}/java-1.8.0-openjdk >%{buildroot}%{_javaconfdir}/maven.conf-openjdk8
+echo JAVA_HOME=%{_jvmlibdir}/java-11-openjdk >%{buildroot}%{_javaconfdir}/maven.conf-openjdk11
+
 
 %post
 update-alternatives --install %{_bindir}/mvn mvn %{homedir}/bin/mvn %{?maven_alternatives_priority}0 \
@@ -271,13 +243,13 @@ update-alternatives --install %{_bindir}/mvn mvn %{homedir}/bin/mvn %{?maven_alt
 --slave %{_mandir}/man1/mvnDebug.1.gz mvnDebug1 %{homedir}/bin/mvn.1.gz \
 
 %postun
-[[ $1 -eq 0 ]] && update-alternatives --remove mvn %{homedir}/bin/mvn
-
+if [[ $1 -eq 0 ]]; then update-alternatives --remove mvn %{homedir}/bin/mvn; fi
 
 %files lib -f .mfiles
 %doc README.md
 %license LICENSE NOTICE
 %{homedir}
+%exclude %{homedir}/bin/mvn*
 %dir %{confdir}
 %dir %{confdir}/logging
 %config(noreplace) %{_sysconfdir}/m2%{?maven_version_suffix}.conf
@@ -285,23 +257,39 @@ update-alternatives --install %{_bindir}/mvn mvn %{homedir}/bin/mvn %{?maven_alt
 %config(noreplace) %{confdir}/logging/simplelogger.properties
 
 %files
+%{homedir}/bin/mvn*
 %ghost %{_bindir}/mvn
 %ghost %{_bindir}/mvnDebug
 %{_datadir}/bash-completion
 %ghost %{_mandir}/man1/mvn.1.gz
 %ghost %{_mandir}/man1/mvnDebug.1.gz
+%if 0%{?maven_version_suffix:1}
+%{_bindir}/mvn%{maven_version_suffix}
+%{_bindir}/mvnDebug%{maven_version_suffix}
+%{_mandir}/man1/mvn%{maven_version_suffix}.1.gz
+%{_mandir}/man1/mvnDebug%{maven_version_suffix}.1.gz
+%endif
 
-%files javadoc -f .mfiles-javadoc
-%license LICENSE NOTICE
+%files openjdk8
+%config %{_javaconfdir}/maven.conf-openjdk8
 
+%files openjdk11
+%config %{_javaconfdir}/maven.conf-openjdk11
 
 %changelog
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1:3.6.3-9
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.6.3-10
+- Bootstrap Maven for CentOS Stream 9
+
+* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.6.3-9
+- Bootstrap build
+- Non-bootstrap build
 
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.6.3-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
+* Thu Dec 24 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.6.3-2
+- Move launcher scripts from maven-lib to maven package
+
 * Mon Dec 14 2020 Jerry James <loganjerry@gmail.com> - 1:3.6.3-7
 - Update jansi dep to jansi1
 
@@ -330,30 +318,63 @@ update-alternatives --install %{_bindir}/mvn mvn %{homedir}/bin/mvn %{?maven_alt
 * Thu May 14 2020 Fabio Valentini <decathorpe@gmail.com> - 1:3.6.1-6
 - Port to modello 1.11.
 
+* Thu Feb 27 2020 Marian Koncek <mkoncek@redhat.com> - 1:3.6.3-1
+- Update to upstream version 3.6.3
+
 * Wed Feb 05 2020 Dinesh Prasanth M K <dmoluguw@redhat.com> - 1:3.6.1-5
 - Require the updated version of slf4j.
 
 * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.6.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
+* Sat Jan 25 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.6.2-4
+- Build with OpenJDK 8
+
+* Thu Jan 23 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.6.2-3
+- Implement JDK bindings
+
 * Thu Nov 21 2019 Fabio Valentini <decathorpe@gmail.com> - 1:3.6.1-3
 - Require the correct version of guava.
 
+* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.6.2-2
+- Mass rebuild for javapackages-tools 201902
+
 * Mon Nov 04 2019 Fabio Valentini <decathorpe@gmail.com> - 1:3.6.1-2
 - Fix postun scriptlet.
 
 * Wed Oct 16 2019 Fabio Valentini <decathorpe@gmail.com> - 1:3.6.1-1
 - Update to version 3.6.1.
 
+* Thu Oct 03 2019 Marian Koncek <mkoncek@redhat.com> - 1:3.6.2-1
+- Update to upstream version 3.6.2
+
 * Thu Aug 29 2019 Fabio Valentini <decathorpe@gmail.com> - 1:3.5.4-12
 - Remove dependency on logback-classic.
 
 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.5.4-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
+* Wed Jul 03 2019 Marian Koncek <mkoncek@redhat.com> - 1:3.6.1-5
+- Port to modello version 1.11
+
+* Thu May 30 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.6.1-4
+- Backport upstream fix for Tycho P2 integarion
+
+* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.6.1-3
+- Mass rebuild for javapackages-tools 201901
+
 * Wed Apr 17 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.5.4-10
 - Update to Mockito 2
 
+* Wed Apr 17 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.6.1-2
+- Update to Mockito 2
+
+* Sat Apr 13 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.6.1-1
+- Update to upstream version 3.6.1
+
+* Fri Apr 12 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.5.4-6
+- Update SLF4J version to 1.7.26
+
 * Wed Mar 20 2019 Peter Robinson <pbrobinson@fedoraproject.org> 1:3.5.4-9
 - Fix dependency on alternatives