(maven-reporting-exec) branch MSHARED-1392 deleted (was 2cd21f6)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch MSHARED-1392 in repository https://gitbox.apache.org/repos/asf/maven-reporting-exec.git was 2cd21f6 [MSHARED-1392] Upgrade to Parent 42 and Maven 3.6.3 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-reporting-exec) branch master updated (c5ea890 -> 2cd21f6)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/maven-reporting-exec.git from c5ea890 [maven-release-plugin] prepare for next development iteration add 2cd21f6 [MSHARED-1392] Upgrade to Parent 42 and Maven 3.6.3 No new revisions were added by this update. Summary of changes: pom.xml| 42 +- .../exec/TestDefaultMavenReportExecutor.java | 42 ++ 2 files changed, 53 insertions(+), 31 deletions(-)
(maven-site) branch MNGSITE-538 deleted (was 0bd98e26)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch MNGSITE-538 in repository https://gitbox.apache.org/repos/asf/maven-site.git was 0bd98e26 [MNGSITE-538] Drop generation of site JAR 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-site) branch master updated (20c1486f -> 0bd98e26)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/maven-site.git from 20c1486f Revert "Bump org.apache.maven.plugins:maven-site-plugin (#523)" add 0bd98e26 [MNGSITE-538] Drop generation of site JAR No new revisions were added by this update. Summary of changes: content/xdoc/download.xml.vm | 4 pom.xml | 19 --- 2 files changed, 23 deletions(-)
(maven-site) 01/01: [MNGSITE-538] Drop generation of site JAR
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch MNGSITE-538 in repository https://gitbox.apache.org/repos/asf/maven-site.git commit 0bd98e267e38c258236fff79a48467c8ca7049d9 Author: Michael Osipov AuthorDate: Mon May 13 11:48:55 2024 +0200 [MNGSITE-538] Drop generation of site JAR --- content/xdoc/download.xml.vm | 4 pom.xml | 19 --- 2 files changed, 23 deletions(-) diff --git a/content/xdoc/download.xml.vm b/content/xdoc/download.xml.vm index b3939a8e..ba722c8d 100644 --- a/content/xdoc/download.xml.vm +++ b/content/xdoc/download.xml.vm @@ -112,10 +112,6 @@ under the License. latest source code from source repository Distributed under the https://www.apache.org/licenses/;>Apache License, version 2.0 other: -Apache Maven Website As Documentation Archive - All current release sources (plugins, shared libraries,...) available at https://downloads.apache.org/maven/ diff --git a/pom.xml b/pom.xml index 0b9114a2..8009b166 100644 --- a/pom.xml +++ b/pom.xml @@ -302,25 +302,6 @@ - -org.apache.maven.plugins -maven-site-plugin - - -jar - - jar - -site - - ${project.reporting.outputDirectory} - -*.jar - - - - - org.apache.rat apache-rat-plugin
(maven-site) branch MNGSITE-538 updated (c60750ea -> 0bd98e26)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch MNGSITE-538 in repository https://gitbox.apache.org/repos/asf/maven-site.git discard c60750ea [MNGSITE-538] Drop generation of site JAR new 0bd98e26 [MNGSITE-538] Drop generation of site JAR 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 (c60750ea) \ N -- N -- N refs/heads/MNGSITE-538 (0bd98e26) 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 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. Summary of changes: content/markdown/test.md | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 content/markdown/test.md
(maven-site) branch MNGSITE-538 created (now c60750ea)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch MNGSITE-538 in repository https://gitbox.apache.org/repos/asf/maven-site.git at c60750ea [MNGSITE-538] Drop generation of site JAR This branch includes the following new commits: new c60750ea [MNGSITE-538] Drop generation of site JAR 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-site) 01/01: [MNGSITE-538] Drop generation of site JAR
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch MNGSITE-538 in repository https://gitbox.apache.org/repos/asf/maven-site.git commit c60750eafe2b63dd0ea933f185f3c6070964e530 Author: Michael Osipov AuthorDate: Mon May 13 11:48:55 2024 +0200 [MNGSITE-538] Drop generation of site JAR --- content/markdown/test.md | 3 +++ content/xdoc/download.xml.vm | 4 pom.xml | 19 --- 3 files changed, 3 insertions(+), 23 deletions(-) diff --git a/content/markdown/test.md b/content/markdown/test.md new file mode 100644 index ..6fa14ebe --- /dev/null +++ b/content/markdown/test.md @@ -0,0 +1,3 @@ +## Introduction + +Foo \ No newline at end of file diff --git a/content/xdoc/download.xml.vm b/content/xdoc/download.xml.vm index b3939a8e..ba722c8d 100644 --- a/content/xdoc/download.xml.vm +++ b/content/xdoc/download.xml.vm @@ -112,10 +112,6 @@ under the License. latest source code from source repository Distributed under the https://www.apache.org/licenses/;>Apache License, version 2.0 other: -Apache Maven Website As Documentation Archive - All current release sources (plugins, shared libraries,...) available at https://downloads.apache.org/maven/ diff --git a/pom.xml b/pom.xml index 0b9114a2..8009b166 100644 --- a/pom.xml +++ b/pom.xml @@ -302,25 +302,6 @@ - -org.apache.maven.plugins -maven-site-plugin - - -jar - - jar - -site - - ${project.reporting.outputDirectory} - -*.jar - - - - - org.apache.rat apache-rat-plugin
(maven-site) branch bump-site-and-fluido-version updated (331ab8cc -> cd5f1522)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch bump-site-and-fluido-version in repository https://gitbox.apache.org/repos/asf/maven-site.git from 331ab8cc Bump Maven Site Plugin AND Maven Fluido Skin add cd5f1522 Fix history No new revisions were added by this update. Summary of changes: content/markdown/docs/history.md.vm | 18 ++ 1 file changed, 6 insertions(+), 12 deletions(-)
(maven-site) 01/01: Bump Maven Site Plugin AND Maven Fluido Skin
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch bump-site-and-fluido-version in repository https://gitbox.apache.org/repos/asf/maven-site.git commit 331ab8cce2c640d88d0e05cdbcf1f8cd84978610 Author: Michael Osipov AuthorDate: Sun May 12 12:10:07 2024 +0200 Bump Maven Site Plugin AND Maven Fluido Skin Both need to be updated in tandem to get proper rendering results. --- content/markdown/code-quality-management.md| 4 ++-- content/markdown/community.md | 20 content/markdown/developers/conventions/jira.md| 20 .../developers/release/maven-core-release.md | 28 +++--- content/markdown/extensions/index.md | 10 content/markdown/glossary.md | 2 +- .../guides/mini/guide-multiple-modules-4.md| 2 +- .../guides/mini/guide-resolver-transport.md| 2 +- content/markdown/issue-management.md | 2 +- content/markdown/maven-1.x-eol.md | 2 +- content/markdown/maven-conventions.md | 2 +- content/markdown/maven-logging.md | 2 +- content/markdown/privacy-policy.md | 2 +- content/markdown/repository-management.md | 8 +++ content/markdown/repository/layout.md | 2 +- content/markdown/security.md | 14 +-- content/markdown/settings.md | 2 +- content/markdown/what-is-maven.md | 2 +- pom.xml| 4 ++-- 19 files changed, 65 insertions(+), 65 deletions(-) diff --git a/content/markdown/code-quality-management.md b/content/markdown/code-quality-management.md index 76fd15ac..b05a5e67 100644 --- a/content/markdown/code-quality-management.md +++ b/content/markdown/code-quality-management.md @@ -1,4 +1,4 @@ -## Code Quality Management +# Code Quality Management This document describes how Maven developers should use JIRA, our issue management system. -### When To Create a JIRA Issue? +## When To Create a JIRA Issue? This section discusses when to create a JIRA issue versus just committing a change in Git (eventually through a PR). @@ -32,28 +32,28 @@ of more than 100 lines, should have JIRA tickets. Creating a JIRA issue and referring it in the commit comments simplifies tracking the changes that happen in a release, using JIRA automatic release notes creation. -### How To Use Issue Details? +## How To Use Issue Details? This section presents some conventions about the issue fields. - Priority +### Priority Committers have the responsibility to realign priority by editing the issue. *Reasoning*: having a correct release note - Assignee +### Assignee Committers can assign an issue to a specific committer that person seems to be well placed to address it. - Component/s +### Component/s Committers have the responsibility to specify the correct component by editing the issue. *Reasoning*: having a correct release note. - Affects Version/s +### Affects Version/s By default, the Maven team considers that an issue which affects a given version also affects preceding versions. For example, an issue that affects Maven 3.6.3 also affects 3.6.0, 3.6.1, 3.6.2. @@ -61,15 +61,15 @@ If it is a regression, the committers should specify the affected versions. *Reasoning*: having a correct release note. - Fix Version/s +### Fix Version/s Update to correct version after merging to master. - Time Tracking +### Time Tracking The Maven team doesn't use this. Committers can if it helps them. -### Further Links +## Further Links - [JIRA Documentation](https://confluence.atlassian.com/jira064/jira-documentation-720411693.html) - [What is an Issue?](https://confluence.atlassian.com/jira064/what-is-an-issue-720416138.html) diff --git a/content/markdown/developers/release/maven-core-release.md b/content/markdown/developers/release/maven-core-release.md index 1d9d77f7..88031a74 100644 --- a/content/markdown/developers/release/maven-core-release.md +++ b/content/markdown/developers/release/maven-core-release.md @@ -1,4 +1,4 @@ -## Releasing Maven +# Releasing Maven -### Security Model +## Security Model The purpose of Maven is to perform the actions defined in the supplied `pom.xml`, which commonly includes compiling and running the associated @@ -29,7 +29,7 @@ the code, dependencies and repositories that are used in your build. If you want to use Maven to build untrusted code, it is up to you to provide the required isolation. -### Security Vulnerabilities +## Security Vulnerabilities Please note that binary patches are not produced for individual vulnerabilities. To obtain the binary fix for a particular vulnerability @@ -39,7 +39,7 @@ has been fixed. For more information about reporting
(maven-site) branch bump-site-and-fluido-version updated (b5e3196c -> 331ab8cc)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch bump-site-and-fluido-version in repository https://gitbox.apache.org/repos/asf/maven-site.git discard b5e3196c Bump Maven Site Plugin AND Maven Fluido Skin new 331ab8cc Bump Maven Site Plugin AND Maven Fluido Skin 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 (b5e3196c) \ N -- N -- N refs/heads/bump-site-and-fluido-version (331ab8cc) 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 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. Summary of changes: content/markdown/code-quality-management.md| 4 ++-- content/markdown/community.md | 20 content/markdown/developers/conventions/jira.md| 20 .../developers/release/maven-core-release.md | 28 +++--- content/markdown/extensions/index.md | 10 content/markdown/glossary.md | 2 +- .../guides/mini/guide-multiple-modules-4.md| 2 +- .../guides/mini/guide-resolver-transport.md| 2 +- content/markdown/issue-management.md | 2 +- content/markdown/maven-1.x-eol.md | 2 +- content/markdown/maven-conventions.md | 2 +- content/markdown/maven-logging.md | 2 +- content/markdown/privacy-policy.md | 2 +- content/markdown/repository-management.md | 8 +++ content/markdown/repository/layout.md | 2 +- content/markdown/security.md | 14 +-- content/markdown/settings.md | 2 +- content/markdown/what-is-maven.md | 2 +- 18 files changed, 63 insertions(+), 63 deletions(-)
(maven-parent) branch drop-banner-name updated (90d1afd -> 79bfaa5)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch drop-banner-name in repository https://gitbox.apache.org/repos/asf/maven-parent.git discard 90d1afd Drop banner name new 79bfaa5 Drop banner name 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 (90d1afd) \ N -- N -- N refs/heads/drop-banner-name (79bfaa5) 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 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. Summary of changes: docs/src/site/site.xml | 1 - 1 file changed, 1 deletion(-)
(maven-parent) 01/01: Drop banner name
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch drop-banner-name in repository https://gitbox.apache.org/repos/asf/maven-parent.git commit 79bfaa523897cffa9f71087001ca6199f46dd52c Author: Michael Osipov AuthorDate: Sun May 12 12:06:03 2024 +0200 Drop banner name We don't need a banner name since we use an image as a banner. Both we be displayed side-by-side with Maven Fluido Skin 2.0.0. If the banner image needs an alternative text, the new Site Model does provide such an attribute. --- docs/src/site/site.xml | 1 - src/site/site.xml | 1 - 2 files changed, 2 deletions(-) diff --git a/docs/src/site/site.xml b/docs/src/site/site.xml index c52c8e5..7e1d417 100644 --- a/docs/src/site/site.xml +++ b/docs/src/site/site.xml @@ -24,7 +24,6 @@ under the License. -${project.name} https://maven.apache.org/images/apache-maven-project.png https://www.apache.org/ diff --git a/src/site/site.xml b/src/site/site.xml index 9c36ce5..7938fd8 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -23,7 +23,6 @@ under the License. xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.1 https://maven.apache.org/xsd/decoration-1.8.1.xsd;> -${project.name} https://maven.apache.org/images/apache-maven-project.png https://www.apache.org/
(maven-site) branch bump-site-and-fluido-version created (now b5e3196c)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch bump-site-and-fluido-version in repository https://gitbox.apache.org/repos/asf/maven-site.git at b5e3196c Bump Maven Site Plugin AND Maven Fluido Skin This branch includes the following new commits: new b5e3196c Bump Maven Site Plugin AND Maven Fluido Skin 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-site) 01/01: Bump Maven Site Plugin AND Maven Fluido Skin
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch bump-site-and-fluido-version in repository https://gitbox.apache.org/repos/asf/maven-site.git commit b5e3196c2056e953a2115cfaf10757c89a8966cf Author: Michael Osipov AuthorDate: Sun May 12 12:10:07 2024 +0200 Bump Maven Site Plugin AND Maven Fluido Skin Both need to be updated in tandem to get proper rendering results. --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 0b9114a2..1960e246 100644 --- a/pom.xml +++ b/pom.xml @@ -75,7 +75,7 @@ 4.0.0-alpha-13,4.0.0-alpha-12,4.0.0-alpha-10,4.0.0-alpha-9,4.0.0-alpha-8,4.0.0-alpha-7,4.0.0-alpha-5,4.0.0-alpha-4,4.0.0-alpha-3,4.0.0-alpha-2 ${project.build.directory}/site -2.0.0-M6 +2.0.0-M8 8 ${project.basedir}/content @@ -108,7 +108,7 @@ org.apache.maven.plugins maven-site-plugin - 4.0.0-M8 + 4.0.0-M14 ${siteDirectory}
(maven-parent) branch drop-banner-name created (now 90d1afd)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch drop-banner-name in repository https://gitbox.apache.org/repos/asf/maven-parent.git at 90d1afd Drop banner name This branch includes the following new commits: new 90d1afd Drop banner name 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-parent) 01/01: Drop banner name
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch drop-banner-name in repository https://gitbox.apache.org/repos/asf/maven-parent.git commit 90d1afd186da3fce4e403789568fe5bbda84c10f Author: Michael Osipov AuthorDate: Sun May 12 12:06:03 2024 +0200 Drop banner name We don't need a banner name since we use an image as a banner. Both we be displayed side-by-side with Maven Fluido Skin 2.0.0. If the banner image needs an alternative text, the new Site Model does provide such an attribute. --- src/site/site.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/src/site/site.xml b/src/site/site.xml index 9c36ce5..7938fd8 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -23,7 +23,6 @@ under the License. xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.1 https://maven.apache.org/xsd/decoration-1.8.1.xsd;> -${project.name} https://maven.apache.org/images/apache-maven-project.png https://www.apache.org/
(maven-fluido-skin) branch MSKINS-246 deleted (was 1f449b6)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch MSKINS-246 in repository https://gitbox.apache.org/repos/asf/maven-fluido-skin.git was 1f449b6 [MSKINS-246] Upgrade plugins and components (in ITs) 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-fluido-skin) branch master updated (d5eef27 -> 1f449b6)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/maven-fluido-skin.git from d5eef27 [MSKINS-243] Update to Parent 41 (#59) add 1f449b6 [MSKINS-246] Upgrade plugins and components (in ITs) No new revisions were added by this update. Summary of changes: pom.xml| 2 +- src/it/mskins-107/verify.groovy| 2 +- src/main/resources/META-INF/maven/skin.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
(maven-reporting-exec) 01/01: [MSHARED-1392] Upgrade to Parent 42 and Maven 3.6.3
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch MSHARED-1392 in repository https://gitbox.apache.org/repos/asf/maven-reporting-exec.git commit 2cd21f6537e066c70f9d002e972a6312cfb5ad25 Author: Michael Osipov AuthorDate: Sat May 11 21:36:06 2024 +0200 [MSHARED-1392] Upgrade to Parent 42 and Maven 3.6.3 This closes #22 --- pom.xml| 42 +- .../exec/TestDefaultMavenReportExecutor.java | 42 ++ 2 files changed, 53 insertions(+), 31 deletions(-) diff --git a/pom.xml b/pom.xml index 842a70b..cc43ac8 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.apache.maven.shared maven-shared-components -41 +42 @@ -57,8 +57,8 @@ 8 -3.2.5 -1.0.0.v20140518 +3.6.3 +1.4.1 1.7.36 4.0.0-M13 3.5.0 @@ -77,21 +77,25 @@ org.apache.maven maven-artifact ${mavenVersion} + provided org.apache.maven maven-core ${mavenVersion} + provided org.apache.maven maven-model ${mavenVersion} + provided org.apache.maven maven-plugin-api ${mavenVersion} + provided org.apache.maven @@ -132,14 +136,14 @@ - org.eclipse.aether - aether-api - ${aetherVersion} + org.apache.maven.resolver + maven-resolver-api + ${resolverVersion} - org.eclipse.aether - aether-util - ${aetherVersion} + org.apache.maven.resolver + maven-resolver-util + ${resolverVersion} @@ -181,21 +185,27 @@ org.apache.maven - maven-aether-provider + maven-compat + ${mavenVersion} + test + + + org.apache.maven + maven-resolver-provider ${mavenVersion} test - org.eclipse.aether - aether-connector-basic - ${aetherVersion} + org.apache.maven.resolver + maven-resolver-connector-basic + ${resolverVersion} test - org.eclipse.aether - aether-transport-http - ${aetherVersion} + org.apache.maven.resolver + maven-resolver-transport-http + ${resolverVersion} test diff --git a/src/test/java/org/apache/maven/reporting/exec/TestDefaultMavenReportExecutor.java b/src/test/java/org/apache/maven/reporting/exec/TestDefaultMavenReportExecutor.java index db42def..f9cff57 100644 --- a/src/test/java/org/apache/maven/reporting/exec/TestDefaultMavenReportExecutor.java +++ b/src/test/java/org/apache/maven/reporting/exec/TestDefaultMavenReportExecutor.java @@ -19,6 +19,7 @@ package org.apache.maven.reporting.exec; import java.io.File; +import java.nio.file.Paths; import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -27,7 +28,11 @@ import org.apache.maven.DefaultMaven; import org.apache.maven.Maven; import org.apache.maven.RepositoryUtils; import org.apache.maven.artifact.repository.ArtifactRepository; +import org.apache.maven.artifact.repository.ArtifactRepositoryFactory; +import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy; +import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout; import org.apache.maven.cli.MavenCli; +import org.apache.maven.cli.configuration.SettingsXmlConfigurationProcessor; import org.apache.maven.execution.DefaultMavenExecutionRequest; import org.apache.maven.execution.DefaultMavenExecutionResult; import org.apache.maven.execution.MavenExecutionRequest; @@ -40,7 +45,6 @@ import org.apache.maven.model.Plugin; import org.apache.maven.model.PluginManagement; import org.apache.maven.plugin.testing.stubs.MavenProjectStub; import org.apache.maven.project.MavenProject; -import org.apache.maven.repository.RepositorySystem; import org.apache.maven.settings.Settings; import org.apache.maven.settings.building.DefaultSettingsBuildingRequest; import org.apache.maven.settings.building.SettingsBuilder; @@ -150,11 +154,11 @@ public class TestDefaultMavenReportExecutor extends PlexusTestCase { try { MavenReportExecutorRequest mavenReportExecutorRequest = new MavenReportExecutorRequest(); - mavenReportExecutorRequest.setLocalRepository(getLocalArtifactRepository()); +mavenReportExecutorRequest.setLocalRepository(getLocalRepo()); mavenReportExecutorRequest.setProject(mavenProject); -MavenSession mavenSession = getMavenSession(getLocalArtifactRepository(), mavenProject); +MavenSession mavenSession = getMavenSession(getLocalRepo(), mavenProject); mavenSession.setCurrentProject(mavenProject); mavenSession.setProjects(Arrays.asList(mavenProject)); mavenReportExecutorRequest.setMavenSession(mavenSession); @@ -207,8 +211,8 @@ public
(maven-reporting-exec) branch MSHARED-1392 updated (6af1f07 -> 2cd21f6)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch MSHARED-1392 in repository https://gitbox.apache.org/repos/asf/maven-reporting-exec.git discard 6af1f07 [MSHARED-1392] Upgrade to Parent 42 and Maven 3.6.3 discard 3ae9a32 first new 2cd21f6 [MSHARED-1392] Upgrade to Parent 42 and Maven 3.6.3 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 (6af1f07) \ N -- N -- N refs/heads/MSHARED-1392 (2cd21f6) 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 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. Summary of changes:
(maven-reporting-exec) branch MSHARED-1392 updated: [MSHARED-1392] Upgrade to Parent 42 and Maven 3.6.3
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch MSHARED-1392 in repository https://gitbox.apache.org/repos/asf/maven-reporting-exec.git The following commit(s) were added to refs/heads/MSHARED-1392 by this push: new 6af1f07 [MSHARED-1392] Upgrade to Parent 42 and Maven 3.6.3 6af1f07 is described below commit 6af1f0740cea9d0023ebf9f8dc00bd9c9be20022 Author: Michael Osipov AuthorDate: Sat May 11 21:58:08 2024 +0200 [MSHARED-1392] Upgrade to Parent 42 and Maven 3.6.3 This closes #22 --- pom.xml| 10 +++ .../exec/TestDefaultMavenReportExecutor.java | 35 ++ 2 files changed, 33 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index 25f7e3a..cc43ac8 100644 --- a/pom.xml +++ b/pom.xml @@ -77,21 +77,25 @@ org.apache.maven maven-artifact ${mavenVersion} + provided org.apache.maven maven-core ${mavenVersion} + provided org.apache.maven maven-model ${mavenVersion} + provided org.apache.maven maven-plugin-api ${mavenVersion} + provided org.apache.maven @@ -179,6 +183,12 @@ ${mavenVersion} test + + org.apache.maven + maven-compat + ${mavenVersion} + test + org.apache.maven maven-resolver-provider diff --git a/src/test/java/org/apache/maven/reporting/exec/TestDefaultMavenReportExecutor.java b/src/test/java/org/apache/maven/reporting/exec/TestDefaultMavenReportExecutor.java index 97f7263..f9cff57 100644 --- a/src/test/java/org/apache/maven/reporting/exec/TestDefaultMavenReportExecutor.java +++ b/src/test/java/org/apache/maven/reporting/exec/TestDefaultMavenReportExecutor.java @@ -19,6 +19,7 @@ package org.apache.maven.reporting.exec; import java.io.File; +import java.nio.file.Paths; import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -27,6 +28,9 @@ import org.apache.maven.DefaultMaven; import org.apache.maven.Maven; import org.apache.maven.RepositoryUtils; import org.apache.maven.artifact.repository.ArtifactRepository; +import org.apache.maven.artifact.repository.ArtifactRepositoryFactory; +import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy; +import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout; import org.apache.maven.cli.MavenCli; import org.apache.maven.cli.configuration.SettingsXmlConfigurationProcessor; import org.apache.maven.execution.DefaultMavenExecutionRequest; @@ -41,7 +45,6 @@ import org.apache.maven.model.Plugin; import org.apache.maven.model.PluginManagement; import org.apache.maven.plugin.testing.stubs.MavenProjectStub; import org.apache.maven.project.MavenProject; -import org.apache.maven.repository.RepositorySystem; import org.apache.maven.settings.Settings; import org.apache.maven.settings.building.DefaultSettingsBuildingRequest; import org.apache.maven.settings.building.SettingsBuilder; @@ -151,11 +154,11 @@ public class TestDefaultMavenReportExecutor extends PlexusTestCase { try { MavenReportExecutorRequest mavenReportExecutorRequest = new MavenReportExecutorRequest(); - mavenReportExecutorRequest.setLocalRepository(getLocalArtifactRepository()); +mavenReportExecutorRequest.setLocalRepository(getLocalRepo()); mavenReportExecutorRequest.setProject(mavenProject); -MavenSession mavenSession = getMavenSession(getLocalArtifactRepository(), mavenProject); +MavenSession mavenSession = getMavenSession(getLocalRepo(), mavenProject); mavenSession.setCurrentProject(mavenProject); mavenSession.setProjects(Arrays.asList(mavenProject)); mavenReportExecutorRequest.setMavenSession(mavenSession); @@ -208,8 +211,8 @@ public class TestDefaultMavenReportExecutor extends PlexusTestCase { getContainer().lookup(MavenExecutionRequestPopulator.class).populateDefaults(request); -request.setLocalRepository(getLocalArtifactRepository()); - request.setLocalRepositoryPath(getLocalArtifactRepository().getBasedir()); +request.setLocalRepository(getLocalRepo()); +request.setLocalRepositoryPath(getLocalRepo().getBasedir()); request.setCacheNotFound(false); request.setSystemProperties(System.getProperties()); @@ -241,15 +244,23 @@ public class TestDefaultMavenReportExecutor extends PlexusTestCase { }; } -private ArtifactRepository getLocalArtifactRepository() throws Exception { -if (localArtifactRepository != null) { -return localArtifactRepository; -} +private ArtifactRepository getLocalRepo() throws Exception { +ArtifactRepositoryFactory artifactRepositoryFactory = lookup
(maven-reporting-exec) 01/01: first
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch MSHARED-1392 in repository https://gitbox.apache.org/repos/asf/maven-reporting-exec.git commit 3ae9a32b956c22a29de20b36fe99723942fbd17f Author: Michael Osipov AuthorDate: Sat May 11 21:36:06 2024 +0200 first --- pom.xml| 32 +++--- .../exec/TestDefaultMavenReportExecutor.java | 7 +++-- 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/pom.xml b/pom.xml index 842a70b..25f7e3a 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.apache.maven.shared maven-shared-components -41 +42 @@ -57,8 +57,8 @@ 8 -3.2.5 -1.0.0.v20140518 +3.6.3 +1.4.1 1.7.36 4.0.0-M13 3.5.0 @@ -132,14 +132,14 @@ - org.eclipse.aether - aether-api - ${aetherVersion} + org.apache.maven.resolver + maven-resolver-api + ${resolverVersion} - org.eclipse.aether - aether-util - ${aetherVersion} + org.apache.maven.resolver + maven-resolver-util + ${resolverVersion} @@ -181,21 +181,21 @@ org.apache.maven - maven-aether-provider + maven-resolver-provider ${mavenVersion} test - org.eclipse.aether - aether-connector-basic - ${aetherVersion} + org.apache.maven.resolver + maven-resolver-connector-basic + ${resolverVersion} test - org.eclipse.aether - aether-transport-http - ${aetherVersion} + org.apache.maven.resolver + maven-resolver-transport-http + ${resolverVersion} test diff --git a/src/test/java/org/apache/maven/reporting/exec/TestDefaultMavenReportExecutor.java b/src/test/java/org/apache/maven/reporting/exec/TestDefaultMavenReportExecutor.java index db42def..97f7263 100644 --- a/src/test/java/org/apache/maven/reporting/exec/TestDefaultMavenReportExecutor.java +++ b/src/test/java/org/apache/maven/reporting/exec/TestDefaultMavenReportExecutor.java @@ -28,6 +28,7 @@ import org.apache.maven.Maven; import org.apache.maven.RepositoryUtils; import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.cli.MavenCli; +import org.apache.maven.cli.configuration.SettingsXmlConfigurationProcessor; import org.apache.maven.execution.DefaultMavenExecutionRequest; import org.apache.maven.execution.DefaultMavenExecutionResult; import org.apache.maven.execution.MavenExecutionRequest; @@ -245,7 +246,7 @@ public class TestDefaultMavenReportExecutor extends PlexusTestCase { return localArtifactRepository; } String localRepoPath = -System.getProperty("localRepository", MavenCli.userMavenConfigurationHome.getPath() + "/repository"); +System.getProperty("localRepository", MavenCli.USER_MAVEN_CONFIGURATION_HOME.getPath() + "/repository"); localArtifactRepository = lookup(RepositorySystem.class).createLocalRepository(new File(localRepoPath)); return localArtifactRepository; @@ -255,9 +256,9 @@ public class TestDefaultMavenReportExecutor extends PlexusTestCase { SettingsBuildingRequest settingsBuildingRequest = new DefaultSettingsBuildingRequest(); - settingsBuildingRequest.setGlobalSettingsFile(MavenCli.DEFAULT_GLOBAL_SETTINGS_FILE); + settingsBuildingRequest.setGlobalSettingsFile(SettingsXmlConfigurationProcessor.DEFAULT_GLOBAL_SETTINGS_FILE); - settingsBuildingRequest.setUserSettingsFile(MavenCli.DEFAULT_USER_SETTINGS_FILE); + settingsBuildingRequest.setUserSettingsFile(SettingsXmlConfigurationProcessor.DEFAULT_USER_SETTINGS_FILE); settingsBuildingRequest.getSystemProperties().putAll(System.getProperties());
(maven-reporting-exec) branch MSHARED-1392 created (now 3ae9a32)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch MSHARED-1392 in repository https://gitbox.apache.org/repos/asf/maven-reporting-exec.git at 3ae9a32 first This branch includes the following new commits: new 3ae9a32 first 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-reporting-impl) branch MSHARED-1392 deleted (was 7bff1c2)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch MSHARED-1392 in repository https://gitbox.apache.org/repos/asf/maven-reporting-impl.git was 7bff1c2 [MSHARED-1392] Upgrade to Parent 42 and Maven 3.6.3 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-reporting-impl) branch master updated (4dae8a7 -> 7bff1c2)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/maven-reporting-impl.git from 4dae8a7 [maven-release-plugin] prepare for next development iteration add 7bff1c2 [MSHARED-1392] Upgrade to Parent 42 and Maven 3.6.3 No new revisions were added by this update. Summary of changes: pom.xml | 16 ++-- 1 file changed, 10 insertions(+), 6 deletions(-)
(maven-reporting-impl) branch MSHARED-1392 updated (490c702 -> 7bff1c2)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch MSHARED-1392 in repository https://gitbox.apache.org/repos/asf/maven-reporting-impl.git discard 490c702 [MSHARED-1392] Upgrade to Parent 42 and Maven 3.6.3 add 7bff1c2 [MSHARED-1392] Upgrade to Parent 42 and Maven 3.6.3 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 (490c702) \ N -- N -- N refs/heads/MSHARED-1392 (7bff1c2) 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: pom.xml | 4 1 file changed, 4 insertions(+)
(maven-reporting-impl) 01/01: [MSHARED-1392] Upgrade to Parent 42 and Maven 3.6.3
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch MSHARED-1392 in repository https://gitbox.apache.org/repos/asf/maven-reporting-impl.git commit 490c702fe9e7d3d326c14d1e25351b33d412de85 Author: Michael Osipov AuthorDate: Sat May 11 11:27:29 2024 +0200 [MSHARED-1392] Upgrade to Parent 42 and Maven 3.6.3 --- pom.xml | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index f9c6a48..bad3a93 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.apache.maven.shared maven-shared-components -41 +42 @@ -57,8 +57,8 @@ 8 -3.2.5 -1.0.0.v20140518 +3.6.3 +1.4.1 2.0.0-M10 2.0.0-M18 4.0.0-M11 @@ -169,9 +169,9 @@ 3.6.1 - org.eclipse.aether - aether-api - ${aetherVersion} + org.apache.maven.resolver + maven-resolver-api + ${resolverVersion} org.eclipse.sisu
(maven-reporting-impl) branch MSHARED-1392 created (now 490c702)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch MSHARED-1392 in repository https://gitbox.apache.org/repos/asf/maven-reporting-impl.git at 490c702 [MSHARED-1392] Upgrade to Parent 42 and Maven 3.6.3 This branch includes the following new commits: new 490c702 [MSHARED-1392] Upgrade to Parent 42 and Maven 3.6.3 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-reporting-api) branch master updated: [MSHARED-1396] Upgrade to Doxia 2.0.0-M11
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 7c0a727 [MSHARED-1396] Upgrade to Doxia 2.0.0-M11 7c0a727 is described below commit 7c0a727ea22e2c31731b5165bf5c794f5f4bc850 Author: Michael Osipov AuthorDate: Fri May 10 09:53:10 2024 +0200 [MSHARED-1396] Upgrade to Doxia 2.0.0-M11 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5aa5efb..10a4453 100644 --- a/pom.xml +++ b/pom.xml @@ -64,7 +64,7 @@ under the License. org.apache.maven.doxia doxia-sink-api - 2.0.0-M10 + 2.0.0-M11
(maven-doxia-sitetools) branch DOXIASITETOOLS-338 deleted (was 6f23244)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch DOXIASITETOOLS-338 in repository https://gitbox.apache.org/repos/asf/maven-doxia-sitetools.git was 6f23244 [DOXIASITETOOLS-338] Upgrade to Parent 42 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-sitetools) branch master updated (aaf0221 -> 6f23244)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/maven-doxia-sitetools.git from aaf0221 Fix incorrect tag add 6f23244 [DOXIASITETOOLS-338] Upgrade to Parent 42 No new revisions were added by this update. Summary of changes: doxia-integration-tools/pom.xml | 26 +- pom.xml | 6 +++--- 2 files changed, 16 insertions(+), 16 deletions(-)
svn commit: r69078 - /release/maven/doxia/
Author: michaelo Date: Fri May 10 07:48:30 2024 New Revision: 69078 Log: Maven Doxia 2.0.0-M11 released Added: release/maven/doxia/doxia-2.0.0-M11-source-release.zip (with props) release/maven/doxia/doxia-2.0.0-M11-source-release.zip.asc release/maven/doxia/doxia-2.0.0-M11-source-release.zip.sha512 Removed: release/maven/doxia/doxia-2.0.0-M10-source-release.zip release/maven/doxia/doxia-2.0.0-M10-source-release.zip.asc release/maven/doxia/doxia-2.0.0-M10-source-release.zip.sha512 Added: release/maven/doxia/doxia-2.0.0-M11-source-release.zip == Binary file - no diff available. Propchange: release/maven/doxia/doxia-2.0.0-M11-source-release.zip -- svn:mime-type = application/octet-stream Added: release/maven/doxia/doxia-2.0.0-M11-source-release.zip.asc == --- release/maven/doxia/doxia-2.0.0-M11-source-release.zip.asc (added) +++ release/maven/doxia/doxia-2.0.0-M11-source-release.zip.asc Fri May 10 07:48:30 2024 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- + +iQEzBAABCgAdFiEEaoFLH4acK76rfLcnGioclL3ologFAmY6acEACgkQGioclL3o +lohwvgf+K8LyqiB0AhgRSiigIyTAWfGJLX0Y3350tUO3bJzGL8/Ko2PlRI4PKvLz +Ekw3pgWm3Zk58R+CAosvY4yqLgVjXCZEKTpj40t8tYJ9v60H+TZgVfIFD9kMVL1f +Wcgmaz/a5peTb2HuOpSRTtFXiClD6MknGiDIY1NgAfL0OoDyPYdf4LYzzGcPa2ni +99ujvzTEhxkassdWIXUeuYGurlKahJhrz5FNoc17S8TI3FlvsVlJJWakw1/o9iWT +BRSoesEJdLLa1ofYwgLHMa4B4/A9nNqToyogrRE3Q/outApf5qLiEuXAddZF5E1U +DeIAIv2SwHdqTdi/DC0zX1RHBF1KhQ== +=ftIl +-END PGP SIGNATURE- Added: release/maven/doxia/doxia-2.0.0-M11-source-release.zip.sha512 == --- release/maven/doxia/doxia-2.0.0-M11-source-release.zip.sha512 (added) +++ release/maven/doxia/doxia-2.0.0-M11-source-release.zip.sha512 Fri May 10 07:48:30 2024 @@ -0,0 +1 @@ +809e92701cde9f378be0a84c1de357737e968a031acfdfb9bfe6ba8a9d579d563a9af2b3fdb546c0da4df3f35f95d3dada58d06b75367f2b22ea81b4025c2e96 \ No newline at end of file
svn commit: r1917631 - in /maven/doxia/website/components: doxia-archives/doxia-2.0.0-M11/ doxia/
Author: michaelo Date: Fri May 10 07:48:20 2024 New Revision: 1917631 Log: Publish Maven Doxia 2.0.0-M11 documentation Added: maven/doxia/website/components/doxia/ - copied from r1917630, maven/doxia/website/components/doxia-archives/doxia-LATEST/ maven/doxia/website/components/doxia-archives/doxia-2.0.0-M11/ - copied from r1917630, maven/doxia/website/components/doxia-archives/doxia-LATEST/
(maven-fluido-skin) branch MSKINS-246 updated (437e53e -> 1f449b6)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch MSKINS-246 in repository https://gitbox.apache.org/repos/asf/maven-fluido-skin.git discard 437e53e [MSKINS-246] Upgrade plugins and components (in ITs) add 1f449b6 [MSKINS-246] Upgrade plugins and components (in ITs) 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 (437e53e) \ N -- N -- N refs/heads/MSKINS-246 (1f449b6) 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: src/main/resources/META-INF/maven/site.vm | 2 +- src/main/resources/css/maven-base.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
(maven-fluido-skin) branch MSKINS-246 created (now 437e53e)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch MSKINS-246 in repository https://gitbox.apache.org/repos/asf/maven-fluido-skin.git at 437e53e [MSKINS-246] Upgrade plugins and components (in ITs) This branch includes the following new commits: new 437e53e [MSKINS-246] Upgrade plugins and components (in ITs) 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-fluido-skin) 01/01: [MSKINS-246] Upgrade plugins and components (in ITs)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch MSKINS-246 in repository https://gitbox.apache.org/repos/asf/maven-fluido-skin.git commit 437e53e00d553549b074cf952a94a2771bc253ed Author: Michael Osipov AuthorDate: Wed May 8 17:25:53 2024 +0200 [MSKINS-246] Upgrade plugins and components (in ITs) Co-authored-by: Konrad Windszus --- pom.xml| 2 +- src/it/mskins-107/verify.groovy| 2 +- src/main/resources/META-INF/maven/site.vm | 2 +- src/main/resources/META-INF/maven/skin.xml | 2 +- src/main/resources/css/maven-base.css | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 8c0bfcf..5e77ce9 100644 --- a/pom.xml +++ b/pom.xml @@ -99,7 +99,7 @@ under the License. 4.3.1 2.3.2 1.11.2 -4.0.0-M10 +4.0.0-M14 2023-10-08T14:07:28Z ${version.maven-site-plugin} diff --git a/src/it/mskins-107/verify.groovy b/src/it/mskins-107/verify.groovy index d80feaa..87d4e33 100644 --- a/src/it/mskins-107/verify.groovy +++ b/src/it/mskins-107/verify.groovy @@ -20,4 +20,4 @@ File index = new File( basedir, "target/site/index.html" ) assert index.exists() -assert index.text.contains("") +assert index.text.contains("") diff --git a/src/main/resources/META-INF/maven/site.vm b/src/main/resources/META-INF/maven/site.vm index 5e0604f..26bb876 100644 --- a/src/main/resources/META-INF/maven/site.vm +++ b/src/main/resources/META-INF/maven/site.vm @@ -239,7 +239,7 @@ #**##set( $sourceStyle = "prettyprint" ) #* *##end ## -#* *#$bodyContent.replaceAll( '(\r?\n)?', '' ).replaceAll( 'class="bodyTable"', 'class="table table-striped"' ).replaceAll( 'class="bodyTable bodyTableBorder"', 'class="table table-bordered table-striped"' ) +#* *#$bodyContent.replace( '', '' ).replace( 'class="bodyTable"', 'class="table table-striped"' ).replace( 'class="bodyTable bodyTableBorder"', 'class="table table-bordered table-striped"' ) #**##if( $sideBarEnabled ) diff --git a/src/main/resources/META-INF/maven/skin.xml b/src/main/resources/META-INF/maven/skin.xml index f795867..4b326c0 100644 --- a/src/main/resources/META-INF/maven/skin.xml +++ b/src/main/resources/META-INF/maven/skin.xml @@ -22,6 +22,6 @@ under the License. http://maven.apache.org/SKIN/2.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/SKIN/2.0.0 http://maven.apache.org/xsd/skin-2.0.0.xsd;> -2.0.0-M12 +2.0.0-M18 diff --git a/src/main/resources/css/maven-base.css b/src/main/resources/css/maven-base.css index 829ef71..5747cd6 100644 --- a/src/main/resources/css/maven-base.css +++ b/src/main/resources/css/maven-base.css @@ -30,7 +30,7 @@ section > p, section > dt, section > dl, section > table.table, -section > div.verbatim { +section > pre { margin-right: 7px; margin-left: 7px; }
svn commit: r1917580 - in /maven/website/components: plugins-archives/maven-site-plugin-4.0.0-M14/ plugins/maven-site-plugin/
Author: michaelo Date: Wed May 8 15:07:07 2024 New Revision: 1917580 Log: Publish Maven Site Plugin 4.0.0-M14 documentation Added: maven/website/components/plugins-archives/maven-site-plugin-4.0.0-M14/ - copied from r1917579, maven/website/components/plugins-archives/maven-site-plugin-LATEST/ maven/website/components/plugins/maven-site-plugin/ - copied from r1917579, maven/website/components/plugins-archives/maven-site-plugin-LATEST/
svn commit: r69040 - /release/maven/plugins/
Author: michaelo Date: Wed May 8 15:05:46 2024 New Revision: 69040 Log: Maven Site Plugin 4.0.0-M14 released Added: release/maven/plugins/maven-site-plugin-4.0.0-M14-source-release.zip (with props) release/maven/plugins/maven-site-plugin-4.0.0-M14-source-release.zip.asc release/maven/plugins/maven-site-plugin-4.0.0-M14-source-release.zip.sha512 Removed: release/maven/plugins/maven-site-plugin-4.0.0-M13-source-release.zip release/maven/plugins/maven-site-plugin-4.0.0-M13-source-release.zip.asc release/maven/plugins/maven-site-plugin-4.0.0-M13-source-release.zip.sha512 Added: release/maven/plugins/maven-site-plugin-4.0.0-M14-source-release.zip == Binary file - no diff available. Propchange: release/maven/plugins/maven-site-plugin-4.0.0-M14-source-release.zip -- svn:mime-type = application/octet-stream Added: release/maven/plugins/maven-site-plugin-4.0.0-M14-source-release.zip.asc == --- release/maven/plugins/maven-site-plugin-4.0.0-M14-source-release.zip.asc (added) +++ release/maven/plugins/maven-site-plugin-4.0.0-M14-source-release.zip.asc Wed May 8 15:05:46 2024 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- + +iQEzBAABCgAdFiEEaoFLH4acK76rfLcnGioclL3ologFAmY33UkACgkQGioclL3o +log8/AgAmV5Oq8nxw+W7rg2TJyKwt4osUiP4iUM0mz/lKoMoDkfRFk4a48K/zJqa +3WhjNXkImloegtRApRrvr4hZdUG0wTTU4tXQ8W+UtlFydAG+Bu70jI+nOuCK4GY3 +aGih2l4YO9Kp8utiyTlo/7w2AAM3mJxUZ/Uzv44QF1kC2Es2F8Pmfqcmqp/O4JfK +mpOU/Os6EJ38r099zyIs9wTTSiqOLYyv8iOLKjIc+YJP5BG0htNAXDCqw/2UA+QX ++CJJ3rQf43XgG0V0Chgf9I5nQL6BVFxtkvfJ0BUYVy6ICyNkmECNW35GIrd0kpeT +Ic8CybCghB0lBeE9Se0JckpvxxsSTQ== +=ATf9 +-END PGP SIGNATURE- Added: release/maven/plugins/maven-site-plugin-4.0.0-M14-source-release.zip.sha512 == --- release/maven/plugins/maven-site-plugin-4.0.0-M14-source-release.zip.sha512 (added) +++ release/maven/plugins/maven-site-plugin-4.0.0-M14-source-release.zip.sha512 Wed May 8 15:05:46 2024 @@ -0,0 +1 @@ +cf9b896e1bc10b0bb81ded66f343e478da4da21300d10ac586ac08a8640bc7c11f25ff49d8f443c12e98011608c5d2db308d9b0b7ec1d9378d84616712b5b660 \ No newline at end of file
(maven-doxia-sitetools) branch dependabot/maven/org.apache.maven-maven-parent-42 deleted (was c3e10f8)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch dependabot/maven/org.apache.maven-maven-parent-42 in repository https://gitbox.apache.org/repos/asf/maven-doxia-sitetools.git was c3e10f8 Bump org.apache.maven:maven-parent from 41 to 42 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-sitetools) 01/01: [DOXIASITETOOLS-338] Upgrade to Parent 42
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch DOXIASITETOOLS-338 in repository https://gitbox.apache.org/repos/asf/maven-doxia-sitetools.git commit 6f232441482c220e8d31c05a50161ca55c45f30d Author: Michael Osipov AuthorDate: Tue May 7 20:44:57 2024 +0200 [DOXIASITETOOLS-338] Upgrade to Parent 42 This closes #153 --- doxia-integration-tools/pom.xml | 26 +- pom.xml | 6 +++--- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/doxia-integration-tools/pom.xml b/doxia-integration-tools/pom.xml index 9f3cbc6..1677622 100644 --- a/doxia-integration-tools/pom.xml +++ b/doxia-integration-tools/pom.xml @@ -69,7 +69,7 @@ org.apache.maven - maven-aether-provider + maven-resolver-provider ${mavenVersion} provided @@ -80,9 +80,9 @@ provided - org.eclipse.aether - aether-api - ${aetherVersion} + org.apache.maven.resolver + maven-resolver-api + ${resolverVersion} provided @@ -161,21 +161,21 @@ test - org.eclipse.aether - aether-impl - ${aetherVersion} + org.apache.maven.resolver + maven-resolver-impl + ${resolverVersion} test - org.eclipse.aether - aether-connector-basic - ${aetherVersion} + org.apache.maven.resolver + maven-resolver-connector-basic + ${resolverVersion} test - org.eclipse.aether - aether-transport-wagon - ${aetherVersion} + org.apache.maven.resolver + maven-resolver-transport-wagon + ${resolverVersion} test diff --git a/pom.xml b/pom.xml index d337f2b..10e959b 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.maven maven-parent -41 +42 @@ -67,10 +67,10 @@ under the License. 8 +3.6.3 2.0.0-M10 1.7.36 -3.2.5 -1.0.0.v20140518 +1.4.1 3.5.3 1.0.0 doxia-sitetools-archives/doxia-sitetools-LATEST
(maven-doxia-sitetools) branch DOXIASITETOOLS-338 created (now 6f23244)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch DOXIASITETOOLS-338 in repository https://gitbox.apache.org/repos/asf/maven-doxia-sitetools.git at 6f23244 [DOXIASITETOOLS-338] Upgrade to Parent 42 This branch includes the following new commits: new 6f23244 [DOXIASITETOOLS-338] Upgrade to Parent 42 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-doxia-sitetools) branch master updated: Fix incorrect tag
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-doxia-sitetools.git The following commit(s) were added to refs/heads/master by this push: new aaf0221 Fix incorrect tag aaf0221 is described below commit aaf0221b47c10fb7470287a6c234a3a60447e267 Author: Michael Osipov AuthorDate: Sun May 5 22:33:17 2024 +0200 Fix incorrect tag --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f7d879e..d337f2b 100644 --- a/pom.xml +++ b/pom.xml @@ -47,7 +47,7 @@ under the License. scm:git:https://gitbox.apache.org/repos/asf/maven-doxia-sitetools.git scm:git:https://gitbox.apache.org/repos/asf/maven-doxia-sitetools.git -doxia-sitetools-2.0.0-M13 +master https://github.com/apache/maven-doxia-sitetools/tree/${project.scm.tag}
(maven-reporting-api) 01/02: [MSHARED-1392] Upgrade to Parent 42
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 commit b5b66f4c6e468685f5105e8d2a965f240b335f5f Author: Michael Osipov AuthorDate: Sun May 5 22:22:08 2024 +0200 [MSHARED-1392] Upgrade to Parent 42 --- pom.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index ffeb14a..7061628 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.maven.shared maven-shared-components -41 +42 @@ -56,8 +56,6 @@ under the License. -8 -3.2.5 2024-04-14T09:53:37Z
(maven-reporting-api) 02/02: Explictily set Java version
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 commit c9a6004a23bcbc8103c2046082e7ac849a2199a6 Author: Michael Osipov AuthorDate: Tue May 7 20:08:30 2024 +0200 Explictily set Java version --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 7061628..5aa5efb 100644 --- a/pom.xml +++ b/pom.xml @@ -56,6 +56,7 @@ under the License. +8 2024-04-14T09:53:37Z
(maven-reporting-api) branch master updated (32b415b -> c9a6004)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/maven-reporting-api.git from 32b415b [maven-release-plugin] prepare for next development iteration new b5b66f4 [MSHARED-1392] Upgrade to Parent 42 new c9a6004 Explictily set Java version 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 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
svn commit: r1917554 [23/26] - in /maven/doxia/website/components/doxia-archives/doxia-LATEST: ./ apidocs/ apidocs/org/apache/maven/doxia/ apidocs/org/apache/maven/doxia/class-use/ apidocs/org/apache/
Modified: maven/doxia/website/components/doxia-archives/doxia-LATEST/doxia-modules/doxia-module-xhtml5/surefire-report.html == --- maven/doxia/website/components/doxia-archives/doxia-LATEST/doxia-modules/doxia-module-xhtml5/surefire-report.html (original) +++ maven/doxia/website/components/doxia-archives/doxia-LATEST/doxia-modules/doxia-module-xhtml5/surefire-report.html Tue May 7 17:59:12 2024 @@ -2,7 +2,7 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -51,8 +51,8 @@ Modules/ Xhtml5/ Surefire Report -| Last Published: 2024-04-11 - Version: 2.0.0-M10 +| Last Published: 2024-05-07 + Version: 2.0.0-M11 @@ -75,7 +75,6 @@ Surefire Checkstyle - CPD PMD Source Xref Test Source Xref @@ -156,7 +155,7 @@ function toggleDisplay(elementId) { 0 2 98.2% -2.531 s +3.305 s Note: failures are anticipated and checked for with assertions while errors are unanticipated. Package List [Summary] [Package List] [Test Cases] @@ -176,7 +175,7 @@ function toggleDisplay(elementId) { 0 2 98.2% -2.531 s +3.305 s Note: package statistics are not computed recursively, they only sum up all of its testsuites numbers. org.apache.maven.doxia.module.xhtml5 @@ -197,7 +196,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.563 s +0.701 s Xhtml5ParserTest @@ -206,7 +205,7 @@ function toggleDisplay(elementId) { 0 2 80.0% -0.326 s +0.385 s Xhtml5SinkTest @@ -215,7 +214,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.889 s +1.002 s Xhtml5SinkWithLanguageIdTest @@ -224,7 +223,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.753 s +1.217 s Test Cases [Summary] [Package List] [Test Cases] Xhtml5IdentityTest @@ -232,7 +231,7 @@ function toggleDisplay(elementId) { testIdentity -0.543 s +0.663 s Xhtml5ParserTest @@ -247,7 +246,7 @@ function toggleDisplay(elementId) { testSinkWrapper -0.069 s +0.072 s testVerbatimCode @@ -260,11 +259,11 @@ function toggleDisplay(elementId) { testDocument -0.047 s +0.031 s testParser -0.015 s +0.047 s testPreEventsList @@ -272,15 +271,15 @@ function toggleDisplay(elementId) { testUnknown -0.032 s +0.047 s testTocMacro -0.016 s +0.031 s testHeadEventsList -0.031 s +0.022 s testDocumentBodyEventsList @@ -290,23 +289,23 @@ function toggleDisplay(elementId) { testNumberedList -0.031 s +0.015 s testTestDocument -0.016 s +0.032 s testParagraph -0.015 s +0.022 s testAddress -0.023 s +0.015 s testTitle -0.015 s +0.016 s testLineBreak @@ -314,15 +313,15 @@ function toggleDisplay(elementId) { testBody -0.031 s +0.015 s testData -0.016 s +0.038 s testDate -0.022 s +0.016 s testLink @@ -334,15 +333,15 @@ function toggleDisplay(elementId) { testText -0.016 s +0.015 s testTime -0.015 s +0.016 s testArticle -0.016 s +0.006 s testVerbatimSource @@ -350,7 +349,7 @@ function toggleDisplay(elementId) { testNonBreakingSpace -0.006 s +0.015 s testLineBreakOpportunity @@ -358,15 +357,15 @@ function toggleDisplay(elementId) { testFigureWithoutCaption -0.100 s +0.116 s testInlineBold -0.016 s +0.031 s testInlineCode -0.015 s +0.007 s testComment @@ -374,19 +373,19 @@ function toggleDisplay(elementId) { testContent -0.015 s +0.016 s testBlockquote -0.016 s +0.015 s testRawText -0.007 s +0.016 s testInlineItalic -0.015 s +0.022 s testNavigation @@ -398,7 +397,7 @@ function toggleDisplay(elementId) { testAuthor -0.016 s +0.031 s testDivider @@ -410,11 +409,11 @@ function toggleDisplay(elementId) { testFooter -0.015 s +0.016 s testHeader -0.016 s +0.015 s testInline @@ -430,11 +429,11 @@ function toggleDisplay(elementId) { testSection1 -0.015 s +0.006 s testSection2 -0.007 s +0.016 s testSection3 @@ -454,45 +453,45 @@ function toggleDisplay(elementId) { testSectionTitle -0.016 s +0.007 s testSidebar -0.016 s +0.015 s testFigureFromUrl -0.018 s +0.031 s testTableWithHeader -0.020 s +0.016 s testDefinitionList -0.018 s +0.016 s testEntities -0.013 s +0.015 s testLinks -0.010 s +0.007 s testTable -0.020 s +0.015 s testHead -0.010 s +0.016 s Xhtml5SinkWithLanguageIdTest testNumberedList -0.010 s +0.016 s testTestDocument @@ -504,31 +503,31 @@ function toggleDisplay(elementId) { testAddress -0.016 s +0.022 s testTitle -0.015 s +0.016 s testLineBreak -0.016 s +0.015 s testBody -0 s +0.032 s testData -0.022 s +0.031 s testDate -0.016 s +0.006 s testLink -0 s +0.032 s testList @@ -536,11 +535,11 @@ function toggleDisplay(elementId) { testText -0.016 s +0.031 s testTime -0.016 s +0.023 s testArticle @@ -552,7 +551,7 @@ function toggleDisplay(elementId) {
svn commit: r1917554 [25/26] - in /maven/doxia/website/components/doxia-archives/doxia-LATEST: ./ apidocs/ apidocs/org/apache/maven/doxia/ apidocs/org/apache/maven/doxia/class-use/ apidocs/org/apache/
Modified: maven/doxia/website/components/doxia-archives/doxia-LATEST/doxia-test-docs/dependency-info.html == --- maven/doxia/website/components/doxia-archives/doxia-LATEST/doxia-test-docs/dependency-info.html (original) +++ maven/doxia/website/components/doxia-archives/doxia-LATEST/doxia-test-docs/dependency-info.html Tue May 7 17:59:12 2024 @@ -2,7 +2,7 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -50,8 +50,8 @@ Doxia base/ Doxia :: Test Documents/ Dependency Information -| Last Published: 2024-04-11 - Version: 2.0.0-M10 +| Last Published: 2024-05-07 + Version: 2.0.0-M11 @@ -124,27 +124,27 @@ dependency groupIdorg.apache.maven.doxia/groupId artifactIddoxia-test-docs/artifactId - version2.0.0-M10/version + version2.0.0-M11/version /dependency Apache Ivy -dependency org=org.apache.maven.doxia name=doxia-test-docs rev=2.0.0-M10 +dependency org=org.apache.maven.doxia name=doxia-test-docs rev=2.0.0-M11 artifact name=doxia-test-docs type=jar / /dependency Groovy Grape @Grapes( -@Grab(group='org.apache.maven.doxia', module='doxia-test-docs', version='2.0.0-M10') +@Grab(group='org.apache.maven.doxia', module='doxia-test-docs', version='2.0.0-M11') ) Gradle/Grails -implementation 'org.apache.maven.doxia:doxia-test-docs:2.0.0-M10' +implementation 'org.apache.maven.doxia:doxia-test-docs:2.0.0-M11' Scala SBT -libraryDependencies += org.apache.maven.doxia % doxia-test-docs % 2.0.0-M10 +libraryDependencies += org.apache.maven.doxia % doxia-test-docs % 2.0.0-M11 Leiningen -[org.apache.maven.doxia/doxia-test-docs 2.0.0-M10] +[org.apache.maven.doxia/doxia-test-docs 2.0.0-M11] Modified: maven/doxia/website/components/doxia-archives/doxia-LATEST/doxia-test-docs/dependency-management.html == --- maven/doxia/website/components/doxia-archives/doxia-LATEST/doxia-test-docs/dependency-management.html (original) +++ maven/doxia/website/components/doxia-archives/doxia-LATEST/doxia-test-docs/dependency-management.html Tue May 7 17:59:12 2024 @@ -2,7 +2,7 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -50,8 +50,8 @@ Doxia base/ Doxia :: Test Documents/ Project Dependency Management -| Last Published: 2024-04-11 - Version: 2.0.0-M10 +| Last Published: 2024-05-07 + Version: 2.0.0-M11 @@ -149,61 +149,61 @@ org.apache.maven.doxia https://maven.apache.org/doxia/doxia/doxia-core/;>doxia-core -2.0.0-M10 +2.0.0-M11 jar https://www.apache.org/licenses/LICENSE-2.0.txt;>Apache-2.0 org.apache.maven.doxia https://maven.apache.org/doxia/doxia/doxia-core/;>doxia-core -2.0.0-M10 +2.0.0-M11 test-jar https://www.apache.org/licenses/LICENSE-2.0.txt;>Apache-2.0 org.apache.maven.doxia https://maven.apache.org/doxia/doxia/doxia-modules/doxia-module-apt/;>doxia-module-apt -2.0.0-M10 +2.0.0-M11 jar https://www.apache.org/licenses/LICENSE-2.0.txt;>Apache-2.0 org.apache.maven.doxia https://maven.apache.org/doxia/doxia/doxia-modules/doxia-module-fml/;>doxia-module-fml -2.0.0-M10 +2.0.0-M11 jar https://www.apache.org/licenses/LICENSE-2.0.txt;>Apache-2.0 org.apache.maven.doxia https://maven.apache.org/doxia/doxia/doxia-modules/doxia-module-markdown/;>doxia-module-markdown -2.0.0-M10 +2.0.0-M11 jar https://www.apache.org/licenses/LICENSE-2.0.txt;>Apache-2.0 org.apache.maven.doxia https://maven.apache.org/doxia/doxia/doxia-modules/doxia-module-xdoc/;>doxia-module-xdoc -2.0.0-M10 +2.0.0-M11 jar https://www.apache.org/licenses/LICENSE-2.0.txt;>Apache-2.0 org.apache.maven.doxia https://maven.apache.org/doxia/doxia/doxia-modules/doxia-module-xhtml5/;>doxia-module-xhtml5 -2.0.0-M10 +2.0.0-M11 jar https://www.apache.org/licenses/LICENSE-2.0.txt;>Apache-2.0 org.apache.maven.doxia https://maven.apache.org/doxia/doxia/doxia-sink-api/;>doxia-sink-api -2.0.0-M10 +2.0.0-M11 jar https://www.apache.org/licenses/LICENSE-2.0.txt;>Apache-2.0 org.apache.maven.doxia https://maven.apache.org/doxia/doxia/doxia-test-docs/;>doxia-test-docs -2.0.0-M10 +2.0.0-M11 jar https://www.apache.org/licenses/LICENSE-2.0.txt;>Apache-2.0 org.apache.maven.plugin-tools https://maven.apache.org/plugin-tools/maven-plugin-annotations;>maven-plugin-annotations -3.10.2 +3.12.0 jar https://www.apache.org/licenses/LICENSE-2.0.txt;>Apache-2.0 Modified: maven/doxia/website/components/doxia-archives/doxia-LATEST/doxia-test-docs/distribution-management.html == --- maven/doxia/website/components/doxia-archives/doxia-LATEST/doxia-test-docs/distribution-management.html (original) +++
svn commit: r1917554 [17/26] - in /maven/doxia/website/components/doxia-archives/doxia-LATEST: ./ apidocs/ apidocs/org/apache/maven/doxia/ apidocs/org/apache/maven/doxia/class-use/ apidocs/org/apache/
Modified: maven/doxia/website/components/doxia-archives/doxia-LATEST/doxia-modules/doxia-module-fml/dependency-info.html == --- maven/doxia/website/components/doxia-archives/doxia-LATEST/doxia-modules/doxia-module-fml/dependency-info.html (original) +++ maven/doxia/website/components/doxia-archives/doxia-LATEST/doxia-modules/doxia-module-fml/dependency-info.html Tue May 7 17:59:12 2024 @@ -2,7 +2,7 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -51,8 +51,8 @@ Modules/ FML/ Dependency Information -| Last Published: 2024-04-11 - Version: 2.0.0-M10 +| Last Published: 2024-05-07 + Version: 2.0.0-M11 @@ -138,27 +138,27 @@ dependency groupIdorg.apache.maven.doxia/groupId artifactIddoxia-module-fml/artifactId - version2.0.0-M10/version + version2.0.0-M11/version /dependency Apache Ivy -dependency org=org.apache.maven.doxia name=doxia-module-fml rev=2.0.0-M10 +dependency org=org.apache.maven.doxia name=doxia-module-fml rev=2.0.0-M11 artifact name=doxia-module-fml type=jar / /dependency Groovy Grape @Grapes( -@Grab(group='org.apache.maven.doxia', module='doxia-module-fml', version='2.0.0-M10') +@Grab(group='org.apache.maven.doxia', module='doxia-module-fml', version='2.0.0-M11') ) Gradle/Grails -implementation 'org.apache.maven.doxia:doxia-module-fml:2.0.0-M10' +implementation 'org.apache.maven.doxia:doxia-module-fml:2.0.0-M11' Scala SBT -libraryDependencies += org.apache.maven.doxia % doxia-module-fml % 2.0.0-M10 +libraryDependencies += org.apache.maven.doxia % doxia-module-fml % 2.0.0-M11 Leiningen -[org.apache.maven.doxia/doxia-module-fml 2.0.0-M10] +[org.apache.maven.doxia/doxia-module-fml 2.0.0-M11] Modified: maven/doxia/website/components/doxia-archives/doxia-LATEST/doxia-modules/doxia-module-fml/dependency-management.html == --- maven/doxia/website/components/doxia-archives/doxia-LATEST/doxia-modules/doxia-module-fml/dependency-management.html (original) +++ maven/doxia/website/components/doxia-archives/doxia-LATEST/doxia-modules/doxia-module-fml/dependency-management.html Tue May 7 17:59:12 2024 @@ -2,7 +2,7 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -51,8 +51,8 @@ Modules/ FML/ Project Dependency Management -| Last Published: 2024-04-11 - Version: 2.0.0-M10 +| Last Published: 2024-05-07 + Version: 2.0.0-M11 @@ -163,61 +163,61 @@ org.apache.maven.doxia https://maven.apache.org/doxia/doxia/doxia-core/;>doxia-core -2.0.0-M10 +2.0.0-M11 jar https://www.apache.org/licenses/LICENSE-2.0.txt;>Apache-2.0 org.apache.maven.doxia https://maven.apache.org/doxia/doxia/doxia-core/;>doxia-core -2.0.0-M10 +2.0.0-M11 test-jar https://www.apache.org/licenses/LICENSE-2.0.txt;>Apache-2.0 org.apache.maven.doxia https://maven.apache.org/doxia/doxia/doxia-modules/doxia-module-apt/;>doxia-module-apt -2.0.0-M10 +2.0.0-M11 jar https://www.apache.org/licenses/LICENSE-2.0.txt;>Apache-2.0 org.apache.maven.doxia https://maven.apache.org/doxia/doxia/doxia-modules/doxia-module-fml/;>doxia-module-fml -2.0.0-M10 +2.0.0-M11 jar https://www.apache.org/licenses/LICENSE-2.0.txt;>Apache-2.0 org.apache.maven.doxia https://maven.apache.org/doxia/doxia/doxia-modules/doxia-module-markdown/;>doxia-module-markdown -2.0.0-M10 +2.0.0-M11 jar https://www.apache.org/licenses/LICENSE-2.0.txt;>Apache-2.0 org.apache.maven.doxia https://maven.apache.org/doxia/doxia/doxia-modules/doxia-module-xdoc/;>doxia-module-xdoc -2.0.0-M10 +2.0.0-M11 jar https://www.apache.org/licenses/LICENSE-2.0.txt;>Apache-2.0 org.apache.maven.doxia https://maven.apache.org/doxia/doxia/doxia-modules/doxia-module-xhtml5/;>doxia-module-xhtml5 -2.0.0-M10 +2.0.0-M11 jar https://www.apache.org/licenses/LICENSE-2.0.txt;>Apache-2.0 org.apache.maven.doxia https://maven.apache.org/doxia/doxia/doxia-sink-api/;>doxia-sink-api -2.0.0-M10 +2.0.0-M11 jar https://www.apache.org/licenses/LICENSE-2.0.txt;>Apache-2.0 org.apache.maven.doxia https://maven.apache.org/doxia/doxia/doxia-test-docs/;>doxia-test-docs -2.0.0-M10 +2.0.0-M11 jar https://www.apache.org/licenses/LICENSE-2.0.txt;>Apache-2.0 org.apache.maven.plugin-tools https://maven.apache.org/plugin-tools/maven-plugin-annotations;>maven-plugin-annotations -3.10.2 +3.12.0 jar https://www.apache.org/licenses/LICENSE-2.0.txt;>Apache-2.0 Modified: maven/doxia/website/components/doxia-archives/doxia-LATEST/doxia-modules/doxia-module-fml/distribution-management.html == --- maven/doxia/website/components/doxia-archives/doxia-LATEST/doxia-modules/doxia-module-fml/distribution-management.html (original)
svn commit: r1917554 [13/26] - in /maven/doxia/website/components/doxia-archives/doxia-LATEST: ./ apidocs/ apidocs/org/apache/maven/doxia/ apidocs/org/apache/maven/doxia/class-use/ apidocs/org/apache/
Modified: maven/doxia/website/components/doxia-archives/doxia-LATEST/doxia-modules/apidocs/org/apache/maven/doxia/module/fml/model/class-use/Part.html == --- maven/doxia/website/components/doxia-archives/doxia-LATEST/doxia-modules/apidocs/org/apache/maven/doxia/module/fml/model/class-use/Part.html (original) +++ maven/doxia/website/components/doxia-archives/doxia-LATEST/doxia-modules/apidocs/org/apache/maven/doxia/module/fml/model/class-use/Part.html Tue May 7 17:59:12 2024 @@ -4,7 +4,7 @@ -Uses of Class org.apache.maven.doxia.module.fml.model.Part (Doxia :: Modules 2.0.0-M10 API) +Uses of Class org.apache.maven.doxia.module.fml.model.Part (Doxia :: Modules 2.0.0-M11 API) @@ -12,7 +12,7 @@ -org.apache.maven.doxia.module.fml.model (Doxia :: Modules 2.0.0-M10 API) +org.apache.maven.doxia.module.fml.model (Doxia :: Modules 2.0.0-M11 API)