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/01/08 17:36:37 UTC
[maven-doxia] branch dependency-cleanup created (now 72b8490)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch dependency-cleanup
in repository https://gitbox.apache.org/repos/asf/maven-doxia.git.
at 72b8490 [DOXIA-636] Upgrade Plexus Utils to 3.3.1
This branch includes the following new commits:
new be44afd [DOXIA-634] Drop and replace usage of Commons Lang in Core
new 6f92d3f [DOXIA-635] Drop and replace usage of Commons IO in Markdown Module
new 72b8490 [DOXIA-636] Upgrade Plexus Utils to 3.3.1
The 3 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/03: [DOXIA-634] Drop and replace usage of Commons Lang in Core
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch dependency-cleanup
in repository https://gitbox.apache.org/repos/asf/maven-doxia.git
commit be44afd985dbbb6888782d9d947d83425a7ec791
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sat Jan 8 18:34:29 2022 +0100
[DOXIA-634] Drop and replace usage of Commons Lang in Core
---
doxia-core/pom.xml | 5 -----
.../java/org/apache/maven/doxia/sink/impl/SinkEventElement.java | 9 +++++++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/doxia-core/pom.xml b/doxia-core/pom.xml
index ef1686f..db4b7e6 100644
--- a/doxia-core/pom.xml
+++ b/doxia-core/pom.xml
@@ -56,11 +56,6 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>3.8.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
<version>1.3</version>
</dependency>
diff --git a/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/SinkEventElement.java b/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/SinkEventElement.java
index 78efe07..73cd4a9 100644
--- a/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/SinkEventElement.java
+++ b/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/SinkEventElement.java
@@ -19,7 +19,7 @@ package org.apache.maven.doxia.sink.impl;
* under the License.
*/
-import org.apache.commons.lang3.builder.ToStringBuilder;
+import java.util.Arrays;
/**
* A single sink event, used for testing purposes in order to check
@@ -81,6 +81,11 @@ public class SinkEventElement
@Override
public String toString()
{
- return ToStringBuilder.reflectionToString( this );
+ StringBuilder builder = new StringBuilder();
+ builder.append( this.getClass().getSimpleName() ).append( '[' );
+ builder.append( "methodName: " ).append( methodName ).append( ", " );
+ builder.append( "args: " ).append( Arrays.toString( args ) );
+ builder.append( ']' );
+ return builder.toString();
}
}
[maven-doxia] 03/03: [DOXIA-636] Upgrade Plexus Utils to 3.3.1
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch dependency-cleanup
in repository https://gitbox.apache.org/repos/asf/maven-doxia.git
commit 72b8490f30a109ca08305c09906a7713ae822866
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sat Jan 8 18:36:28 2022 +0100
[DOXIA-636] Upgrade Plexus Utils to 3.3.1
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 7c31177..b785feb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -175,7 +175,7 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>3.3.0</version>
+ <version>3.3.1</version>
</dependency>
<!-- SLF4J -->
[maven-doxia] 02/03: [DOXIA-635] Drop and replace usage of Commons IO in Markdown Module
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch dependency-cleanup
in repository https://gitbox.apache.org/repos/asf/maven-doxia.git
commit 6f92d3fd373821ab5f6159b82366c40b56182ab4
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sat Jan 8 18:35:47 2022 +0100
[DOXIA-635] Drop and replace usage of Commons IO in Markdown Module
---
doxia-modules/doxia-module-markdown/pom.xml | 4 ----
.../org/apache/maven/doxia/module/markdown/MarkdownParser.java | 9 ++++-----
pom.xml | 7 -------
3 files changed, 4 insertions(+), 16 deletions(-)
diff --git a/doxia-modules/doxia-module-markdown/pom.xml b/doxia-modules/doxia-module-markdown/pom.xml
index 24b2f20..c696681 100644
--- a/doxia-modules/doxia-module-markdown/pom.xml
+++ b/doxia-modules/doxia-module-markdown/pom.xml
@@ -73,10 +73,6 @@ under the License.
<artifactId>plexus-utils</artifactId>
</dependency>
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<scope>test</scope>
diff --git a/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownParser.java b/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownParser.java
index 33057ea..1ac7508 100644
--- a/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownParser.java
+++ b/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownParser.java
@@ -34,7 +34,6 @@ import com.vladsch.flexmark.ext.tables.TablesExtension;
import com.vladsch.flexmark.ext.wikilink.WikiLinkExtension;
import com.vladsch.flexmark.ext.gfm.strikethrough.StrikethroughExtension;
-import org.apache.commons.io.input.CharSequenceReader;
import org.apache.maven.doxia.markup.HtmlMarkup;
import org.apache.maven.doxia.module.xhtml.XhtmlParser;
import org.apache.maven.doxia.parser.AbstractParser;
@@ -169,10 +168,10 @@ public class MarkdownParser
try
{
// Markdown to HTML (using flexmark-java library)
- CharSequence html = toHtml( source );
+ String html = toHtml( source );
// then HTML to Sink API
- parser.parse( new CharSequenceReader( html ), sink );
+ parser.parse( html, sink );
}
catch ( IOException e )
{
@@ -187,7 +186,7 @@ public class MarkdownParser
* @return HTML content generated by flexmark-java
* @throws IOException passed through
*/
- CharSequence toHtml( Reader source )
+ String toHtml( Reader source )
throws IOException
{
// Read the source
@@ -264,7 +263,7 @@ public class MarkdownParser
html.append( "</body>" );
html.append( "</html>" );
- return html;
+ return html.toString();
}
/**
diff --git a/pom.xml b/pom.xml
index 88c131e..7c31177 100644
--- a/pom.xml
+++ b/pom.xml
@@ -178,13 +178,6 @@ under the License.
<version>3.3.0</version>
</dependency>
- <!-- Apache Commons IO -->
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>2.6</version>
- </dependency>
-
<!-- SLF4J -->
<dependency>
<groupId>org.slf4j</groupId>