You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2022/11/25 20:22:00 UTC
[maven-doxia-sitetools] 01/01: fixes
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch fixes
in repository https://gitbox.apache.org/repos/asf/maven-doxia-sitetools.git
commit 0fdc04cf8af5f6336fc3ded9834e52de0055a251
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Fri Nov 25 21:21:48 2022 +0100
fixes
---
doxia-decoration-model/pom.xml | 8 +++-----
doxia-integration-tools/pom.xml | 7 +++----
doxia-site-renderer/pom.xml | 16 +++++++---------
doxia-skin-model/pom.xml | 8 +++-----
pom.xml | 10 ++++------
5 files changed, 20 insertions(+), 29 deletions(-)
diff --git a/doxia-decoration-model/pom.xml b/doxia-decoration-model/pom.xml
index 336a561..7734037 100644
--- a/doxia-decoration-model/pom.xml
+++ b/doxia-decoration-model/pom.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,7 +17,6 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-
<project xmlns="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">
<modelVersion>4.0.0</modelVersion>
@@ -75,27 +73,27 @@ under the License.
<executions>
<execution>
<id>descriptor</id>
- <phase>generate-sources</phase>
<goals>
<goal>xpp3-writer</goal>
<goal>java</goal>
<goal>xpp3-reader</goal>
<goal>xsd</goal>
</goals>
+ <phase>generate-sources</phase>
</execution>
<execution>
<id>descriptor-xdoc</id>
- <phase>pre-site</phase>
<goals>
<goal>xdoc</goal>
</goals>
+ <phase>pre-site</phase>
</execution>
<execution>
<id>descriptor-xsd</id>
- <phase>pre-site</phase>
<goals>
<goal>xsd</goal>
</goals>
+ <phase>pre-site</phase>
<configuration>
<outputDirectory>${project.build.directory}/generated-site/resources/xsd</outputDirectory>
</configuration>
diff --git a/doxia-integration-tools/pom.xml b/doxia-integration-tools/pom.xml
index 73b7bbf..bbac8ed 100644
--- a/doxia-integration-tools/pom.xml
+++ b/doxia-integration-tools/pom.xml
@@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,7 +17,6 @@
specific language governing permissions and limitations
under the License.
-->
-
<project xmlns="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">
<modelVersion>4.0.0</modelVersion>
@@ -38,7 +36,7 @@
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
- <version>4.0.0-M1</version>
+ <version>4.0.0-M3</version>
</dependency>
<dependency>
@@ -196,6 +194,7 @@
<plugin>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-metadata</artifactId>
+ <version>2.1.1</version>
<executions>
<execution>
<id>create-component-descriptor</id>
diff --git a/doxia-site-renderer/pom.xml b/doxia-site-renderer/pom.xml
index f5f79fa..31c6935 100644
--- a/doxia-site-renderer/pom.xml
+++ b/doxia-site-renderer/pom.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,7 +17,6 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-
<project xmlns="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">
<modelVersion>4.0.0</modelVersion>
@@ -156,12 +154,12 @@ under the License.
<classifier>no_aop</classifier>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-classworlds</artifactId>
- <version>2.6.0</version>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-classworlds</artifactId>
+ <version>2.6.0</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
@@ -177,7 +175,7 @@ under the License.
<dependency>
<groupId>net.sourceforge.htmlunit</groupId>
<artifactId>htmlunit</artifactId>
- <version>2.62.0</version>
+ <version>2.67.0</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/doxia-skin-model/pom.xml b/doxia-skin-model/pom.xml
index c652f90..dadedc9 100644
--- a/doxia-skin-model/pom.xml
+++ b/doxia-skin-model/pom.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,7 +17,6 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-
<project xmlns="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">
<modelVersion>4.0.0</modelVersion>
@@ -57,26 +55,26 @@ under the License.
<executions>
<execution>
<id>descriptor</id>
- <phase>generate-sources</phase>
<goals>
<goal>java</goal>
<goal>xpp3-reader</goal>
<goal>xsd</goal>
</goals>
+ <phase>generate-sources</phase>
</execution>
<execution>
<id>descriptor-xdoc</id>
- <phase>pre-site</phase>
<goals>
<goal>xdoc</goal>
</goals>
+ <phase>pre-site</phase>
</execution>
<execution>
<id>descriptor-xsd</id>
- <phase>pre-site</phase>
<goals>
<goal>xsd</goal>
</goals>
+ <phase>pre-site</phase>
<configuration>
<outputDirectory>${project.build.directory}/generated-site/resources/xsd</outputDirectory>
</configuration>
diff --git a/pom.xml b/pom.xml
index ccd8cbb..7f08a88 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,7 +17,6 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-
<project xmlns="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">
<modelVersion>4.0.0</modelVersion>
@@ -26,7 +24,7 @@ under the License.
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
<version>36</version>
- <relativePath />
+ <relativePath/>
</parent>
<groupId>org.apache.maven.doxia</groupId>
@@ -49,8 +47,8 @@ under the License.
<scm>
<connection>scm:git:https://gitbox.apache.org/repos/asf/maven-doxia-sitetools.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/maven-doxia-sitetools.git</developerConnection>
- <url>https://github.com/apache/maven-doxia-sitetools/tree/${project.scm.tag}</url>
<tag>doxia-sitetools-2.0.0-M3</tag>
+ <url>https://github.com/apache/maven-doxia-sitetools/tree/${project.scm.tag}</url>
</scm>
<issueManagement>
<system>jira</system>
@@ -73,7 +71,7 @@ under the License.
<slf4jVersion>1.7.36</slf4jVersion>
<mavenVersion>3.2.5</mavenVersion>
<aetherVersion>1.0.0.v20140518</aetherVersion>
- <wagonVersion>2.8</wagonVersion>
+ <wagonVersion>3.5.2</wagonVersion>
<junitVersion>5.8.2</junitVersion>
<maven.site.path>doxia-sitetools-archives/doxia-sitetools-LATEST</maven.site.path>
<project.build.outputTimestamp>2022-06-20T18:19:40Z</project.build.outputTimestamp>
@@ -154,7 +152,7 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>3.4.2</version>
+ <version>3.5.0</version>
</dependency>
<!-- SLF4J -->
<dependency>