You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2020/09/30 20:38:59 UTC
[jspwiki] 02/08: dependency udpate: flexmark to 0.62.2
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit 10c7137c9ba18d2009ce30c3de2559ab0d4b74b4
Author: juanpablo <ju...@apache.org>
AuthorDate: Wed Sep 30 22:31:48 2020 +0200
dependency udpate: flexmark to 0.62.2
---
.../attributeprovider/ExternalLinkAttributeProviderState.java | 6 +++---
.../attributeprovider/ImageLinkAttributeProviderState.java | 6 +++---
.../attributeprovider/InterWikiLinkAttributeProviderState.java | 8 ++++----
.../attributeprovider/JSPWikiLinkAttributeProvider.java | 6 +++---
.../attributeprovider/LocalEditLinkAttributeProviderState.java | 6 +++---
.../LocalFootnoteLinkAttributeProviderState.java | 6 +++---
.../LocalFootnoteRefLinkAttributeProviderState.java | 6 +++---
.../attributeprovider/LocalLinkAttributeProviderState.java | 6 +++---
.../attributeprovider/LocalReadLinkAttributeProviderState.java | 6 +++---
.../attributeprovider/NodeAttributeProviderState.java | 4 ++--
.../attributeprovider/WysiwygEditingAttributeProviderState.java | 6 +++---
pom.xml | 2 +-
12 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/ExternalLinkAttributeProviderState.java b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/ExternalLinkAttributeProviderState.java
index 3724a60..b9f778f 100755
--- a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/ExternalLinkAttributeProviderState.java
+++ b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/ExternalLinkAttributeProviderState.java
@@ -19,7 +19,7 @@
package org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider;
import com.vladsch.flexmark.util.ast.Node;
-import com.vladsch.flexmark.util.html.Attributes;
+import com.vladsch.flexmark.util.html.MutableAttributes;
import org.apache.oro.text.regex.Pattern;
import org.apache.wiki.api.core.Context;
import org.apache.wiki.markdown.nodes.JSPWikiLink;
@@ -56,10 +56,10 @@ public class ExternalLinkAttributeProviderState implements NodeAttributeProvider
/**
* {@inheritDoc}
*
- * @see NodeAttributeProviderState#setAttributes(Attributes, Node)
+ * @see NodeAttributeProviderState#setAttributes(MutableAttributes, Node)
*/
@Override
- public void setAttributes( final Attributes attributes, final JSPWikiLink link ) {
+ public void setAttributes( final MutableAttributes attributes, final JSPWikiLink link ) {
if( linkOperations.isImageLink( link.getUrl().toString(), isImageInlining, inlineImagePatterns ) ) {
new ImageLinkAttributeProviderState( wikiContext, link.getText().toString(), hasRef ).setAttributes( attributes, link );
} else {
diff --git a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/ImageLinkAttributeProviderState.java b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/ImageLinkAttributeProviderState.java
index 239204a..6775a6c 100755
--- a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/ImageLinkAttributeProviderState.java
+++ b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/ImageLinkAttributeProviderState.java
@@ -19,7 +19,7 @@
package org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider;
import com.vladsch.flexmark.util.ast.Node;
-import com.vladsch.flexmark.util.html.Attributes;
+import com.vladsch.flexmark.util.html.MutableAttributes;
import org.apache.wiki.api.core.Context;
import org.apache.wiki.api.core.ContextEnum;
import org.apache.wiki.markdown.nodes.JSPWikiLink;
@@ -47,10 +47,10 @@ public class ImageLinkAttributeProviderState implements NodeAttributeProviderSta
/**
* {@inheritDoc}
*
- * @see NodeAttributeProviderState#setAttributes(Attributes, Node)
+ * @see NodeAttributeProviderState#setAttributes(MutableAttributes, Node)
*/
@Override
- public void setAttributes( final Attributes attributes, final JSPWikiLink link ) {
+ public void setAttributes( final MutableAttributes attributes, final JSPWikiLink link ) {
if( isLinkFromText && linkOperations.isExternalLink( link.getText().toString() ) ) {
attributes.replaceValue( "class", MarkupParser.CLASS_EXTERNAL );
attributes.replaceValue( "href", urlRef );
diff --git a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/InterWikiLinkAttributeProviderState.java b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/InterWikiLinkAttributeProviderState.java
index 3c22303..f2f5ce6 100755
--- a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/InterWikiLinkAttributeProviderState.java
+++ b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/InterWikiLinkAttributeProviderState.java
@@ -20,7 +20,7 @@ package org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider;
import com.vladsch.flexmark.ast.Link;
import com.vladsch.flexmark.util.ast.Node;
-import com.vladsch.flexmark.util.html.Attributes;
+import com.vladsch.flexmark.util.html.MutableAttributes;
import org.apache.oro.text.regex.Pattern;
import org.apache.wiki.api.core.Context;
import org.apache.wiki.markdown.nodes.JSPWikiLink;
@@ -59,10 +59,10 @@ public class InterWikiLinkAttributeProviderState implements NodeAttributeProvide
/**
* {@inheritDoc}
*
- * @see NodeAttributeProviderState#setAttributes(Attributes, Node)
+ * @see NodeAttributeProviderState#setAttributes(MutableAttributes, Node)
*/
@Override
- public void setAttributes( final Attributes attributes, final JSPWikiLink link ) {
+ public void setAttributes( final MutableAttributes attributes, final JSPWikiLink link ) {
final String[] refAndPage = link.getWikiLink().split( ":" );
if( !m_wysiwygEditorMode ) {
String urlReference = wikiContext.getEngine().getInterWikiURL( refAndPage[ 0 ] );
@@ -79,7 +79,7 @@ public class InterWikiLinkAttributeProviderState implements NodeAttributeProvide
}
}
- void setInterWikiLinkAttrs( final Attributes attributes, final Link link, final String url ) {
+ void setInterWikiLinkAttrs( final MutableAttributes attributes, final Link link, final String url ) {
attributes.replaceValue( "class", MarkupParser.CLASS_INTERWIKI );
attributes.replaceValue( "href", url );
}
diff --git a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/JSPWikiLinkAttributeProvider.java b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/JSPWikiLinkAttributeProvider.java
index 93a51b7..8fda011 100755
--- a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/JSPWikiLinkAttributeProvider.java
+++ b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/JSPWikiLinkAttributeProvider.java
@@ -21,7 +21,7 @@ package org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider;
import com.vladsch.flexmark.html.AttributeProvider;
import com.vladsch.flexmark.html.renderer.AttributablePart;
import com.vladsch.flexmark.util.ast.Node;
-import com.vladsch.flexmark.util.html.Attributes;
+import com.vladsch.flexmark.util.html.MutableAttributes;
import org.apache.commons.lang3.StringUtils;
import org.apache.oro.text.regex.Pattern;
import org.apache.wiki.api.core.Context;
@@ -56,10 +56,10 @@ public class JSPWikiLinkAttributeProvider implements AttributeProvider {
/**
* {@inheritDoc}
*
- * @see AttributeProvider#setAttributes(Node, AttributablePart, Attributes)
+ * @see AttributeProvider#setAttributes(Node, AttributablePart, MutableAttributes)
*/
@Override
- public void setAttributes( final Node node, final AttributablePart part, final Attributes attributes ) {
+ public void setAttributes( final Node node, final AttributablePart part, final MutableAttributes attributes ) {
if( node instanceof JSPWikiLink ) {
final JSPWikiLink link = ( JSPWikiLink )node;
final NodeAttributeProviderState< JSPWikiLink > linkState;
diff --git a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalEditLinkAttributeProviderState.java b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalEditLinkAttributeProviderState.java
index 9715b5d..8f77ad0 100755
--- a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalEditLinkAttributeProviderState.java
+++ b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalEditLinkAttributeProviderState.java
@@ -19,7 +19,7 @@
package org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider;
import com.vladsch.flexmark.util.ast.Node;
-import com.vladsch.flexmark.util.html.Attributes;
+import com.vladsch.flexmark.util.html.MutableAttributes;
import org.apache.wiki.api.core.Context;
import org.apache.wiki.i18n.InternationalizationManager;
import org.apache.wiki.markdown.nodes.JSPWikiLink;
@@ -46,10 +46,10 @@ public class LocalEditLinkAttributeProviderState implements NodeAttributeProvide
/**
* {@inheritDoc}
*
- * @see NodeAttributeProviderState#setAttributes(Attributes, Node)
+ * @see NodeAttributeProviderState#setAttributes(MutableAttributes, Node)
*/
@Override
- public void setAttributes( final Attributes attributes, final JSPWikiLink link ) {
+ public void setAttributes( final MutableAttributes attributes, final JSPWikiLink link ) {
final ResourceBundle rb = Preferences.getBundle( wikiContext, InternationalizationManager.CORE_BUNDLE );
attributes.replaceValue( "title", MessageFormat.format( rb.getString( "markupparser.link.create" ), url ) );
attributes.replaceValue( "class", MarkupParser.CLASS_EDITPAGE );
diff --git a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalFootnoteLinkAttributeProviderState.java b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalFootnoteLinkAttributeProviderState.java
index e7dafee..499d52f 100755
--- a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalFootnoteLinkAttributeProviderState.java
+++ b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalFootnoteLinkAttributeProviderState.java
@@ -19,7 +19,7 @@
package org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider;
import com.vladsch.flexmark.util.ast.Node;
-import com.vladsch.flexmark.util.html.Attributes;
+import com.vladsch.flexmark.util.html.MutableAttributes;
import org.apache.wiki.api.core.Context;
import org.apache.wiki.markdown.nodes.JSPWikiLink;
import org.apache.wiki.parser.MarkupParser;
@@ -39,10 +39,10 @@ public class LocalFootnoteLinkAttributeProviderState implements NodeAttributePro
/**
* {@inheritDoc}
*
- * @see NodeAttributeProviderState#setAttributes(Attributes, Node)
+ * @see NodeAttributeProviderState#setAttributes(MutableAttributes, Node)
*/
@Override
- public void setAttributes( final Attributes attributes, final JSPWikiLink link ) {
+ public void setAttributes( final MutableAttributes attributes, final JSPWikiLink link ) {
attributes.replaceValue( "class", MarkupParser.CLASS_FOOTNOTE );
attributes.replaceValue( "href", link.getUrl().toString() );
}
diff --git a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalFootnoteRefLinkAttributeProviderState.java b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalFootnoteRefLinkAttributeProviderState.java
index cd873f4..64591de 100755
--- a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalFootnoteRefLinkAttributeProviderState.java
+++ b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalFootnoteRefLinkAttributeProviderState.java
@@ -19,7 +19,7 @@
package org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider;
import com.vladsch.flexmark.util.ast.Node;
-import com.vladsch.flexmark.util.html.Attributes;
+import com.vladsch.flexmark.util.html.MutableAttributes;
import org.apache.wiki.api.core.Context;
import org.apache.wiki.markdown.nodes.JSPWikiLink;
import org.apache.wiki.parser.MarkupParser;
@@ -39,10 +39,10 @@ public class LocalFootnoteRefLinkAttributeProviderState implements NodeAttribute
/**
* {@inheritDoc}
*
- * @see NodeAttributeProviderState#setAttributes(Attributes, Node)
+ * @see NodeAttributeProviderState#setAttributes(MutableAttributes, Node)
*/
@Override
- public void setAttributes( final Attributes attributes, final JSPWikiLink link ) {
+ public void setAttributes( final MutableAttributes attributes, final JSPWikiLink link ) {
attributes.replaceValue( "class", MarkupParser.CLASS_FOOTNOTE_REF );
attributes.replaceValue( "href", "#ref-" + wikiContext.getName() + "-" + link.getText().toString() );
}
diff --git a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalLinkAttributeProviderState.java b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalLinkAttributeProviderState.java
index 53fe884..d48558a 100755
--- a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalLinkAttributeProviderState.java
+++ b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalLinkAttributeProviderState.java
@@ -19,7 +19,7 @@
package org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider;
import com.vladsch.flexmark.util.ast.Node;
-import com.vladsch.flexmark.util.html.Attributes;
+import com.vladsch.flexmark.util.html.MutableAttributes;
import com.vladsch.flexmark.util.sequence.CharSubSequence;
import org.apache.oro.text.regex.Pattern;
import org.apache.wiki.api.core.Context;
@@ -57,10 +57,10 @@ public class LocalLinkAttributeProviderState implements NodeAttributeProviderSta
/**
* {@inheritDoc}
*
- * @see NodeAttributeProviderState#setAttributes(Attributes, Node)
+ * @see NodeAttributeProviderState#setAttributes(MutableAttributes, Node)
*/
@Override
- public void setAttributes( final Attributes attributes, final JSPWikiLink link ) {
+ public void setAttributes( final MutableAttributes attributes, final JSPWikiLink link ) {
final int hashMark = link.getUrl().toString().indexOf( '#' );
final String attachment = wikiContext.getEngine().getManager( AttachmentManager.class ).getAttachmentInfoName( wikiContext, link.getWikiLink() );
if( attachment != null ) {
diff --git a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalReadLinkAttributeProviderState.java b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalReadLinkAttributeProviderState.java
index e8c597e..1045595 100755
--- a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalReadLinkAttributeProviderState.java
+++ b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalReadLinkAttributeProviderState.java
@@ -19,7 +19,7 @@
package org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider;
import com.vladsch.flexmark.util.ast.Node;
-import com.vladsch.flexmark.util.html.Attributes;
+import com.vladsch.flexmark.util.html.MutableAttributes;
import org.apache.wiki.api.core.Context;
import org.apache.wiki.markdown.nodes.JSPWikiLink;
import org.apache.wiki.parser.MarkupParser;
@@ -39,10 +39,10 @@ public class LocalReadLinkAttributeProviderState implements NodeAttributeProvide
/**
* {@inheritDoc}
*
- * @see NodeAttributeProviderState#setAttributes(Attributes, Node)
+ * @see NodeAttributeProviderState#setAttributes(MutableAttributes, Node)
*/
@Override
- public void setAttributes( final Attributes attributes, final JSPWikiLink link ) {
+ public void setAttributes( final MutableAttributes attributes, final JSPWikiLink link ) {
attributes.replaceValue( "class", MarkupParser.CLASS_WIKIPAGE );
attributes.replaceValue( "href", link.getUrl().toString() );
}
diff --git a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/NodeAttributeProviderState.java b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/NodeAttributeProviderState.java
index feaa851..9d4be3f 100755
--- a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/NodeAttributeProviderState.java
+++ b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/NodeAttributeProviderState.java
@@ -19,7 +19,7 @@
package org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider;
import com.vladsch.flexmark.util.ast.Node;
-import com.vladsch.flexmark.util.html.Attributes;
+import com.vladsch.flexmark.util.html.MutableAttributes;
/**
@@ -33,6 +33,6 @@ public interface NodeAttributeProviderState < T extends Node > {
* @param attributes node attributes.
* @param node the specific node in which the attributes are going to be set.
*/
- void setAttributes( Attributes attributes, T node );
+ void setAttributes( MutableAttributes attributes, T node );
}
diff --git a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/WysiwygEditingAttributeProviderState.java b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/WysiwygEditingAttributeProviderState.java
index a2a0dff..939289e 100755
--- a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/WysiwygEditingAttributeProviderState.java
+++ b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/WysiwygEditingAttributeProviderState.java
@@ -19,7 +19,7 @@
package org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider;
import com.vladsch.flexmark.util.ast.Node;
-import com.vladsch.flexmark.util.html.Attributes;
+import com.vladsch.flexmark.util.html.MutableAttributes;
import org.apache.wiki.api.core.Context;
import org.apache.wiki.htmltowiki.XHtmlToWikiConfig;
import org.apache.wiki.markdown.nodes.JSPWikiLink;
@@ -44,10 +44,10 @@ public class WysiwygEditingAttributeProviderState implements NodeAttributeProvid
/**
* {@inheritDoc}
*
- * @see NodeAttributeProviderState#setAttributes(Attributes, Node)
+ * @see NodeAttributeProviderState#setAttributes(MutableAttributes, Node)
*/
@Override
- public void setAttributes( final Attributes attributes, final JSPWikiLink link ) {
+ public void setAttributes( final MutableAttributes attributes, final JSPWikiLink link ) {
if( m_wysiwygEditorMode ) {
if( attributes.getValue( "class" ) != null ) {
final String href = attributes.getValue( "href" );
diff --git a/pom.xml b/pom.xml
index f500fa0..5a3c8d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,7 +52,7 @@
<commons-lang.version>3.11</commons-lang.version>
<commons-text.version>1.9</commons-text.version>
<ehcache.version>2.10.6</ehcache.version>
- <flexmark.version>0.61.32</flexmark.version>
+ <flexmark.version>0.62.2</flexmark.version>
<freshcookies-security.version>0.60</freshcookies-security.version>
<gson.version>2.8.5</gson.version>
<hsqldb.version>2.5.1</hsqldb.version>