switched to java 8 and wicket 7.4.0

6 files changed, 135 insertions, 51 deletions

diff --git a/.classpath b/.classpath
index ccf6a4e0..8b884436 100644
--- a/.classpath
+++ b/.classpath
@@ -17,9 +17,18 @@
 	<classpathentry kind="lib" path="ext/javax.mail-1.5.1.jar" sourcepath="ext/src/javax.mail-1.5.1.jar" />
 	<classpathentry kind="lib" path="ext/javax.servlet-api-3.1.0.jar" sourcepath="ext/src/javax.servlet-api-3.1.0.jar" />
 	<classpathentry kind="lib" path="ext/jetty-all-9.2.13.v20150730.jar" sourcepath="ext/src/jetty-all-9.2.13.v20150730.jar" />
-	<classpathentry kind="lib" path="ext/wicket-1.4.22.jar" sourcepath="ext/src/wicket-1.4.22.jar" />
-	<classpathentry kind="lib" path="ext/wicket-auth-roles-1.4.22.jar" sourcepath="ext/src/wicket-auth-roles-1.4.22.jar" />
-	<classpathentry kind="lib" path="ext/wicket-extensions-1.4.22.jar" sourcepath="ext/src/wicket-extensions-1.4.22.jar" />
+	<classpathentry kind="lib" path="ext/wicket-core-7.4.0.jar" sourcepath="ext/src/wicket-core-7.4.0.jar" />
+	<classpathentry kind="lib" path="ext/commons-collections4-4.1.jar" sourcepath="ext/src/commons-collections4-4.1.jar" />
+	<classpathentry kind="lib" path="ext/wicket-request-7.4.0.jar" sourcepath="ext/src/wicket-request-7.4.0.jar" />
+	<classpathentry kind="lib" path="ext/wicket-util-7.4.0.jar" sourcepath="ext/src/wicket-util-7.4.0.jar" />
+	<classpathentry kind="lib" path="ext/commons-fileupload-1.3.2.jar" sourcepath="ext/src/commons-fileupload-1.3.2.jar" />
+	<classpathentry kind="lib" path="ext/commons-io-2.2.jar" sourcepath="ext/src/commons-io-2.2.jar" />
+	<classpathentry kind="lib" path="ext/hamcrest-junit-2.0.0.0.jar" sourcepath="ext/src/hamcrest-junit-2.0.0.0.jar" />
+	<classpathentry kind="lib" path="ext/junit-4.11.jar" sourcepath="ext/src/junit-4.11.jar" />
+	<classpathentry kind="lib" path="ext/hamcrest-core-1.3.jar" sourcepath="ext/src/hamcrest-core-1.3.jar" />
+	<classpathentry kind="lib" path="ext/java-hamcrest-2.0.0.0.jar" sourcepath="ext/src/java-hamcrest-2.0.0.0.jar" />
+	<classpathentry kind="lib" path="ext/wicket-auth-roles-7.4.0.jar" sourcepath="ext/src/wicket-auth-roles-7.4.0.jar" />
+	<classpathentry kind="lib" path="ext/wicket-extensions-7.4.0.jar" sourcepath="ext/src/wicket-extensions-7.4.0.jar" />
 	<classpathentry kind="lib" path="ext/lucene-core-4.10.4.jar" sourcepath="ext/src/lucene-core-4.10.4.jar" />
 	<classpathentry kind="lib" path="ext/lucene-analyzers-common-4.10.4.jar" sourcepath="ext/src/lucene-analyzers-common-4.10.4.jar" />
 	<classpathentry kind="lib" path="ext/lucene-highlighter-4.10.4.jar" sourcepath="ext/src/lucene-highlighter-4.10.4.jar" />
@@ -48,7 +57,7 @@
 	<classpathentry kind="lib" path="ext/httpcore-4.3.3.jar" sourcepath="ext/src/httpcore-4.3.3.jar" />
 	<classpathentry kind="lib" path="ext/commons-logging-1.1.3.jar" sourcepath="ext/src/commons-logging-1.1.3.jar" />
 	<classpathentry kind="lib" path="ext/commons-codec-1.7.jar" sourcepath="ext/src/commons-codec-1.7.jar" />
