forked from pool/maven-reporting-impl
Accepting request 1113248 from Java:packages
3.2.0 OBS-URL: https://build.opensuse.org/request/show/1113248 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/maven-reporting-impl?expand=0&rev=5
This commit is contained in:
commit
8739ce8ccf
@ -1,7 +1,20 @@
|
||||
--- maven-reporting-impl-3.1.0/pom.xml 2022-03-10 17:08:29.894389771 +0100
|
||||
+++ maven-reporting-impl-3.1.0/pom.xml 2022-03-10 17:09:12.654649105 +0100
|
||||
@@ -140,12 +140,6 @@
|
||||
<version>4.13.1</version>
|
||||
From b087582c8bbe88ac8fd3a59c129d4bd7953a720f Mon Sep 17 00:00:00 2001
|
||||
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
||||
Date: Wed, 9 Feb 2022 14:37:18 -0700
|
||||
Subject: [PATCH] Remove dependency on junit-addons
|
||||
|
||||
---
|
||||
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 d46a817..6b6295c 100644
|
||||
--- a/pom.xml
|
||||
+++ b/pom.xml
|
||||
@@ -151,12 +151,6 @@
|
||||
<version>4.13.2</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
- <dependency>
|
||||
@ -13,9 +26,11 @@
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
--- maven-reporting-impl-3.1.0/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java 2022-03-10 17:08:29.894389771 +0100
|
||||
+++ maven-reporting-impl-3.1.0/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java 2022-03-10 17:09:12.654649105 +0100
|
||||
@@ -599,7 +599,7 @@
|
||||
diff --git a/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java b/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
|
||||
index 4c9a07c..4693e1d 100644
|
||||
--- a/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
|
||||
+++ b/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
|
||||
@@ -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
|
||||
*/
|
||||
@ -24,9 +39,11 @@
|
||||
{
|
||||
if ( StringUtils.isEmpty( text ) )
|
||||
{
|
||||
--- maven-reporting-impl-3.1.0/src/test/java/org/apache/maven/reporting/AbstractMavenReportRendererTest.java 2022-03-10 17:08:29.898389795 +0100
|
||||
+++ maven-reporting-impl-3.1.0/src/test/java/org/apache/maven/reporting/AbstractMavenReportRendererTest.java 2022-03-10 17:09:12.654649105 +0100
|
||||
@@ -24,7 +24,8 @@
|
||||
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;
|
||||
@ -36,7 +53,7 @@
|
||||
|
||||
/**
|
||||
* Test case for some public method in AbstractMavenReportRenderer.
|
||||
@@ -32,13 +33,6 @@
|
||||
@@ -32,13 +33,6 @@ import junitx.util.PrivateAccessor;
|
||||
public class AbstractMavenReportRendererTest
|
||||
extends TestCase
|
||||
{
|
||||
@ -50,3 +67,5 @@
|
||||
private static void checkPattern( String pattern, String[] expectedResult ) throws Throwable
|
||||
{
|
||||
List<String> result = applyPattern( pattern );
|
||||
--
|
||||
2.34.1
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e81e170d9666aa4e6880b23ba20c16de046387fa31726de837003ecd4b039d2b
|
||||
size 47021
|
BIN
maven-reporting-impl-3.2.0-source-release.zip
(Stored with Git LFS)
Normal file
BIN
maven-reporting-impl-3.2.0-source-release.zip
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -11,14 +11,15 @@
|
||||
<property name="project.groupId" value="org.apache.maven.reporting"/>
|
||||
<property name="project.artifactId" value="maven-reporting-impl"/>
|
||||
<property name="project.name" value="Apache Maven Reporting Implementation"/>
|
||||
<property name="project.version" value="3.1.0"/>
|
||||
<property name="project.version" value="3.2.0"/>
|
||||
|
||||
<property name="spec.version" value="3.1"/>
|
||||
<property name="spec.version" value="3.2"/>
|
||||
|
||||
<property name="project.organization.name"
|
||||
value="The Apache Software Foundation"/>
|
||||
|
||||
<property name="compiler.source" value="1.8"/>
|
||||
<property name="compiler.release" value="8"/>
|
||||
<property name="compiler.source" value="1.${compiler.release}"/>
|
||||
<property name="compiler.target" value="${compiler.source}"/>
|
||||
|
||||
<property name="build.finalName"
|
||||
@ -60,6 +61,7 @@
|
||||
encoding="UTF-8"
|
||||
optimize="false"
|
||||
deprecation="true"
|
||||
release="${compiler.release}"
|
||||
target="${compiler.target}"
|
||||
verbose="false"
|
||||
fork="false"
|
||||
|
@ -1,3 +1,18 @@
|
||||
-------------------------------------------------------------------
|
||||
Sun Sep 24 01:58:46 UTC 2023 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Upgrade to version 3.2.0
|
||||
* Improvement:
|
||||
+ MSHARED-1099 - Render with a skin when report is run in
|
||||
standalone mode
|
||||
* Dependency upgrades:
|
||||
+ MSHARED-1120 - Upgrade Maven Reporting API to 3.1.1
|
||||
+ MSHARED-1121 - Upgrade plugins and components in project and
|
||||
ITs
|
||||
- Modified patch:
|
||||
* 0001-Remove-dependency-on-junit-addons.patch
|
||||
+ rediff
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Sep 6 22:31:19 UTC 2023 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
|
@ -17,7 +17,7 @@
|
||||
|
||||
|
||||
Name: maven-reporting-impl
|
||||
Version: 3.1.0
|
||||
Version: 3.2.0
|
||||
Release: 0
|
||||
Summary: Abstract classes to manage report generation
|
||||
License: Apache-2.0
|
||||
@ -37,7 +37,7 @@ BuildRequires: maven-doxia-sink-api
|
||||
BuildRequires: maven-doxia-sitetools
|
||||
BuildRequires: maven-lib
|
||||
BuildRequires: maven-plugin-annotations
|
||||
BuildRequires: maven-reporting-api
|
||||
BuildRequires: maven-reporting-api >= 3.1.1
|
||||
BuildRequires: maven-shared-utils
|
||||
BuildRequires: plexus-utils
|
||||
BuildRequires: unzip
|
||||
@ -63,8 +63,6 @@ API documentation for %{name}.
|
||||
cp %{SOURCE1} build.xml
|
||||
%patch0 -p1
|
||||
|
||||
%pom_remove_parent
|
||||
|
||||
# integration tests try to download stuff from the internet
|
||||
# and therefore they don't work in Build Service
|
||||
%pom_remove_plugin :maven-invoker-plugin
|
||||
@ -72,22 +70,25 @@ cp %{SOURCE1} build.xml
|
||||
%build
|
||||
mkdir -p lib
|
||||
build-jar-repository -s lib \
|
||||
maven-doxia/doxia-core \
|
||||
maven-doxia/doxia-logging-api \
|
||||
maven-doxia/doxia-module-xhtml \
|
||||
maven-doxia/doxia-module-xhtml5 \
|
||||
maven-doxia/doxia-sink-api \
|
||||
maven-doxia-sitetools/doxia-decoration-model \
|
||||
maven-doxia-sitetools/doxia-site-renderer \
|
||||
maven/maven-core \
|
||||
maven/maven-plugin-api \
|
||||
maven-plugin-tools/maven-plugin-annotations \
|
||||
maven-reporting-api/maven-reporting-api \
|
||||
maven-shared-utils/maven-shared-utils \
|
||||
plexus/utils
|
||||
maven-doxia/doxia-core \
|
||||
maven-doxia/doxia-logging-api \
|
||||
maven-doxia/doxia-module-xhtml \
|
||||
maven-doxia/doxia-module-xhtml5 \
|
||||
maven-doxia/doxia-sink-api \
|
||||
maven-doxia-sitetools/doxia-decoration-model \
|
||||
maven-doxia-sitetools/doxia-integration-tools \
|
||||
maven-doxia-sitetools/doxia-site-renderer \
|
||||
maven/maven-artifact \
|
||||
maven/maven-compat \
|
||||
maven/maven-core \
|
||||
maven/maven-plugin-api \
|
||||
maven-plugin-tools/maven-plugin-annotations \
|
||||
maven-reporting-api/maven-reporting-api \
|
||||
maven-shared-utils/maven-shared-utils \
|
||||
plexus/utils
|
||||
|
||||
%{ant} \
|
||||
jar javadoc
|
||||
jar javadoc
|
||||
|
||||
%install
|
||||
# jar
|
||||
|
Loading…
Reference in New Issue
Block a user