svn commit: r1051162 - in /karaf/trunk: assembly/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg pom.xml

[gn...@apache.org]

Author: gnodet
Date: Mon Dec 20 16:06:40 2010
New Revision: 1051162

URL: http://svn.apache.org/viewvc?rev=1051162&view=rev
Log:
[KARAF-333] Update karaf to use pax-url-mvn ver 1.2.2

Modified:
    karaf/trunk/assembly/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg
    karaf/trunk/pom.xml

Modified: karaf/trunk/assembly/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg
URL: http://svn.apache.org/viewvc/karaf/trunk/assembly/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg?rev=1051162&r1=1051161&r2=1051162&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg (original)
+++ karaf/trunk/assembly/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg Mon Dec 20 16:06:40 2010
@@ -46,6 +46,23 @@
 #org.ops4j.pax.url.mvn.localRepository=
 
 #
+# Default this to false. It's just weird to use undocumented repos
+#
+org.ops4j.pax.url.mvn.useFallbackRepositories=false
+
+#
+# Uncomment if you are behind a web proxy. PAX URL will use the proxy settings
+# from the Maven conf/settings.xml file
+#
+# org.ops4j.pax.url.mvn.proxySupport=true
+
+#
+# Disable aether support by default.  This ensure that the defaultRepositories
+# below will be used
+#
+org.ops4j.pax.url.mvn.disableAether=true
+
+#
 # Comma separated list of repositories scanned when resolving an artifact.
 # Those repositories will be checked before iterating through the
 #    below list of repositories and even before the local repository

Modified: karaf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1051162&r1=1051161&r2=1051162&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Mon Dec 20 16:06:40 2010
@@ -143,7 +143,7 @@
         <pax.exam.version>1.2.2</pax.exam.version>
         <pax.logging.version>1.5.3</pax.logging.version>
         <pax.runner.version>1.5.0</pax.runner.version>
-        <pax.url.version>1.2.1</pax.url.version>
+        <pax.url.version>1.2.2</pax.url.version>
         <pax.web.version>0.8.1</pax.web.version>
         <pax.tinybundles.version>1.3.0</pax.tinybundles.version>
         <servlet.api.version>2.5</servlet.api.version>