rpms/maven
6
0
Fork 0
Code Issues Pull Requests Releases Activity

re-import sources as agreed with the maintainer

Browse Source
This commit is contained in:
Adam Samalik 2023-06-29 10:57:47 +02:00
parent 5968faa133
commit 602a75485b
9 changed files with 74 additions and 182 deletions

1
.fmf/version
View File

@ -1 +0,0 @@
1

23
.gitignore vendored
View File

@ -1,2 +1,23 @@
SOURCES/apache-maven-3.5.4-src.tar.gz
/apache-maven-3.0-src.tar.gz
/apache-maven-3.0.2-src.tar.gz
/apache-maven-3.0.3-RC1-src.tar.gz
/apache-maven-3.0.3-src.tar.gz
/apache-maven-3.0.4-src.tar.gz
/apache-maven-3.0.5-src.tar.gz
/apache-maven-3.1.0-src.tar.gz
/apache-maven-3.1.1-src.tar.gz
/apache-maven-3.2.0-src.tar.gz
/apache-maven-3.2.1-src.tar.gz
/apache-maven-3.2.2-src.tar.gz
/apache-maven-3.2.3-src.tar.gz
/apache-maven-3.2.5-src.tar.gz
/apache-maven-3.3.0-src.tar.gz
/apache-maven-3.3.1-src.tar.gz
/apache-maven-3.3.3-src.tar.gz
/apache-maven-3.3.8-src.tar.gz
/apache-maven-3.3.9-src.tar.gz
/apache-maven-3.4.0-SNAPSHOT-src.tar.gz
/apache-maven-3.5.0-src.tar.gz
/apache-maven-3.5.2-src.tar.gz
/apache-maven-3.5.3-src.tar.gz
/apache-maven-3.5.4-src.tar.gz

51
0003-Use-non-shaded-HTTP-wagon.patch
View File

@ -1,51 +0,0 @@
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

96
0004-Remove-dependency-on-powermock.patch
View File

@ -1,96 +0,0 @@
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

9
gating.yaml
View File

@ -1,9 +0,0 @@
--- !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}

52
maven-script Normal file
View File

@ -0,0 +1,52 @@
#!/bin/sh
for f in /etc/mavenrc /etc/java/maven.conf "$HOME/.mavenrc"; do
[ -f "$f" ] && . "$f"
done
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
export M2_HOME="${M2_HOME:-/usr/share/maven}"
# traverses directory structure from process work directory to filesystem root
# first directory with .mvn subdirectory is considered project base directory
find_maven_basedir() {
(
basedir="`pwd`"
wdir="`pwd`"
while [ "$wdir" != '/' ] ; do
if [ -d "$wdir"/.mvn ] ; then
basedir=$wdir
break
fi
wdir="`cd "$wdir/.."; pwd`"
done
echo "${basedir}"
)
}
export MAVEN_PROJECTBASEDIR="${MAVEN_BASEDIR:-`find_maven_basedir`}"
export MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
project_opts=$(
[ -e "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config" ] &&
cat /tmp/foo "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config")
exec "$JAVACMD" \
$project_opts \
$MAVEN_OPTS \
$MAVEN_DEBUG_OPTS \
-classpath $(build-classpath plexus-classworlds) \
-Dclassworlds.conf="${M2_HOME}/bin/m2.conf" \
-Dmaven.home="${M2_HOME}" \
-Dmaven.multiModuleProjectDirectory="${MAVEN_PROJECTBASEDIR}" \
org.codehaus.plexus.classworlds.launcher.Launcher \
"$@"

8
plans/smoke-jdk11.fmf
View File

@ -1,8 +0,0 @@
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

8
plans/smoke-jdk17.fmf
View File

@ -1,8 +0,0 @@
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

8
plans/smoke-jdk8.fmf
View File

@ -1,8 +0,0 @@
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