!33 [sync] PR-30: 用%{_vendor}替换openEuler

From: @openeuler-sync-bot 
Reviewed-by: @cherry530 
Signed-off-by: @cherry530

0001-adapt-mvn-script.patch

@@ -1,14 +1,14 @@
-From 46041685a82b861bc8616bb603e341adb740a302 Mon Sep 17 00:00:00 2001
+From 405e23d53b66a688082ed8c22385c5174e212be4 Mon Sep 17 00:00:00 2001
 From: Michael Simacek <msimacek@redhat.com>
-Date: Wed, 1 Feb 2017 14:54:26 +0100
+Date: Mon, 25 May 2020 12:10:33 +0200
-Subject: [PATCH 1/3] Adapt mvn script
+Subject: [PATCH 1/4] adapt mvn script
 
 ---
- apache-maven/src/bin/mvn | 19 ++++++++++++++++---
+ apache-maven/src/bin/mvn | 17 +++++++++++++++--
- 1 file changed, 16 insertions(+), 3 deletions(-)
+ 1 file changed, 15 insertions(+), 2 deletions(-)
 
 diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
-index a554c66..818cf70 100755
+index a554c66..0c07ba6 100644
 --- a/apache-maven/src/bin/mvn
 +++ b/apache-maven/src/bin/mvn
 @@ -22,7 +22,7 @@
@@ -55,15 +55,6 @@ index a554c66..818cf70 100755
  
  # 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
+2.26.2
 

0002-invoke-logback-via-reflection.patch

@@ -1,53 +1,53 @@
-From 4e1e32e3a96c6876a22cca6743288b8c8df4adb0 Mon Sep 17 00:00:00 2001
+From 3ce790eaafcf42e8720c778b712345f100064f38 Mon Sep 17 00:00:00 2001
 From: Michael Simacek <msimacek@redhat.com>
-Date: Tue, 6 Jun 2017 13:47:43 +0200
+Date: Mon, 25 May 2020 12:12:15 +0200
-Subject: [PATCH 2/3] Invoke logback via reflection
+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 5d9fab7..ced38cb 100644
+index d16eaa9..51274eb 100644
 --- a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/LogbackConfiguration.java
 +++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/LogbackConfiguration.java
 @@ -35,22 +35,31 @@ public class LogbackConfiguration
-     @Override
+     @Override
-     public void setRootLoggerLevel( Level level )
+     public void setRootLoggerLevel( Level level )
-     {
+     {
--        ch.qos.logback.classic.Level value;
+-        ch.qos.logback.classic.Level value;
-+        String value;
++        String value;
-         switch ( level )
+         switch ( level )
-         {
+         {
-             case DEBUG:
+             case DEBUG:
--                value = ch.qos.logback.classic.Level.DEBUG;
+-                value = ch.qos.logback.classic.Level.DEBUG;
-+                value = "DEBUG";
++                value = "DEBUG";
-                 break;
+                 break;
- 
+ 
-             case INFO:
+             case INFO:
--                value = ch.qos.logback.classic.Level.INFO;
+-                value = ch.qos.logback.classic.Level.INFO;
-+                value = "INFO";
++                value = "INFO";
-                 break;
+                 break;
- 
+ 
-             default:
+             default:
--                value = ch.qos.logback.classic.Level.ERROR;
+-                value = ch.qos.logback.classic.Level.ERROR;
-+                value = "ERROR";
++                value = "ERROR";
-                 break;
+                 break;
-         }
+         }
--        ( (ch.qos.logback.classic.Logger) LoggerFactory.getLogger( Logger.ROOT_LOGGER_NAME ) ).setLevel( value );
+-        ( (ch.qos.logback.classic.Logger) LoggerFactory.getLogger( Logger.ROOT_LOGGER_NAME ) ).setLevel( value );
-+        Logger logger = LoggerFactory.getLogger( Logger.ROOT_LOGGER_NAME );
++        Logger logger = LoggerFactory.getLogger( Logger.ROOT_LOGGER_NAME );
-+        try {
++        try {
-+            Class<?> levelClass = Class.forName("ch.qos.logback.classic.Level");
++            Class<?> levelClass = Class.forName("ch.qos.logback.classic.Level");
-+            Object logbackLevel = levelClass.getField(value).get(null);
++            Object logbackLevel = levelClass.getField(value).get(null);
-+            Class<?> loggerClass = Class.forName("ch.qos.logback.classic.Logger");
++            Class<?> loggerClass = Class.forName("ch.qos.logback.classic.Logger");
-+            loggerClass.getMethod("setLevel", new Class<?>[] {levelClass})
++            loggerClass.getMethod("setLevel", new Class<?>[] {levelClass})
-+                .invoke(logger, new Object[] {logbackLevel});
++                .invoke(logger, new Object[] {logbackLevel});
-+        } catch (Exception e) {
++        } catch (Exception e) {
-+            throw new RuntimeException("Failed to initialize logback configuration", e);
++            throw new RuntimeException("Failed to initialize logback configuration", e);
-+        }
++        }
-     }
+     }
- 
+ 
-     @Override
+     @Override
 -- 
