diff options
author | James Moger <james.moger@gitblit.com> | 2014-04-11 13:34:36 -0400 |
---|---|---|
committer | James Moger <james.moger@gitblit.com> | 2014-04-11 13:48:16 -0400 |
commit | cff7ccfc20f775dff4d7f76cb9bf2a7766b071ea (patch) | |
tree | cb404049fa32878f5576ba01777ba93326169762 | |
parent | df3594165089d28409cdd57bbe5f3fde304557f1 (diff) | |
download | gitblit-cff7ccfc20f775dff4d7f76cb9bf2a7766b071ea.tar.gz gitblit-cff7ccfc20f775dff4d7f76cb9bf2a7766b071ea.zip |
Build with Java 7
-rw-r--r-- | README.markdown | 2 | ||||
-rw-r--r-- | build.moxie | 8 | ||||
-rw-r--r-- | releases.moxie | 4 |
3 files changed, 8 insertions, 6 deletions
diff --git a/README.markdown b/README.markdown index be60b2a7..fb8632f4 100644 --- a/README.markdown +++ b/README.markdown @@ -13,7 +13,7 @@ The text of the license is included in the file LICENSE in the root of the proje Java Runtime Requirement
------------------------------------
-Gitblit requires at Java 6 Runtime Environment (JRE) or a Java 6 Development Kit (JDK).
+Gitblit requires at Java 7 Runtime Environment (JRE) or a Java 7 Development Kit (JDK).
Getting help
------------
diff --git a/build.moxie b/build.moxie index 87677373..4e567b47 100644 --- a/build.moxie +++ b/build.moxie @@ -68,12 +68,12 @@ resourceDirectories: - 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' diff --git a/releases.moxie b/releases.moxie index e79782b6..1d260905 100644 --- a/releases.moxie +++ b/releases.moxie @@ -5,7 +5,7 @@ r22: { title: ${project.name} ${project.version} released id: ${project.version} date: ${project.buildDate} - note: ~ + note: Gitblit now requires Java 7 for build & runtime. html: ~ text: ~ security: ~ @@ -24,12 +24,14 @@ r22: { - 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 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 - args4j 2.0.26 - JGit 3.3.1 - Mina SSHD 0.10.1 |