From f879b59d26aa85b3a80d984abd7194ffb3e9946d Mon Sep 17 00:00:00 2001
From: Alex Lewis <alex.lewis001@gmail.com>
Date: Mon, 23 Dec 2013 10:02:18 -0500
Subject: [PATCH] Fixed test.
---
build.moxie | 49 ++++++++++++++++++++++++++++++++++---------------
1 files changed, 34 insertions(+), 15 deletions(-)
diff --git a/build.moxie b/build.moxie
index 16e06b2..697e054 100644
--- a/build.moxie
+++ b/build.moxie
@@ -3,25 +3,26 @@
#
# Specify minimum Moxie version required to build
-requires: 0.7.4
+requires: 0.9.1
# Project Metadata
name: Gitblit
description: pure Java Git solution
groupId: com.gitblit
artifactId: gitblit
-version: 1.3.0-SNAPSHOT
+version: 1.4.0-SNAPSHOT
inceptionYear: 2011
# Current stable release
-releaseVersion: 1.2.1
-releaseDate: '2013-01-15'
+releaseVersion: 1.3.2
+releaseDate: 2013-08-22
# Project urls
url: 'http://gitblit.com'
issuesUrl: 'http://code.google.com/p/gitblit/issues/list'
socialNetworkUrl: 'https://plus.google.com/114464678392593421684'
forumUrl: 'http://groups.google.com/group/gitblit'
+mavenUrl: 'http://gitblit.github.io/gitblit-maven'
# Licenses section included for POM generation
licenses:
@@ -56,7 +57,10 @@
# a scope to each directory.
sourceDirectories:
- compile 'src/main/java'
+- compile 'src/main/bugtraq'
+- compile 'src/main/dagger' apt
- test 'src/test/java'
+- test 'src/test/bugtraq'
# Moxie supports one site-scoped directory for mx:doc
- site 'src/site'
@@ -89,21 +93,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.8.v20121106
+ jetty.version : 8.1.13.v20130916
wicket.version : 1.4.21
- lucene.version : 3.6.1
- jgit.version : 3.0.0-SNAPSHOT
+ lucene.version : 4.6.0
+ jgit.version : 3.2.0.201312181205-r
groovy.version : 1.8.8
- bouncycastle.version : 1.47
+ bouncycastle.version : 1.49
selenium.version : 2.28.0
+ wikitext.version : 1.4
}
# Dependencies
@@ -118,12 +123,16 @@
#
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.intellij:annotations:12.0' :war
- compile 'com.beust:jcommander:1.17' :fedclient :authority
- compile 'log4j:log4j:1.2.17' :war :fedclient :authority
- compile 'org.slf4j:slf4j-api:1.6.6' :war :fedclient :authority
- compile 'org.slf4j:slf4j-log4j12:1.6.6' :war :fedclient :authority
-- compile 'javax.mail:mail:1.4.3' :war :fedclient :authority
+- compile 'javax.mail:mail:1.4.3' :war :authority
- compile 'javax.servlet:javax.servlet-api:3.0.1' :fedclient
- compile 'org.eclipse.jetty.aggregate:jetty-webapp:${jetty.version}' @jar
- compile 'org.eclipse.jetty:jetty-ajp:${jetty.version}' @jar
@@ -132,11 +141,19 @@
- compile 'org.apache.wicket:wicket-extensions:${wicket.version}' :war !org.mockito
- compile 'org.wicketstuff:googlecharts:${wicket.version}' :war
- compile 'org.apache.lucene:lucene-core:${lucene.version}' :war :fedclient
+- compile 'org.apache.lucene:lucene-analyzers-common:${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.apache.lucene:lucene-queryparser:${lucene.version}' :war :fedclient
+- compile 'org.pegdown:pegdown:1.4.2' :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.eclipse.jgit:org.eclipse.jgit.http.server:${jgit.version}' :war :manager :authority
- compile 'org.bouncycastle:bcprov-jdk15on:${bouncycastle.version}' :war :authority
- compile 'org.bouncycastle:bcmail-jdk15on:${bouncycastle.version}' :war :authority
- compile 'org.bouncycastle:bcpkix-jdk15on:${bouncycastle.version}' :war :authority
@@ -147,9 +164,12 @@
- compile 'org.apache.ivy:ivy:2.2.0' :war
- compile 'com.toedter:jcalendar:1.3.2' :authority
- compile 'org.apache.commons:commons-compress:1.4.1' :war
+- compile 'commons-io:commons-io:2.2' :war
- compile 'com.force.api:force-partner-api:24.0.0' :war
- compile 'org.freemarker:freemarker:2.3.19' :war
- compile 'com.github.dblock.waffle:waffle-jna:1.5' :war
+- compile 'org.kohsuke:libpam4j:1.7' :war
+- compile 'commons-codec:commons-codec:1.7' :war
- test 'junit'
# Dependencies for Selenium web page testing
- test 'org.seleniumhq.selenium:selenium-java:${selenium.version}' @jar
@@ -158,4 +178,3 @@
# Dependencies with the "build" scope are retrieved
# and injected into the Ant runtime classpath
- build 'jacoco'
-
--
Gitblit v1.9.1