Repository: karaf Updated Branches: refs/heads/karaf-3.0.x 91f5c75e9 -> f93282194
Align pax url mvn configuration with master (in order to speed up Karaf startup) Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/f9328219 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/f9328219 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/f9328219 Branch: refs/heads/karaf-3.0.x Commit: f932821947ed4309aafb5909a3a6ebeb5f6d116d Parents: 91f5c75 Author: Jean-Baptiste Onofré <[email protected]> Authored: Sun Aug 31 21:36:48 2014 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Sun Aug 31 21:36:48 2014 +0200 ---------------------------------------------------------------------- .../release/resources/etc/org.ops4j.pax.url.mvn.cfg | 16 ++++------------ .../resources/etc/org.ops4j.pax.url.mvn.cfg | 16 ++++------------ 2 files changed, 8 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/f9328219/assemblies/features/framework/src/main/release/resources/etc/org.ops4j.pax.url.mvn.cfg ---------------------------------------------------------------------- diff --git a/assemblies/features/framework/src/main/release/resources/etc/org.ops4j.pax.url.mvn.cfg b/assemblies/features/framework/src/main/release/resources/etc/org.ops4j.pax.url.mvn.cfg index b33b55e..b824c0a 100644 --- a/assemblies/features/framework/src/main/release/resources/etc/org.ops4j.pax.url.mvn.cfg +++ b/assemblies/features/framework/src/main/release/resources/etc/org.ops4j.pax.url.mvn.cfg @@ -57,12 +57,6 @@ org.ops4j.pax.url.mvn.useFallbackRepositories=false # org.ops4j.pax.url.mvn.proxySupport=false # -# 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 @@ -72,7 +66,9 @@ org.ops4j.pax.url.mvn.useFallbackRepositories=false # # The following property value will add the system folder as a repo. # -#org.ops4j.pax.url.mvn.defaultRepositories= +org.ops4j.pax.url.mvn.defaultRepositories=\ + file:${karaf.home}/${karaf.default.repository}@id=system.repository@snapshots,\ + file:${karaf.data}/kar@id=kar.repository@multi@snapshots # Use the default local repo (e.g.~/.m2/repository) as a "remote" repo org.ops4j.pax.url.mvn.defaultLocalRepoAsRemote=false @@ -80,11 +76,9 @@ org.ops4j.pax.url.mvn.defaultLocalRepoAsRemote=false # # Comma separated list of repositories scanned when resolving an artifact. # The default list includes the following repositories containing releases: -# file:${karaf.home}/${karaf.default.repository}@id=system.repository # http://repo1.maven.org/maven2 # http://repository.springsource.com/maven/bundles/release # http://repository.springsource.com/maven/bundles/external -# file:${karaf.data}/kar@id=kar.repository@multi # To add repositories to the default ones, prepend '+' to the list of repositories # to add. # A repository url can be appended with zero or more of the following flags: @@ -99,8 +93,6 @@ org.ops4j.pax.url.mvn.defaultLocalRepoAsRemote=false # https://oss.sonatype.org/content/repositories/ops4j-snapshots@id=ops4j.sonatype.snapshots.deploy@snapshots@noreleases # org.ops4j.pax.url.mvn.repositories= \ - file:${karaf.home}/${karaf.default.repository}@id=system.repository, \ http://repo1.maven.org/maven2@id=central, \ http://repository.springsource.com/maven/bundles/release@id=spring.ebr.release, \ - http://repository.springsource.com/maven/bundles/external@id=spring.ebr.external, \ - file:${karaf.data}/kar@id=kar.repository@multi + http://repository.springsource.com/maven/bundles/external@id=spring.ebr.external http://git-wip-us.apache.org/repos/asf/karaf/blob/f9328219/assemblies/features/framework/src/main/snapshot/resources/etc/org.ops4j.pax.url.mvn.cfg ---------------------------------------------------------------------- diff --git a/assemblies/features/framework/src/main/snapshot/resources/etc/org.ops4j.pax.url.mvn.cfg b/assemblies/features/framework/src/main/snapshot/resources/etc/org.ops4j.pax.url.mvn.cfg index 238909b..bff0ecd 100644 --- a/assemblies/features/framework/src/main/snapshot/resources/etc/org.ops4j.pax.url.mvn.cfg +++ b/assemblies/features/framework/src/main/snapshot/resources/etc/org.ops4j.pax.url.mvn.cfg @@ -57,12 +57,6 @@ org.ops4j.pax.url.mvn.useFallbackRepositories=false # org.ops4j.pax.url.mvn.proxySupport=false # -# 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 @@ -72,7 +66,9 @@ org.ops4j.pax.url.mvn.useFallbackRepositories=false # # The following property value will add the system folder as a repo. # -#org.ops4j.pax.url.mvn.defaultRepositories= +org.ops4j.pax.url.mvn.defaultRepositories=\ + file:${karaf.home}/${karaf.default.repository}@id=system.repository@snapshots,\ + file:${karaf.data}/kar@id=kar.repository@multi@snapshots # Use the default local repo (e.g.~/.m2/repository) as a "remote" repo org.ops4j.pax.url.mvn.defaultLocalRepoAsRemote=false @@ -80,14 +76,12 @@ org.ops4j.pax.url.mvn.defaultLocalRepoAsRemote=false # # Comma separated list of repositories scanned when resolving an artifact. # The default list includes the following repositories: -# file:${karaf.home}/${karaf.default.repository}@id=system.repository # http://repo1.maven.org/maven2@id=central # http://repository.apache.org/content/groups/snapshots-group@id=apache@snapshots@noreleases # http://repository.springsource.com/maven/bundles/release@id=spring.ebr # http://repository.springsource.com/maven/bundles/external@id=spring.ebr.external # https://oss.sonatype.org/content/repositories/snapshots@id=sonatype.snapshots.deploy@snapshots@norelease # https://oss.sonatype.org/content/repositories/ops4j-snapshots@id=ops4j.sonatype.snapshots.deploy@snapshots@noreleases -# file:${karaf.data}/kar@id=kar.repository@multi # To add repositories to the default ones, prepend '+' to the list of repositories # to add. # A repository url can be appended with zero or more of the following flags: @@ -96,11 +90,9 @@ org.ops4j.pax.url.mvn.defaultLocalRepoAsRemote=false # @id=repository.id : the id for the repository, just like in the settings.xml this is optional but recommended # org.ops4j.pax.url.mvn.repositories= \ - file:${karaf.home}/${karaf.default.repository}@id=system.repository, \ http://repo1.maven.org/maven2@id=central, \ http://repository.apache.org/content/groups/snapshots-group@id=apache@snapshots@noreleases, \ http://repository.springsource.com/maven/bundles/release@id=spring.ebr.release, \ http://repository.springsource.com/maven/bundles/external@id=spring.ebr.external, \ https://oss.sonatype.org/content/repositories/snapshots@id=sonatype.snapshots.deploy@snapshots@norelease, \ - https://oss.sonatype.org/content/repositories/ops4j-snapshots@id=ops4j.sonatype.snapshots.deploy@snapshots@noreleases, \ - file:${karaf.data}/kar@id=kar.repository@multi + https://oss.sonatype.org/content/repositories/ops4j-snapshots@id=ops4j.sonatype.snapshots.deploy@snapshots@noreleases
