You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2023/01/21 19:56:18 UTC
[maven-reporting-api] branch master updated: [MSHARED-1177] Upgrade to Maven Parent 39
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-reporting-api.git
The following commit(s) were added to refs/heads/master by this push:
new d5858ac [MSHARED-1177] Upgrade to Maven Parent 39
d5858ac is described below
commit d5858ac2b21b825afe9af6c1995e3f9790406aa3
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sat Jan 21 20:55:59 2023 +0100
[MSHARED-1177] Upgrade to Maven Parent 39
---
pom.xml | 8 +++-----
.../apache/maven/reporting/MavenMultiPageReport.java | 16 ++++++----------
.../java/org/apache/maven/reporting/MavenReport.java | 17 +++++++----------
.../apache/maven/reporting/MavenReportException.java | 19 +++++++------------
.../apache/maven/reporting/MavenReportRenderer.java | 10 ++++------
5 files changed, 27 insertions(+), 43 deletions(-)
diff --git a/pom.xml b/pom.xml
index 11cee9d..1d45daa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,14 +17,13 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-components</artifactId>
- <version>36</version>
+ <version>39</version>
<relativePath />
</parent>
@@ -39,8 +37,8 @@ under the License.
<scm>
<connection>scm:git:https://gitbox.apache.org/repos/asf/maven-reporting-api.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/maven-reporting-api.git</developerConnection>
- <url>https://github.com/apache/maven-reporting-api/tree/${project.scm.tag}</url>
<tag>HEAD</tag>
+ <url>https://github.com/apache/maven-reporting-api/tree/${project.scm.tag}</url>
</scm>
<issueManagement>
<system>jira</system>
diff --git a/src/main/java/org/apache/maven/reporting/MavenMultiPageReport.java b/src/main/java/org/apache/maven/reporting/MavenMultiPageReport.java
index 770873c..5a52eef 100644
--- a/src/main/java/org/apache/maven/reporting/MavenMultiPageReport.java
+++ b/src/main/java/org/apache/maven/reporting/MavenMultiPageReport.java
@@ -1,5 +1,3 @@
-package org.apache.maven.reporting;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.reporting;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,12 +16,13 @@ package org.apache.maven.reporting;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.reporting;
+
+import java.util.Locale;
import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.doxia.sink.SinkFactory;
-import java.util.Locale;
-
/**
* Interface created separately for backwards compatibility. This method
* would ideally have been added in the {@link MavenReport} interface, and the other 'generate'
@@ -33,9 +32,7 @@ import java.util.Locale;
* @see MavenReport#generate(Sink, Locale)
* @since 3.0 (copied in maven-site-plugin 2.0-beta-6)
*/
-public interface MavenMultiPageReport
- extends MavenReport
-{
+public interface MavenMultiPageReport extends MavenReport {
/**
* Generate multi page report.
*
@@ -44,6 +41,5 @@ public interface MavenMultiPageReport
* @param sinkFactory the sink factory to create sub sinks.
* @throws MavenReportException if an error occurs.
*/
- void generate( Sink sink, SinkFactory sinkFactory, Locale locale )
- throws MavenReportException;
+ void generate(Sink sink, SinkFactory sinkFactory, Locale locale) throws MavenReportException;
}
diff --git a/src/main/java/org/apache/maven/reporting/MavenReport.java b/src/main/java/org/apache/maven/reporting/MavenReport.java
index 98b5e50..9e63bf2 100644
--- a/src/main/java/org/apache/maven/reporting/MavenReport.java
+++ b/src/main/java/org/apache/maven/reporting/MavenReport.java
@@ -1,5 +1,3 @@
-package org.apache.maven.reporting;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.reporting;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.reporting;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.reporting;
import java.io.File;
import java.util.Locale;
@@ -32,8 +31,7 @@ import org.apache.maven.doxia.sink.Sink;
* @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
* @since 2.0
*/
-public interface MavenReport
-{
+public interface MavenReport {
/** Plexus lookup name */
String ROLE = MavenReport.class.getName();
@@ -52,8 +50,7 @@ public interface MavenReport
* @param locale the wanted locale to generate the report.
* @throws MavenReportException if any
*/
- void generate( Sink sink, Locale locale )
- throws MavenReportException;
+ void generate(Sink sink, Locale locale) throws MavenReportException;
/**
* Get the base name used to create report's output file(s).
@@ -76,7 +73,7 @@ public interface MavenReport
* @param locale the wanted locale to return the report's name.
* @return the name of this report.
*/
- String getName( Locale locale );
+ String getName(Locale locale);
/**
* Get the localized report description.
@@ -84,14 +81,14 @@ public interface MavenReport
* @param locale the wanted locale to return the report's description.
* @return the description of this report.
*/
- String getDescription( Locale locale );
+ String getDescription(Locale locale);
/**
* Set a new output directory. Useful for staging.
*
* @param outputDirectory the new output directory
*/
- void setReportOutputDirectory( File outputDirectory );
+ void setReportOutputDirectory(File outputDirectory);
/**
* @return the current report output directory.
diff --git a/src/main/java/org/apache/maven/reporting/MavenReportException.java b/src/main/java/org/apache/maven/reporting/MavenReportException.java
index 90c952b..be21244 100644
--- a/src/main/java/org/apache/maven/reporting/MavenReportException.java
+++ b/src/main/java/org/apache/maven/reporting/MavenReportException.java
@@ -1,5 +1,3 @@
-package org.apache.maven.reporting;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.reporting;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.reporting;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.reporting;
/**
* An exception occurring during the execution of a Maven report.
@@ -26,9 +25,7 @@ package org.apache.maven.reporting;
* @author <a href="evenisse@apache.org">Emmanuel Venisse</a>
* @since 2.0
*/
-public class MavenReportException
- extends Exception
-{
+public class MavenReportException extends Exception {
/** The serialVersionUID **/
public static final long serialVersionUID = -6200353563231163785L;
@@ -37,9 +34,8 @@ public class MavenReportException
*
* @param msg the exception message.
*/
- public MavenReportException( String msg )
- {
- super( msg );
+ public MavenReportException(String msg) {
+ super(msg);
}
/**
@@ -48,8 +44,7 @@ public class MavenReportException
* @param msg the exception message.
* @param cause the cause.
*/
- public MavenReportException( String msg, Exception cause )
- {
- super( msg, cause );
+ public MavenReportException(String msg, Exception cause) {
+ super(msg, cause);
}
}
diff --git a/src/main/java/org/apache/maven/reporting/MavenReportRenderer.java b/src/main/java/org/apache/maven/reporting/MavenReportRenderer.java
index 5b6e5fe..c174ca3 100644
--- a/src/main/java/org/apache/maven/reporting/MavenReportRenderer.java
+++ b/src/main/java/org/apache/maven/reporting/MavenReportRenderer.java
@@ -1,5 +1,3 @@
-package org.apache.maven.reporting;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.reporting;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.reporting;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.reporting;
/**
* Basis for rendering report.
@@ -29,8 +28,7 @@ package org.apache.maven.reporting;
* that could take a velocity template and pipe that through Doxia rather than coding
* them up like this.
*/
-public interface MavenReportRenderer
-{
+public interface MavenReportRenderer {
/**
* @return the wanted report's title.
*/
@@ -40,4 +38,4 @@ public interface MavenReportRenderer
* Renderer a report.
*/
void render();
-}
\ No newline at end of file
+}