!3 [sync] PR-2: 【编译失败处理】22.03:LTS:Next分支包编译失败
From: @openeuler-sync-bot Reviewed-by: @wangchong1995924 Signed-off-by: @wangchong1995924
This commit is contained in:
commit
76f4d094e5
41
0001-add-javadoc-plugin-to-pom-file.patch
Normal file
41
0001-add-javadoc-plugin-to-pom-file.patch
Normal file
@ -0,0 +1,41 @@
|
|||||||
|
From 7f86809519c5b4294a32d85fad47e2db6c2558ae Mon Sep 17 00:00:00 2001
|
||||||
|
From: wang--ge <wang__ge@126.com>
|
||||||
|
Date: Mon, 17 Jan 2022 15:31:30 +0800
|
||||||
|
Subject: [PATCH] add javadoc plugin to pom file
|
||||||
|
|
||||||
|
---
|
||||||
|
pom.xml | 18 ++++++++++++++++++
|
||||||
|
1 file changed, 18 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/pom.xml b/pom.xml
|
||||||
|
index a78a1ef..0abcc2a 100644
|
||||||
|
--- a/pom.xml
|
||||||
|
+++ b/pom.xml
|
||||||
|
@@ -82,6 +82,24 @@ See the Apache License Version 2.0 for the specific language governing permissio
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
|
+ <plugin>
|
||||||
|
+ <groupId>org.apache.maven.plugins</groupId>
|
||||||
|
+ <artifactId>maven-javadoc-plugin</artifactId>
|
||||||
|
+ <version>3.0.0-M1</version>
|
||||||
|
+ <configuration>
|
||||||
|
+ <sourceFileExcludes>
|
||||||
|
+ <sourceFileExclude>**/org/sonatype/plexus/build/incremental/*BuildContext.java</sourceFileExclude>
|
||||||
|
+ </sourceFileExcludes>
|
||||||
|
+ </configuration>
|
||||||
|
+ <executions>
|
||||||
|
+ <execution>
|
||||||
|
+ <id>attach-javadocs</id>
|
||||||
|
+ <goals>
|
||||||
|
+ <goal>jar</goal>
|
||||||
|
+ </goals>
|
||||||
|
+ </execution>
|
||||||
|
+ </executions>
|
||||||
|
+ </plugin>
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
|
||||||
|
--
|
||||||
|
2.30.0
|
||||||
|
|
||||||
@ -1,16 +1,18 @@
|
|||||||
Name: plexus-build-api
|
Name: plexus-build-api
|
||||||
Version: 0.0.7
|
Version: 0.0.7
|
||||||
Release: 23
|
Release: 24
|
||||||
Summary: Plexus Build API
|
Summary: Plexus Build API
|
||||||
License: ASL 2.0
|
License: ASL 2.0
|
||||||
URL: https://github.com/sonatype/sisu-build-api
|
URL: https://github.com/sonatype/sisu-build-api
|
||||||
Source0: https://github.com/sonatype/sisu-build-api/tarball/plexus-build-api-0.0.7/sonatype-sisu-build-api-plexus-build-api-0.0.7-0-g883ea67.tar.gz
|
Source0: https://github.com/sonatype/sisu-build-api/tarball/plexus-build-api-0.0.7/sonatype-sisu-build-api-plexus-build-api-0.0.7-0-g883ea67.tar.gz
|
||||||
Source1: http://www.apache.org/licenses/LICENSE-2.0.txt
|
Source1: http://www.apache.org/licenses/LICENSE-2.0.txt
|
||||||
BuildRequires: maven-local mvn(org.codehaus.plexus:plexus-component-metadata) mvn(org.codehaus.plexus:plexus-container-default)
|
Source2: xmvn-reactor
|
||||||
BuildRequires: mvn(org.codehaus.plexus:plexus-utils) mvn(org.sonatype.spice:spice-parent:pom:)
|
BuildRequires: maven java-1.8.0-openjdk-devel maven-local
|
||||||
|
Requires: java-1.8.0-openjdk
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
Patch0001: plexus-build-api-migration-to-component-metadata.patch
|
Patch0001: plexus-build-api-migration-to-component-metadata.patch
|
||||||
|
Patch0002: 0001-add-javadoc-plugin-to-pom-file.patch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Plexus Build API
|
Plexus Build API
|
||||||
@ -26,17 +28,30 @@ Documentation for plexus-build-api.
|
|||||||
%prep
|
%prep
|
||||||
%autosetup -n sonatype-sisu-build-api-f1f8849 -p1
|
%autosetup -n sonatype-sisu-build-api-f1f8849 -p1
|
||||||
cp -p %{SOURCE1} .
|
cp -p %{SOURCE1} .
|
||||||
|
cp %{SOURCE2} ./.xmvn-reactor
|
||||||
|
echo `pwd` > absolute_prefix.log
|
||||||
|
sed -i 's/\//\\\//g' absolute_prefix.log
|
||||||
|
absolute_prefix=`head -n 1 absolute_prefix.log`
|
||||||
|
sed -i 's/absolute-prefix/'"$absolute_prefix"'/g' .xmvn-reactor
|
||||||
%mvn_file : plexus/plexus-build-api
|
%mvn_file : plexus/plexus-build-api
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%mvn_build
|
mvn -DskipTests -DskipIT package
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%mvn_install
|
%mvn_install
|
||||||
|
install -d -m 0755 %{buildroot}/%{_javadocdir}/%{name}
|
||||||
|
install -m 0755 target/plexus-build-api-0.0.7-javadoc.jar %{buildroot}/%{_javadocdir}/%{name}
|
||||||
|
|
||||||
%files -f .mfiles
|
%files -f .mfiles
|
||||||
%doc LICENSE-2.0.txt
|
%doc LICENSE-2.0.txt
|
||||||
|
|
||||||
%files help -f .mfiles-javadoc
|
%files help
|
||||||
|
%{_javadocdir}/%{name}
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Jan 17 2022 Ge Wang <wangge20@huawei.com> - 0.0.7-24
|
||||||
|
- Use mvn build to replace maven_local build due to plexus-utils updated
|
||||||
|
|
||||||
* Tue Feb 18 2020 lingsheng <lingsheng@huawei.com> - 0.0.7-23
|
* Tue Feb 18 2020 lingsheng <lingsheng@huawei.com> - 0.0.7-23
|
||||||
- Package init
|
- Package init
|
||||||
|
|||||||
58
xmvn-reactor
Normal file
58
xmvn-reactor
Normal file
@ -0,0 +1,58 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.0.0">
|
||||||
|
<artifacts>
|
||||||
|
<artifact>
|
||||||
|
<groupId>org.sonatype.plexus</groupId>
|
||||||
|
<artifactId>plexus-build-api</artifactId>
|
||||||
|
<version>0.0.7</version>
|
||||||
|
<path>absolute-prefix/target/plexus-build-api-0.0.7.jar</path>
|
||||||
|
<properties>
|
||||||
|
<type>jar</type>
|
||||||
|
<requiresJava>1.6</requiresJava>
|
||||||
|
</properties>
|
||||||
|
<dependencies>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.codehaus.plexus</groupId>
|
||||||
|
<artifactId>plexus-utils</artifactId>
|
||||||
|
<requestedVersion>1.5.8</requestedVersion>
|
||||||
|
</dependency>
|
||||||
|
</dependencies>
|
||||||
|
</artifact>
|
||||||
|
<artifact>
|
||||||
|
<groupId>org.sonatype.plexus</groupId>
|
||||||
|
<artifactId>plexus-build-api</artifactId>
|
||||||
|
<extension>pom</extension>
|
||||||
|
<version>0.0.7</version>
|
||||||
|
<path>absolute-prefix/pom.xml</path>
|
||||||
|
<properties>
|
||||||
|
<type>jar</type>
|
||||||
|
<requiresJava>1.6</requiresJava>
|
||||||
|
</properties>
|
||||||
|
<dependencies>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.codehaus.plexus</groupId>
|
||||||
|
<artifactId>plexus-utils</artifactId>
|
||||||
|
<requestedVersion>1.5.8</requestedVersion>
|
||||||
|
</dependency>
|
||||||
|
</dependencies>
|
||||||
|
</artifact>
|
||||||
|
<artifact>
|
||||||
|
<groupId>org.sonatype.plexus</groupId>
|
||||||
|
<artifactId>plexus-build-api</artifactId>
|
||||||
|
<classifier>tests</classifier>
|
||||||
|
<version>0.0.7</version>
|
||||||
|
<path>absolute-prefix/target/plexus-build-api-0.0.7-tests.jar</path>
|
||||||
|
<properties>
|
||||||
|
<type>jar</type>
|
||||||
|
<requiresJava>1.6</requiresJava>
|
||||||
|
</properties>
|
||||||
|
<dependencies>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.codehaus.plexus</groupId>
|
||||||
|
<artifactId>plexus-utils</artifactId>
|
||||||
|
<requestedVersion>1.5.8</requestedVersion>
|
||||||
|
</dependency>
|
||||||
|
</dependencies>
|
||||||
|
</artifact>
|
||||||
|
</artifacts>
|
||||||
|
</metadata>
|
||||||
Loading…
x
Reference in New Issue
Block a user