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/02/24 16:27:17 UTC
[maven-doxia-sitetools] 01/03: mvn4 aggregator
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 d09835455409de3f6bc6899daaf9a7fefe5e3abb
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Jan 28 23:11:54 2022 +0100
mvn4 aggregator
---
.gitmodules | 2 ++
doxia-integration-tools/pom.xml | 21 ++-------------------
.../src/main/resources/site-tool_ru.properties | 1 +
pom.xml | 6 +++---
4 files changed, 8 insertions(+), 22 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 c0e3854..fca5e18 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.1.0</version>
+ <version>3.1.0-SNAPSHOT</version>
</dependency>
<dependency>
@@ -77,7 +77,7 @@
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-aether-provider</artifactId>
+ <artifactId>maven-resolver-provider</artifactId>
<version>${mavenVersion}</version>
<scope>provided</scope>
</dependency>
@@ -191,23 +191,6 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-metadata</artifactId>
- <executions>
- <execution>
- <id>create-component-descriptor</id>
- <goals>
- <goal>generate-metadata</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
<reporting>
<plugins>
<plugin>
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 d56cbe9..cbb4955 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>
@@ -69,9 +69,9 @@ under the License.
<properties>
<javaVersion>8</javaVersion>
- <doxiaVersion>2.0.0-M2</doxiaVersion>
+ <doxiaVersion>2.0.0-M2-SNAPSHOT</doxiaVersion>
<slf4jVersion>1.7.32</slf4jVersion>
- <mavenVersion>3.2.5</mavenVersion>
+ <mavenVersion>4.0.0-alpha-1-SNAPSHOT</mavenVersion>
<aetherVersion>1.0.0.v20140518</aetherVersion>
<wagonVersion>2.8</wagonVersion>
<junitVersion>5.8.2</junitVersion>