From a806d728a60525720e0ef6c5bcb7e7062a4835ad Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 05 May 2014 13:40:57 -0400
Subject: [PATCH] Create ticket/N branch on pt start N
---
build.moxie | 73 +++++++++++++++++++++++-------------
1 files changed, 47 insertions(+), 26 deletions(-)
diff --git a/build.moxie b/build.moxie
index bbcd0e7..b676917 100644
--- a/build.moxie
+++ b/build.moxie
@@ -3,19 +3,19 @@
#
# 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.4.0-SNAPSHOT
+version: 1.6.0-SNAPSHOT
inceptionYear: 2011
# Current stable release
-releaseVersion: 1.3.2
-releaseDate: 2013-08-22
+releaseVersion: 1.5.0
+releaseDate: 2014-04-17
# Project urls
url: 'http://gitblit.com'
@@ -57,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'
@@ -65,12 +68,12 @@
- compile 'src/main/resources'
- site 'src/site/resources'
-# compile for Java 6 class format
+# compile for Java 7 class format
tasks: {
'mx:javac' : {
- source: 1.6
- target: 1.6
- compiler: javac1.6
+ source: 1.7
+ target: 1.7
+ compiler: javac1.7
encoding: UTF-8
# stop complaints about bootstrap classpath when compiling with Java 7
compilerArgs: '-Xlint:-options'
@@ -90,21 +93,24 @@
# 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 : 9.1.4.v20140401
wicket.version : 1.4.21
- lucene.version : 3.6.1
- jgit.version : 3.0.0.201306101825-r
+ lucene.version : 4.6.0
+ jgit.version : 3.3.1.201403241930-r
groovy.version : 1.8.8
- bouncycastle.version : 1.47
+ bouncycastle.version : 1.49
selenium.version : 2.28.0
+ wikitext.version : 1.4
+ sshd.version: 0.11.0
+ mina.version: 2.0.7
}
# Dependencies
@@ -119,28 +125,39 @@
#
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 'com.intellij:annotations:12.0' :war
- 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.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
+- compile 'org.slf4j:slf4j-api:1.7.5' :war :fedclient :authority
+- compile 'org.slf4j:slf4j-log4j12:1.7.5' :war :fedclient :authority
+- compile 'com.sun.mail:javax.mail:1.5.1' :war :authority
+- compile 'javax.servlet:javax.servlet-api:3.1.0' :fedclient
+- compile 'org.eclipse.jetty.aggregate:jetty-all:${jetty.version}' @jar
- compile 'org.apache.wicket:wicket:${wicket.version}' :war !org.mockito
- compile 'org.apache.wicket:wicket-auth-roles:${wicket.version}' :war !org.mockito
- 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.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.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 !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
- compile 'org.bouncycastle:bcmail-jdk15on:${bouncycastle.version}' :war :authority
- compile 'org.bouncycastle:bcpkix-jdk15on:${bouncycastle.version}' :war :authority
+- compile 'org.apache.sshd:sshd-core:${sshd.version}' :war !org.easymock
+- compile 'org.apache.mina:mina-core:${mina.version}' :war !org.easymock
- compile 'rome:rome:0.9' :war :manager :api
- compile 'com.google.code.gson:gson:1.7.2' :war :fedclient :manager :api
- compile 'org.codehaus.groovy:groovy-all:${groovy.version}' :war
@@ -153,7 +170,11 @@
- 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 'args4j:args4j:2.0.26' :war :fedclient :authority
- compile 'commons-codec:commons-codec:1.7' :war
+- compile 'redis.clients:jedis:2.3.1' :war
+- compile 'ro.fortsoft.pf4j:pf4j:0.8.0' :war
+- compile 'org.apache.tika:tika-core:1.5' :war
- test 'junit'
# Dependencies for Selenium web page testing
- test 'org.seleniumhq.selenium:selenium-java:${selenium.version}' @jar
--
Gitblit v1.9.1