!1 Package init

Merge pull request !1 from jeff200902/master
This commit is contained in:
openeuler-ci-bot 2020-08-28 17:15:27 +08:00 committed by Gitee
commit 125ca766d3
4 changed files with 122 additions and 0 deletions

View File

@ -0,0 +1,71 @@
From 1d3eca7e7d7ba1a4a89b56519694eeee4ee91353 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Fri, 20 Mar 2015 11:53:02 +0100
Subject: [PATCH] Port to Maven 3.3.1
---
pom.xml | 4 ++--
.../java/org/apache/maven/plugin/gpg/AscArtifactMetadata.java | 9 +++++++++
.../java/org/apache/maven/plugin/gpg/AttachedSignedArtifact.java | 6 ------
3 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/pom.xml b/pom.xml
index f06d5fb..fea749f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,7 +57,7 @@ under the License.
</distributionManagement>
<properties>
- <mavenVersion>2.2.1</mavenVersion>
+ <mavenVersion>3.3.1</mavenVersion>
</properties>
<dependencies>
@@ -68,7 +68,7 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
+ <artifactId>maven-compat</artifactId>
<version>${mavenVersion}</version>
</dependency>
<dependency>
diff --git a/src/main/java/org/apache/maven/plugin/gpg/AscArtifactMetadata.java b/src/main/java/org/apache/maven/plugin/gpg/AscArtifactMetadata.java
index 00c62ee..acce010 100644
--- a/src/main/java/org/apache/maven/plugin/gpg/AscArtifactMetadata.java
+++ b/src/main/java/org/apache/maven/plugin/gpg/AscArtifactMetadata.java
@@ -90,6 +90,15 @@ public class AscArtifactMetadata
return getFilename();
}
+ public void merge( org.apache.maven.repository.legacy.metadata.ArtifactMetadata metadata )
+ {
+ AscArtifactMetadata m = (AscArtifactMetadata) metadata;
+ if ( !m.file.equals( file ) )
+ {
+ throw new IllegalStateException( "Cannot add two different pieces of metadata for: " + getKey() );
+ }
+ }
+
public void merge( ArtifactMetadata metadata )
{
AscArtifactMetadata m = (AscArtifactMetadata) metadata;
diff --git a/src/main/java/org/apache/maven/plugin/gpg/AttachedSignedArtifact.java b/src/main/java/org/apache/maven/plugin/gpg/AttachedSignedArtifact.java
index 3a4d431..f2fccda 100644
--- a/src/main/java/org/apache/maven/plugin/gpg/AttachedSignedArtifact.java
+++ b/src/main/java/org/apache/maven/plugin/gpg/AttachedSignedArtifact.java
@@ -308,10 +308,4 @@ public class AttachedSignedArtifact
{
return delegate.compareTo( o );
}
-
- public ArtifactMetadata getMetadata( Class<?> metadataClass )
- {
- // TODO Auto-generated method stub
- return delegate.getMetadata( metadataClass );
- }
}
--
2.1.0

Binary file not shown.

47
maven-gpg-plugin.spec Normal file
View File

@ -0,0 +1,47 @@
Name: maven-gpg-plugin
Version: 1.6
Release: 1
Summary: Maven GPG Plugin
License: ASL 2.0
URL: http://maven.apache.org/plugins/maven-gpg-plugin/
BuildArch: noarch
Source0: https://mirrors.bfsu.edu.cn/apache/maven/plugins/%{name}-%{version}-source-release.zip
Patch0: 0001-Port-to-Maven-3.3.1.patch
BuildRequires: maven-local mvn(org.apache.maven:maven-artifact)
BuildRequires: mvn(org.apache.maven:maven-compat) mvn(org.apache.maven:maven-model)
BuildRequires: mvn(org.apache.maven:maven-plugin-api)
BuildRequires: mvn(org.apache.maven:maven-repository-metadata)
BuildRequires: mvn(org.apache.maven.plugins:maven-plugins:pom:)
BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
BuildRequires: mvn(org.codehaus.plexus:plexus-utils)
BuildRequires: mvn(org.sonatype.plexus:plexus-sec-dispatcher)
Requires: gnupg
%description
This plugin signs all of the project's attached artifacts with
GnuPG. It adds goals gpg:sign and gpg:sign-and-deploy-file.
%package javadoc
Summary: Javadoc for %{name}
%description javadoc
API documentation for %{name}.
%prep
%setup -q
%patch0 -p1
%build
%mvn_build
%install
%mvn_install
%files -f .mfiles
%dir %{_javadir}/%{name}
%doc LICENSE NOTICE
%files javadoc -f .mfiles-javadoc
%doc LICENSE NOTICE
%changelog
* Sat Aug 22 2020 Jeffery.Gao <gaojianxing@huawei.com> - 1.6-1
- Package init

4
maven-gpg-plugin.yaml Normal file
View File

@ -0,0 +1,4 @@
version_control: NA
src_repo: NA
tag_prefix: NA
seperator: NA