Author: gnodet
Date: Mon Dec 20 16:05:51 2010
New Revision: 1051160
URL: http://svn.apache.org/viewvc?rev=1051160&view=rev
Log:
[KARAF-333] Update karaf to use pax-url-mvn ver 1.2.2
Modified:
karaf/branches/karaf-2.1.x/assembly/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg
karaf/branches/karaf-2.1.x/pom.xml
Modified:
karaf/branches/karaf-2.1.x/assembly/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.1.x/assembly/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg?rev=1051160&r1=1051159&r2=1051160&view=diff
==============================================================================
---
karaf/branches/karaf-2.1.x/assembly/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg
(original)
+++
karaf/branches/karaf-2.1.x/assembly/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg
Mon Dec 20 16:05:51 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/branches/karaf-2.1.x/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.1.x/pom.xml?rev=1051160&r1=1051159&r2=1051160&view=diff
==============================================================================
--- karaf/branches/karaf-2.1.x/pom.xml (original)
+++ karaf/branches/karaf-2.1.x/pom.xml Mon Dec 20 16:05:51 2010
@@ -138,7 +138,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.7.4</pax.web.version>
<servlet.api.version>2.5</servlet.api.version>
<spring.osgi.version>1.2.0</spring.osgi.version>
