From 3f5b8f5d9203aa7ffb7fbe9cdbaf9dba3da6cae6 Mon Sep 17 00:00:00 2001
From: Hybris95 <hybris_95@hotmail.com>
Date: Thu, 01 May 2014 16:14:15 -0400
Subject: [PATCH] Fixes sort, page building and search functions on "my tickets" page.
---
build.moxie | 29 ++++++++++++++---------------
1 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/build.moxie b/build.moxie
index eb2878a..6d80c50 100644
--- a/build.moxie
+++ b/build.moxie
@@ -10,12 +10,12 @@
description: pure Java Git solution
groupId: com.gitblit
artifactId: gitblit
-version: 1.5.0-SNAPSHOT
+version: 1.6.0-SNAPSHOT
inceptionYear: 2011
# Current stable release
-releaseVersion: 1.4.1
-releaseDate: 2014-03-18
+releaseVersion: 1.5.0
+releaseDate: 2014-04-17
# Project urls
url: 'http://gitblit.com'
@@ -68,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'
@@ -101,7 +101,7 @@
# Convenience properties for dependencies
properties: {
- jetty.version : 8.1.13.v20130916
+ jetty.version : 9.1.4.v20140401
wicket.version : 1.4.21
lucene.version : 4.6.0
jgit.version : 3.3.1.201403241930-r
@@ -109,7 +109,7 @@
bouncycastle.version : 1.49
selenium.version : 2.28.0
wikitext.version : 1.4
- sshd.version: 0.10.1
+ sshd.version: 0.11.0
mina.version: 2.0.7
}
@@ -131,12 +131,11 @@
# Standard dependencies
- 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 'org.slf4j:slf4j-api:1.7.5' :war :fedclient :authority
+- compile 'org.slf4j:slf4j-log4j12:1.7.5' :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
+- 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
@@ -174,7 +173,7 @@
- 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.6' :war
+- compile 'ro.fortsoft.pf4j:pf4j:0.8.0' :war
- test 'junit'
# Dependencies for Selenium web page testing
- test 'org.seleniumhq.selenium:selenium-java:${selenium.version}' @jar
--
Gitblit v1.9.1