From a7af195bed674c2f0f1a74b69cefc8be1d90572d Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 14 Apr 2014 15:06:25 -0400
Subject: [PATCH] Expose the plugin manager to the webapp
---
build.moxie | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/build.moxie b/build.moxie
index 7ba9b4c..0f7ac81 100644
--- a/build.moxie
+++ b/build.moxie
@@ -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,14 +101,16 @@
# 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.0.201403021825-r
+ jgit.version : 3.3.1.201403241930-r
groovy.version : 1.8.8
bouncycastle.version : 1.49
selenium.version : 2.28.0
wikitext.version : 1.4
+ sshd.version: 0.10.1
+ mina.version: 2.0.7
}
# Dependencies
@@ -132,13 +134,11 @@
- 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 :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
-- 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
@@ -156,6 +156,8 @@
- 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
@@ -171,6 +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.7.1' :war
- test 'junit'
# Dependencies for Selenium web page testing
- test 'org.seleniumhq.selenium:selenium-java:${selenium.version}' @jar
--
Gitblit v1.9.1