commit 0fc1def773442b116315136f2efdb83c41827330
Author: James Antill <jantill@redhat.com>
Date:   Mon Aug 8 12:41:53 2022 -0400

    Import rpm: 3bca766ae561fee0b9f064ab4e5d9590adf07682

diff --git a/.fmf/version b/.fmf/version
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/.fmf/version
@@ -0,0 +1 @@
+1
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..916ab6a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+SOURCES/apache-maven-3.5.4-src.tar.gz
diff --git a/0001-Adapt-mvn-script.patch b/0001-Adapt-mvn-script.patch
new file mode 100644
index 0000000..0b5361b
--- /dev/null
+++ b/0001-Adapt-mvn-script.patch
@@ -0,0 +1,69 @@
+From 46041685a82b861bc8616bb603e341adb740a302 Mon Sep 17 00:00:00 2001
+From: Michael Simacek <msimacek@redhat.com>
+Date: Wed, 1 Feb 2017 14:54:26 +0100
+Subject: [PATCH 1/3] Adapt mvn script
+
+---
+ apache-maven/src/bin/mvn | 19 ++++++++++++++++---
+ 1 file changed, 16 insertions(+), 3 deletions(-)
+
+diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
+index a554c66..818cf70 100755
+--- 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`
+@@ -102,7 +115,7 @@ if [ ! -x "$JAVACMD" ] ; then
+   exit 1
+ fi
+ 
+-CLASSWORLDS_JAR=`echo "${MAVEN_HOME}"/boot/plexus-classworlds-*.jar`
++CLASSWORLDS_JAR=`build-classpath plexus-classworlds`
+ CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+ 
+ # For Cygwin, switch paths to Windows format before running java
+-- 
+2.17.1
+
diff --git a/0002-Invoke-logback-via-reflection.patch b/0002-Invoke-logback-via-reflection.patch
new file mode 100644
index 0000000..71d45e6
--- /dev/null
+++ b/0002-Invoke-logback-via-reflection.patch
@@ -0,0 +1,53 @@
+From 4e1e32e3a96c6876a22cca6743288b8c8df4adb0 Mon Sep 17 00:00:00 2001
+From: Michael Simacek <msimacek@redhat.com>
+Date: Tue, 6 Jun 2017 13:47:43 +0200
+Subject: [PATCH 2/3] 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 5d9fab7..ced38cb 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.17.1
+
diff --git a/0003-Revert-MNG-6335-Update-Mockito-to-2.12.0.patch b/0003-Revert-MNG-6335-Update-Mockito-to-2.12.0.patch
new file mode 100644
index 0000000..24ff301
--- /dev/null
+++ b/0003-Revert-MNG-6335-Update-Mockito-to-2.12.0.patch
@@ -0,0 +1,180 @@
+From 6b5e263ebd03be9551c4e6aa394ac2334fff7c03 Mon Sep 17 00:00:00 2001
+From: Michael Simacek <msimacek@redhat.com>
+Date: Tue, 13 Mar 2018 11:49:16 +0100
+Subject: [PATCH 3/3] Revert "[ MNG-6335] Update Mockito to 2.12.0"
+
+This reverts commit a03489b67d04a4b014ff5d1c151b331a39bf100b.
+---
+ .../DefaultToolchainManagerPrivateTest.java       | 15 +++++++++------
+ .../toolchain/DefaultToolchainManagerTest.java    |  4 ++--
+ .../building/DefaultToolchainsBuilderTest.java    | 14 +++++++-------
+ maven-embedder/pom.xml                            |  1 -
+ pom.xml                                           |  2 +-
+ 5 files changed, 19 insertions(+), 17 deletions(-)
+
+diff --git a/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivateTest.java b/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivateTest.java
+index c937564..1e48441 100644
+--- a/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivateTest.java
++++ b/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivateTest.java
+@@ -20,7 +20,8 @@ package org.apache.maven.toolchain;
+  */
+ 
+ import static org.junit.Assert.assertEquals;
+-import static org.mockito.ArgumentMatchers.anyString;
++import static org.junit.Assert.fail;
++import static org.mockito.Matchers.anyString;
+ import static org.mockito.Mockito.mock;
+ import static org.mockito.Mockito.never;
+ import static org.mockito.Mockito.verify;
+@@ -144,8 +145,9 @@ public class DefaultToolchainManagerPrivateTest
+         verify( logger, never() ).error( anyString() );
+         assertEquals( 2, toolchains.length );
+     }
+-
+-    @Test
++    
++    @SuppressWarnings( "unchecked" )
++    @Test( expected = MisconfiguredToolchainException.class )
+     public void testMisconfiguredToolchain()
+         throws Exception
+     {
+@@ -153,11 +155,12 @@ public class DefaultToolchainManagerPrivateTest
+         MavenSession session = mock( MavenSession.class );
+         MavenExecutionRequest req = new DefaultMavenExecutionRequest();
+         when( session.getRequest() ).thenReturn( req );
++        when(toolchainFactory_basicType.createDefaultToolchain()).thenThrow( MisconfiguredToolchainException.class );
+ 
+         // execute
+-        ToolchainPrivate[] basics = toolchainManager.getToolchainsForType("basic", session);
+-
++        toolchainManager.getToolchainsForType( "basic", session );
++        
+         // verify
+-        assertEquals( 0, basics.length );
++        fail( "Should exit with a MisconfiguredToolchainException" );
+     }
+ }
+diff --git a/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerTest.java b/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerTest.java
+index 84444c0..6e85c42 100644
+--- a/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerTest.java
++++ b/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerTest.java
+@@ -20,6 +20,7 @@ package org.apache.maven.toolchain;
+  */
+ 
+ import static org.junit.Assert.assertEquals;
++import static org.mockito.Matchers.anyMap;
+ import static org.mockito.Matchers.isA;
+ import static org.mockito.Mockito.mock;
+ import static org.mockito.Mockito.verify;
+@@ -38,7 +39,6 @@ import org.apache.maven.toolchain.model.ToolchainModel;
+ import org.codehaus.plexus.logging.Logger;
+ import org.junit.Before;
+ import org.junit.Test;
+-import org.mockito.ArgumentMatchers;
+ import org.mockito.InjectMocks;
+ import org.mockito.Mock;
+ import org.mockito.MockitoAnnotations;
+@@ -142,7 +142,7 @@ public class DefaultToolchainManagerTest
+         executionRequest.setToolchains( toolchainModels );
+         when( session.getRequest() ).thenReturn( executionRequest );
+         ToolchainPrivate basicPrivate = mock( ToolchainPrivate.class );
+-        when( basicPrivate.matchesRequirements( ArgumentMatchers.<String, String>anyMap() ) ).thenReturn( false ).thenReturn( true );
++        when( basicPrivate.matchesRequirements( anyMap() ) ).thenReturn( false ).thenReturn( true );
+         when( toolchainFactory_basicType.createToolchain( isA( ToolchainModel.class ) ) ).thenReturn( basicPrivate );
+ 
+         List<Toolchain> toolchains =
+diff --git a/maven-core/src/test/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilderTest.java b/maven-core/src/test/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilderTest.java
+index fc530df..80fca09 100644
+--- a/maven-core/src/test/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilderTest.java
++++ b/maven-core/src/test/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilderTest.java
+@@ -21,7 +21,8 @@ package org.apache.maven.toolchain.building;
+ 
+ import static org.junit.Assert.assertEquals;
+ import static org.junit.Assert.assertNotNull;
+-import static org.mockito.ArgumentMatchers.any;
++import static org.mockito.Matchers.any;
++import static org.mockito.Matchers.anyMap;
+ import static org.mockito.Mockito.when;
+ 
+ import java.io.IOException;
+@@ -34,7 +35,6 @@ import org.apache.maven.toolchain.model.PersistedToolchains;
+ import org.apache.maven.toolchain.model.ToolchainModel;
+ import org.junit.Before;
+ import org.junit.Test;
+-import org.mockito.ArgumentMatchers;
+ import org.mockito.InjectMocks;
+ import org.mockito.Mock;
+ import org.mockito.MockitoAnnotations;
+@@ -78,7 +78,7 @@ public class DefaultToolchainsBuilderTest
+         toolchain.setType( "TYPE" );
+         toolchain.addProvide( "key", "user_value" );
+         userResult.addToolchain(  toolchain );
+-        when( toolchainsReader.read( any( InputStream.class ), ArgumentMatchers.<String, Object>anyMap()) ).thenReturn( userResult );
++        when( toolchainsReader.read( any( InputStream.class ), anyMap() ) ).thenReturn( userResult );
+ 
+         ToolchainsBuildingResult result = toolchainBuilder.build( request );
+         assertNotNull( result.getEffectiveToolchains() );
+@@ -101,7 +101,7 @@ public class DefaultToolchainsBuilderTest
+         toolchain.setType( "TYPE" );
+         toolchain.addProvide( "key", "global_value" );
+         globalResult.addToolchain(  toolchain );
+-        when( toolchainsReader.read( any( InputStream.class ), ArgumentMatchers.<String, Object>anyMap()) ).thenReturn( globalResult );
++        when( toolchainsReader.read( any( InputStream.class ), anyMap() ) ).thenReturn( globalResult );
+ 
+         ToolchainsBuildingResult result = toolchainBuilder.build( request );
+         assertNotNull( result.getEffectiveToolchains() );
+@@ -131,7 +131,7 @@ public class DefaultToolchainsBuilderTest
+         globalToolchain.setType( "TYPE" );
+         globalToolchain.addProvide( "key", "global_value" );
+         globalResult.addToolchain(  globalToolchain );
+-        when( toolchainsReader.read( any( InputStream.class ), ArgumentMatchers.<String, Object>anyMap()) ).thenReturn( globalResult ).thenReturn( userResult );
++        when( toolchainsReader.read( any( InputStream.class ), anyMap() ) ).thenReturn( globalResult ).thenReturn( userResult );
+ 
+         ToolchainsBuildingResult result = toolchainBuilder.build( request );
+         assertNotNull( result.getEffectiveToolchains() );
+@@ -150,7 +150,7 @@ public class DefaultToolchainsBuilderTest
+         ToolchainsBuildingRequest request = new DefaultToolchainsBuildingRequest();
+         request.setGlobalToolchainsSource( new StringSource( "" ) );
+         ToolchainsParseException parseException = new ToolchainsParseException( "MESSAGE", 4, 2 );
+-        when( toolchainsReader.read( any( InputStream.class ), ArgumentMatchers.<String, Object>anyMap()) ).thenThrow( parseException );
++        when( toolchainsReader.read( any( InputStream.class ), anyMap() ) ).thenThrow( parseException );
+         
+         try
+         {
+@@ -169,7 +169,7 @@ public class DefaultToolchainsBuilderTest
+         ToolchainsBuildingRequest request = new DefaultToolchainsBuildingRequest();
+         request.setGlobalToolchainsSource( new StringSource( "", "LOCATION" ) );
+         IOException ioException = new IOException( "MESSAGE" );
+-        when( toolchainsReader.read( any( InputStream.class ), ArgumentMatchers.<String, Object>anyMap()) ).thenThrow( ioException );
++        when( toolchainsReader.read( any( InputStream.class ), anyMap() ) ).thenThrow( ioException );
+         
+         try
+         {
+diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
+index 8a00565..2a9668b 100644
+--- a/maven-embedder/pom.xml
++++ b/maven-embedder/pom.xml
+@@ -141,7 +141,6 @@ under the License.
+     <dependency>
+       <groupId>org.mockito</groupId>
+       <artifactId>mockito-core</artifactId>
+-      <scope>test</scope>
+     </dependency>
+     <dependency>
+       <groupId>org.fusesource.jansi</groupId>
+diff --git a/pom.xml b/pom.xml
+index ef1d0b0..77b3395 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -53,7 +53,7 @@ under the License.
+     <commonsCliVersion>1.4</commonsCliVersion>
+     <commonsLangVersion>3.5</commonsLangVersion>
+     <junitVersion>4.12</junitVersion>
+-    <mockitoVersion>2.12.0</mockitoVersion>
++    <mockitoVersion>1.10.19</mockitoVersion>
+     <plexusVersion>1.7.1</plexusVersion>
+     <plexusInterpolationVersion>1.24</plexusInterpolationVersion>
+     <plexusUtilsVersion>3.1.0</plexusUtilsVersion>
+-- 
+2.17.1
+
diff --git a/0003-Use-non-shaded-HTTP-wagon.patch b/0003-Use-non-shaded-HTTP-wagon.patch
new file mode 100644
index 0000000..d61abb3
--- /dev/null
+++ b/0003-Use-non-shaded-HTTP-wagon.patch
@@ -0,0 +1,51 @@
+From c8933d155694ce37b1d4be59a744c8f7cbde6bb5 Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk@redhat.com>
+Date: Mon, 1 Jul 2019 09:51:56 +0200
+Subject: [PATCH 4/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.
+     <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>
+-- 
+2.24.1
+
diff --git a/0004-Remove-dependency-on-powermock.patch b/0004-Remove-dependency-on-powermock.patch
new file mode 100644
index 0000000..fef675c
--- /dev/null
+++ b/0004-Remove-dependency-on-powermock.patch
@@ -0,0 +1,96 @@
+From f6eb583525c7f777bde16182c57a47345fd53cb0 Mon Sep 17 00:00:00 2001
+From: Marian Koncek <mkoncek@redhat.com>
+Date: Thu, 5 Sep 2019 15:21:04 +0200
+Subject: [PATCH] Remove dependency on powermock
+
+---
+ .../StringSearchModelInterpolatorTest.java    | 66 -------------------
+ 1 file changed, 66 deletions(-)
+
+diff --git 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
+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
+@@ -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
+     {
+-- 
+2.24.1
+
diff --git a/gating.yaml b/gating.yaml
new file mode 100644
index 0000000..9214b2f
--- /dev/null
+++ b/gating.yaml
@@ -0,0 +1,9 @@
+--- !Policy
+product_versions:
+  - rhel-9
+decision_contexts:
+  - osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
+  # https://docs.engineering.redhat.com/display/RHELPLAN/Maven+Bootstrap+manual+gating+test
+  - !PassingTestCaseRule {test_case_name: manual.sst_cs_apps.maven.bootstrap}
diff --git a/maven-bash-completion b/maven-bash-completion
new file mode 100644
index 0000000..0ca36fa
--- /dev/null
+++ b/maven-bash-completion
@@ -0,0 +1,90 @@
+_m2_make_goals()
+{
+  plugin=$1
+  mojos=$2
+  for mojo in $mojos
+  do
+    export goals="$goals $plugin:$mojo"
+  done
+}
+
+_m2_complete()
+{
+  local cur goals
+
+  COMPREPLY=()
+  cur="${COMP_WORDS[COMP_CWORD]}"
+  prev="${COMP_WORDS[COMP_CWORD-1]}"
+
+  case "${prev}" in
+       -f | --file|-l|--log-file)
+              COMPREPLY=( $(compgen -f ${cur}) )
+              return 0
+       ;;
+       *);;
+  esac
+
+
+  goals='clean compile test install package deploy site verify'
+  if [[ ${cur} == -* ]] ; then
+     goals="$goals -am --also-make
+                   -amd --also-make-dependents
+                   -B --batch-mode
+                   -C --strict-checksums
+                   -c --lax-checksums
+                   -cpu --check-plugin-updates
+                   -D --define
+                   -e --errors
+                   -emp --encrypt-master-password
+                   -ep --encrypt-password
+                   -f --file
+                   -fae --fail-at-end
+                   -ff --fail-fast
+                   -fn --fail-never
+                   -gs --global-settings
+                   -h --help
+                   -l --log-file
+                   -N --non-recursive
+                   -npr --no-plugin-registry
+                   -npu --no-plugin-updates
+                   -nsu --no-snapshot-updates
+                   -o --offline
+                   -P --activate-profiles
+                   -pl --projects
+                   -q --quiet
+                   -rf --resume-from
+                   -s --settings
+                   -T --threads
+                   -t --toolchains
+                   -U --update-snapshots
+                   -up --update-plugins
+                   -V --show-version
+                   -v --version
+                   -X --debug
+                   -Dmaven.test.skip=true
+                   -Dmaven.compiler.source=1.5
+                   -Dmaven.compiler.source=1.6
+                   -Dmaven.compiler.source=1.7
+                   -Dmaven.compiler.target=1.5
+                   -Dmaven.compiler.target=1.6
+                   -Dmaven.compiler.target=1.7
+                   -Dproject.build.sourceEncoding=UTF-8
+                   -Dmaven.repo.local=
+                   -Dmaven.local.depmap.file=
+                   -Dmaven.local.debug=true
+                   -Dmaven.local.mode=true"
+  fi
+
+  goals=$goals _m2_make_goals "eclipse" "eclipse"
+  goals=$goals _m2_make_goals "idea" "idea"
+  goals=$goals _m2_make_goals "assembly" "assembly"
+  goals=$goals _m2_make_goals "plexus" "app bundle-application bundle-runtime descriptor runtime service"
+  goals=$goals _m2_make_goals "dependency" "analyze analyze-dep-mgt analyze-only analyze-report analyze-duplicate
+                                           build-classpath copy copy-dependencies get go-offline list properties
+                                           purge-local-repository resolve resolve-plugins sources tree unpack
+                                           unpack-dependencies"
+  cur=`echo $cur | sed 's/\\\\//g'`
+  COMPREPLY=($(compgen -W "${goals}" -- ${cur} | sed 's/\\\\//g') )
+}
+
+complete -F _m2_complete -o filenames mvn
diff --git a/maven.spec b/maven.spec
new file mode 100644
index 0000000..c54cf78
--- /dev/null
+++ b/maven.spec
@@ -0,0 +1,778 @@
+%bcond_without  logback
+
+%global bundled_slf4j_version 1.7.25
+%global homedir %{_datadir}/%{name}%{?maven_version_suffix}
+%global confdir %{_sysconfdir}/%{name}%{?maven_version_suffix}
+
+Name:           maven
+Epoch:          1
+Version:        3.5.4
+Release:        5%{?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:            http://maven.apache.org/
+BuildArch:      noarch
+
+Source0:        http://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
+# Downstream-specific, avoids dependency on logback
+# Used only when %%without logback is in effect
+Patch2:         0002-Invoke-logback-via-reflection.patch
+# We don't have mockito 2 yet
+Patch3:         0003-Revert-MNG-6335-Update-Mockito-to-2.12.0.patch
+
+BuildRequires:  maven-local
+BuildRequires:  mvn(com.google.guava:guava:20.0)
+BuildRequires:  mvn(com.google.inject:guice::no_aop:)
+BuildRequires:  mvn(commons-cli:commons-cli)
+BuildRequires:  mvn(commons-jxpath:commons-jxpath)
+BuildRequires:  mvn(javax.annotation:jsr250-api)
+BuildRequires:  mvn(javax.inject:javax.inject)
+BuildRequires:  mvn(junit:junit)
+BuildRequires:  mvn(org.apache.commons:commons-lang3)
+BuildRequires:  mvn(org.apache.maven:maven-parent:pom:)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-assembly-plugin)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-dependency-plugin)
+BuildRequires:  mvn(org.apache.maven.resolver:maven-resolver-api)
+BuildRequires:  mvn(org.apache.maven.resolver:maven-resolver-connector-basic)
+BuildRequires:  mvn(org.apache.maven.resolver:maven-resolver-impl)
+BuildRequires:  mvn(org.apache.maven.resolver:maven-resolver-spi)
+BuildRequires:  mvn(org.apache.maven.resolver:maven-resolver-transport-wagon)
+BuildRequires:  mvn(org.apache.maven.resolver:maven-resolver-util)
+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::shaded:)
+BuildRequires:  mvn(org.apache.maven.wagon:wagon-provider-api)
+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)
+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)
+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)
+BuildRequires:  mvn(org.sonatype.plexus:plexus-cipher)
+BuildRequires:  mvn(org.sonatype.plexus:plexus-sec-dispatcher)
+BuildRequires:  mvn(xmlunit:xmlunit)
+
+BuildRequires:  slf4j-sources = %{bundled_slf4j_version}
+
+%if %{with logback}
+BuildRequires:  mvn(ch.qos.logback:logback-classic)
+%endif
+
+Requires:       %{name}-lib = %{epoch}:%{version}-%{release}
+
+Requires(post): chkconfig
+Requires(postun): chkconfig
+
+# 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:       apache-commons-logging
+Requires:       atinject
+Requires:       cdi-api
+Requires:       geronimo-annotation
+Requires:       google-guice
+Requires:       guava20
+Requires:       hawtjni-runtime
+Requires:       httpcomponents-client
+Requires:       httpcomponents-core
+Requires:       jansi
+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
+
+%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
+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
+Core part of Apache Maven that can be used as a library.
+
+%package        javadoc
+Summary:        API documentation for %{name}
+
+%description    javadoc
+%{summary}.
+
+%prep
+%setup -q -n apache-%{name}-%{version}
+
+%patch1 -p1
+%patch3 -p1
+
+# not really used during build, but a precaution
+find -name '*.jar' -not -path '*/test/*' -delete
+find -name '*.class' -delete
+find -name '*.bat' -delete
+
+sed -i 's:\r::' apache-maven/src/conf/settings.xml
+
+# Downloads dependency licenses from the Internet and aggregates them.
+# We already ship the licenses in their respective packages.
+rm apache-maven/src/main/appended-resources/META-INF/LICENSE.vm
+
+# Disable plugins which are not useful for us
+%pom_remove_plugin -r :animal-sniffer-maven-plugin
+%pom_remove_plugin -r :apache-rat-plugin
+%pom_remove_plugin -r :maven-site-plugin
+%pom_remove_plugin -r :buildnumber-maven-plugin
+sed -i "
+/buildNumber=/ {
+  s/=.*/=Red Hat %{version}-%{release}/
+  s/%{dist}$//
+}
+/timestamp=/ d
+" `find -name build.properties`
+
+%mvn_package :apache-maven __noinstall
+
+%if %{without logback}
+%pom_remove_dep -r :logback-classic
+%patch2 -p1
+%endif
+
+%mvn_alias :maven-resolver-provider :maven-aether-provider
+
+%build
+%mvn_build -- -Dproject.build.sourceEncoding=UTF-8
+
+mkdir m2home
+(cd m2home
+    tar --delay-directory-restore -xvf ../apache-maven/target/*tar.gz
+)
+
+
+%install
+%mvn_install
+
+export M2_HOME=$(pwd)/m2home/apache-maven-%{version}%{?ver_add}
+
+install -d -m 755 %{buildroot}%{homedir}/conf
+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 \
+    commons-{codec,logging} httpcomponents/{httpclient,httpcore} maven-wagon/http-shared
+
+# Transitive deps of cdi-api that should have been excluded
+rm %{buildroot}%{homedir}/lib/jboss-interceptors*.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/
+
+install -p -m 644 %{SOURCE2} %{buildroot}%{homedir}/bin/
+gzip -9 %{buildroot}%{homedir}/bin/mvn.1
+install -p -m 644 %{SOURCE1} %{buildroot}%{_datadir}/bash-completion/completions/mvn%{?maven_version_suffix}
+mv $M2_HOME/bin/m2.conf %{buildroot}%{_sysconfdir}/m2%{?maven_version_suffix}.conf
+ln -sf %{_sysconfdir}/m2%{?maven_version_suffix}.conf %{buildroot}%{homedir}/bin/m2.conf
+mv $M2_HOME/conf/settings.xml %{buildroot}%{confdir}/
+ln -sf %{confdir}/settings.xml %{buildroot}%{homedir}/conf/settings.xml
+mv $M2_HOME/conf/logging %{buildroot}%{confdir}/
+ln -sf %{confdir}/logging %{buildroot}%{homedir}/conf
+
+# Ghosts for alternatives
+install -d -m 755 %{buildroot}%{_bindir}/
+install -d -m 755 %{buildroot}%{_mandir}/man1/
+touch %{buildroot}%{_bindir}/{mvn,mvnDebug}
+touch %{buildroot}%{_mandir}/man1/{mvn,mvnDebug}.1
+
+
+%post
+update-alternatives --install %{_bindir}/mvn mvn %{homedir}/bin/mvn %{?maven_alternatives_priority}0 \
+--slave %{_bindir}/mvnDebug mvnDebug %{homedir}/bin/mvnDebug \
+--slave %{_mandir}/man1/mvn.1.gz mvn1 %{homedir}/bin/mvn.1.gz \
+--slave %{_mandir}/man1/mvnDebug.1.gz mvnDebug1 %{homedir}/bin/mvn.1.gz \
+
+%postun
+[[ $1 -eq 0 ]] && update-alternatives --remove %{name} %{homedir}/bin/mvn
+
+
+%files lib -f .mfiles
+%doc README.md
+%license LICENSE NOTICE
+%{homedir}
+%dir %{confdir}
+%dir %{confdir}/logging
+%config(noreplace) %{_sysconfdir}/m2%{?maven_version_suffix}.conf
+%config(noreplace) %{confdir}/settings.xml
+%config(noreplace) %{confdir}/logging/simplelogger.properties
+
+%files
+%ghost %{_bindir}/mvn
+%ghost %{_bindir}/mvnDebug
+%{_datadir}/bash-completion
+%ghost %{_mandir}/man1/mvn.1.gz
+%ghost %{_mandir}/man1/mvnDebug.1.gz
+
+%files javadoc -f .mfiles-javadoc
+%license LICENSE NOTICE
+
+
+%changelog
+* Mon Jul 30 2018 Severin Gehwolf <sgehwolf@redhat.com> - 1:3.5.4-2
+- Require javapackages-tools for maven-lib.
+
+* Thu Jul 26 2018 Michael Simacek <msimacek@redhat.com> - 1:3.5.4-4
+- Symlink jansi-linux to lib
+
+* Mon Jul 23 2018 Michael Simacek <msimacek@redhat.com> - 1:3.5.4-3
+- Fix license tag to include MIT for bundled slf4j
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.5.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Mon Jun 25 2018 Michael Simacek <msimacek@redhat.com> - 1:3.5.4-1
+- Update to upstream version 3.5.4
+
+* Wed Apr 18 2018 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.5.3-2
+- Introduce alternatives
+
+* Thu Mar 15 2018 Michael Simacek <msimacek@redhat.com> - 1:3.5.3-1
+- Update to upstream version 3.5.3
+
+* Thu Mar 15 2018 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.5.2-5
+- Don't install mvnyjp in bindir
+
+* Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1:3.5.2-4
+- Escape macros in %%changelog
+
+* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.5.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Mon Feb 05 2018 Michael Simacek <msimacek@redhat.com> - 1:3.5.2-2
+- Use guava20
+
+* Wed Oct 25 2017 Michael Simacek <msimacek@redhat.com> - 1:3.5.2-1
+- Update to upstream version 3.5.2
+
+* Fri Sep 15 2017 Michael Simacek <msimacek@redhat.com> - 1:3.5.0-7
+- Fix FTBFS after maven-remote-reources-plugin update
+
+* Tue Aug 08 2017 Michael Simacek <msimacek@redhat.com> - 1:3.5.0-6
+- Generate build number based on package release number
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.5.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Thu Jun 08 2017 Michael Simacek <msimacek@redhat.com> - 1:3.5.0-4
+- Update logback conditional to replace logback usage with reflection
+
+* Wed Apr 26 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.5.0-3
+- Add apache-commons-codec to plexus.core
+- Resolves: rhbz#1445738
+
+* Wed Apr 19 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.5.0-2
+- Add alias for maven-aether-provider
+
+* Tue Apr 11 2017 Michael Simacek <msimacek@redhat.com> - 1:3.5.0-1
+- Update to upstream version 3.5.0
+
+* Fri Mar  3 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.3.9-9
+- Fix bash-completion directory ownership
+
+* Wed Mar 01 2017 Michael Simacek <msimacek@redhat.com> - 1:3.3.9-8
+- Avoid subshell for build-jar-repository
+
+* Thu Feb 16 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.3.9-7
+- Conditionalize weak dependencies
+
+* Tue Feb 14 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.3.9-6
+- Remove BR on maven-javadoc-plugin
+
+* Mon Feb 06 2017 Michael Simacek <msimacek@redhat.com> - 1:3.3.9-5
+- Remove BR on buildnumber-plugin
+
+* Mon Feb 06 2017 Michael Simacek <msimacek@redhat.com> - 1:3.3.9-4
+- Remove buildnumber-plugin from build
+
+* Thu Feb 02 2017 Michael Simacek <msimacek@redhat.com> - 1:3.3.9-3
+- Add conditional for logback
+
+* Thu Feb 02 2017 Michael Simacek <msimacek@redhat.com> - 1:3.3.9-2
+- Remove site-plugin and enforce-plugin from build
+
+* Wed Feb 01 2017 Michael Simacek <msimacek@redhat.com> - 1:3.3.9-1
+- Downgrade to 3.3.9
+
+* Wed Dec 14 2016 Michael Simacek <msimacek@redhat.com> - 3.4.0-0.6.20161118git8ae1a3e
+- Bump slf4j version
+
+* Fri Nov 18 2016 Michael Simacek <msimacek@redhat.com> - 3.4.0-0.5.20161118git8ae1a3e
+- Restore compatibility with maven-polyglot
+
+* Fri Nov 18 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.4.0-0.4.20161118git8ae1a3e
+- Versioned bundled(slf4j) provides
+
+* Fri Nov 18 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.4.0-0.3.20161118git8ae1a3e
+- Update to latest upstream snapshot
+- Source-bundle slf4j-simple
+
+* Mon Aug 15 2016 Michael Simacek <msimacek@redhat.com> - 3.4.0-0.2.20160807git9f2452a
+- Use patched upstream launcher instead of custom script
+
+* Mon Aug  8 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.4.0-0.1.20160807git9f2452a
+- Update to 3.4.0 snapshot
+
+* Fri Jul  1 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.3.9-6
+- Add missing BR on maven-enforcer-plugin
+
+* Tue Jun 28 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.3.9-5
+- Add maven-lib subpackage
+
+* Thu Apr  7 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.3.9-4
+- Force SLF4J SimpleLogger re-initialization
+- Resolves: rhbz#1324832
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.9-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Mon Nov 23 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.3.9-2
+- Fix symlinks: add commons-lang3 and remove geronimo-annotation
+
+* Fri Nov 13 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.3.9-1
+- Update to upstream version 3.3.9
+
+* Mon Nov  2 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.3.8-1
+- Update to upstream version 3.3.8
+
+* Fri Jul 10 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.3.3-3
+- Recommend java-devel instead of requiring it
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.3.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Thu Apr 23 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.3.3-1
+- Update to upstream version 3.3.3
+
+* Wed Apr  1 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.3.1-2
+- Install mvnDebug and mvnyjp in bindir
+- Update manpage
+- Resolves: rhbz#1207850
+
+* Mon Mar 16 2015 Michal Srb <msrb@redhat.com> - 3.3.1-1
+- Add commons-io, commons-lang and jsoup to plexus.core (Resolves: rhbz#1202286)
+
+* Fri Mar 13 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.3.1-1
+- Update to upstream version 3.3.1
+
+* Thu Mar 12 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.3.0-1
+- Update to upstream version 3.3.0
+
+* Wed Feb 18 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.5-2
+- Add objectweb-asm to plexus.core
+
+* Mon Jan 19 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.5-1
+- Update to upstream version 3.2.5
+
+* Sat Dec  6 2014 Ville Skyttä <ville.skytta@iki.fi> - 3.2.3-4
+- Fix bash completion filename
+
+* Tue Oct 14 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.3-3
+- Remove legacy Obsoletes/Provides for maven2
+
+* Mon Sep 29 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.3-2
+- Update patches
+
+* Fri Aug 22 2014 Michal Srb <msrb@redhat.com> - 3.2.3-1
+- Update to upstream version 3.2.3
+
+* Wed Jun 18 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.2-1
+- Update to upstream version 3.2.2
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.2.1-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Thu Jun  5 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.1-10
+- Fix artifact pattern in %%mvn_file invocation
+
+* Wed Jun  4 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.1-9
+- Install additional lib symlinks only for JAR files
+
+* Wed Jun  4 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.1-8
+- Fix dangling symlinks in Maven lib dir
+- Resolves: rhbz#1104396
+
+* Mon Jun  2 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.1-7
+- Clean up patches
+- Add patch for MNG-5613
+
+* Mon May 26 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.1-6
+- Remove BuildRequires on maven-surefire-provider-junit4
+
+* Mon Mar 17 2014 Michal Srb <msrb@redhat.com> - 3.2.1-5
+- Add missing BR: modello-maven-plugin
+
+* Fri Mar  7 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.1-4
+- Set logback dependency scope to provided
+
+* Mon Feb 24 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.1-3
+- Add patch for MNG-5591
+
+* Thu Feb 20 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.1-2
+- Migrate to Wagon subpackages
+
+* Thu Feb 20 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.1-1
+- Remove BR on plexus-containers-container-default
+
+* Mon Feb 17 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.1-1
+- Update to upstream version 3.2.1
+
+* Tue Feb 11 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.0-1
+- Update to upstream version 3.2.0
+
+* Mon Dec 23 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.1.1-15
+- Read user and system config files in maven-script
+
+* Wed Nov 13 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.1.1-14
+- Update to Sisu 0.1.0 and Guice 3.1.6
+
+* Fri Nov  8 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.1.1-13
+- Add wagon-http-shared4 to plexus.core
+
+* Tue Nov  5 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.1.1-6
+- Update F20 to upstream bugfix release 3.1.1
+
+* Tue Nov  5 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.1.1-5
+- Add OrderWithRequires: xmvn
+- Related: rhbz#1014355
+
+* Tue Oct 29 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.1.1-4
+- Add explicit requires
+
+* Wed Oct 23 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.1.1-3
+- Rebuild to regenerate broken POM files
+- Related: rhbz#1021484
+
+* Mon Oct 21 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.1.0-10
+- Add dependencies of wagon-http-shaded to plexus.core
+- Remove objectweb-asm from plexus.core
+- Add explicit requires
+- Resolves: rhbz#1023872
+
+* Mon Oct  7 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.1.1-1
+- Update to upstream version 3.1.1
+- Remove patch for MNG-5503 (included upstream)
+
+* Mon Sep 23 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.1.0-9
+- Synchronize JAR list in lib/ with upstream release
+- Remove test dependencies on aopalliance and cglib
+
+* Thu Aug 29 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.1.0-8
+- Migrate from easymock 1 to easymock 3
+- Resolves: rhbz#1002432
+
+* Fri Aug 23 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.1.0-7
+- Add patch for MNG-5503
+- Resolves: rhbz#991454
+
+* Mon Aug 12 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.1.0-6
+- Update Aether to 0.9.0.M3
+
+* Mon Aug 12 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.1.0-5
+- Prepare for update to Aether 0.9.0.M3
+
+* Fri Aug  9 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.1.0-4
+- Remove workaround for incompatible plexus-utils
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.1.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Tue Jul 23 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.1.0-2
+- Install simplelogger.properties into %%{_sysconfdir}
+
+* Tue Jul 23 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.1.0-1
+- Update to upstream version 3.1.0
+
+* Fri Jul 19 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.5-8
+- Use sonatype-aether symlinks
+
+* Mon May 20 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.5-7
+- Move bash-completion files to primary location
+- Resolves: rhbz#918000
+
+* Fri May 10 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.5-6
+- Remove unneeded BR: async-http-client
+- Add Requires on java-devel
+
+* Thu May  2 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.5-5
+- BR proper aether subpackages
+- Resolves: rhbz#958160
+
+* Fri Apr 26 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.5-4
+- Add missing BuildRequires
+
+* Tue Mar 12 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.5-3
+- Make ext/ a subdirectory of lib/
+
+* Tue Mar 12 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.5-2
+- In maven-script don't override M2_HOME if already set
+
+* Fri Mar  1 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.5-1
+- Update to upstream version 3.0.5
+- Move settings.xml to /etc
+
+* Mon Feb 11 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.4-32
+- Remove xerces-j2 from plexus.core realm
+- Resolves: rhbz#784816
+
+* Thu Feb  7 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.4-31
+- Migrate BR from sisu to sisu subpackages
+
+* Wed Feb  6 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.4-30
+- Remove unneeded R: maven-local
+
+* Fri Jan 25 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.4-29
+- Drop support for local mode
+- Build with xmvn, rely on auto-requires
+
+* Wed Jan 23 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.4-28
+- Move mvn-local and mvn-rpmbuild out of %%_bindir
+
+* Tue Nov 27 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.4-27
+- Move some parts to maven-local package
+
+* Thu Nov 22 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.4-26
+- Force source >= 1.5 and target >= source
+
+* Mon Nov 19 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.4-25
+- Fix license tag
+
+* Thu Nov 15 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.4-24
+- Install NOTICE file with javadoc package
+
+* Tue Nov 13 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.4-23
+- Temporarly require Plexus POMs as a workaround
+
+* Mon Nov 12 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.4-22
+- Drop dependency on maven2-common-poms
+- Drop support for /etc/maven/fragments
+
+* Thu Nov 08 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.0.4-21
+- Add support for custom jar/pom/fragment directories
+
+* Thu Nov  8 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.4-20
+- Remove all slf4j providers except nop from maven realm
+
+* Thu Nov  1 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.4-19
+- Add aopalliance and cglib to maven-model-builder test dependencies
+
+* Thu Nov  1 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.4-18
+- Add objectweb-asm to classpath
+
+* Thu Nov  1 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.4-17
+- Add aopalliance, cglib, slf4j to classpath
+
+* Wed Oct 31 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.4-16
+- Don't echo JAVA_HOME in maven-script
+- Add bash completion for -Dproject.build.sourceEncoding
+
+* Mon Oct 29 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.4-15
+- Add a few bash completion goals
+
+* Wed Oct 24 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.0.4-14
+- Enable test skipping patch only for local mode (#869399)
+
+* Fri Oct 19 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.0.4-13
+- Make sure we look for requested pom file and not resolved
+
+* Thu Oct 18 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.0.4-12
+- Look into maven.repo.local first to handle corner-case packages (#865599)
+- Finish handling of compatibility packages
+- Disable animal-sniffer temporarily in Fedora as well
+
+* Mon Aug 27 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.4-11
+- Disable animal-sniffer on RHEL
+
+* Wed Jul 25 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.0.4-10
+- Fix exit code of mvn-rpmbuild outside of mock
+- Fix bug in compatibility jar handling
+
+* Mon Jul 23 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.4-9
+- Run redundant dependency checks only in mock
+
+* Tue Jul 17 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.4-8
+- Add manual page
+
+* Mon Jun 11 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.4-7
+- Implement redundant dependency checks
+
+* Thu May 24 2012 Krzysztof Daniel <kdaniel@redhat.com> 3.0.4-6
+- Bug 824789 -Use the version if it is possible.
+
+* Mon May 14 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.0.4-5
+- Use Obsoletes instead of Conflicts
+
+* Mon May 14 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.0.4-4
+- Obsolete and provide maven2
+
+* Thu Mar 29 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.0.4-3
+- Make package noarch again to simplify bootstrapping
+
+* Thu Feb  9 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.0.4-2
+- Make javadoc noarch
+- Make compilation source level 1.5
+- Fix borked tarball unpacking (reason unknown)
+
+* Tue Jan 31 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.0.4-1
+- Update to latest upstream version
+
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.0.3-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Tue Dec 13 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.0.3-16
+- Add maven2-common-poms to Requires
+
+* Tue Oct 11 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.0.3-15
+- Provide mvn script now instead of maven2
+- Conflict with older versions of maven2
+
+* Tue Aug 30 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.0.3-14
+- Fix test scope skipping
+
+* Mon Aug 22 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.0.3-13
+- Remove unnecessary deps causing problems from lib/
+- Add utf-8 source encoding patch
+
+* Thu Jul 28 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.0.3-12
+- Disable debug package creation
+
+* Thu Jul 28 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.0.3-11
+- Change to arch specific since we are using _libdir for _jnidir
+
+* Tue Jul 26 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.0.3-10
+- Add bash completion (#706856)
+
+* Mon Jul  4 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.0.3-9
+- Add resolving from jnidir and java-jni
+
+* Thu Jun 23 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.0.3-8
+- Add maven-parent to BR/R
+
+* Wed Jun 22 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.0.3-7
+- Process fragments in alphabetical order
+
+* Tue Jun 21 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.0.3-6
+- Fix handling of fallback default_poms
+- Add empty-dep into maven package to not require maven2 version
+
+* Fri Jun 10 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.0.3-5
+- Process fragments directly instead of maven2-depmap.xml
+- Expect fragments in /usr/share/maven-fragments
+- Resolve poms also from /usr/share/maven-poms
+
+* Mon Jun  6 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.0.3-4
+- Add help to mvn-rpmbuild and mvn-local (rhbz#710448)
+
+* Tue May 10 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.0.3-3
+- Improve and clean up depmap handling for m2/m3 repos
+
+* Mon Apr 18 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.0.3-2
+- Enable MAVEN_OPTS override in scripts
+
+* Fri Mar  4 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.0.3-1
+- Update to 3.0.3
+- Add ext subdirectory to lib
+
+* Tue Mar  1 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.0.3-0.1.rc1
+- Update to 3.0.3rc1
+- Enable tests again
+
+* Thu Feb 10 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.0.2-2
+- Added mvn-rpmbuild script to be used in spec files
+- mvn-local is now mixed mode (online with javadir priority)
+- Changed mvn.jpp to mvn.local
+
+* Fri Jan 28 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.0.2-1
+- Update to latest version (3.0.2)
+- Ignore test failures temporarily
+
+* Wed Jan 12 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.0-6
+- Fix bug #669034
+
+* Tue Jan 11 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.0-5
+- Fix bugs #667625 #667614 and #667636
+- Install maven metadata so they are not downloaded when mvn is run
+- Rename mvn3-local to mvn-local
+- Add more comments to resolver patch
+
+* Tue Dec 21 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.0-4
+- Add fedora local resolver
+- Fix quoting of arguments to mvn scripts
+- Add javadoc subpackage
+- Make jars versionless and remove unneeded clean section
+
+* Wed Dec  1 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.0-3
+- Remove maven-ant-tasks jar in prep
+- Make fragment file as %%config
+
+* Tue Nov 16 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.0-2
+- Added apache-commons-parent to BR after commons changes
+
+* Tue Oct 12 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.0-1
+- Initial package with vanilla maven (no jpp mode yet)
diff --git a/mvn.1 b/mvn.1
new file mode 100644
index 0000000..1363cd6
--- /dev/null
+++ b/mvn.1
@@ -0,0 +1,153 @@
+.TH MVN "1" "April 2015" "Apache Maven 3.3.1" "User Commands"
+.SH NAME
+mvn \- software project management and comprehension tool
+.SH DESCRIPTION
+usage: mvn [options] [<goal(s)>] [<phase(s)>]
+usage: mvnDebug [options] [<goal(s)>] [<phase(s)>]
+.SH OPTIONS
+.TP
+\fB\-am\fR,\-\-also\-make
+If project list is specified, also
+build projects required by the
+list
+.TP
+\fB\-amd\fR,\-\-also\-make\-dependents
+If project list is specified, also
+build projects that depend on
+projects on the list
+.TP
+\fB\-B\fR,\-\-batch\-mode
+Run in non\-interactive (batch)
+mode
+.TP
+\fB\-b\fR,\-\-builder <arg>
+The id of the build strategy to
+use.
+.TP
+\fB\-C\fR,\-\-strict\-checksums
+Fail the build if checksums don't
+match
+.TP
+\fB\-c\fR,\-\-lax\-checksums
+Warn if checksums don't match
+.TP
+\fB\-cpu\fR,\-\-check\-plugin\-updates
+Ineffective, only kept for
+backward compatibility
+.TP
+\fB\-D\fR,\-\-define <arg>
+Define a system property
+.TP
+\fB\-e\fR,\-\-errors
+Produce execution error messages
+.TP
+\fB\-emp\fR,\-\-encrypt\-master\-password <arg>
+Encrypt master security password
+.TP
+\fB\-ep\fR,\-\-encrypt\-password <arg>
+Encrypt server password
+.TP
+\fB\-f\fR,\-\-file <arg>
+Force the use of an alternate POM
+file (or directory with pom.xml).
+.TP
+\fB\-fae\fR,\-\-fail\-at\-end
+Only fail the build afterwards;
+allow all non\-impacted builds to
+continue
+.TP
+\fB\-ff\fR,\-\-fail\-fast
+Stop at first failure in
+reactorized builds
+.TP
+\fB\-fn\fR,\-\-fail\-never
+NEVER fail the build, regardless
+of project result
+.TP
+\fB\-gs\fR,\-\-global\-settings <arg>
+Alternate path for the global
+settings file
+.TP
+\fB\-gt\fR,\-\-global\-toolchains <arg>
+Alternate path for the global
+toolchains file
+.TP
+\fB\-h\fR,\-\-help
+Display help information
+.TP
+\fB\-l\fR,\-\-log\-file <arg>
+Log file to where all build output
+will go.
+.TP
+\fB\-llr\fR,\-\-legacy\-local\-repository
+Use Maven 2 Legacy Local
+Repository behaviour, ie no use of
+_remote.repositories. Can also be
+activated by using
+\fB\-Dmaven\fR.legacyLocalRepo=true
+.TP
+\fB\-N\fR,\-\-non\-recursive
+Do not recurse into sub\-projects
+.TP
+\fB\-npr\fR,\-\-no\-plugin\-registry
+Ineffective, only kept for
+backward compatibility
+.TP
+\fB\-npu\fR,\-\-no\-plugin\-updates
+Ineffective, only kept for
+backward compatibility
+.TP
+\fB\-nsu\fR,\-\-no\-snapshot\-updates
+Suppress SNAPSHOT updates
+.TP
+\fB\-o\fR,\-\-offline
+Work offline
+.TP
+\fB\-P\fR,\-\-activate\-profiles <arg>
+Comma\-delimited list of profiles
+to activate
+.TP
+\fB\-pl\fR,\-\-projects <arg>
+Comma\-delimited list of specified
+reactor projects to build instead
+of all projects. A project can be
+specified by [groupId]:artifactId
+or by its relative path.
+.TP
+\fB\-q\fR,\-\-quiet
+Quiet output \- only show errors
+.TP
+\fB\-rf\fR,\-\-resume\-from <arg>
+Resume reactor from specified
+project
+.TP
+\fB\-s\fR,\-\-settings <arg>
+Alternate path for the user
+settings file
+.TP
+\fB\-T\fR,\-\-threads <arg>
+Thread count, for instance 2.0C
+where C is core multiplied
+.TP
+\fB\-t\fR,\-\-toolchains <arg>
+Alternate path for the user
+toolchains file
+.TP
+\fB\-U\fR,\-\-update\-snapshots
+Forces a check for missing
+releases and updated snapshots on
+remote repositories
+.TP
+\fB\-up\fR,\-\-update\-plugins
+Ineffective, only kept for
+backward compatibility
+.TP
+\fB\-V\fR,\-\-show\-version
+Display version information
+WITHOUT stopping build
+.TP
+\fB\-v\fR,\-\-version
+Display version information
+.TP
+\fB\-X\fR,\-\-debug
+Produce execution debug output
diff --git a/plans/smoke-jdk11.fmf b/plans/smoke-jdk11.fmf
new file mode 100644
index 0000000..4ad3c5f
--- /dev/null
+++ b/plans/smoke-jdk11.fmf
@@ -0,0 +1,8 @@
+summary: Basic smoke test - OpenJDK 11
+prepare:
+  how: install
+  exclude:
+    - maven-openjdk8
+    - maven-openjdk17
+execute:
+  script: mvn -V dependency:get -Dartifact=junit:junit:4.12 && stat $HOME/.m2/repository/junit/junit/4.12/junit-4.12.jar
diff --git a/plans/smoke-jdk17.fmf b/plans/smoke-jdk17.fmf
new file mode 100644
index 0000000..1200458
--- /dev/null
+++ b/plans/smoke-jdk17.fmf
@@ -0,0 +1,8 @@
+summary: Basic smoke test - OpenJDK 17
+prepare:
+  how: install
+  exclude:
+    - maven-openjdk8
+    - maven-openjdk11
+execute:
+  script: mvn -V dependency:get -Dartifact=junit:junit:4.12 && stat $HOME/.m2/repository/junit/junit/4.12/junit-4.12.jar
diff --git a/plans/smoke-jdk8.fmf b/plans/smoke-jdk8.fmf
new file mode 100644
index 0000000..c83338c
--- /dev/null
+++ b/plans/smoke-jdk8.fmf
@@ -0,0 +1,8 @@
+summary: Basic smoke test - OpenJDK 8
+prepare:
+  how: install
+  exclude:
+    - maven-openjdk11
+    - maven-openjdk17
+execute:
+  script: mvn -V dependency:get -Dartifact=junit:junit:4.12 && stat $HOME/.m2/repository/junit/junit/4.12/junit-4.12.jar
diff --git a/sources b/sources
new file mode 100644
index 0000000..de954ee
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA1 (apache-maven-3.5.4-src.tar.gz) = 04aefb9462af8cf7ca93808cd246f4c28b8ae4a1