-2.17.1
+2.26.2
 

0003-use-non-shaded-HTTP-wagon.patch

@@ -0,0 +1,51 @@
+From 1a5ab44597d81d4001c70b425736754dc8a6b663 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
+
+---
+ 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.26.2
+

0004-remove-dependency-on-powermock.patch

@@ -0,0 +1,96 @@
+From 36e88235cc6cb2bdd335f004cae0356662f2d22b 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
+
+---
+ .../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.26.2
+

maven.spec

@@ -4,23 +4,27 @@
 %global confdir %{_sysconfdir}/%{name}%{?maven_version_suffix}
 Name:                maven
 Epoch:               1
-Version:             3.5.4
+Version:             3.6.3
-Release:             7
+Release:             2
 Summary:             Java project management and project comprehension tool
 License:             ASL 2.0 and MIT
 URL:                 http://maven.apache.org/
 Source0:             http://archive.apache.org/dist/maven/maven-3/%{version}/source/apache-maven-%{version}-src.tar.gz
 Source1:             maven-bash-completion
 Source2:             mvn.1
-Patch1:              0001-Adapt-mvn-script.patch
+Patch1:              0001-adapt-mvn-script.patch
-Patch2:              0002-Invoke-logback-via-reflection.patch
+Patch2:              0002-invoke-logback-via-reflection.patch
-BuildRequires:       maven-local mvn(com.google.guava:guava:20.0)
+Patch3:              0003-use-non-shaded-HTTP-wagon.patch
+Patch4:              0004-remove-dependency-on-powermock.patch
+
+BuildRequires:       maven-local
 BuildRequires:       mvn(com.google.inject:guice::no_aop:) mvn(commons-cli:commons-cli)
 BuildRequires:       mvn(commons-jxpath:commons-jxpath) mvn(javax.annotation:jsr250-api)
 BuildRequires:       mvn(javax.inject:javax.inject) mvn(junit:junit)
 BuildRequires:       mvn(org.apache.commons:commons-lang3) 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.plugins:maven-failsafe-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)
@@ -29,30 +33,32 @@ BuildRequires:       mvn(org.apache.maven.resolver:maven-resolver-transport-wago
 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-http)
 BuildRequires:       mvn(org.apache.maven.wagon:wagon-provider-api)
-BuildRequires:       mvn(org.codehaus.modello:modello-maven-plugin)
+BuildRequires:       mvn(org.codehaus.modello:modello-maven-plugin) >= 1.11
 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.codehaus.plexus:plexus-utils) >= 3.2.0
 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) mvn(org.fusesource.jansi:jansi)
+BuildRequires:       mvn(org.hamcrest:hamcrest-library)
+BuildRequires:       mvn(org.jsoup:jsoup)
 BuildRequires:       mvn(org.mockito:mockito-core) >= 2 mvn(org.slf4j:jcl-over-slf4j)
 BuildRequires:       mvn(org.slf4j:slf4j-api) mvn(org.slf4j:slf4j-simple)
 BuildRequires:       mvn(org.sonatype.plexus:plexus-cipher)
