You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2025/08/10 09:23:25 UTC
(maven-doxia) branch pom-cleanup created (now c0554f16)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch pom-cleanup
in repository https://gitbox.apache.org/repos/asf/maven-doxia.git
at c0554f16 Cleanup pom, remove redundant dependencies
This branch includes the following new commits:
new c0554f16 Cleanup pom, remove redundant dependencies
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) 01/01: Cleanup pom, remove redundant dependencies
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch pom-cleanup
in repository https://gitbox.apache.org/repos/asf/maven-doxia.git
commit c0554f160ab5ef005fbb79af4e5f52b94383d667
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sun Aug 10 11:22:23 2025 +0200
Cleanup pom, remove redundant dependencies
---
doxia-core/pom.xml | 16 ------
.../maven/doxia/sink/impl/AbstractSinkTest.java | 12 ++---
doxia-modules/doxia-module-apt/pom.xml | 20 -------
doxia-modules/doxia-module-fml/pom.xml | 6 ---
doxia-modules/doxia-module-markdown/pom.xml | 6 ---
doxia-modules/doxia-module-xdoc/pom.xml | 16 ------
doxia-modules/doxia-module-xhtml5/pom.xml | 16 ------
doxia-modules/pom.xml | 1 -
doxia-sink-api/pom.xml | 1 -
doxia-test-docs/pom.xml | 1 -
pom.xml | 61 +---------------------
11 files changed, 7 insertions(+), 149 deletions(-)
diff --git a/doxia-core/pom.xml b/doxia-core/pom.xml
index 409a84f3..784a578f 100644
--- a/doxia-core/pom.xml
+++ b/doxia-core/pom.xml
@@ -24,7 +24,6 @@ under the License.
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia</artifactId>
<version>2.1.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>doxia-core</artifactId>
@@ -77,26 +76,11 @@ under the License.
<artifactId>junit-jupiter-api</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>com.google.inject</groupId>
- <artifactId>guice</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.xmlunit</groupId>
- <artifactId>xmlunit-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.xmlunit</groupId>
- <artifactId>xmlunit-matchers</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
diff --git a/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/AbstractSinkTest.java b/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/AbstractSinkTest.java
index 9cc909d4..540fc137 100644
--- a/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/AbstractSinkTest.java
+++ b/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/AbstractSinkTest.java
@@ -29,9 +29,7 @@ import org.apache.maven.doxia.sink.SinkEventAttributes;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.xmlunit.matchers.CompareMatcher.isIdenticalTo;
/**
* Abstract base class to test sinks.
@@ -592,7 +590,7 @@ public abstract class AbstractSinkTest extends AbstractModuleTest {
String expected = getFigureBlock(source, caption);
if (isXmlSink()) {
- assertThat(wrapXml(actual), isIdenticalTo(wrapXml(expected)));
+ assertEquals(wrapXml(actual), wrapXml(expected));
} else {
assertEquals(expected, actual);
}
@@ -611,7 +609,7 @@ public abstract class AbstractSinkTest extends AbstractModuleTest {
String expected = getFigureBlock(source, null);
if (isXmlSink()) {
- assertThat(wrapXml(actual), isIdenticalTo(wrapXml(expected)));
+ assertEquals(wrapXml(actual), wrapXml(expected));
} else {
assertEquals(expected, actual);
}
@@ -630,7 +628,7 @@ public abstract class AbstractSinkTest extends AbstractModuleTest {
String expected = getFigureBlock(source, null);
if (isXmlSink()) {
- assertThat(wrapXml(actual), isIdenticalTo(wrapXml(expected)));
+ assertEquals(wrapXml(actual), wrapXml(expected));
} else {
assertEquals(expected, actual);
}
@@ -676,7 +674,7 @@ public abstract class AbstractSinkTest extends AbstractModuleTest {
String expected = getTableBlock(cell, caption);
if (isXmlSink()) {
- assertThat(wrapXml(actual), isIdenticalTo(wrapXml(expected)));
+ assertEquals(wrapXml(actual), wrapXml(expected));
} else {
assertEquals(expected, actual);
}
@@ -723,7 +721,7 @@ public abstract class AbstractSinkTest extends AbstractModuleTest {
String expected = getTableWithHeaderBlock("header_", "row1_", "row2_");
if (isXmlSink()) {
- assertThat(wrapXml(actual), isIdenticalTo(wrapXml(expected)));
+ assertEquals(wrapXml(actual), wrapXml(expected));
} else {
assertEquals(expected, actual);
}
diff --git a/doxia-modules/doxia-module-apt/pom.xml b/doxia-modules/doxia-module-apt/pom.xml
index 2e76006e..81d69eee 100644
--- a/doxia-modules/doxia-module-apt/pom.xml
+++ b/doxia-modules/doxia-module-apt/pom.xml
@@ -24,7 +24,6 @@ under the License.
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-modules</artifactId>
<version>2.1.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>doxia-module-apt</artifactId>
@@ -33,10 +32,6 @@ under the License.
<description>A Doxia module for Almost Plain Text source documents.
APT format is supported both as source and target formats.</description>
- <!-- START SNIPPET: test -->
- <!-- test snippet -->
- <!-- END SNIPPET: test -->
-
<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
@@ -54,21 +49,6 @@ under the License.
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
</dependency>
- <dependency>
- <groupId>com.google.inject</groupId>
- <artifactId>guice</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.xmlunit</groupId>
- <artifactId>xmlunit-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.xmlunit</groupId>
- <artifactId>xmlunit-matchers</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
diff --git a/doxia-modules/doxia-module-fml/pom.xml b/doxia-modules/doxia-module-fml/pom.xml
index 31e62efb..d9d684c3 100644
--- a/doxia-modules/doxia-module-fml/pom.xml
+++ b/doxia-modules/doxia-module-fml/pom.xml
@@ -24,7 +24,6 @@ under the License.
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-modules</artifactId>
<version>2.1.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>doxia-module-fml</artifactId>
@@ -56,11 +55,6 @@ under the License.
</dependency>
<!-- test -->
- <dependency>
- <groupId>com.google.inject</groupId>
- <artifactId>guice</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-test-docs</artifactId>
diff --git a/doxia-modules/doxia-module-markdown/pom.xml b/doxia-modules/doxia-module-markdown/pom.xml
index 48a5efec..98ee5b09 100644
--- a/doxia-modules/doxia-module-markdown/pom.xml
+++ b/doxia-modules/doxia-module-markdown/pom.xml
@@ -24,7 +24,6 @@ under the License.
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-modules</artifactId>
<version>2.1.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>doxia-module-markdown</artifactId>
@@ -159,11 +158,6 @@ under the License.
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-xml</artifactId>
</dependency>
- <dependency>
- <groupId>com.google.inject</groupId>
- <artifactId>guice</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
diff --git a/doxia-modules/doxia-module-xdoc/pom.xml b/doxia-modules/doxia-module-xdoc/pom.xml
index 59e16d97..20994232 100644
--- a/doxia-modules/doxia-module-xdoc/pom.xml
+++ b/doxia-modules/doxia-module-xdoc/pom.xml
@@ -24,7 +24,6 @@ under the License.
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-modules</artifactId>
<version>2.1.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>doxia-module-xdoc</artifactId>
@@ -56,26 +55,11 @@ under the License.
</dependency>
<!-- test -->
- <dependency>
- <groupId>com.google.inject</groupId>
- <artifactId>guice</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-test-docs</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.xmlunit</groupId>
- <artifactId>xmlunit-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.xmlunit</groupId>
- <artifactId>xmlunit-matchers</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
diff --git a/doxia-modules/doxia-module-xhtml5/pom.xml b/doxia-modules/doxia-module-xhtml5/pom.xml
index 3fe71906..1cfd15be 100644
--- a/doxia-modules/doxia-module-xhtml5/pom.xml
+++ b/doxia-modules/doxia-module-xhtml5/pom.xml
@@ -24,7 +24,6 @@ under the License.
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-modules</artifactId>
<version>2.1.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>doxia-module-xhtml5</artifactId>
@@ -55,21 +54,6 @@ under the License.
<artifactId>plexus-xml</artifactId>
</dependency>
- <dependency>
- <groupId>com.google.inject</groupId>
- <artifactId>guice</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.xmlunit</groupId>
- <artifactId>xmlunit-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.xmlunit</groupId>
- <artifactId>xmlunit-matchers</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
diff --git a/doxia-modules/pom.xml b/doxia-modules/pom.xml
index 83bed694..9c04cc6c 100644
--- a/doxia-modules/pom.xml
+++ b/doxia-modules/pom.xml
@@ -24,7 +24,6 @@ under the License.
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia</artifactId>
<version>2.1.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>doxia-modules</artifactId>
diff --git a/doxia-sink-api/pom.xml b/doxia-sink-api/pom.xml
index 82265c11..8c6faee7 100644
--- a/doxia-sink-api/pom.xml
+++ b/doxia-sink-api/pom.xml
@@ -24,7 +24,6 @@ under the License.
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia</artifactId>
<version>2.1.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>doxia-sink-api</artifactId>
diff --git a/doxia-test-docs/pom.xml b/doxia-test-docs/pom.xml
index 168389c8..bc59122a 100644
--- a/doxia-test-docs/pom.xml
+++ b/doxia-test-docs/pom.xml
@@ -24,7 +24,6 @@ under the License.
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia</artifactId>
<version>2.1.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>doxia-test-docs</artifactId>
diff --git a/pom.xml b/pom.xml
index b5a435da..59381252 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,7 +86,6 @@ under the License.
<checkstyle.violation.ignore>RedundantThrows,NewlineAtEndOfFile,ParameterNumber,MethodLength,FileLength,MethodName,InnerAssignment,MagicNumber</checkstyle.violation.ignore>
<project.build.outputTimestamp>2024-10-20T15:01:56Z</project.build.outputTimestamp>
<slf4jVersion>1.7.36</slf4jVersion>
- <xmlunitVersion>2.10.3</xmlunitVersion>
</properties>
<dependencyManagement>
@@ -142,29 +141,6 @@ under the License.
</dependency>
<!-- test -->
- <dependency>
- <groupId>org.xmlunit</groupId>
- <artifactId>xmlunit-core</artifactId>
- <version>${xmlunitVersion}</version>
- <scope>test</scope>
- <!-- Exclude due to https://github.com/xmlunit/xmlunit/issues/248 -->
- <exclusions>
- <exclusion>
- <groupId>jakarta.activation</groupId>
- <artifactId>jakarta.activation-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.xmlunit</groupId>
- <artifactId>xmlunit-matchers</artifactId>
- <version>${xmlunitVersion}</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-testing</artifactId>
@@ -178,20 +154,12 @@ under the License.
<scope>test</scope>
</dependency>
- <!-- Plexus -->
- <dependency>
- <groupId>com.google.inject</groupId>
- <artifactId>guice</artifactId>
- <version>6.0.0</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<version>1</version>
</dependency>
- <!-- SLF4J -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
@@ -203,14 +171,6 @@ under the License.
<version>${slf4jVersion}</version>
</dependency>
- <dependency>
- <groupId>org.junit</groupId>
- <artifactId>junit-bom</artifactId>
- <version>5.13.4</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
-
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
@@ -224,17 +184,6 @@ under the License.
</dependencies>
</dependencyManagement>
- <pluginRepositories>
- <pluginRepository>
- <releases>
- <enabled>false</enabled>
- </releases>
- <id>apache.snapshots</id>
- <name>Apache Snapshot Repository</name>
- <url>https://repository.apache.org/snapshots</url>
- </pluginRepository>
- </pluginRepositories>
-
<build>
<resources>
<resource>
@@ -279,18 +228,12 @@ under the License.
</plugin>
</plugins>
</pluginManagement>
+
<plugins>
<plugin>
<groupId>org.eclipse.sisu</groupId>
<artifactId>sisu-maven-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>main-index</goal>
- <goal>test-index</goal>
- </goals>
- </execution>
- </executions>
+ <version>0.9.0.M4</version>
</plugin>
</plugins>
</build>