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 2018/07/12 22:28:30 UTC
[jspwiki] branch master updated (d2d57d6 -> 60c2327)
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git.
from d2d57d6 2.10.5-git-07 : fix to plain haddock editor related to the new functionality to recover unsaved page edits
new 85eff48 update flexmark to 0.34.6
new 826782c update slf4j to 1.7.25
new 60c2327 2.10.5-git-08 : update flexmark to 0.34.6 and slf4j to 1.7.25
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.
Summary of changes:
ChangeLog | 4 ++++
.../attributeprovider/JSPWikiLinkAttributeProviderFactory.java | 6 +++---
jspwiki-war/src/main/java/org/apache/wiki/Release.java | 2 +-
pom.xml | 4 ++--
4 files changed, 10 insertions(+), 6 deletions(-)
[jspwiki] 03/03: 2.10.5-git-08 : update flexmark to 0.34.6 and
slf4j to 1.7.25
Posted by ju...@apache.org.
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 60c2327f7555ce28a4fcca8994ec9773740af075
Author: juanpablo <ju...@apache.org>
AuthorDate: Fri Jul 13 00:28:03 2018 +0200
2.10.5-git-08 : update flexmark to 0.34.6 and slf4j to 1.7.25
---
ChangeLog | 4 ++++
jspwiki-war/src/main/java/org/apache/wiki/Release.java | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index af415e0..8c09361 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2018-07-08 Juan Pablo Santos (juanpablo AT apache DOT org)
+
+ * 2.10.5-git-08 : update flexmark to 0.34.6 and slf4j to 1.7.25
+
2018-07-09 Dirk Frederickx (brushed AT apache DOT org)
* 2.10.5-git-07 : fix to plain haddock editor related to the new
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/Release.java b/jspwiki-war/src/main/java/org/apache/wiki/Release.java
index f60386e..fa6d270 100644
--- a/jspwiki-war/src/main/java/org/apache/wiki/Release.java
+++ b/jspwiki-war/src/main/java/org/apache/wiki/Release.java
@@ -72,7 +72,7 @@ public final class Release {
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "7";
+ public static final String BUILD = "8";
/**
* This is the generic version string you should use when printing out the version. It is of
[jspwiki] 02/03: update slf4j to 1.7.25
Posted by ju...@apache.org.
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 826782c5cf099fb529d6a9816de7f9784bae0967
Author: juanpablo <ju...@apache.org>
AuthorDate: Fri Jul 13 00:27:46 2018 +0200
update slf4j to 1.7.25
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 4974115..661256d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,7 @@
<jdk.version>1.6</jdk.version>
<lucene.version>4.7.0</lucene.version>
<selenium.version>2.42.0</selenium.version>
- <slf4j.version>1.7.12</slf4j.version>
+ <slf4j.version>1.7.25</slf4j.version>
<wro4j.version>1.8.0</wro4j.version>
<minimize>true</minimize> <!-- wro4j compression -->
</properties>
[jspwiki] 01/03: update flexmark to 0.34.6
Posted by ju...@apache.org.
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 85eff482a904e0d000a5709bb5e8008ce1d94056
Author: juanpablo <ju...@apache.org>
AuthorDate: Fri Jul 13 00:25:20 2018 +0200
update flexmark to 0.34.6
---
.../attributeprovider/JSPWikiLinkAttributeProviderFactory.java | 6 +++---
pom.xml | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/JSPWikiLinkAttributeProviderFactory.java b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/JSPWikiLinkAttributeProviderFactory.java
index a7dab2d..49a9fd8 100755
--- a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/JSPWikiLinkAttributeProviderFactory.java
+++ b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/JSPWikiLinkAttributeProviderFactory.java
@@ -23,7 +23,7 @@ import org.apache.wiki.WikiContext;
import com.vladsch.flexmark.html.AttributeProvider;
import com.vladsch.flexmark.html.AttributeProviderFactory;
import com.vladsch.flexmark.html.IndependentAttributeProviderFactory;
-import com.vladsch.flexmark.html.renderer.NodeRendererContext;
+import com.vladsch.flexmark.html.renderer.LinkResolverContext;
/**
@@ -40,10 +40,10 @@ public class JSPWikiLinkAttributeProviderFactory extends IndependentAttributePro
/**
* {@inheritDoc}
*
- * @see com.vladsch.flexmark.html.AttributeProviderFactory#create(com.vladsch.flexmark.html.renderer.NodeRendererContext)
+ * @see com.vladsch.flexmark.html.AttributeProviderFactory#create(com.vladsch.flexmark.html.renderer.LinkResolverContext)
*/
@Override
- public AttributeProvider create( final NodeRendererContext context ) {
+ public AttributeProvider create( final LinkResolverContext context ) {
return new JSPWikiLinkAttributeProvider( wikiContext );
}
diff --git a/pom.xml b/pom.xml
index 0c4c3b9..4974115 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <flexmark.version>0.28.38</flexmark.version>
+ <flexmark.version>0.34.6</flexmark.version>
<jdk.version>1.6</jdk.version>
<lucene.version>4.7.0</lucene.version>
<selenium.version>2.42.0</selenium.version>