-BuildRequires:       mvn(org.sonatype.plexus:plexus-sec-dispatcher) mvn(xmlunit:xmlunit)
+BuildRequires:       mvn(org.sonatype.plexus:plexus-sec-dispatcher) mvn(org.xmlunit:xmlunit-core) 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}
-Requires(post): /usr/sbin/update-alternatives
+Requires(post):      /usr/sbin/update-alternatives
-Requires(postun): /usr/sbin/update-alternatives
+Requires(postun):    /usr/sbin/update-alternatives
-Requires:            java-devel
+Requires:            java-1.8.0-devel
 Requires:            aopalliance apache-commons-cli apache-commons-codec apache-commons-io
 Requires:            apache-commons-lang3 apache-commons-logging atinject cdi-api
 Requires:            geronimo-annotation google-guice guava20 hawtjni-runtime httpcomponents-client
@@ -88,9 +94,12 @@ Summary:             API documentation for %{name}
 %prep
 %setup -q -n apache-%{name}-%{version}
 %patch1 -p1
+%patch3 -p1
+%patch4 -p1
 find -name '*.jar' -not -path '*/test/*' -delete
 find -name '*.class' -delete
 find -name '*.bat' -delete
+%pom_remove_dep -r :powermock-reflect
 sed -i 's:\r::' apache-maven/src/conf/settings.xml
 rm apache-maven/src/main/appended-resources/META-INF/LICENSE.vm
 %pom_remove_plugin -r :animal-sniffer-maven-plugin
@@ -99,7 +108,7 @@ rm apache-maven/src/main/appended-resources/META-INF/LICENSE.vm
 %pom_remove_plugin -r :buildnumber-maven-plugin
 sed -i "
 /buildNumber=/ {
-  s/=.*/=openEuler %{version}-%{release}/
+  s/=.*/=%{_vendor} %{version}-%{release}/
   s/%{dist}$//
 }
 /timestamp=/ d
@@ -111,6 +120,14 @@ sed -i "
 %endif
 %mvn_alias :maven-resolver-provider :maven-aether-provider
 
+%pom_xpath_inject 'pom:build/pom:plugins' '
+<plugin>
+    <groupId>org.eclipse.sisu</groupId>
+    <artifactId>sisu-maven-plugin</artifactId>
+</plugin>' maven-model-builder/pom.xml
+
+%pom_xpath_set "//pom:dependency[pom:artifactId='jansi']/pom:version" 1.18
+
 %build
 %mvn_build -- -Dproject.build.sourceEncoding=UTF-8
 mkdir m2home
@@ -127,7 +144,7 @@ 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}
 build-jar-repository -s -p %{buildroot}%{homedir}/lib \
-    commons-{codec,logging} httpcomponents/{httpclient,httpcore} maven-wagon/http-shared
+    httpcomponents/{httpclient,httpcore} maven-wagon/http-shared
 rm %{buildroot}%{homedir}/lib/jboss-interceptors*.jar
 rm %{buildroot}%{homedir}/lib/javax.el-api*.jar
 ln -s %{_jnidir}/jansi-native/jansi-linux.jar %{buildroot}%{homedir}/lib/
@@ -152,7 +169,7 @@ 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
@@ -175,6 +192,21 @@ update-alternatives --install %{_bindir}/mvn mvn %{homedir}/bin/mvn %{?maven_alt
 %license LICENSE NOTICE
 
 %changelog
+* Thu Nov 17 2022 wulei <wulei80@h-partners.com> - 1:3.6.3-2
+- Replace openEuler with %{_vendor}
+
+* Mon Feb 21 2022 Ge Wang <wangge20@huawei.com> - 1:3.6.3-1
+- upgrade to version 3.6.3
+
+* Sat Jul 24 2021 wangyue <wangyue92@huawei.com> - 1:3.5.4-10
+- fix maven downgrade error
+
+* Fri Jul 16 2021 wutao <wutao61@huawei.com> - 1:3.5.4-9
+- fix CVE-2021-26291
+
+* Thu Oct 15 2020 lingsheng <lingsheng@huawei.com> - 1:3.5.4-8
+- Change require to java-1.8.0-devel
+
 * Sat Sep 12 2020 yaokai13 <yaokai13@huawei.com> - 1:3.5.4-7
 - Fix the spelling mistakes