]> source.dussan.org Git - gitblit.git/commitdiff
projects / gitblit.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 60110f7)
Update to Pegdown 1.5.0
authorJames Moger <james.moger@gitblit.com>
Fri, 18 Sep 2015 12:19:36 +0000 (08:19 -0400)
committerJames Moger <james.moger@gitblit.com>
Fri, 18 Sep 2015 12:19:36 +0000 (08:19 -0400)
.classpath patch | blob | history
build.moxie patch | blob | history
gitblit.iml patch | blob | history
src/main/java/com/gitblit/utils/MarkdownUtils.java patch | blob | history

diff --git a/.classpath b/.classpath
index bd0b4372ca83733d1dcaf810359e62c283e6708f..9eaa7e431fec86dbc60589cbe83580a5fbfca8f2 100644 (file)
--- a/.classpath
+++ b/.classpath
@@ -28,13 +28,13 @@
        <classpathentry kind="lib" path="ext/lucene-queryparser-4.10.0.jar" sourcepath="ext/src/lucene-queryparser-4.10.0.jar" />
        <classpathentry kind="lib" path="ext/lucene-sandbox-4.10.0.jar" sourcepath="ext/src/lucene-sandbox-4.10.0.jar" />
        <classpathentry kind="lib" path="ext/jakarta-regexp-1.4.jar" />
-       <classpathentry kind="lib" path="ext/pegdown-1.4.2.jar" sourcepath="ext/src/pegdown-1.4.2.jar" />
-       <classpathentry kind="lib" path="ext/parboiled-java-1.1.6.jar" sourcepath="ext/src/parboiled-java-1.1.6.jar" />
-       <classpathentry kind="lib" path="ext/parboiled-core-1.1.6.jar" sourcepath="ext/src/parboiled-core-1.1.6.jar" />
-       <classpathentry kind="lib" path="ext/asm-4.1.jar" sourcepath="ext/src/asm-4.1.jar" />
-       <classpathentry kind="lib" path="ext/asm-tree-4.1.jar" sourcepath="ext/src/asm-tree-4.1.jar" />
-       <classpathentry kind="lib" path="ext/asm-analysis-4.1.jar" sourcepath="ext/src/asm-analysis-4.1.jar" />
-       <classpathentry kind="lib" path="ext/asm-util-4.1.jar" sourcepath="ext/src/asm-util-4.1.jar" />
+       <classpathentry kind="lib" path="ext/pegdown-1.5.0.jar" sourcepath="ext/src/pegdown-1.5.0.jar" />
+       <classpathentry kind="lib" path="ext/parboiled-java-1.1.7.jar" sourcepath="ext/src/parboiled-java-1.1.7.jar" />
+       <classpathentry kind="lib" path="ext/parboiled-core-1.1.7.jar" sourcepath="ext/src/parboiled-core-1.1.7.jar" />
+       <classpathentry kind="lib" path="ext/asm-5.0.3.jar" sourcepath="ext/src/asm-5.0.3.jar" />
+       <classpathentry kind="lib" path="ext/asm-tree-5.0.3.jar" sourcepath="ext/src/asm-tree-5.0.3.jar" />
+       <classpathentry kind="lib" path="ext/asm-analysis-5.0.3.jar" sourcepath="ext/src/asm-analysis-5.0.3.jar" />
+       <classpathentry kind="lib" path="ext/asm-util-5.0.3.jar" sourcepath="ext/src/asm-util-5.0.3.jar" />
        <classpathentry kind="lib" path="ext/wikitext-core-1.4.jar" sourcepath="ext/src/wikitext-core-1.4.jar" />
        <classpathentry kind="lib" path="ext/twiki-core-1.4.jar" sourcepath="ext/src/twiki-core-1.4.jar" />
        <classpathentry kind="lib" path="ext/textile-core-1.4.jar" sourcepath="ext/src/textile-core-1.4.jar" />
diff --git a/build.moxie b/build.moxie
index 311e26dfd174436d42d290f6ec3da8dac18d82ba..8d92fda027ed7bf0c4e4ea6baecc0579154d9f45 100644 (file)
--- a/build.moxie
+++ b/build.moxie
@@ -148,7 +148,7 @@ dependencies:
 - compile 'org.apache.lucene:lucene-highlighter:${lucene.version}' :war :fedclient
 - compile 'org.apache.lucene:lucene-memory:${lucene.version}' :war :fedclient
 - compile 'org.apache.lucene:lucene-queryparser:${lucene.version}' :war :fedclient