-	<classpathentry kind="lib" path="ext/org.eclipse.jdt.annotation-1.1.0.jar" />
+	<classpathentry kind="lib" path="ext/org.eclipse.jdt.annotation-1.1.0.jar" sourcepath="ext/src/org.eclipse.jdt.annotation-1.1.0.jar" />
 	<classpathentry kind="lib" path="ext/org.eclipse.jgit.http.server-4.1.1.201511131810-r.jar" sourcepath="ext/src/org.eclipse.jgit.http.server-4.1.1.201511131810-r.jar" />
 	<classpathentry kind="lib" path="ext/bcprov-jdk15on-1.52.jar" sourcepath="ext/src/bcprov-jdk15on-1.52.jar" />
 	<classpathentry kind="lib" path="ext/bcmail-jdk15on-1.52.jar" sourcepath="ext/src/bcmail-jdk15on-1.52.jar" />
@@ -64,7 +73,6 @@
 	<classpathentry kind="lib" path="ext/jcalendar-1.3.2.jar" />
 	<classpathentry kind="lib" path="ext/commons-compress-1.4.1.jar" sourcepath="ext/src/commons-compress-1.4.1.jar" />
 	<classpathentry kind="lib" path="ext/xz-1.0.jar" sourcepath="ext/src/xz-1.0.jar" />
-	<classpathentry kind="lib" path="ext/commons-io-2.2.jar" sourcepath="ext/src/commons-io-2.2.jar" />
 	<classpathentry kind="lib" path="ext/force-partner-api-24.0.0.jar" sourcepath="ext/src/force-partner-api-24.0.0.jar" />
 	<classpathentry kind="lib" path="ext/force-wsc-24.0.0.jar" sourcepath="ext/src/force-wsc-24.0.0.jar" />
 	<classpathentry kind="lib" path="ext/js-1.7R2.jar" sourcepath="ext/src/js-1.7R2.jar" />
@@ -79,8 +87,6 @@
 	<classpathentry kind="lib" path="ext/pf4j-0.9.0.jar" sourcepath="ext/src/pf4j-0.9.0.jar" />
 	<classpathentry kind="lib" path="ext/tika-core-1.5.jar" sourcepath="ext/src/tika-core-1.5.jar" />
 	<classpathentry kind="lib" path="ext/jsoup-1.7.3.jar" sourcepath="ext/src/jsoup-1.7.3.jar" />
-	<classpathentry kind="lib" path="ext/junit-4.11.jar" sourcepath="ext/src/junit-4.11.jar" />
-	<classpathentry kind="lib" path="ext/hamcrest-core-1.3.jar" sourcepath="ext/src/hamcrest-core-1.3.jar" />
 	<classpathentry kind="lib" path="ext/selenium-java-2.28.0.jar" sourcepath="ext/src/selenium-java-2.28.0.jar" />
 	<classpathentry kind="lib" path="ext/selenium-support-2.28.0.jar" sourcepath="ext/src/selenium-support-2.28.0.jar" />
 	<classpathentry kind="lib" path="ext/selenium-firefox-driver-2.28.0.jar" sourcepath="ext/src/selenium-firefox-driver-2.28.0.jar" />
@@ -93,10 +99,5 @@
 	<classpathentry kind="lib" path="ext/mockito-core-1.10.19.jar" sourcepath="ext/src/mockito-core-1.10.19.jar" />
 	<classpathentry kind="lib" path="ext/objenesis-2.1.jar" sourcepath="ext/src/objenesis-2.1.jar" />
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER" />
-	<classpathentry kind="src" path="src/main/dagger">
-		<attributes>
-			<attribute name="optional" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="output" path="bin/classes" />
 </classpath>
diff --git a/.gitignore b/.gitignore
index e268ccbc..c7244b85 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,4 @@ tags
 /**/init.lua
 /**/session
 /nbproject/private
+/target/
diff --git a/.project b/.project
index 90c747bc..f2e77755 100644
--- a/.project
+++ b/.project
@@ -15,8 +15,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
 	</natures>
diff --git a/build.moxie b/build.moxie
index e84ab401..1431e5ee 100644
--- a/build.moxie
+++ b/build.moxie
@@ -68,14 +68,14 @@ resourceDirectories:
 - compile 'src/main/resources'
 - site 'src/site/resources'
 
-# compile for Java 7 class format
+# compile for Java 8 class format
 tasks: {
 	'mx:javac' : {
-        source: 1.7
-        target: 1.7
-        compiler: javac1.7
+        source: 1.8
+        target: 1.8
+        compiler: javac1.8
         encoding: UTF-8
-        # stop complaints about bootstrap classpath when compiling with Java 7
+        # stop complaints about bootstrap classpath when compiling with Java 8
         compilerArgs: '-Xlint:-options'
     }
 }
