From: James Moger <james.moger@gitblit.com>
Date: Thu, 15 May 2014 13:15:07 +0000 (-0400)
Subject: Update to AsciiDoctorJ 1.5.0.preview2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fheads%2Fticket%2F7;p=gitblit.git

Update to AsciiDoctorJ 1.5.0.preview2
---

diff --git a/.classpath b/.classpath
index 42b0efc7..b5fcfbf4 100644
--- a/.classpath
+++ b/.classpath
@@ -40,9 +40,9 @@
 	<classpathentry kind="lib" path="ext/tracwiki-core-1.4.jar" sourcepath="ext/src/tracwiki-core-1.4.jar" />
 	<classpathentry kind="lib" path="ext/mediawiki-core-1.4.jar" sourcepath="ext/src/mediawiki-core-1.4.jar" />
 	<classpathentry kind="lib" path="ext/confluence-core-1.4.jar" sourcepath="ext/src/confluence-core-1.4.jar" />
-	<classpathentry kind="lib" path="ext/asciidoctor-java-integration-0.1.4.jar" sourcepath="ext/src/asciidoctor-java-integration-0.1.4.jar" />
-	<classpathentry kind="lib" path="ext/jruby-complete-1.7.4.jar" sourcepath="ext/src/jruby-complete-1.7.4.jar" />
-	<classpathentry kind="lib" path="ext/jcommander-1.30.jar" sourcepath="ext/src/jcommander-1.30.jar" />
+	<classpathentry kind="lib" path="ext/asciidoctorj-1.5.0.preview2.jar" sourcepath="ext/src/asciidoctorj-1.5.0.preview2.jar" />
+	<classpathentry kind="lib" path="ext/jruby-complete-1.7.9.jar" sourcepath="ext/src/jruby-complete-1.7.9.jar" />
+	<classpathentry kind="lib" path="ext/jcommander-1.32.jar" sourcepath="ext/src/jcommander-1.32.jar" />
 	<classpathentry kind="lib" path="ext/org.eclipse.jgit-3.3.1.201403241930-r.jar" sourcepath="ext/src/org.eclipse.jgit-3.3.1.201403241930-r.jar" />
 	<classpathentry kind="lib" path="ext/jsch-0.1.50.jar" sourcepath="ext/src/jsch-0.1.50.jar" />
 	<classpathentry kind="lib" path="ext/JavaEWAH-0.7.9.jar" sourcepath="ext/src/JavaEWAH-0.7.9.jar" />
diff --git a/build.moxie b/build.moxie
index a8780303..827a510c 100644
--- a/build.moxie
+++ b/build.moxie
@@ -95,9 +95,10 @@ dependencyDirectory: ext
 registeredRepositories:
 - { id: eclipse, url: 'http://repo.eclipse.org/content/groups/releases' }
 - { id: eclipse-snapshots, url: 'http://repo.eclipse.org/content/groups/snapshots' }
+- { id: asciidoctorj, url: 'http://dl.bintray.com/lordofthejars/maven' }
 
 # Source all dependencies from the following repositories in the specified order
-repositories: central, eclipse-snapshots, eclipse
+repositories: central, eclipse-snapshots, eclipse, asciidoctorj
 
 # Convenience properties for dependencies
 properties: {
@@ -111,7 +112,7 @@ properties: {
   wikitext.version : 1.4
   sshd.version: 0.11.0
   mina.version: 2.0.7
-  asciidoctorj.version : 0.1.4
+  asciidoctorj.version : 1.5.0.preview2
   }
 
 # Dependencies
@@ -152,7 +153,7 @@ dependencies:
 - compile 'org.fusesource.wikitext:tracwiki-core:${wikitext.version}' :war
 - compile 'org.fusesource.wikitext:mediawiki-core:${wikitext.version}' :war
 - compile 'org.fusesource.wikitext:confluence-core:${wikitext.version}' :war
-- compile 'org.asciidoctor:asciidoctor-java-integration:${asciidoctorj.version}' :war
+- compile 'org.asciidoctor:asciidoctorj:${asciidoctorj.version}' :war
 - compile 'org.eclipse.jgit:org.eclipse.jgit:${jgit.version}' :war :fedclient :manager :authority !junit
 - compile 'org.eclipse.jgit:org.eclipse.jgit.http.server:${jgit.version}' :war :manager :authority !junit
 - compile 'org.bouncycastle:bcprov-jdk15on:${bouncycastle.version}' :war :authority
diff --git a/gitblit.iml b/gitblit.iml
index 1811093d..e0796054 100644
--- a/gitblit.iml
+++ b/gitblit.iml
@@ -397,35 +397,35 @@
       </library>
     </orderEntry>
     <orderEntry type="module-library">
-      <library name="asciidoctor-java-integration-0.1.4.jar">
+      <library name="asciidoctorj-1.5.0.preview2.jar">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/ext/asciidoctor-java-integration-0.1.4.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/asciidoctorj-1.5.0.preview2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/ext/src/asciidoctor-java-integration-0.1.4.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/src/asciidoctorj-1.5.0.preview2.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
     <orderEntry type="module-library">
-      <library name="jruby-complete-1.7.4.jar">
+      <library name="jruby-complete-1.7.9.jar">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/ext/jruby-complete-1.7.4.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/jruby-complete-1.7.9.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/ext/src/jruby-complete-1.7.4.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/src/jruby-complete-1.7.9.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
     <orderEntry type="module-library">
-      <library name="jcommander-1.30.jar">
+      <library name="jcommander-1.32.jar">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/ext/jcommander-1.30.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/jcommander-1.32.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/ext/src/jcommander-1.30.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/src/jcommander-1.32.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>