From 3a9e76b63f09a32e0b6812e18ffff00fab8e58e6 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 29 Nov 2013 11:05:51 -0500
Subject: [PATCH] Flattened IGitblitManager, GitblitManager, and GitBlit classes
---
build.moxie | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/build.moxie b/build.moxie
index bbcd0e7..acc1afb 100644
--- a/build.moxie
+++ b/build.moxie
@@ -3,7 +3,7 @@
#
# Specify minimum Moxie version required to build
-requires: 0.7.4
+requires: 0.9.1
# Project Metadata
name: Gitblit
@@ -57,6 +57,7 @@
# a scope to each directory.
sourceDirectories:
- compile 'src/main/java'
+- compile 'src/main/dagger' apt
- test 'src/test/java'
# Moxie supports one site-scoped directory for mx:doc
- site 'src/site'
@@ -90,21 +91,22 @@
# Register the Eclipse JGit Maven repositories
registeredRepositories:
-- { id: jgit, url: 'http://download.eclipse.org/jgit/maven' }
-- { id: jgit-snapshots, url: 'https://repo.eclipse.org/content/groups/snapshots' }
+- { id: eclipse, url: 'http://repo.eclipse.org/content/groups/releases' }
+- { id: eclipse-snapshots, url: 'http://repo.eclipse.org/content/groups/snapshots' }
# Source all dependencies from the following repositories in the specified order
-repositories: central, jgit-snapshots, jgit
+repositories: central, eclipse-snapshots, eclipse
# Convenience properties for dependencies
properties: {
- jetty.version : 7.6.13.v20130916
+ jetty.version : 8.1.13.v20130916
wicket.version : 1.4.21
lucene.version : 3.6.1
- jgit.version : 3.0.0.201306101825-r
+ jgit.version : 3.1.0.201310021548-r
groovy.version : 1.8.8
bouncycastle.version : 1.47
selenium.version : 2.28.0
+ wikitext.version : 1.4
}
# Dependencies
@@ -119,6 +121,9 @@
#
dependencies:
+# Dagger dependency injection library (annotation processor)
+- compile 'com.squareup.dagger:dagger:1.1.0' :war apt
+- compile 'com.squareup.dagger:dagger-compiler:1.1.0' :war optional apt
# Standard dependencies
- compile 'com.beust:jcommander:1.17' :fedclient :authority
- compile 'log4j:log4j:1.2.17' :war :fedclient :authority
@@ -135,7 +140,13 @@
- compile 'org.apache.lucene:lucene-core:${lucene.version}' :war :fedclient
- compile 'org.apache.lucene:lucene-highlighter:${lucene.version}' :war :fedclient
- compile 'org.apache.lucene:lucene-memory:${lucene.version}' :war :fedclient
-- compile 'org.tautua.markdownpapers:markdownpapers-core:1.3.2' :war
+- compile 'org.pegdown:pegdown:1.4.1' :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
+- 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.eclipse.jgit:org.eclipse.jgit:${jgit.version}' :war :fedclient :manager :authority
- compile 'org.eclipse.jgit:org.eclipse.jgit.http.server:${jgit.version}' :war :fedclient :manager :authority
- compile 'org.bouncycastle:bcprov-jdk15on:${bouncycastle.version}' :war :authority
--
Gitblit v1.9.1