Ver código fonte

Merge branch 'ticket/200' into develop

tags/v1.7.0
James Moger 9 anos atrás
pai
commit
ecc298bc65
3 arquivos alterados com 5 adições e 5 exclusões
  1. 1
    1
      .classpath
  2. 1
    1
      build.moxie
  3. 3
    3
      gitblit.iml

+ 1
- 1
.classpath Ver arquivo

@@ -16,7 +16,7 @@
<classpathentry kind="lib" path="ext/slf4j-log4j12-1.7.7.jar" sourcepath="ext/src/slf4j-log4j12-1.7.7.jar" />
<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.2.v20140723.jar" sourcepath="ext/src/jetty-all-9.2.2.v20140723.jar" />
<classpathentry kind="lib" path="ext/jetty-all-9.2.3.v20140905.jar" sourcepath="ext/src/jetty-all-9.2.3.v20140905.jar" />
<classpathentry kind="lib" path="ext/wicket-1.4.21.jar" sourcepath="ext/src/wicket-1.4.21.jar" />
<classpathentry kind="lib" path="ext/wicket-auth-roles-1.4.21.jar" sourcepath="ext/src/wicket-auth-roles-1.4.21.jar" />
<classpathentry kind="lib" path="ext/wicket-extensions-1.4.21.jar" sourcepath="ext/src/wicket-extensions-1.4.21.jar" />

+ 1
- 1
build.moxie Ver arquivo

@@ -102,7 +102,7 @@ repositories: central, eclipse-snapshots, eclipse, gitblit

# Convenience properties for dependencies
properties: {
jetty.version : 9.2.2.v20140723
jetty.version : 9.2.3.v20140905
wicket.version : 1.4.21
lucene.version : 4.10.0
jgit.version : 3.5.0.201409260305-r

+ 3
- 3
gitblit.iml Ver arquivo

@@ -135,13 +135,13 @@
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="jetty-all-9.2.2.v20140723.jar">
<library name="jetty-all-9.2.3.v20140905.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/ext/jetty-all-9.2.2.v20140723.jar!/" />
<root url="jar://$MODULE_DIR$/ext/jetty-all-9.2.3.v20140905.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/ext/src/jetty-all-9.2.2.v20140723.jar!/" />
<root url="jar://$MODULE_DIR$/ext/src/jetty-all-9.2.3.v20140905.jar!/" />
</SOURCES>
</library>
</orderEntry>

Carregando…
Cancelar
Salvar