Version 3.1.0. Verify the sources.
This commit is contained in:
Jerry James
parent
d188aa5e8f
commit
56466c377c
5
.gitignore
vendored
5
.gitignore
vendored
@ -1,5 +1,4 @@
|
||||
/maven-reporting-impl-2.2.tar.xz
|
||||
/LICENSE-2.0.txt
|
||||
/maven-reporting-impl-2.3-source-release.zip
|
||||
/maven-reporting-impl-2.4-source-release.zip
|
||||
/maven-reporting-impl-3.0.0-source-release.zip
|
||||
/maven-reporting-impl-*-source-release.zip
|
||||
/maven-reporting-impl-*-source-release.zip.asc
|
||||
|
||||
@ -1,72 +1,72 @@
|
||||
From 2f414c5566febf44beb77c43340eafccad1547e2 Mon Sep 17 00:00:00 2001
|
||||
From b087582c8bbe88ac8fd3a59c129d4bd7953a720f Mon Sep 17 00:00:00 2001
|
||||
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
||||
Date: Tue, 17 Jul 2018 11:57:16 +0200
|
||||
Date: Wed, 9 Feb 2022 14:37:18 -0700
|
||||
Subject: [PATCH] Remove dependency on junit-addons
|
||||
|
||||
---
|
||||
pom.xml | 6 ------
|
||||
.../apache/maven/reporting/AbstractMavenReportRenderer.java | 2 +-
|
||||
.../maven/reporting/AbstractMavenReportRendererTest.java | 10 ++--------
|
||||
pom.xml | 6 ------
|
||||
.../maven/reporting/AbstractMavenReportRenderer.java | 2 +-
|
||||
.../reporting/AbstractMavenReportRendererTest.java | 10 ++--------
|
||||
3 files changed, 3 insertions(+), 15 deletions(-)
|
||||
|
||||
diff --git a/pom.xml b/pom.xml
|
||||
index 239742e..dc75ecd 100644
|
||||
index d46a817..6b6295c 100644
|
||||
--- a/pom.xml
|
||||
+++ b/pom.xml
|
||||
@@ -135,12 +135,6 @@
|
||||
<version>3.8.2</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
- <dependency>
|
||||
- <groupId>junit-addons</groupId>
|
||||
- <artifactId>junit-addons</artifactId>
|
||||
- <version>1.4</version>
|
||||
- <scope>test</scope>
|
||||
- </dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
@@ -140,12 +140,6 @@
|
||||
<version>4.13.1</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
- <dependency>
|
||||
- <groupId>junit-addons</groupId>
|
||||
- <artifactId>junit-addons</artifactId>
|
||||
- <version>1.4</version>
|
||||
- <scope>test</scope>
|
||||
- </dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
diff --git a/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java b/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
|
||||
index 6f954ae..c11acd3 100644
|
||||
index 4c9a07c..4693e1d 100644
|
||||
--- a/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
|
||||
+++ b/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
|
||||
@@ -597,7 +597,7 @@ public abstract class AbstractMavenReportRenderer
|
||||
* @param text a text with or without the pattern <code>{text, url}</code>
|
||||
* @return a map of text/href
|
||||
*/
|
||||
- private static List<String> applyPattern( String text )
|
||||
+ static List<String> applyPattern( String text )
|
||||
{
|
||||
if ( StringUtils.isEmpty( text ) )
|
||||
{
|
||||
@@ -599,7 +599,7 @@ public abstract class AbstractMavenRepor
|
||||
* @param text a text with or without the pattern <code>{text, url}</code>
|
||||
* @return a map of text/href
|
||||
*/
|
||||
- private static List<String> applyPattern( String text )
|
||||
+ static List<String> applyPattern( String text )
|
||||
{
|
||||
if ( StringUtils.isEmpty( text ) )
|
||||
{
|
||||
diff --git a/src/test/java/org/apache/maven/reporting/AbstractMavenReportRendererTest.java b/src/test/java/org/apache/maven/reporting/AbstractMavenReportRendererTest.java
|
||||
index cdb9299..e8dce8f 100644
|
||||
--- a/src/test/java/org/apache/maven/reporting/AbstractMavenReportRendererTest.java
|
||||
+++ b/src/test/java/org/apache/maven/reporting/AbstractMavenReportRendererTest.java
|
||||
@@ -24,7 +24,8 @@ import java.util.List;
|
||||
|
||||
import junit.framework.Assert;
|
||||
import junit.framework.TestCase;
|
||||
-import junitx.util.PrivateAccessor;
|
||||
+
|
||||
+import static org.apache.maven.reporting.AbstractMavenReportRenderer.applyPattern;
|
||||
|
||||
/**
|
||||
* Test case for some public method in AbstractMavenReportRenderer.
|
||||
|
||||
import junit.framework.Assert;
|
||||
import junit.framework.TestCase;
|
||||
-import junitx.util.PrivateAccessor;
|
||||
+
|
||||
+import static org.apache.maven.reporting.AbstractMavenReportRenderer.applyPattern;
|
||||
|
||||
/**
|
||||
* Test case for some public method in AbstractMavenReportRenderer.
|
||||
@@ -32,13 +33,6 @@ import junitx.util.PrivateAccessor;
|
||||
public class AbstractMavenReportRendererTest
|
||||
extends TestCase
|
||||
{
|
||||
- private static List<String> applyPattern( String pattern )
|
||||
- throws Throwable
|
||||
- {
|
||||
- return (List<String>) PrivateAccessor.invoke( AbstractMavenReportRenderer.class, "applyPattern",
|
||||
- new Class[] { String.class }, new Object[] { pattern } );
|
||||
- }
|
||||
-
|
||||
private static void checkPattern( String pattern, String[] expectedResult ) throws Throwable
|
||||
{
|
||||
List<String> result = applyPattern( pattern );
|
||||
public class AbstractMavenReportRendererTest
|
||||
extends TestCase
|
||||
{
|
||||
- private static List<String> applyPattern( String pattern )
|
||||
- throws Throwable
|
||||
- {
|
||||
- return (List<String>) PrivateAccessor.invoke( AbstractMavenReportRenderer.class, "applyPattern",
|
||||
- new Class[] { String.class }, new Object[] { pattern } );
|
||||
- }
|
||||
-
|
||||
private static void checkPattern( String pattern, String[] expectedResult ) throws Throwable
|
||||
{
|
||||
List<String> result = applyPattern( pattern );
|
||||
--
|
||||
2.14.3
|
||||
2.34.1
|
||||
|
||||
|
||||
@ -1,15 +1,19 @@
|
||||
Name: maven-reporting-impl
|
||||
Version: 3.0.0
|
||||
Release: 14%{?dist}
|
||||
Version: 3.1.0
|
||||
Release: 1%{?dist}
|
||||
Summary: Abstract classes to manage report generation
|
||||
License: ASL 2.0
|
||||
URL: http://maven.apache.org/shared/%{name}
|
||||
URL: https://maven.apache.org/shared/maven-reporting-impl/
|
||||
BuildArch: noarch
|
||||
|
||||
Source0: http://repo1.maven.org/maven2/org/apache/maven/reporting/%{name}/%{version}/%{name}-%{version}-source-release.zip
|
||||
|
||||
Source0: https://www.apache.org/dist/maven/reporting/%{name}-%{version}-source-release.zip
|
||||
Source1: https://www.apache.org/dist/maven/reporting/%{name}-%{version}-source-release.zip.asc
|
||||
# Apache Maven public key
|
||||
Source2: https://www.apache.org/dist/maven/KEYS
|
||||
# Fedora does not have junit-addons
|
||||
Patch0: 0001-Remove-dependency-on-junit-addons.patch
|
||||
|
||||
BuildRequires: gnupg2
|
||||
BuildRequires: maven-local
|
||||
BuildRequires: mvn(junit:junit)
|
||||
BuildRequires: mvn(org.apache.maven.doxia:doxia-core)
|
||||
@ -24,30 +28,22 @@ BuildRequires: mvn(org.apache.maven.shared:maven-shared-components:pom:)
|
||||
BuildRequires: mvn(org.apache.maven.shared:maven-shared-utils)
|
||||
BuildRequires: mvn(org.codehaus.plexus:plexus-utils)
|
||||
|
||||
%{?javadoc_package}
|
||||
|
||||
%description
|
||||
Abstract classes to manage report generation, which can be run both:
|
||||
|
||||
* as part of a site generation (as a maven-reporting-api's MavenReport),
|
||||
* or as a direct standalone invocation (as a maven-plugin-api's Mojo).
|
||||
|
||||
This is a replacement package for maven-shared-reporting-impl
|
||||
|
||||
%package javadoc
|
||||
Summary: Javadoc for %{name}
|
||||
|
||||
%description javadoc
|
||||
API documentation for %{name}.
|
||||
|
||||
%prep
|
||||
%{gpgverify} --data=%{SOURCE0} --signature=%{SOURCE1} --keyring=%{SOURCE2}
|
||||
%autosetup -p1
|
||||
|
||||
# integration tests try to download stuff from the internet
|
||||
# and therefore they don't work in Koji
|
||||
%pom_remove_plugin :maven-invoker-plugin
|
||||
|
||||
# Build for JDK 8 at a minimum
|
||||
sed -i 's/1\.6/1.8/g' pom.xml
|
||||
|
||||
%build
|
||||
%mvn_build
|
||||
|
||||
@ -55,12 +51,14 @@ sed -i 's/1\.6/1.8/g' pom.xml
|
||||
%mvn_install
|
||||
|
||||
%files -f .mfiles
|
||||
%doc LICENSE NOTICE
|
||||
|
||||
%files javadoc -f .mfiles-javadoc
|
||||
%doc LICENSE NOTICE
|
||||
%doc README.md
|
||||
%license LICENSE NOTICE
|
||||
|
||||
%changelog
|
||||
* Wed Feb 9 2022 Jerry James <loganjerry@gmail.com> - 3.1.0-1
|
||||
- Version 3.1.0
|
||||
- Verify the sources
|
||||
|
||||
* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 3.0.0-14
|
||||
- Rebuilt for java-17-openjdk as system jdk
|
||||
|
||||
|
||||
3
sources
3
sources
@ -1 +1,2 @@
|
||||
SHA512 (maven-reporting-impl-3.0.0-source-release.zip) = 6e24af617f0e647bb05fa3a61ec3eb7946bb5e804097877fa8a09b40e5978f52e5a524712e44be161212a8651c00747155aad239d6eb44fc124519a7e2c1e592
|
||||
SHA512 (maven-reporting-impl-3.1.0-source-release.zip) = 8f7012a05db0486e41eb62ac423fce6a65b75e525ec11a20b6279c5f7280191d039ca9ad48f424d86ee55e436fb848c91fea401d4e9f931a754180a9a919ac76
|
||||
SHA512 (maven-reporting-impl-3.1.0-source-release.zip.asc) = 600b8208ef02210ccbf561eb72a9449d81bbf714820b4b97086fdfd24257a5a88009324a053a4bc39e2baad7dfb5595eb0f639de8fce9d86368cef1eeefeb69c
|
||||
|
||||
Loading…
Reference in New Issue
Block a user