summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Moger <james.moger@gitblit.com>2014-05-05 09:10:16 -0600
committerJames Moger <james.moger@gitblit.com>2014-05-05 09:10:16 -0600
commit3920e1f852b0417fd1217095d7ec12cbd6f41cb8 (patch)
tree2aafba4d02e71c624e7348696f4ef8c46b2ee112
parent477412d32836c6a8821f17ff0c26a3c18843d815 (diff)
parent4d1f6a5670c90b53cbb1dbf6bb75f20cb440445b (diff)
downloadgitblit-3920e1f852b0417fd1217095d7ec12cbd6f41cb8.tar.gz
gitblit-3920e1f852b0417fd1217095d7ec12cbd6f41cb8.zip
Merged #58 "Update javax.mail to 1.5.1"
-rw-r--r--.classpath2
-rw-r--r--build.moxie2
-rw-r--r--gitblit.iml6
3 files changed, 5 insertions, 5 deletions
diff --git a/.classpath b/.classpath
index e577b7ca..519aa513 100644
--- a/.classpath
+++ b/.classpath
@@ -13,7 +13,7 @@
<classpathentry kind="lib" path="ext/log4j-1.2.17.jar" sourcepath="ext/src/log4j-1.2.17.jar" />
<classpathentry kind="lib" path="ext/slf4j-api-1.7.5.jar" sourcepath="ext/src/slf4j-api-1.7.5.jar" />
<classpathentry kind="lib" path="ext/slf4j-log4j12-1.7.5.jar" sourcepath="ext/src/slf4j-log4j12-1.7.5.jar" />
- <classpathentry kind="lib" path="ext/mail-1.4.3.jar" sourcepath="ext/src/mail-1.4.3.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.1.4.v20140401.jar" sourcepath="ext/src/jetty-all-9.1.4.v20140401.jar" />
<classpathentry kind="lib" path="ext/wicket-1.4.21.jar" sourcepath="ext/src/wicket-1.4.21.jar" />
diff --git a/build.moxie b/build.moxie
index 5f560532..b676917b 100644
--- a/build.moxie
+++ b/build.moxie
@@ -133,7 +133,7 @@ dependencies:
- compile 'log4j:log4j:1.2.17' :war :fedclient :authority
- compile 'org.slf4j:slf4j-api:1.7.5' :war :fedclient :authority
- compile 'org.slf4j:slf4j-log4j12:1.7.5' :war :fedclient :authority
-- compile 'javax.mail:mail:1.4.3' :war :authority
+- compile 'com.sun.mail:javax.mail:1.5.1' :war :authority
- 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
diff --git a/gitblit.iml b/gitblit.iml
index 7e25249e..78828b68 100644
--- a/gitblit.iml
+++ b/gitblit.iml
@@ -102,13 +102,13 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="mail-1.4.3.jar">
+ <library name="javax.mail-1.5.1.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/mail-1.4.3.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/javax.mail-1.5.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/mail-1.4.3.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/javax.mail-1.5.1.jar!/" />
</SOURCES>
</library>
</orderEntry>