!2 update to version 34
From: @zhanghua1831 Reviewed-by: @maminjie,@small_leek,@wangchong1995924 Signed-off-by: @small_leek,@wangchong1995924
This commit is contained in:
commit
43c23e7d63
Binary file not shown.
BIN
maven-parent-34-source-release.zip
Normal file
BIN
maven-parent-34-source-release.zip
Normal file
Binary file not shown.
@ -1,23 +1,41 @@
|
||||
Name: maven-parent
|
||||
Version: 27
|
||||
Release: 7
|
||||
Version: 34
|
||||
Release: 1
|
||||
Summary: Maven project parent POM
|
||||
License: ASL 2.0
|
||||
URL: http://maven.apache.org
|
||||
Source0: http://repo1.maven.org/maven2/org/apache/maven/maven-parent/%{version}/maven-parent-%{version}-source-release.zip
|
||||
Source0: https://repo1.maven.org/maven2/org/apache/maven/maven-parent/%{version}/maven-parent-%{version}-source-release.zip
|
||||
BuildArch: noarch
|
||||
BuildRequires: maven-local apache-parent
|
||||
BuildRequires: maven-local
|
||||
BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
|
||||
BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin)
|
||||
BuildRequires: mvn(org.apache.maven.plugins:maven-remote-resources-plugin)
|
||||
BuildRequires: mvn(org.apache:apache:pom:)
|
||||
BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata)
|
||||
|
||||
Provides: maven-shared = %{version}-%{release}
|
||||
Obsoletes: maven-shared <= 22-9
|
||||
|
||||
Provides: maven-plugins-pom = %{version}-%{release}
|
||||
Obsoletes: maven-plugins-pom <= 28-9
|
||||
|
||||
Patch1: remove_javadoc_plugin_taglet.patch
|
||||
|
||||
%description
|
||||
This POM is the common parent of all of the Maven components in the Apache Maven project.
|
||||
|
||||
%prep
|
||||
%autosetup -n maven-parent-%{version}
|
||||
%pom_remove_plugin :maven-enforcer-plugin
|
||||
%pom_remove_plugin :maven-checkstyle-plugin
|
||||
%autosetup -n maven-parent-%{version} -p1
|
||||
|
||||
%pom_remove_plugin :apache-rat-plugin
|
||||
%pom_remove_plugin :maven-checkstyle-plugin
|
||||
%pom_remove_plugin -r :maven-enforcer-plugin
|
||||
%pom_remove_plugin :maven-scm-publish-plugin
|
||||
%pom_remove_plugin :maven-site-plugin
|
||||
|
||||
%build
|
||||
%mvn_build
|
||||
|
||||
%install
|
||||
%mvn_install
|
||||
|
||||
@ -25,5 +43,9 @@ This POM is the common parent of all of the Maven components in the Apache Maven
|
||||
%doc LICENSE NOTICE
|
||||
|
||||
%changelog
|
||||
* Thu Apr 1 2021 zhanghua <zhanghua40@huawei.com> - 34-1
|
||||
- update to version 34.
|
||||
- Obsolete maven-shared and maven-plugins-pom.
|
||||
|
||||
* Thu Dec 12 2019 Ling Yang <lingyang2@huawei.com> - 27-7
|
||||
- Package init
|
||||
|
||||
36
remove_javadoc_plugin_taglet.patch
Normal file
36
remove_javadoc_plugin_taglet.patch
Normal file
@ -0,0 +1,36 @@
|
||||
From 48ed7bdf1b0b4d17b481f5674ce075237781de2d Mon Sep 17 00:00:00 2001
|
||||
From: zhanghua1831 <zhanghua1831@163.com>
|
||||
Date: Thu, 1 Apr 2021 19:37:56 +0800
|
||||
Subject: [PATCH] Remove javadoc taglet configuration
|
||||
|
||||
---
|
||||
maven-plugins/pom.xml | 13 -------------
|
||||
1 file changed, 13 deletions(-)
|
||||
|
||||
diff --git a/maven-plugins/pom.xml b/maven-plugins/pom.xml
|
||||
index d07bdaa..c34f547 100644
|
||||
--- a/maven-plugins/pom.xml
|
||||
+++ b/maven-plugins/pom.xml
|
||||
@@ -96,19 +96,6 @@ under the License.
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</plugin>
|
||||
- <plugin>
|
||||
- <groupId>org.apache.maven.plugins</groupId>
|
||||
- <artifactId>maven-javadoc-plugin</artifactId>
|
||||
- <configuration>
|
||||
- <tagletArtifacts>
|
||||
- <tagletArtifact combine.id="org.apache.maven.plugin-tools:maven-plugin-tools-javadoc">
|
||||
- <groupId>org.apache.maven.plugin-tools</groupId>
|
||||
- <artifactId>maven-plugin-tools-javadoc</artifactId>
|
||||
- <version>${mavenPluginToolsVersion}</version>
|
||||
- </tagletArtifact>
|
||||
- </tagletArtifacts>
|
||||
- </configuration>
|
||||
- </plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-release-plugin</artifactId>
|
||||
--
|
||||
2.23.0
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user