Merged #219 "Update to Guice 4.0-beta5"

James Moger

2014-11-04 02c6a8c24505625c5f411c0af1019c7c1f443d07

Merged #219 "Update to Guice 4.0-beta5"

 .classpath

@@ -5,7 +5,7 @@
    <classpathentry kind="src" path="src/test/java" output="bin/test-classes" />
    <classpathentry kind="src" path="src/test/bugtraq" output="bin/test-classes" />
    <classpathentry kind="src" path="src/main/resources" />
    <classpathentry kind="lib" path="ext/guice-4.0-beta4.jar" sourcepath="ext/src/guice-4.0-beta4.jar" />
    <classpathentry kind="lib" path="ext/guice-4.0-beta5.jar" sourcepath="ext/src/guice-4.0-beta5.jar" />
    <classpathentry kind="lib" path="ext/javax.inject-1.jar" sourcepath="ext/src/javax.inject-1.jar" />
    <classpathentry kind="lib" path="ext/aopalliance-1.0.jar" sourcepath="ext/src/aopalliance-1.0.jar" />
    <classpathentry kind="lib" path="ext/guava-17.0.jar" sourcepath="ext/src/guava-17.0.jar" />

 build.moxie

@@ -112,7 +112,7 @@
  wikitext.version : 1.4
  sshd.version: 0.13.0
  mina.version: 2.0.7
  guice.version : 4.0-beta4
  guice.version : 4.0-beta5
  # Gitblit maintains a fork of guice-servlet
  guice-servlet.version : 4.0-gb1
  }

 gitblit.iml

@@ -14,13 +14,13 @@
    </content>
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module-library">
      <library name="guice-4.0-beta4.jar">
      <library name="guice-4.0-beta5.jar">
        <CLASSES>
          <root url="jar://$MODULE_DIR$/ext/guice-4.0-beta4.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/guice-4.0-beta5.jar!/" />
        </CLASSES>
        <JAVADOC />
        <SOURCES>
          <root url="jar://$MODULE_DIR$/ext/src/guice-4.0-beta4.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/src/guice-4.0-beta5.jar!/" />
        </SOURCES>
      </library>
    </orderEntry>

 releases.moxie

@@ -30,7 +30,7 @@
    - Add Priority & Severity fields for tickets (pr-220, ticket-157)
    - Add Maintenance ticket type (pr-223, ticket-206)    
    dependencyChanges:
    - Guice 4.0-beta4 (ticket-80)
    - Guice 4.0-beta5 (ticket-80, ticket-219)
    - SLF4j 1.7.7 (ticket-122)
    - gson 2.2.2 (ticket-123)
    - Freemarker 2.3.20 (ticket-124)