Author: mreutegg
Date: Thu Feb 6 09:23:06 2020
New Revision: 1873691
URL: http://svn.apache.org/viewvc?rev=1873691&view=rev
Log:
OAK-8535: oak-it-osgi fails with encrypted credentials in settings.xml
Merged revision 1864683 from trunk
Modified:
jackrabbit/oak/branches/1.6/ (props changed)
jackrabbit/oak/branches/1.6/oak-it-osgi/pom.xml
Propchange: jackrabbit/oak/branches/1.6/
------------------------------------------------------------------------------
Merged /jackrabbit/oak/trunk:r1864683
Modified: jackrabbit/oak/branches/1.6/oak-it-osgi/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-it-osgi/pom.xml?rev=1873691&r1=1873690&r2=1873691&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-it-osgi/pom.xml (original)
+++ jackrabbit/oak/branches/1.6/oak-it-osgi/pom.xml Thu Feb 6 09:23:06 2020
@@ -183,7 +183,7 @@
<dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-aether</artifactId>
- <version>1.5.2</version>
+ <version>2.6.1</version>
<scope>test</scope>
</dependency>
<dependency>