From d3b1e34c7428fbe4ef3abeee9eaef0f885c3f19b Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 14 Apr 2014 12:31:56 -0400
Subject: [PATCH] Merged #47 "Fix diffstat display for tickets with pending submodule changes"

---
 releases.moxie |   23 +++++++++++++++++++----
 1 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/releases.moxie b/releases.moxie
index 32da215..f683f2b 100644
--- a/releases.moxie
+++ b/releases.moxie
@@ -5,9 +5,17 @@
     title: ${project.name} ${project.version} released
     id: ${project.version}
     date: ${project.buildDate}
-    note: ~
+    note: Gitblit now requires Java 7 for build & runtime.
     html: ~
-    text: ~
+    text: ''
+          MAJOR Release.
+
+          * Integrated SSH daemon based on Apache Mina/SSHD and Gerrit
+          * Basic plugin management framework and plugin registry, limited extension points
+          * Replace GoogleCharts with a self-hosted copy of the flotr2 charting library
+          * Move to Java 7, some dependencies require this
+          * Move to Jetty 9, dropped AJP feature because it was removed upstream
+          ''
     security: ~
     fixes:
     - Repository mailing lists could not be reset from the Edit Repository page (issue-399)
@@ -24,22 +32,29 @@
     - Option to allow LDAP users to directly authenticate without performing LDAP searches (pr-162)
     - Replace JCommander with args4j to be consistent with other tools (ticket-28)
     - Sort repository urls by descending permissions and by transport security within equal permissions
+    - Move to Java 7 & updated to Jetty 9.1.4
+    - dropped AJP support because it has been removed from upstream Jetty
+    - dropped settings: server.useNio, server.ajpPort, server.ajpBindInterface
+    - dropped GO parameters: --ajpPort, --useNio
     additions:
     - Added an SSH daemon with public key authentication (issue-369, ticket-6)
     - Added beginnings of a plugin framework for extending Gitblit (issue-381, ticket-23)
     - Added a French translation (pr-163)
     - Added a setting to control what transports may be used for pushes
     dependencyChanges:
+    - Java 7
+    - Jetty 9.1.4
     - args4j 2.0.26
     - JGit 3.3.1
     - Mina SSHD 0.10.1
-    - pf4j 0.6
+    - pf4j 0.7.1
     contributors:
     - James Moger
     - David Ostrovsky
     - Johann Ollivier-Lapeyre
     - Jeremie Brebec
     - Tim Ryan
+    - Decebal Suiu
     settings:
     - { name: 'realm.ldap.bindpattern', defaultValue: ' ' }
     - { name: 'tickets.closeOnPushCommitMessageRegex', defaultValue: '(?:fixes|closes)[\\s-]+#?(\\d+)' }
@@ -51,7 +66,7 @@
     - { name: 'git.sshBackend', defaultValue: 'NIO2' }
     - { name: 'git.sshCommandStartThreads', defaultValue: '2' }
     - { name: 'plugins.folder', defaultValue: '${baseFolder}/plugins' }
-    - { name: 'plugins.registry', defaultValue: 'http://gitblit.github.io/gitblit-registry/plugins.json' }
+    - { name: 'plugins.registry', defaultValue: 'http://plugins.gitblit.com/plugins.json' }
 }
 
 #

--
Gitblit v1.9.1