@@ -104,7 +104,7 @@ repositories: central, eclipse-snapshots, eclipse, gitblit
 properties: {
   jetty.version  : 9.2.13.v20150730
   slf4j.version  : 1.7.12
-  wicket.version : 1.4.22
+  wicket.version : 7.4.0
   lucene.version : 4.10.4
   jgit.version   : 4.1.1.201511131810-r
   groovy.version : 2.4.4
@@ -140,7 +140,7 @@ dependencies:
 - compile 'com.sun.mail:javax.mail:1.5.1' :war
 - 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-core:${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.apache.lucene:lucene-core:${lucene.version}' :war :fedclient
diff --git a/gitblit.iml b/gitblit.iml
index 93331b20..ec6dc5e1 100644
--- a/gitblit.iml
+++ b/gitblit.iml
@@ -146,35 +146,123 @@
       </library>
     </orderEntry>
     <orderEntry type="module-library">
-      <library name="wicket-1.4.22.jar">
+      <library name="wicket-core-7.4.0.jar">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/ext/wicket-1.4.22.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/wicket-core-7.4.0.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/ext/src/wicket-1.4.22.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/src/wicket-core-7.4.0.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
     <orderEntry type="module-library">
-      <library name="wicket-auth-roles-1.4.22.jar">
+      <library name="commons-collections4-4.1.jar">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/ext/wicket-auth-roles-1.4.22.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/commons-collections4-4.1.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/ext/src/wicket-auth-roles-1.4.22.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/src/commons-collections4-4.1.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
     <orderEntry type="module-library">
-      <library name="wicket-extensions-1.4.22.jar">
+      <library name="wicket-request-7.4.0.jar">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/ext/wicket-extensions-1.4.22.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/wicket-request-7.4.0.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/ext/src/wicket-extensions-1.4.22.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/src/wicket-request-7.4.0.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="wicket-util-7.4.0.jar">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/ext/wicket-util-7.4.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/ext/src/wicket-util-7.4.0.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="commons-fileupload-1.3.2.jar">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/ext/commons-fileupload-1.3.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/ext/src/commons-fileupload-1.3.2.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="commons-io-2.2.jar">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/ext/commons-io-2.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/ext/src/commons-io-2.2.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="hamcrest-junit-2.0.0.0.jar">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/ext/hamcrest-junit-2.0.0.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/ext/src/hamcrest-junit-2.0.0.0.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="hamcrest-core-1.3.jar">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/ext/hamcrest-core-1.3.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/ext/src/hamcrest-core-1.3.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="java-hamcrest-2.0.0.0.jar">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/ext/java-hamcrest-2.0.0.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/ext/src/java-hamcrest-2.0.0.0.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="wicket-auth-roles-7.4.0.jar">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/ext/wicket-auth-roles-7.4.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/ext/src/wicket-auth-roles-7.4.0.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="wicket-extensions-7.4.0.jar">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/ext/wicket-extensions-7.4.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/ext/src/wicket-extensions-7.4.0.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
@@ -490,7 +578,9 @@
           <root url="jar://$MODULE_DIR$/ext/org.eclipse.jdt.annotation-1.1.0.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jdt.annotation-1.1.0.jar!/" />
+        </SOURCES>
       </library>
     </orderEntry>
     <orderEntry type="module-library">
@@ -657,17 +747,6 @@
       </library>
     </orderEntry>
     <orderEntry type="module-library">
-      <library name="commons-io-2.2.jar">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/ext/commons-io-2.2.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/ext/src/commons-io-2.2.jar!/" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
       <library name="force-partner-api-24.0.0.jar">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/ext/force-partner-api-24.0.0.jar!/" />
@@ -833,17 +912,6 @@
       </library>
     </orderEntry>
     <orderEntry type="module-library" scope="TEST">
-      <library name="hamcrest-core-1.3.jar">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/ext/hamcrest-core-1.3.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/ext/src/hamcrest-core-1.3.jar!/" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" scope="TEST">
       <library name="selenium-java-2.28.0.jar">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/ext/selenium-java-2.28.0.jar!/" />
diff --git a/src/test/config/test-users.conf b/src/test/config/test-users.conf
index 4361410c..dfb2e46a 100644
--- a/src/test/config/test-users.conf
+++ b/src/test/config/test-users.conf
@@ -1,3 +1,11 @@
+[user "TicketRefTest"]
+	password = admin
+	displayName = TicketRefTest
+	emailAddress = TicketRefTest@example.com
+	accountType = LOCAL
+	emailMeOnMyTicketChanges = true
+	role = "#none"
+	repository = RW+:ticketreferencetest.git
 [user "admin"]
 	password = admin
 	cookie = dd94709528bb1c83d08f3088d4043f4742891f4f