You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by gn...@apache.org on 2022/01/28 22:11:57 UTC
[maven-doxia-sitetools] branch mvn4 created (now 107e8c1)
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a change to branch mvn4
in repository https://gitbox.apache.org/repos/asf/maven-doxia-sitetools.git.
at 107e8c1 mvn4 aggregator
This branch includes the following new commits:
new 107e8c1 mvn4 aggregator
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] 01/01: mvn4 aggregator
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch mvn4
in repository https://gitbox.apache.org/repos/asf/maven-doxia-sitetools.git
commit 107e8c16213a0f5851e5cdddb7fbf6cd0173065b
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Jan 28 23:11:54 2022 +0100
mvn4 aggregator
---
.gitmodules | 2 ++
doxia-integration-tools/pom.xml | 7 +++----
doxia-integration-tools/src/main/resources/site-tool_ru.properties | 1 +
pom.xml | 7 ++++---
4 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..cca253b
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,2 @@
+[submodule "doxia/sitetools"]
+ branch = mvn4
diff --git a/doxia-integration-tools/pom.xml b/doxia-integration-tools/pom.xml
index 1362f6b..7756e41 100644
--- a/doxia-integration-tools/pom.xml
+++ b/doxia-integration-tools/pom.xml
@@ -38,7 +38,7 @@
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
- <version>3.0</version>
+ <version>3.1.0-SNAPSHOT</version>
</dependency>
<dependency>
@@ -59,7 +59,7 @@
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact-manager</artifactId>
+ <artifactId>maven-core</artifactId>
<version>${mavenVersion}</version>
<scope>provided</scope>
</dependency>
@@ -70,9 +70,8 @@
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
+ <artifactId>maven-compat</artifactId>
<version>${mavenVersion}</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
diff --git a/doxia-integration-tools/src/main/resources/site-tool_ru.properties b/doxia-integration-tools/src/main/resources/site-tool_ru.properties
index 60506eb..6d3cceb 100644
--- a/doxia-integration-tools/src/main/resources/site-tool_ru.properties
+++ b/doxia-integration-tools/src/main/resources/site-tool_ru.properties
@@ -15,6 +15,7 @@
# specific language governing permissions and limitations
# under the License.
+# CHECKSTYLE_OFF: LineLength
decorationModel.menu.parentproject = \u041e\u0441\u043d\u043e\u0432\u043d\u043e\u0439 \u041f\u0440\u043e\u0435\u043a\u0442
decorationModel.menu.projectdocumentation = \u0414\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430\u0446\u0438\u044f \u041f\u0440\u043e\u0435\u043a\u0442\u0430
decorationModel.menu.projectinformation = \u0418\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f \u043e \u041f\u0440\u043e\u0435\u043a\u0442\u0435
diff --git a/pom.xml b/pom.xml
index 2315dec..42d50b4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
- <version>34</version>
+ <version>35-SNAPSHOT</version>
<relativePath />
</parent>
@@ -68,9 +68,9 @@ under the License.
</distributionManagement>
<properties>
- <doxiaVersion>2.0.0-M1</doxiaVersion>
+ <doxiaVersion>2.0.0-M2-SNAPSHOT</doxiaVersion>
<slf4jVersion>1.7.32</slf4jVersion>
- <mavenVersion>2.2.1</mavenVersion>
+ <mavenVersion>4.0.0-alpha-1-SNAPSHOT</mavenVersion>
<maven.site.path>doxia-sitetools-archives/doxia-sitetools-LATEST</maven.site.path>
<project.build.outputTimestamp>2021-12-12T17:08:52Z</project.build.outputTimestamp>
</properties>
@@ -266,6 +266,7 @@ under the License.
<plugin>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-metadata</artifactId>
+ <version>2.1.1</version>
<executions>
<execution>
<goals>