diff options
| author | Martin Stockhammer <martin.stockhammer@ars.de> | 2017-11-11 00:10:29 +0100 |
|---|---|---|
| committer | Martin Stockhammer <martin.stockhammer@ars.de> | 2017-11-11 00:10:29 +0100 |
| commit | 8462e8785037b5b4a9ed2821e604343df39372c7 (patch) | |
| tree | 605c58b290c9be44957ea448541326734964392a | |
| parent | c6e4e563d6698aa7cb5772878bc0fe22066b7884 (diff) | |
| parent | 58999bbb0d2e0fd027c8222a30680a77d65e2b8c (diff) | |
| download | archiva-8462e8785037b5b4a9ed2821e604343df39372c7.tar.gz archiva-8462e8785037b5b4a9ed2821e604343df39372c7.zip | |
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/archiva
| -rw-r--r-- | pom.xml | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -78,7 +78,7 @@ <surefire.redirectTestOutputToFile>true</surefire.redirectTestOutputToFile> <lucene.version>4.10.4</lucene.version> - <jcr-oak.version>1.7.5</jcr-oak.version> + <jcr-oak.version>1.7.10</jcr-oak.version> <jackrabbit.version>2.15.4</jackrabbit.version> <cxf.version>3.0.3</cxf.version> @@ -86,8 +86,7 @@ <httpclient.version>4.5.2</httpclient.version> <httpclient.core.version>4.4.4</httpclient.core.version> <javaxMailVersion>1.4</javaxMailVersion> - <!--jettyVersion>9.4.5.v20170502</jettyVersion--> - <jettyVersion>9.4.7-SNAPSHOT</jettyVersion> + <jettyVersion>9.4.7.v20170914</jettyVersion> <guava.version>15.0</guava.version> <openjpaVersion>2.4.1</openjpaVersion> |