You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2021/12/12 23:53:10 UTC
[maven-reporting-api] branch MSHARED-844 updated (cf3a9f6 -> c45966d)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch MSHARED-844
in repository https://gitbox.apache.org/repos/asf/maven-reporting-api.git.
discard cf3a9f6 Add GitHub Actions setup
discard 665c476 [MSHARED-844] Upgraed Doxia API to 1.11.1
new c3e3dd5 Add GitHub Actions setup
new c45966d [MSHARED-844] Upgrade Doxia API to 1.11.1
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (cf3a9f6)
\
N -- N -- N refs/heads/MSHARED-844 (c45966d)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 16 ++++++++++++++++
.../org/apache/maven/reporting/MavenMultiPageReport.java | 7 +++++++
.../java/org/apache/maven/reporting/MavenReport.java | 8 ++++----
3 files changed, 27 insertions(+), 4 deletions(-)
[maven-reporting-api] 02/02: [MSHARED-844] Upgrade Doxia API to 1.11.1
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MSHARED-844
in repository https://gitbox.apache.org/repos/asf/maven-reporting-api.git
commit c45966d088dbd1b367ec48396f7bed2632cbc08c
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Mon Dec 13 00:24:38 2021 +0100
[MSHARED-844] Upgrade Doxia API to 1.11.1
---
pom.xml | 24 +++++++++++++++++++++-
.../maven/reporting/MavenMultiPageReport.java | 7 +++++++
.../org/apache/maven/reporting/MavenReport.java | 8 ++++----
3 files changed, 34 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3c647fc..d464fad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,11 +74,33 @@ under the License.
<project.build.outputTimestamp>2020-04-04T09:03:59Z</project.build.outputTimestamp>
</properties>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>3.3.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>3.1.2</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
<dependencies>
<dependency>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-sink-api</artifactId>
- <version>1.9.1</version>
+ <version>1.11.1</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>plexus-container-default</artifactId>
+ <groupId>org.codehaus.plexus</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
</project>
diff --git a/src/main/java/org/apache/maven/reporting/MavenMultiPageReport.java b/src/main/java/org/apache/maven/reporting/MavenMultiPageReport.java
index 0a4db97..4c8e6ec 100644
--- a/src/main/java/org/apache/maven/reporting/MavenMultiPageReport.java
+++ b/src/main/java/org/apache/maven/reporting/MavenMultiPageReport.java
@@ -36,6 +36,13 @@ import java.util.Locale;
public interface MavenMultiPageReport
extends MavenReport
{
+ /**
+ * Generate multi page report.
+ *
+ * @param sink The sink to write to.
+ * @param locale The locale to use.
+ * @throws MavenReportException if an error occurs.
+ */
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 72bea3c..0ca6086 100644
--- a/src/main/java/org/apache/maven/reporting/MavenReport.java
+++ b/src/main/java/org/apache/maven/reporting/MavenReport.java
@@ -102,16 +102,16 @@ public interface MavenReport
* An external report is a report which calls a third party program which generates some reports too.
* A good example is javadoc tool.
*
- * @return <tt>true</tt> if this report is external, <tt>false</tt> otherwise.
- * Default should be <tt>false</tt>.
+ * @return {@code true} if this report is external, {@code false} otherwise.
+ * Default should be {@code false}.
*/
boolean isExternalReport();
/**
* Verify some conditions before generate the report.
*
- * @return <tt>true</tt> if this report could be generated, <tt>false</tt> otherwise.
- * Default should be <tt>true</tt>.
+ * @return {@code true} if this report could be generated, {@code false} otherwise.
+ * Default should be {@code true}.
*/
boolean canGenerateReport();
}
[maven-reporting-api] 01/02: Add GitHub Actions setup
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MSHARED-844
in repository https://gitbox.apache.org/repos/asf/maven-reporting-api.git
commit c3e3dd556e996804d684c81f23fa3e74ab620bc7
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Mon Dec 13 00:25:53 2021 +0100
Add GitHub Actions setup
---
.github/dependabot.yml | 39 ++++++++++++++++++++++++++++++++++++++
.github/workflows/maven-verify.yml | 29 ++++++++++++++++++++++++++++
2 files changed, 68 insertions(+)
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000..eb730a8
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,39 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "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
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+version: 2
+updates:
+- package-ecosystem: maven
+ directory: "/"
+ schedule:
+ interval: daily
+ time: '04:00'
+ open-pull-requests-limit: 10
+ ignore:
+ # ignore Java 8+ dependencies
+ - dependency-name: org.mockito:mockito-core
+ versions:
+ - ">= 3.0"
+ - dependency-name: org.apache.commons:commons-lang3
+ versions:
+ - ">= 3.9"
+ - dependency-name: commons-io:commons-io
+ versions:
+ - ">= 2.7"
+ # Ignore Maven 3.2.1+
+ - dependency-name: org.apache.maven.plugin-testing:maven-plugin-testing-tools
+ versions:
+ - ">=3.2.0"
\ No newline at end of file
diff --git a/.github/workflows/maven-verify.yml b/.github/workflows/maven-verify.yml
new file mode 100644
index 0000000..7a38e97
--- /dev/null
+++ b/.github/workflows/maven-verify.yml
@@ -0,0 +1,29 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "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
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+name: Verify
+
+on:
+ push:
+ branches-ignore:
+ - dependabot/**
+ pull_request:
+
+jobs:
+ build:
+ name: Verify
+ uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v1