-- compile 'org.pegdown:pegdown:1.4.2' :war
+- compile 'org.pegdown:pegdown:1.5.0' :war
 - compile 'org.fusesource.wikitext:wikitext-core:${wikitext.version}' :war
 - compile 'org.fusesource.wikitext:twiki-core:${wikitext.version}' :war
 - compile 'org.fusesource.wikitext:textile-core:${wikitext.version}' :war
diff --git a/gitblit.iml b/gitblit.iml
index 343f24e4697bafa88a83bfcd65d472245b997e69..55903760004aaac1a68e8eb6f59c1a2648b3caf0 100644 (file)
--- a/gitblit.iml
+++ b/gitblit.iml
@@ -265,79 +265,79 @@
       </library>
     </orderEntry>
     <orderEntry type="module-library">
-      <library name="pegdown-1.4.2.jar">
+      <library name="pegdown-1.5.0.jar">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/ext/pegdown-1.4.2.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/pegdown-1.5.0.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/ext/src/pegdown-1.4.2.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/src/pegdown-1.5.0.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
     <orderEntry type="module-library">
-      <library name="parboiled-java-1.1.6.jar">
+      <library name="parboiled-java-1.1.7.jar">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/ext/parboiled-java-1.1.6.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/parboiled-java-1.1.7.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/ext/src/parboiled-java-1.1.6.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/src/parboiled-java-1.1.7.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
     <orderEntry type="module-library">
-      <library name="parboiled-core-1.1.6.jar">
+      <library name="parboiled-core-1.1.7.jar">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/ext/parboiled-core-1.1.6.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/parboiled-core-1.1.7.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/ext/src/parboiled-core-1.1.6.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/src/parboiled-core-1.1.7.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
     <orderEntry type="module-library">
-      <library name="asm-4.1.jar">
+      <library name="asm-5.0.3.jar">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/ext/asm-4.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/asm-5.0.3.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/ext/src/asm-4.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/src/asm-5.0.3.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
     <orderEntry type="module-library">
-      <library name="asm-tree-4.1.jar">
+      <library name="asm-tree-5.0.3.jar">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/ext/asm-tree-4.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/asm-tree-5.0.3.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/ext/src/asm-tree-4.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/src/asm-tree-5.0.3.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
     <orderEntry type="module-library">
-      <library name="asm-analysis-4.1.jar">
+      <library name="asm-analysis-5.0.3.jar">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/ext/asm-analysis-4.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/asm-analysis-5.0.3.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/ext/src/asm-analysis-4.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/src/asm-analysis-5.0.3.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
     <orderEntry type="module-library">
-      <library name="asm-util-4.1.jar">
+      <library name="asm-util-5.0.3.jar">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/ext/asm-util-4.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/asm-util-5.0.3.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/ext/src/asm-util-4.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/src/asm-util-5.0.3.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
diff --git a/src/main/java/com/gitblit/utils/MarkdownUtils.java b/src/main/java/com/gitblit/utils/MarkdownUtils.java
index 2ebfdb26463efaf6db5caeb08be20a06f174233e..e0c9dd4e7e5b8d3850aa41e766b7c074876286b7 100644 (file)
--- a/src/main/java/com/gitblit/utils/MarkdownUtils.java
+++ b/src/main/java/com/gitblit/utils/MarkdownUtils.java
@@ -16,6 +16,7 @@
 package com.gitblit.utils;\r
 \r
 import static org.pegdown.Extensions.ALL;\r
+import static org.pegdown.Extensions.ANCHORLINKS;\r
 import static org.pegdown.Extensions.SMARTYPANTS;\r
 \r
 import java.io.IOException;\r
@@ -76,7 +77,7 @@ public class MarkdownUtils {
         */\r
        public static String transformMarkdown(String markdown, LinkRenderer linkRenderer) {\r
                try {\r
-                       PegDownProcessor pd = new PegDownProcessor(ALL & ~SMARTYPANTS);\r
+                       PegDownProcessor pd = new PegDownProcessor(ALL & ~SMARTYPANTS & ~ANCHORLINKS);\r
                        RootNode astRoot = pd.parseMarkdown(markdown.toCharArray());\r
                        return new WorkaroundHtmlSerializer(linkRenderer == null ? new LinkRenderer() : linkRenderer).toHtml(astRoot);\r
                } catch (ParsingTimeoutException e) {\r
Pure java git solution: https://github.com/gitblit-org/gitblit