Sync from SUSE:ALP:Source:Standard:1.0 maven-reporting-impl revision 45762fde14d56c520e62b74b50c2ca5b
This commit is contained in:
commit
d19ab4ad2a
23
.gitattributes
vendored
Normal file
23
.gitattributes
vendored
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
## Default LFS
|
||||||
|
*.7z filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.bsp filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.bz2 filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.gem filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.gz filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.jar filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.lz filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.lzma filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.obscpio filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.oxt filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.pdf filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.png filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.rpm filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.tbz filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.tbz2 filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.tgz filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.ttf filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.txz filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.whl filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.xz filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.zip filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.zst filter=lfs diff=lfs merge=lfs -text
|
71
0001-Remove-dependency-on-junit-addons.patch
Normal file
71
0001-Remove-dependency-on-junit-addons.patch
Normal file
@ -0,0 +1,71 @@
|
|||||||
|
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>
|
||||||
|
- <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 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
|
||||||
|
*/
|
||||||
|
- 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.
|
||||||
|
@@ -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 );
|
||||||
|
--
|
||||||
|
2.34.1
|
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.
137
maven-reporting-impl-build.xml
Normal file
137
maven-reporting-impl-build.xml
Normal file
@ -0,0 +1,137 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
|
||||||
|
<project name="maven-reporting-impl" default="package" basedir=".">
|
||||||
|
|
||||||
|
<!-- ====================================================================== -->
|
||||||
|
<!-- Build environment properties -->
|
||||||
|
<!-- ====================================================================== -->
|
||||||
|
|
||||||
|
<property file="build.properties"/>
|
||||||
|
|
||||||
|
<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.2.0"/>
|
||||||
|
|
||||||
|
<property name="spec.version" value="3.2"/>
|
||||||
|
|
||||||
|
<property name="project.organization.name"
|
||||||
|
value="The Apache Software Foundation"/>
|
||||||
|
|
||||||
|
<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"
|
||||||
|
value="${project.artifactId}-${project.version}"/>
|
||||||
|
<property name="build.dir" value="target"/>
|
||||||
|
<property name="build.outputDir" value="${build.dir}/classes"/>
|
||||||
|
<property name="build.srcDir" value="src/main/java"/>
|
||||||
|
<property name="build.resourceDir" value="src/main/resources"/>
|
||||||
|
|
||||||
|
<property name="reporting.outputDirectory" value="${build.dir}/site"/>
|
||||||
|
|
||||||
|
<!-- ====================================================================== -->
|
||||||
|
<!-- Defining classpaths -->
|
||||||
|
<!-- ====================================================================== -->
|
||||||
|
|
||||||
|
<path id="build.classpath">
|
||||||
|
<fileset dir="lib">
|
||||||
|
<include name="**/*.jar"/>
|
||||||
|
</fileset>
|
||||||
|
</path>
|
||||||
|
|
||||||
|
<!-- ====================================================================== -->
|
||||||
|
<!-- Cleaning up target -->
|
||||||
|
<!-- ====================================================================== -->
|
||||||
|
|
||||||
|
<target name="clean" description="Clean the output directory">
|
||||||
|
<delete dir="${build.dir}"/>
|
||||||
|
</target>
|
||||||
|
|
||||||
|
<!-- ====================================================================== -->
|
||||||
|
<!-- Compilation target -->
|
||||||
|
<!-- ====================================================================== -->
|
||||||
|
|
||||||
|
<target name="compile" description="Compile the code">
|
||||||
|
<mkdir dir="${build.outputDir}"/>
|
||||||
|
<javac destdir="${build.outputDir}"
|
||||||
|
nowarn="false"
|
||||||
|
debug="true"
|
||||||
|
encoding="UTF-8"
|
||||||
|
optimize="false"
|
||||||
|
deprecation="true"
|
||||||
|
release="${compiler.release}"
|
||||||
|
target="${compiler.target}"
|
||||||
|
verbose="false"
|
||||||
|
fork="false"
|
||||||
|
source="${compiler.source}">
|
||||||
|
<src>
|
||||||
|
<pathelement location="${build.srcDir}"/>
|
||||||
|
</src>
|
||||||
|
<classpath refid="build.classpath"/>
|
||||||
|
</javac>
|
||||||
|
</target>
|
||||||
|
|
||||||
|
<!-- ====================================================================== -->
|
||||||
|
<!-- Javadoc target -->
|
||||||
|
<!-- ====================================================================== -->
|
||||||
|
|
||||||
|
<target name="javadoc" description="Generates the Javadoc of the application">
|
||||||
|
<javadoc sourcepath="${build.srcDir}"
|
||||||
|
packagenames="*"
|
||||||
|
destdir="${reporting.outputDirectory}/apidocs"
|
||||||
|
access="protected"
|
||||||
|
source="${compiler.source}"
|
||||||
|
verbose="false"
|
||||||
|
version="true"
|
||||||
|
use="true"
|
||||||
|
author="true"
|
||||||
|
splitindex="false"
|
||||||
|
nodeprecated="false"
|
||||||
|
nodeprecatedlist="false"
|
||||||
|
notree="false"
|
||||||
|
noindex="false"
|
||||||
|
nohelp="false"
|
||||||
|
nonavbar="false"
|
||||||
|
serialwarn="false"
|
||||||
|
encoding="UTF-8"
|
||||||
|
linksource="false"
|
||||||
|
breakiterator="false">
|
||||||
|
<classpath refid="build.classpath"/>
|
||||||
|
</javadoc>
|
||||||
|
</target>
|
||||||
|
|
||||||
|
<!-- ====================================================================== -->
|
||||||
|
<!-- Package target -->
|
||||||
|
<!-- ====================================================================== -->
|
||||||
|
|
||||||
|
<target name="package" depends="compile" description="Package the application">
|
||||||
|
<jar jarfile="${build.dir}/${build.finalName}.jar"
|
||||||
|
compress="true"
|
||||||
|
index="false"
|
||||||
|
basedir="${build.outputDir}"
|
||||||
|
excludes="**/package.html">
|
||||||
|
<manifest>
|
||||||
|
<attribute name="Implementation-Title" value="${project.name}"/>
|
||||||
|
<attribute name="Implementation-URL" value="https://maven.apache.org/shared/${project.artifactId}/"/>
|
||||||
|
<attribute name="Implementation-Vendor" value="${project.organization.name}"/>
|
||||||
|
<attribute name="Implementation-Vendor-Id" value="${project.groupId}"/>
|
||||||
|
<attribute name="Implementation-Version" value="${project.version}"/>
|
||||||
|
<attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/>
|
||||||
|
<attribute name="JavaPackages-GroupId" value="${project.groupId}"/>
|
||||||
|
<attribute name="JavaPackages-Version" value="${project.version}"/>
|
||||||
|
<attribute name="Specification-Title" value="${project.name}"/>
|
||||||
|
<attribute name="Specification-Vendor" value="${project.organization.name}"/>
|
||||||
|
<attribute name="Specification-Version" value="${spec.version}"/>
|
||||||
|
</manifest>
|
||||||
|
</jar>
|
||||||
|
</target>
|
||||||
|
|
||||||
|
<!-- ====================================================================== -->
|
||||||
|
<!-- A dummy target for the package named after the type it creates -->
|
||||||
|
<!-- ====================================================================== -->
|
||||||
|
|
||||||
|
<target name="jar" depends="package" description="Builds the jar for the application"/>
|
||||||
|
|
||||||
|
</project>
|
39
maven-reporting-impl.changes
Normal file
39
maven-reporting-impl.changes
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
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>
|
||||||
|
|
||||||
|
- Remove unnecessary dependency on xmvn tools and parent pom
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Mar 11 07:02:31 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
- Upgrade to version 3.1.0
|
||||||
|
* API sync with maven-reporting-api 3.1.0
|
||||||
|
- Modified patch:
|
||||||
|
* 0001-Remove-dependency-on-junit-addons.patch
|
||||||
|
+ rediff
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Mar 11 11:43:42 UTC 2020 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
- Fix build against newer doxia that requires html5 module
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Mar 29 13:44:55 UTC 2019 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
- Initial packaging of maven-reporting-impl 3.0.0
|
||||||
|
- Generate and customize ant build.xml file
|
113
maven-reporting-impl.spec
Normal file
113
maven-reporting-impl.spec
Normal file
@ -0,0 +1,113 @@
|
|||||||
|
#
|
||||||
|
# spec file for package maven-reporting-impl
|
||||||
|
#
|
||||||
|
# Copyright (c) 2023 SUSE LLC
|
||||||
|
#
|
||||||
|
# All modifications and additions to the file contributed by third parties
|
||||||
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
|
# upon. The license for this file, and modifications and additions to the
|
||||||
|
# file, is the same license as for the pristine package itself (unless the
|
||||||
|
# license for the pristine package is not an Open Source License, in which
|
||||||
|
# case the license is the MIT License). An "Open Source License" is a
|
||||||
|
# license that conforms to the Open Source Definition (Version 1.9)
|
||||||
|
# published by the Open Source Initiative.
|
||||||
|
|
||||||
|
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
||||||
|
#
|
||||||
|
|
||||||
|
|
||||||
|
Name: maven-reporting-impl
|
||||||
|
Version: 3.2.0
|
||||||
|
Release: 0
|
||||||
|
Summary: Abstract classes to manage report generation
|
||||||
|
License: Apache-2.0
|
||||||
|
Group: Development/Libraries/Java
|
||||||
|
URL: https://maven.apache.org/shared/%{name}
|
||||||
|
Source0: http://archive.apache.org/dist/maven/reporting/%{name}-%{version}-source-release.zip
|
||||||
|
Source1: %{name}-build.xml
|
||||||
|
Patch0: 0001-Remove-dependency-on-junit-addons.patch
|
||||||
|
BuildRequires: ant
|
||||||
|
BuildRequires: fdupes
|
||||||
|
BuildRequires: javapackages-local >= 6
|
||||||
|
BuildRequires: maven-doxia-core
|
||||||
|
BuildRequires: maven-doxia-logging-api
|
||||||
|
BuildRequires: maven-doxia-module-xhtml
|
||||||
|
BuildRequires: maven-doxia-module-xhtml5
|
||||||
|
BuildRequires: maven-doxia-sink-api
|
||||||
|
BuildRequires: maven-doxia-sitetools
|
||||||
|
BuildRequires: maven-lib
|
||||||
|
BuildRequires: maven-plugin-annotations
|
||||||
|
BuildRequires: maven-reporting-api >= 3.1.1
|
||||||
|
BuildRequires: maven-shared-utils
|
||||||
|
BuildRequires: plexus-utils
|
||||||
|
BuildRequires: unzip
|
||||||
|
BuildArch: noarch
|
||||||
|
|
||||||
|
%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}
|
||||||
|
Group: Documentation/HTML
|
||||||
|
|
||||||
|
%description javadoc
|
||||||
|
API documentation for %{name}.
|
||||||
|
|
||||||
|
%prep
|
||||||
|
%setup -q
|
||||||
|
cp %{SOURCE1} build.xml
|
||||||
|
%patch0 -p1
|
||||||
|
|
||||||
|
# integration tests try to download stuff from the internet
|
||||||
|
# and therefore they don't work in Build Service
|
||||||
|
%pom_remove_plugin :maven-invoker-plugin
|
||||||
|
|
||||||
|
%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-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
|
||||||
|
|
||||||
|
%install
|
||||||
|
# jar
|
||||||
|
install -dm 0755 %{buildroot}%{_javadir}/%{name}
|
||||||
|
install -pm 0644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}.jar
|
||||||
|
# pom
|
||||||
|
install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name}
|
||||||
|
%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom
|
||||||
|
%add_maven_depmap %{name}/%{name}.pom %{name}/%{name}.jar
|
||||||
|
# javadoc
|
||||||
|
install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
|
||||||
|
cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
|
||||||
|
%fdupes -s %{buildroot}%{_javadocdir}
|
||||||
|
|
||||||
|
%files -f .mfiles
|
||||||
|
%license LICENSE NOTICE
|
||||||
|
|
||||||
|
%files javadoc
|
||||||
|
%{_javadocdir}/%{name}
|
||||||
|
%license LICENSE NOTICE
|
||||||
|
|
||||||
|
%changelog
|
Loading…
Reference in New Issue
Block a user