(maven-artifact-plugin) branch drop-deprecated updated (f6debaf -> d001d57)
This is an automated email from the ASF dual-hosted git repository. cstamas pushed a change to branch drop-deprecated in repository https://gitbox.apache.org/repos/asf/maven-artifact-plugin.git from f6debaf Drop deprecated classes add d001d57 Fix resolver util No new revisions were added by this update. Summary of changes: pgp-keys-map.list | 1 + pom.xml | 6 ++ 2 files changed, 7 insertions(+)
(maven-artifact-plugin) 01/01: Drop deprecated classes
This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a commit to branch drop-deprecated
in repository https://gitbox.apache.org/repos/asf/maven-artifact-plugin.git
commit f6debafbb9947915d9319ce3e20e95913260b393
Author: Tamas Cservenak
AuthorDate: Sat Mar 16 22:32:38 2024 +0100
Drop deprecated classes
---
.github/dependabot.yml | 30 +
.github/workflows/maven-verify.yml | 2 +-
pgp-keys-map.list | 13 +-
pom.xml| 41 +-
.../artifact/buildinfo/AbstractBuildinfoMojo.java | 21 ++-
.../artifact/buildinfo/BuildInfoWriter.java| 69 +-
.../plugins/artifact/buildinfo/BuildinfoMojo.java | 2 +-
.../artifact/buildinfo/CheckBuildPlanMojo.java | 33 +++--
.../plugins/artifact/buildinfo/CompareMojo.java| 45 +++
.../artifact/buildinfo/JdkToolchainUtil.java | 13 +-
.../artifact/buildinfo/ReferenceBuildinfoUtil.java | 141 ++---
src/site/apt/plugin-issues.apt | 48 +++
.../NotReproduciblePluginsDocumentationTest.java | 18 ++-
13 files changed, 262 insertions(+), 214 deletions(-)
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 000..95c2b1a
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,30 @@
+#
+# 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
+
+- package-ecosystem: "github-actions"
+ directory: "/"
+ schedule:
+interval: "daily"
diff --git a/.github/workflows/maven-verify.yml
b/.github/workflows/maven-verify.yml
index bbd7786..932827c 100644
--- a/.github/workflows/maven-verify.yml
+++ b/.github/workflows/maven-verify.yml
@@ -24,4 +24,4 @@ on:
jobs:
build:
name: Verify
-uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v2
+uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v4
diff --git a/pgp-keys-map.list b/pgp-keys-map.list
index 5e0a25e..f470899 100644
--- a/pgp-keys-map.list
+++ b/pgp-keys-map.list
@@ -15,15 +15,18 @@
# specific language governing permissions and limitations
# under the License.
-commons-codec:commons-codec = 0xBC87A3FD0A54480F0BADBEBD21939FF0CA2A6567
+com.github.luben:zstd-jni = 0x9AC5712CABE9635B65663AB0711C0A9A896FE336
+commons-codec:commons-codec = 0x2DB4F1EF0FA761ECC4EA935C86FDC7E2A11262CB
commons-io:commons-io = 0x2DB4F1EF0FA761ECC4EA935C86FDC7E2A11262CB
javax.inject:javax.inject = noSig
+junit:junit = 0xFF6E2C001948C5F2F38B0CC385911F425EC61B51
org.apache.maven.* = 0xB920D295BF0E61CB4CF0896C33CD6733AF5EC452
-org.apache.maven:maven-archiver = 0x29BEA2A645F2D6CED7FB12E02B172E3E156466E8
+org.apache.maven:maven-archiver = 0x84789D24DF77A32433CE1F079EB80E92EB2135B1
org.apache.maven.shared:maven-shared-utils =
0x84789D24DF77A32433CE1F079EB80E92EB2135B1
-org.codehaus.plexus:plexus-archiver =
0x29BEA2A645F2D6CED7FB12E02B172E3E156466E8
-org.codehaus.plexus:plexus-interpolation =
0x47063E8BA7A6450E4A52E7AE466CAED6E0747D50
-org.codehaus.plexus:plexus-io = 0xF254B35617DC255D9344BCFA873A8E86B4372146
+org.codehaus.plexus:plexus-archiver =
0x84789D24DF77A32433CE1F079EB80E92EB2135B1
+org.codehaus.plexus:plexus-interpolation =
0xF254B35617DC255D9344BCFA873A8E86B4372146
+org.codehaus.plexus:plexus-io = 0x09A808E1930F779CC6C54807E4C753D85335E876
org.codehaus.plexus:plexus-utils = 0xEA23DB1360D9029481E7F2EFECDFEA3CB4493B94
org.codehaus.plexus:plexus-xml = 0xFA77DCFEF2EE6EB2DEBEDD2C012579464D01C06A
+org.hamcrest = 0xE3A9F95079E84CE201F7CF60BEDE11EAF1164480
org.slf4j:slf4j-api = 0x475F3B8E59E6E63AA78067482C7B12F2A511E325
diff --git a/pom.xml b/pom.xml
index 1637163..65b670d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,7 @@
Plugin to manage artifacts tasks
-${mavenVersion}
+3.2.5
@@ -60,7 +60,8 @@
-3.2.5
+3.9.6
+1.9.18
8
2023-09-29T05:51:46Z
@@ -91,9 +92,9 @@
provided
- org.eclipse.aether
- aether-api
- 1.0.0.v20140518
+
(maven-artifact-plugin) branch drop-deprecated created (now f6debaf)
This is an automated email from the ASF dual-hosted git repository. cstamas pushed a change to branch drop-deprecated in repository https://gitbox.apache.org/repos/asf/maven-artifact-plugin.git at f6debaf Drop deprecated classes This branch includes the following new commits: new f6debaf Drop deprecated classes The 1 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.
(maven-artifact-plugin) 01/01: [MNG-8077] tolerate injected timestamp value
This is an automated email from the ASF dual-hosted git repository.
rmannibucau pushed a commit to branch MNG-8077
in repository https://gitbox.apache.org/repos/asf/maven-artifact-plugin.git
commit 7f4ba17e0cd16699500ca0da7802df2903d9cfab
Author: Romain Manni-Bucau
AuthorDate: Sat Mar 16 19:44:32 2024 +0100
[MNG-8077] tolerate injected timestamp value
---
pgp-keys-map.list | 8 +++
pom.xml| 6 +++
.../artifact/buildinfo/AbstractBuildinfoMojo.java | 15 --
.../buildinfo/AbstractBuildinfoMojoTest.java | 63 ++
4 files changed, 89 insertions(+), 3 deletions(-)
diff --git a/pgp-keys-map.list b/pgp-keys-map.list
index 5e0a25e..845c71a 100644
--- a/pgp-keys-map.list
+++ b/pgp-keys-map.list
@@ -21,9 +21,17 @@ javax.inject:javax.inject = noSig
org.apache.maven.* = 0xB920D295BF0E61CB4CF0896C33CD6733AF5EC452
org.apache.maven:maven-archiver = 0x29BEA2A645F2D6CED7FB12E02B172E3E156466E8
org.apache.maven.shared:maven-shared-utils =
0x84789D24DF77A32433CE1F079EB80E92EB2135B1
+org.apiguardian:apiguardian-api:1.1.2 =
0xFF6E2C001948C5F2F38B0CC385911F425EC61B51
org.codehaus.plexus:plexus-archiver =
0x29BEA2A645F2D6CED7FB12E02B172E3E156466E8
org.codehaus.plexus:plexus-interpolation =
0x47063E8BA7A6450E4A52E7AE466CAED6E0747D50
org.codehaus.plexus:plexus-io = 0xF254B35617DC255D9344BCFA873A8E86B4372146
org.codehaus.plexus:plexus-utils = 0xEA23DB1360D9029481E7F2EFECDFEA3CB4493B94
org.codehaus.plexus:plexus-xml = 0xFA77DCFEF2EE6EB2DEBEDD2C012579464D01C06A
+org.junit.jupiter:junit-jupiter:5.10.2 =
0xFF6E2C001948C5F2F38B0CC385911F425EC61B51
+org.junit.jupiter:junit-jupiter-api:5.10.2 =
0xFF6E2C001948C5F2F38B0CC385911F425EC61B51
+org.junit.jupiter:junit-jupiter-engine:5.10.2 =
0xFF6E2C001948C5F2F38B0CC385911F425EC61B51
+org.junit.jupiter:junit-jupiter-params:5.10.2 =
0xFF6E2C001948C5F2F38B0CC385911F425EC61B51
+org.junit.platform:junit-platform-commons:1.10.2 =
0xFF6E2C001948C5F2F38B0CC385911F425EC61B51
+org.junit.platform:junit-platform-engine:1.10.2 =
0xFF6E2C001948C5F2F38B0CC385911F425EC61B51
+org.opentest4j:opentest4j:1.3.0 = 0xFF6E2C001948C5F2F38B0CC385911F425EC61B51
org.slf4j:slf4j-api = 0x475F3B8E59E6E63AA78067482C7B12F2A511E325
diff --git a/pom.xml b/pom.xml
index 1637163..6c69006 100644
--- a/pom.xml
+++ b/pom.xml
@@ -135,6 +135,12 @@
maven-plugin-annotations
provided
+
+ org.junit.jupiter
+ junit-jupiter
+ 5.10.2
+ test
+
diff --git
a/src/main/java/org/apache/maven/plugins/artifact/buildinfo/AbstractBuildinfoMojo.java
b/src/main/java/org/apache/maven/plugins/artifact/buildinfo/AbstractBuildinfoMojo.java
index 2c0b632..69fa250 100644
---
a/src/main/java/org/apache/maven/plugins/artifact/buildinfo/AbstractBuildinfoMojo.java
+++
b/src/main/java/org/apache/maven/plugins/artifact/buildinfo/AbstractBuildinfoMojo.java
@@ -166,9 +166,18 @@ public abstract class AbstractBuildinfoMojo extends
AbstractMojo {
MavenArchiver archiver = new MavenArchiver();
Date timestamp = archiver.parseOutputTimestamp(outputTimestamp);
if (timestamp == null) {
-log.error("Reproducible Build not activated by
project.build.outputTimestamp property: "
-+ "see
https://maven.apache.org/guides/mini/guide-reproducible-builds.html;);
-return true;
+// try to resolve it at runtime - injected from a property
+String injected =
project.getProperties().getProperty("project.build.outputTimestamp");
+if (injected != null) {
+log.info("project.build.outputTimestamp is injected by the
build");
+} else {
+log.error("Reproducible Build not activated by
project.build.outputTimestamp property: "
++ "see
https://maven.apache.org/guides/mini/guide-reproducible-builds.html, "
++ "ex: "
++ new
SimpleDateFormat("-MM-dd'T'HH:mm:ssXXX").format(new Date())
++ "");
+return true;
+}
}
if (log.isDebugEnabled()) {
diff --git
a/src/test/java/org/apache/maven/plugins/artifact/buildinfo/AbstractBuildinfoMojoTest.java
b/src/test/java/org/apache/maven/plugins/artifact/buildinfo/AbstractBuildinfoMojoTest.java
new file mode 100644
index 000..349e12e
--- /dev/null
+++
b/src/test/java/org/apache/maven/plugins/artifact/buildinfo/AbstractBuildinfoMojoTest.java
@@ -0,0 +1,63 @@
+/*
+ * 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
(maven-artifact-plugin) branch MNG-8077 created (now 7f4ba17)
This is an automated email from the ASF dual-hosted git repository. rmannibucau pushed a change to branch MNG-8077 in repository https://gitbox.apache.org/repos/asf/maven-artifact-plugin.git at 7f4ba17 [MNG-8077] tolerate injected timestamp value This branch includes the following new commits: new 7f4ba17 [MNG-8077] tolerate injected timestamp value The 1 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.
(maven) branch master updated: [MNG-4840] document requiredMavenVersion in plugin descriptor
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/master by this push:
new 740dae43ca [MNG-4840] document requiredMavenVersion in plugin
descriptor
740dae43ca is described below
commit 740dae43ca3ccf7692f37edf3184387e5666ca6b
Author: Hervé Boutemy
AuthorDate: Sat Mar 16 16:02:49 2024 +0100
[MNG-4840] document requiredMavenVersion in plugin descriptor
---
api/maven-api-plugin/src/main/mdo/plugin.mdo| 12 +---
.../apache/maven/plugin/descriptor/PluginDescriptor.java| 13 +
2 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/api/maven-api-plugin/src/main/mdo/plugin.mdo
b/api/maven-api-plugin/src/main/mdo/plugin.mdo
index 30933a497f..74e94165c0 100644
--- a/api/maven-api-plugin/src/main/mdo/plugin.mdo
+++ b/api/maven-api-plugin/src/main/mdo/plugin.mdo
@@ -89,13 +89,19 @@ under the License.
requiredJavaVersion
1.1.0+
- A version range which specifies the supported Java
versions. A version range can either use the usual mathematical syntax
"[2.0.10,2.1.0),[3.0,)" or use a single version "2.2.1". The latter is a short
form for "[2.2.1,)", i.e. denotes the minimum version required.
+
+A version range which specifies the supported Java versions. A
version range can either use the usual mathematical syntax
"[2.0.10,2.1.0),[3.0,)" or use a single version "2.2.1". The latter is a short
form for "[2.2.1,)", i.e. denotes the minimum version required.
+@since Maven 4.0.0-alpha-3
+
String
requiredMavenVersion
- 1.1.0+
- A version range which specifies the supported Maven
versions. A version range can either use the usual mathematical syntax
"[2.0.10,2.1.0),[3.0,)" or use a single version "2.2.1". The latter is a short
form for "[2.2.1,)", i.e. denotes the minimum version required. This value
takes precedence over the POMs Maven prerequisite.
+ 1.0.0+
+
+A version range which specifies the supported Maven versions. A
version range can either use the usual mathematical syntax
"[2.0.10,2.1.0),[3.0,)" or use a single version "2.2.1". The latter is a short
form for "[2.2.1,)", i.e. denotes the minimum version required. This value
takes precedence over the POMs Maven prerequisite.
+@since Maven 3.0.2
+
String
diff --git
a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java
b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java
index b806830879..1f041cb851 100644
---
a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java
+++
b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java
@@ -81,6 +81,7 @@ public class PluginDescriptor extends ComponentSetDescriptor
implements Cloneabl
private String description;
+// MNG-4840
private String requiredMavenVersion;
private String requiredJavaVersion;
@@ -367,10 +368,22 @@ public class PluginDescriptor extends
ComponentSetDescriptor implements Cloneabl
return description;
}
+/**
+ * Set required Maven version.
+ *
+ * @param requiredMavenVersion Maven version required by the plugin
+ * @since 3.0.2
+ */
public void setRequiredMavenVersion(String requiredMavenVersion) {
this.requiredMavenVersion = requiredMavenVersion;
}
+/**
+ * Get required Maven version.
+ *
+ * @return the Maven version required by the plugin
+ * @since 3.0.2
+ */
public String getRequiredMavenVersion() {
return requiredMavenVersion;
}
(maven) branch MNG-4840-documentation-4 deleted (was 5370e2dab5)
This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a change to branch MNG-4840-documentation-4 in repository https://gitbox.apache.org/repos/asf/maven.git was 5370e2dab5 [MNG-4840] document requiredMavenVersion in plugin descriptor The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(maven) branch MNG-4840-documentation-4 created (now 5370e2dab5)
This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a change to branch MNG-4840-documentation-4 in repository https://gitbox.apache.org/repos/asf/maven.git at 5370e2dab5 [MNG-4840] document requiredMavenVersion in plugin descriptor This branch includes the following new commits: new 5370e2dab5 [MNG-4840] document requiredMavenVersion in plugin descriptor The 1 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.
(maven) 01/01: [MNG-4840] document requiredMavenVersion in plugin descriptor
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch MNG-4840-documentation-4
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 5370e2dab5f1231b81487805a228005fe6ef0709
Author: Hervé Boutemy
AuthorDate: Sat Mar 16 16:02:49 2024 +0100
[MNG-4840] document requiredMavenVersion in plugin descriptor
---
api/maven-api-plugin/src/main/mdo/plugin.mdo| 12 +---
.../apache/maven/plugin/descriptor/PluginDescriptor.java| 13 +
2 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/api/maven-api-plugin/src/main/mdo/plugin.mdo
b/api/maven-api-plugin/src/main/mdo/plugin.mdo
index 30933a497f..74e94165c0 100644
--- a/api/maven-api-plugin/src/main/mdo/plugin.mdo
+++ b/api/maven-api-plugin/src/main/mdo/plugin.mdo
@@ -89,13 +89,19 @@ under the License.
requiredJavaVersion
1.1.0+
- A version range which specifies the supported Java
versions. A version range can either use the usual mathematical syntax
"[2.0.10,2.1.0),[3.0,)" or use a single version "2.2.1". The latter is a short
form for "[2.2.1,)", i.e. denotes the minimum version required.
+
+A version range which specifies the supported Java versions. A
version range can either use the usual mathematical syntax
"[2.0.10,2.1.0),[3.0,)" or use a single version "2.2.1". The latter is a short
form for "[2.2.1,)", i.e. denotes the minimum version required.
+@since Maven 4.0.0-alpha-3
+
String
requiredMavenVersion
- 1.1.0+
- A version range which specifies the supported Maven
versions. A version range can either use the usual mathematical syntax
"[2.0.10,2.1.0),[3.0,)" or use a single version "2.2.1". The latter is a short
form for "[2.2.1,)", i.e. denotes the minimum version required. This value
takes precedence over the POMs Maven prerequisite.
+ 1.0.0+
+
+A version range which specifies the supported Maven versions. A
version range can either use the usual mathematical syntax
"[2.0.10,2.1.0),[3.0,)" or use a single version "2.2.1". The latter is a short
form for "[2.2.1,)", i.e. denotes the minimum version required. This value
takes precedence over the POMs Maven prerequisite.
+@since Maven 3.0.2
+
String
diff --git
a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java
b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java
index b806830879..1f041cb851 100644
---
a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java
+++
b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java
@@ -81,6 +81,7 @@ public class PluginDescriptor extends ComponentSetDescriptor
implements Cloneabl
private String description;
+// MNG-4840
private String requiredMavenVersion;
private String requiredJavaVersion;
@@ -367,10 +368,22 @@ public class PluginDescriptor extends
ComponentSetDescriptor implements Cloneabl
return description;
}
+/**
+ * Set required Maven version.
+ *
+ * @param requiredMavenVersion Maven version required by the plugin
+ * @since 3.0.2
+ */
public void setRequiredMavenVersion(String requiredMavenVersion) {
this.requiredMavenVersion = requiredMavenVersion;
}
+/**
+ * Get required Maven version.
+ *
+ * @return the Maven version required by the plugin
+ * @since 3.0.2
+ */
public String getRequiredMavenVersion() {
return requiredMavenVersion;
}
(maven-invoker-plugin) branch MINVOKER-352 deleted (was 84b2692)
This is an automated email from the ASF dual-hosted git repository. sjaranowski pushed a change to branch MINVOKER-352 in repository https://gitbox.apache.org/repos/asf/maven-invoker-plugin.git was 84b2692 [MINVOKER-352] - Remove usage commons-lang3 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(maven-invoker-plugin) branch dependabot/github_actions/apache/maven-gh-actions-shared-4 deleted (was a706b91)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/github_actions/apache/maven-gh-actions-shared-4 in repository https://gitbox.apache.org/repos/asf/maven-invoker-plugin.git was a706b91 Bump apache/maven-gh-actions-shared from 3 to 4 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(maven-invoker-plugin) branch master updated: Bump apache/maven-gh-actions-shared from 3 to 4
This is an automated email from the ASF dual-hosted git repository. sjaranowski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-invoker-plugin.git The following commit(s) were added to refs/heads/master by this push: new 6dc88b6 Bump apache/maven-gh-actions-shared from 3 to 4 6dc88b6 is described below commit 6dc88b62b7776cc29a5998dcff9d8dfe39a40fa2 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Mon Mar 4 13:09:09 2024 + Bump apache/maven-gh-actions-shared from 3 to 4 Bumps [apache/maven-gh-actions-shared](https://github.com/apache/maven-gh-actions-shared) from 3 to 4. - [Commits](https://github.com/apache/maven-gh-actions-shared/compare/v3...v4) --- updated-dependencies: - dependency-name: apache/maven-gh-actions-shared dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/maven-verify.yml| 2 +- .github/workflows/release-drafter.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven-verify.yml b/.github/workflows/maven-verify.yml index 9811acb..f213d07 100644 --- a/.github/workflows/maven-verify.yml +++ b/.github/workflows/maven-verify.yml @@ -24,6 +24,6 @@ on: jobs: build: name: Verify -uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v3 +uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v4 with: verify-fail-fast: false diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml index b44872c..1049eaa 100644 --- a/.github/workflows/release-drafter.yml +++ b/.github/workflows/release-drafter.yml @@ -22,4 +22,4 @@ on: - master jobs: update_release_draft: - uses: apache/maven-gh-actions-shared/.github/workflows/release-drafter.yml@v3 + uses: apache/maven-gh-actions-shared/.github/workflows/release-drafter.yml@v4
(maven) branch MNG-4840-documentation deleted (was 321653b4d7)
This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a change to branch MNG-4840-documentation in repository https://gitbox.apache.org/repos/asf/maven.git was 321653b4d7 [MNG-4840] document requiredMavenVersion in plugin descriptor The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(maven) branch maven-3.9.x updated: [MNG-4840] document requiredMavenVersion in plugin descriptor
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch maven-3.9.x
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/maven-3.9.x by this push:
new a137cc67bd [MNG-4840] document requiredMavenVersion in plugin
descriptor
a137cc67bd is described below
commit a137cc67bdc28409c4b9b25eb2aed06f1e070122
Author: Hervé Boutemy
AuthorDate: Sat Mar 16 16:02:49 2024 +0100
[MNG-4840] document requiredMavenVersion in plugin descriptor
---
.../apache/maven/plugin/descriptor/PluginDescriptor.java| 13 +
maven-plugin-api/src/main/mdo/plugin.mdo| 9 +
2 files changed, 22 insertions(+)
diff --git
a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java
b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java
index e4f5cc4935..85e289bfb5 100644
---
a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java
+++
b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java
@@ -77,6 +77,7 @@ public class PluginDescriptor extends ComponentSetDescriptor
implements Cloneabl
private String description;
+// MNG-4840
private String requiredMavenVersion;
private Plugin plugin;
@@ -295,10 +296,22 @@ public class PluginDescriptor extends
ComponentSetDescriptor implements Cloneabl
return description;
}
+/**
+ * Set required Maven version.
+ *
+ * @param requiredMavenVersion Maven version required by the plugin
+ * @since 3.0.2
+ */
public void setRequiredMavenVersion(String requiredMavenVersion) {
this.requiredMavenVersion = requiredMavenVersion;
}
+/**
+ * Get required Maven version.
+ *
+ * @return the Maven version required by the plugin
+ * @since 3.0.2
+ */
public String getRequiredMavenVersion() {
return requiredMavenVersion;
}
diff --git a/maven-plugin-api/src/main/mdo/plugin.mdo
b/maven-plugin-api/src/main/mdo/plugin.mdo
index 5232e6a4ae..4ccc632b3d 100644
--- a/maven-plugin-api/src/main/mdo/plugin.mdo
+++ b/maven-plugin-api/src/main/mdo/plugin.mdo
@@ -92,6 +92,15 @@ under the License.
boolean
true
+
+ requiredMavenVersion
+ 1.0.0
+
+Minimum Maven version required to use the plugin.
+@since Maven 3.0.2
+
+ String
+
mojos
1.0.0
(maven) 01/01: [MNG-4840] document requiredMavenVersion in plugin descriptor
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch MNG-4840-documentation
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 321653b4d7134a8d5125c37f82ec0cea85d0c849
Author: Hervé Boutemy
AuthorDate: Sat Mar 16 16:02:49 2024 +0100
[MNG-4840] document requiredMavenVersion in plugin descriptor
---
.../apache/maven/plugin/descriptor/PluginDescriptor.java| 13 +
maven-plugin-api/src/main/mdo/plugin.mdo| 9 +
2 files changed, 22 insertions(+)
diff --git
a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java
b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java
index e4f5cc4935..85e289bfb5 100644
---
a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java
+++
b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java
@@ -77,6 +77,7 @@ public class PluginDescriptor extends ComponentSetDescriptor
implements Cloneabl
private String description;
+// MNG-4840
private String requiredMavenVersion;
private Plugin plugin;
@@ -295,10 +296,22 @@ public class PluginDescriptor extends
ComponentSetDescriptor implements Cloneabl
return description;
}
+/**
+ * Set required Maven version.
+ *
+ * @param requiredMavenVersion Maven version required by the plugin
+ * @since 3.0.2
+ */
public void setRequiredMavenVersion(String requiredMavenVersion) {
this.requiredMavenVersion = requiredMavenVersion;
}
+/**
+ * Get required Maven version.
+ *
+ * @return the Maven version required by the plugin
+ * @since 3.0.2
+ */
public String getRequiredMavenVersion() {
return requiredMavenVersion;
}
diff --git a/maven-plugin-api/src/main/mdo/plugin.mdo
b/maven-plugin-api/src/main/mdo/plugin.mdo
index 5232e6a4ae..4ccc632b3d 100644
--- a/maven-plugin-api/src/main/mdo/plugin.mdo
+++ b/maven-plugin-api/src/main/mdo/plugin.mdo
@@ -92,6 +92,15 @@ under the License.
boolean
true
+
+ requiredMavenVersion
+ 1.0.0
+
+Minimum Maven version required to use the plugin.
+@since Maven 3.0.2
+
+ String
+
mojos
1.0.0
(maven) branch MNG-4840-documentation created (now 321653b4d7)
This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a change to branch MNG-4840-documentation in repository https://gitbox.apache.org/repos/asf/maven.git at 321653b4d7 [MNG-4840] document requiredMavenVersion in plugin descriptor This branch includes the following new commits: new 321653b4d7 [MNG-4840] document requiredMavenVersion in plugin descriptor The 1 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.
(maven-plugin-tools) 01/02: [MPLUGIN-511] prepare method to list releases history
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git
commit d9f8d8941d6996ad39b6f4c427f8e126c1176154
Author: Tamas Cservenak
AuthorDate: Mon Mar 4 17:40:59 2024 +0100
[MPLUGIN-511] prepare method to list releases history
---
.../maven/plugin/plugin/report/PluginReport.java | 53 ++
1 file changed, 53 insertions(+)
diff --git
a/maven-plugin-report-plugin/src/main/java/org/apache/maven/plugin/plugin/report/PluginReport.java
b/maven-plugin-report-plugin/src/main/java/org/apache/maven/plugin/plugin/report/PluginReport.java
index 954363c5..3c47a3cf 100644
---
a/maven-plugin-report-plugin/src/main/java/org/apache/maven/plugin/plugin/report/PluginReport.java
+++
b/maven-plugin-report-plugin/src/main/java/org/apache/maven/plugin/plugin/report/PluginReport.java
@@ -26,7 +26,10 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
+import org.apache.maven.RepositoryUtils;
import org.apache.maven.doxia.sink.Sink;
+import org.apache.maven.execution.MavenSession;
+import org.apache.maven.model.building.ModelBuildingRequest;
import org.apache.maven.plugin.descriptor.MojoDescriptor;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.apache.maven.plugin.descriptor.PluginDescriptorBuilder;
@@ -36,12 +39,24 @@ import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import
org.apache.maven.plugins.plugin.descriptor.EnhancedPluginDescriptorBuilder;
+import org.apache.maven.project.DefaultProjectBuildingRequest;
+import org.apache.maven.project.MavenProject;
+import org.apache.maven.project.ProjectBuilder;
+import org.apache.maven.project.ProjectBuildingException;
+import org.apache.maven.project.ProjectBuildingRequest;
+import org.apache.maven.project.ProjectBuildingResult;
import org.apache.maven.reporting.AbstractMavenReport;
import org.apache.maven.reporting.MavenReportException;
import org.apache.maven.rtinfo.RuntimeInformation;
import org.codehaus.plexus.configuration.PlexusConfigurationException;
import org.codehaus.plexus.i18n.I18N;
import org.codehaus.plexus.util.xml.XmlStreamReader;
+import org.eclipse.aether.RepositorySystem;
+import org.eclipse.aether.artifact.DefaultArtifact;
+import org.eclipse.aether.resolution.VersionRangeRequest;
+import org.eclipse.aether.resolution.VersionRangeResolutionException;
+import org.eclipse.aether.resolution.VersionRangeResult;
+import org.eclipse.aether.version.Version;
/**
* Generates the Plugin's documentation report: plugin-info.html
plugin overview page,
@@ -123,6 +138,15 @@ public class PluginReport extends AbstractMavenReport {
@Parameter(property =
"maven.plugin.report.disableInternalJavadocLinkValidation")
private boolean disableInternalJavadocLinkValidation;
+@Component
+private MavenSession mavenSession;
+
+@Component
+private RepositorySystem repositorySystem;
+
+@Component
+private ProjectBuilder projectBuilder;
+
/**
* {@inheritDoc}
*/
@@ -232,4 +256,33 @@ public class PluginReport extends AbstractMavenReport {
}
}
}
+
+private List discoverVersions() throws
VersionRangeResolutionException {
+MavenProject currentProject = mavenSession.getCurrentProject();
+VersionRangeRequest rangeRequest = new VersionRangeRequest();
+rangeRequest.setArtifact(
+new DefaultArtifact(currentProject.getGroupId() + ":" +
currentProject.getArtifactId() + ":[0,)"));
+rangeRequest.setRepositories(
+
RepositoryUtils.toRepos(mavenSession.getCurrentProject().getRemoteArtifactRepositories()));
+VersionRangeResult rangeResult =
+
repositorySystem.resolveVersionRange(mavenSession.getRepositorySession(),
rangeRequest);
+return rangeResult.getVersions();
+}
+
+private ProjectBuildingResult buildMavenProject(String version) throws
ProjectBuildingException {
+MavenProject currentProject = mavenSession.getCurrentProject();
+ProjectBuildingRequest buildRequest = new
DefaultProjectBuildingRequest();
+buildRequest.setLocalRepository(mavenSession.getLocalRepository());
+
buildRequest.setRemoteRepositories(mavenSession.getCurrentProject().getRemoteArtifactRepositories());
+
buildRequest.setValidationLevel(ModelBuildingRequest.VALIDATION_LEVEL_MINIMAL);
+buildRequest.setProcessPlugins(false);
+
buildRequest.setRepositoryMerging(ProjectBuildingRequest.RepositoryMerging.REQUEST_DOMINANT);
+buildRequest.setSystemProperties(mavenSession.getSystemProperties());
+buildRequest.setUserProperties(mavenSession.getUserProperties());
+buildRequest.setRepositorySession(mavenSession.getRepositorySession());
+
(maven-plugin-tools) branch MPLUGIN-511-2 deleted (was 983e7ebf)
This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a change to branch MPLUGIN-511-2 in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git was 983e7ebf [MPLUGIN-511] add versions history requirements detection The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(maven-plugin-tools) 02/02: [MPLUGIN-511] add versions history requirements detection
This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git commit cd747611b768031b57fda87bb8e19845d2dc69fa Author: Hervé Boutemy AuthorDate: Wed Mar 6 02:18:47 2024 +0100 [MPLUGIN-511] add versions history requirements detection --- .../src/it/plugin-info-jdk/verify.groovy | 2 +- .../invoker.properties | 18 + .../pom.xml| 90 ++ .../src/main/java/org/MyMojo.java | 65 .../verify.groovy | 14 ++-- .../maven/plugin/plugin/report/PluginReport.java | 56 +++--- .../plugin/plugin/report/RequirementsHistory.java | 49 +++- 7 files changed, 258 insertions(+), 36 deletions(-) diff --git a/maven-plugin-report-plugin/src/it/plugin-info-jdk/verify.groovy b/maven-plugin-report-plugin/src/it/plugin-info-jdk/verify.groovy index 5afea34b..9520fec9 100644 --- a/maven-plugin-report-plugin/src/it/plugin-info-jdk/verify.groovy +++ b/maven-plugin-report-plugin/src/it/plugin-info-jdk/verify.groovy @@ -20,6 +20,6 @@ assert new File( basedir, 'property/target/site/plugin-info.html' ).text.contains( '1.3' ) assert new File( basedir, 'propertyRelease/target/site/plugin-info.html' ).text.contains( '8' ) assert new File( basedir, 'pluginManagement/target/site/plugin-info.html' ).text.contains( '1.4' ) -assert new File( basedir, 'plugin/target/site/plugin-info.html' ).text.contains( '1.5' ) +assert new File( basedir, 'plugin/target/site/plugin-info.html' ).text.contains( '5' ) return true; diff --git a/maven-plugin-report-plugin/src/it/plugin-report-detect-requirements-history/invoker.properties b/maven-plugin-report-plugin/src/it/plugin-report-detect-requirements-history/invoker.properties new file mode 100644 index ..a3d335ef --- /dev/null +++ b/maven-plugin-report-plugin/src/it/plugin-report-detect-requirements-history/invoker.properties @@ -0,0 +1,18 @@ +# 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. + +invoker.goals = site diff --git a/maven-plugin-report-plugin/src/it/plugin-report-detect-requirements-history/pom.xml b/maven-plugin-report-plugin/src/it/plugin-report-detect-requirements-history/pom.xml new file mode 100644 index ..a032447e --- /dev/null +++ b/maven-plugin-report-plugin/src/it/plugin-report-detect-requirements-history/pom.xml @@ -0,0 +1,90 @@ + + + + +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;> + 4.0.0 + + org.apache.maven.plugins + maven-plugin-report-plugin + 1.0-SNAPSHOT + maven-plugin + + MPLUGIN-511 + +Test discovery of plugin requirements history. + + + +UTF-8 + + + + + org.apache.maven + maven-plugin-api + @mavenVersion@ + provided + + + org.apache.maven.plugin-tools + maven-plugin-annotations + @project.version@ + provided + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + @compilerPluginVersion@ + + + org.apache.maven.plugins + maven-site-plugin + @sitePluginVersion@ + + + org.apache.maven.plugins + maven-plugin-plugin + @project.version@ + +prefix + + + + + + + +true + + +org.apache.maven.plugins +maven-plugin-report-plugin +@project.version@ + + + + diff --git a/maven-plugin-report-plugin/src/it/plugin-report-detect-requirements-history/src/main/java/org/MyMojo.java b/maven-plugin-report-plugin/src/it/plugin-report-detect-requirements-history/src/main/java/org/MyMojo.java new file mode 100644 index ..d2f2e77f --- /dev/null +++ b/maven-plugin-report-plugin/src/it/plugin-report-detect-requirements-history/src/main/java/org/MyMojo.java @@ -0,0 +1,65 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under
(maven-plugin-tools) branch master updated (bf0587c5 -> cd747611)
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git
from bf0587c5 fix build (#266)
new d9f8d894 [MPLUGIN-511] prepare method to list releases history
new cd747611 [MPLUGIN-511] add versions history requirements detection
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:
.../src/it/plugin-info-jdk/verify.groovy | 2 +-
.../invoker.properties | 0
.../pom.xml| 181 ++---
.../src/main/java/org/MyMojo.java | 0
.../verify.groovy | 11 +-
.../maven/plugin/plugin/report/PluginReport.java | 91 +++
.../plugin/plugin/report/RequirementsHistory.java | 49 +++---
7 files changed, 215 insertions(+), 119 deletions(-)
copy maven-plugin-report-plugin/src/it/{plugin-report-requirements-history =>
plugin-report-detect-requirements-history}/invoker.properties (100%)
copy maven-plugin-report-plugin/src/it/{mplugin-319_report-since =>
plugin-report-detect-requirements-history}/pom.xml (81%)
copy maven-plugin-report-plugin/src/it/{plugin-report-annotations =>
plugin-report-detect-requirements-history}/src/main/java/org/MyMojo.java (100%)
copy maven-plugin-report-plugin/src/it/{plugin-report-requirements-history =>
plugin-report-detect-requirements-history}/verify.groovy (79%)
(maven-plugin-tools) branch MPLUGIN-511-2 updated (4607b856 -> 983e7ebf)
This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a change to branch MPLUGIN-511-2 in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git omit 4607b856 [MPLUGIN-511] improvements based on feedback omit 58648cfa [MPLUGIN-511] add versions history requirements detection add 983e7ebf [MPLUGIN-511] add versions history requirements detection 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 (4607b856) \ N -- N -- N refs/heads/MPLUGIN-511-2 (983e7ebf) 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. No new revisions were added by this update. Summary of changes:
(maven-doxia) branch feature/simplify-verbatim-xhtml-markup deleted (was 06217613)
This is an automated email from the ASF dual-hosted git repository. kwin pushed a change to branch feature/simplify-verbatim-xhtml-markup in repository https://gitbox.apache.org/repos/asf/maven-doxia.git was 06217613 clarify comment The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(maven-doxia) branch master updated: [DOXIA-731] Simplify HTML markup emitted from Sink.verbatim (#202)
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-doxia.git
The following commit(s) were added to refs/heads/master by this push:
new 356a0fe6 [DOXIA-731] Simplify HTML markup emitted from Sink.verbatim
(#202)
356a0fe6 is described below
commit 356a0fe63fe6789f001518455514e513c1a40647
Author: Konrad Windszus
AuthorDate: Sat Mar 16 12:33:33 2024 +0100
[DOXIA-731] Simplify HTML markup emitted from Sink.verbatim (#202)
Emit either or .
Add parser tests for verbatim text/code (for all parsers)
---
.../maven/doxia/sink/impl/Xhtml5BaseSink.java | 82 +++--
.../maven/doxia/parser/AbstractParserTest.java | 127 -
.../maven/doxia/parser/Xhtml5BaseParserTest.java | 12 +-
.../maven/doxia/sink/impl/SinkTestDocument.java| 8 +-
.../maven/doxia/sink/impl/Xhtml5BaseSinkTest.java | 15 ++-
.../maven/doxia/module/apt/AptParserTest.java | 25 +++-
.../maven/doxia/module/fml/FmlParserTest.java | 63 +-
.../doxia/module/markdown/MarkdownParserTest.java | 36 +-
.../apache/maven/doxia/module/xdoc/XdocSink.java | 21 ++--
.../maven/doxia/module/xdoc/XdocParserTest.java| 14 ++-
.../doxia/module/xhtml5/Xhtml5ParserTest.java | 14 ++-
.../maven/doxia/module/xhtml5/Xhtml5SinkTest.java | 2 +-
12 files changed, 344 insertions(+), 75 deletions(-)
diff --git
a/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/Xhtml5BaseSink.java
b/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/Xhtml5BaseSink.java
index cdb7d7b8..bbe3107e 100644
---
a/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/Xhtml5BaseSink.java
+++
b/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/Xhtml5BaseSink.java
@@ -40,6 +40,7 @@ import org.apache.maven.doxia.markup.HtmlMarkup;
import org.apache.maven.doxia.markup.Markup;
import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.doxia.sink.SinkEventAttributes;
+import org.apache.maven.doxia.sink.impl.Xhtml5BaseSink.VerbatimMode;
import org.apache.maven.doxia.util.DoxiaUtils;
import org.apache.maven.doxia.util.HtmlTools;
import org.codehaus.plexus.util.xml.PrettyPrintXMLWriter;
@@ -77,8 +78,16 @@ public class Xhtml5BaseSink extends AbstractXmlSink
implements HtmlMarkup {
/** An indication on if we're inside a paragraph flag. */
private boolean paragraphFlag;
-/** An indication on if we're in verbatim mode. */
-private boolean verbatimFlag;
+protected enum VerbatimMode {
+/** not in verbatim mode */
+OFF,
+/** Inside {@code } */
+ON,
+/** Inside {@code } */
+ON_WITH_CODE
+}
+/** An indication on if we're in verbatim mode and if so, surrounded by
which tags. */
+private VerbatimMode verbatimMode;
/** Stack of alignment int[] of table cells. */
private final LinkedList cellJustifStack;
@@ -160,21 +169,28 @@ public class Xhtml5BaseSink extends AbstractXmlSink
implements HtmlMarkup {
}
/**
- * Setter for the field verbatimFlag.
*
- * @param verb a verbatim flag.
+ * @return the current verbatim mode.
+ */
+protected VerbatimMode getVerbatimMode() {
+return this.verbatimMode;
+}
+
+/**
+ * Setter for the field verbatimMode.
+ *
+ * @param mode a verbatim mode.
*/
-protected void setVerbatimFlag(boolean verb) {
-this.verbatimFlag = verb;
+protected void setVerbatimMode(VerbatimMode mode) {
+this.verbatimMode = mode;
}
/**
- * isVerbatimFlag.
*
- * @return the current verbatim flag.
+ * @return {@code true} if inside verbatim section, {@code false} otherwise
*/
-protected boolean isVerbatimFlag() {
-return this.verbatimFlag;
+protected boolean isVerbatim() {
+return this.verbatimMode != VerbatimMode.OFF;
}
/**
@@ -232,7 +248,7 @@ public class Xhtml5BaseSink extends AbstractXmlSink
implements HtmlMarkup {
this.headFlag = false;
this.paragraphFlag = false;
-this.verbatimFlag = false;
+this.verbatimMode = VerbatimMode.OFF;
this.evenTableRow = true;
this.tableAttributes = null;
@@ -825,11 +841,13 @@ public class Xhtml5BaseSink extends AbstractXmlSink
implements HtmlMarkup {
}
/**
- * The default class style is verbatim, for source is {@code
verbatim source}.
+ * Depending on whether the decoration attribute is "source" or not, this
leads
+ * to either emitting {@code } or just {@code }.
+ * No default classes are emitted but the given attributes are always
added to the {@code pre} element only.
*
* {@inheritDoc}
- * @see javax.swing.text.html.HTML.Tag#DIV
* @see javax.swing.text.html.HTML.Tag#PRE
+ * @see javax.swing.text.html.HTML.Tag#CODE
*/
@Override
(maven-doxia) branch feature/simplify-verbatim-xhtml-markup updated (55f1695a -> 06217613)
This is an automated email from the ASF dual-hosted git repository. kwin pushed a change to branch feature/simplify-verbatim-xhtml-markup in repository https://gitbox.apache.org/repos/asf/maven-doxia.git discard 55f1695a [DOXIA-731] Simplify HTML markup emitted from Sink.verbatim add aa6b907b Bump apache/maven-gh-actions-shared from 3 to 4 add ea3e4953 [DOXIA-732] Don't fail for duplicate anchor names (#203) add 6091eef2 [DOXIA-723] fix mix-up of column and line add 07a069c2 [DOXIA-731] Simplify HTML markup emitted from Sink.verbatim add 06217613 clarify comment 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 (55f1695a) \ N -- N -- N refs/heads/feature/simplify-verbatim-xhtml-markup (06217613) 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. No new revisions were added by this update. Summary of changes: .github/workflows/maven-verify.yml | 2 +- .../java/org/apache/maven/doxia/sink/impl/AbstractSink.java | 2 +- .../java/org/apache/maven/doxia/sink/impl/SinkWrapper.java | 11 +++ .../maven/doxia/sink/impl/UniqueAnchorNamesValidator.java | 13 ++--- .../maven/doxia/module/markdown/MarkdownParserTest.java | 6 +- 5 files changed, 24 insertions(+), 10 deletions(-)
