You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2014/02/25 23:27:10 UTC
git commit: [KARAF-2793] Remove tight coupling from bundle/core and
kar/core to pax-url-aether
Repository: karaf
Updated Branches:
refs/heads/master 86c5e3c4b -> c1b98adb6
[KARAF-2793] Remove tight coupling from bundle/core and kar/core to pax-url-aether
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/c1b98adb
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/c1b98adb
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/c1b98adb
Branch: refs/heads/master
Commit: c1b98adb654f4aa1ca280f9b9a41af2f766651fb
Parents: 86c5e3c
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Tue Feb 25 23:26:58 2014 +0100
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Tue Feb 25 23:26:58 2014 +0100
----------------------------------------------------------------------
bundle/core/src/test/resources/settings.xml | 50 -----------------------
bundle/core/src/test/resources/settings2.xml | 50 -----------------------
2 files changed, 100 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/c1b98adb/bundle/core/src/test/resources/settings.xml
----------------------------------------------------------------------
diff --git a/bundle/core/src/test/resources/settings.xml b/bundle/core/src/test/resources/settings.xml
index ea73c3e..cd8cdc8 100644
--- a/bundle/core/src/test/resources/settings.xml
+++ b/bundle/core/src/test/resources/settings.xml
@@ -1,51 +1,7 @@
<settings>
- <!--
- <mirrors>
- <mirror>
- <id>nexus</id>
- <mirrorOf>*</mirrorOf>
- <url>http://192.168.0.128:8081/nexus/content/groups/public</url>
- </mirror>
- </mirrors>
- -->
- <servers>
- </servers>
<localRepository>foo/bar</localRepository>
<profiles>
<profile>
- <id>signing-key</id>
- <properties>
- <gpg.passphrase>paulaudesixtinemarieamelie</gpg.passphrase>
- <gpg.keyname>B4493B94</gpg.keyname>
- <!--
- <release-paxurl-altGitURL>scm:git:file:///Users/gnodet/work/git/org.ops4j.pax.url</release-paxurl-altGitURL>
- <release-altGitURL>scm:git:file:///Users/gnodet/work/git/org.ops4j.pax.web</release-altGitURL>
- <altDeploymentRepository>apache.releases.https::default::https://repository.apache.org/service/local/staging/deploy/maven2/</altDeploymentRepository>
- -->
- </properties>
- </profile>
- <profile>
- <id>nexus</id>
- <!--Enable snapshots for the built in central repo to direct -->
- <!--all requests to nexus via the mirror -->
- <repositories>
- <repository>
- <id>central</id>
- <url>http://central</url>
- <releases><enabled>true</enabled></releases>
- <snapshots><enabled>true</enabled></snapshots>
- </repository>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>central</id>
- <url>http://central</url>
- <releases><enabled>true</enabled></releases>
- <snapshots><enabled>true</enabled></snapshots>
- </pluginRepository>
- </pluginRepositories>
- </profile>
- <profile>
<id>downloadSources</id>
<properties>
<downloadSources>true</downloadSources>
@@ -53,12 +9,6 @@
</profile>
</profiles>
<activeProfiles>
- <!--make the profile active all the time -->
- <!--
- <activeProfile>nexus</activeProfile>
- <activeProfile>fuse-repo</activeProfile>
- -->
- <activeProfile>signing-key</activeProfile>
<activeProfile>downloadSources</activeProfile>
</activeProfiles>
</settings>
http://git-wip-us.apache.org/repos/asf/karaf/blob/c1b98adb/bundle/core/src/test/resources/settings2.xml
----------------------------------------------------------------------
diff --git a/bundle/core/src/test/resources/settings2.xml b/bundle/core/src/test/resources/settings2.xml
index 82bc7cb..25a06c3 100644
--- a/bundle/core/src/test/resources/settings2.xml
+++ b/bundle/core/src/test/resources/settings2.xml
@@ -2,53 +2,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
http://maven.apache.org/xsd/settings-1.0.0.xsd">
- <!--
- <mirrors>
- <mirror>
- <id>nexus</id>
- <mirrorOf>*</mirrorOf>
- <url>http://192.168.0.128:8081/nexus/content/groups/public</url>
- </mirror>
- </mirrors>
- -->
- <servers>
- </servers>
<localRepository>foo/bar</localRepository>
<profiles>
<profile>
- <id>signing-key</id>
- <properties>
- <gpg.passphrase>paulaudesixtinemarieamelie</gpg.passphrase>
- <gpg.keyname>B4493B94</gpg.keyname>
- <!--
- <release-paxurl-altGitURL>scm:git:file:///Users/gnodet/work/git/org.ops4j.pax.url</release-paxurl-altGitURL>
- <release-altGitURL>scm:git:file:///Users/gnodet/work/git/org.ops4j.pax.web</release-altGitURL>
- <altDeploymentRepository>apache.releases.https::default::https://repository.apache.org/service/local/staging/deploy/maven2/</altDeploymentRepository>
- -->
- </properties>
- </profile>
- <profile>
- <id>nexus</id>
- <!--Enable snapshots for the built in central repo to direct -->
- <!--all requests to nexus via the mirror -->
- <repositories>
- <repository>
- <id>central</id>
- <url>http://central</url>
- <releases><enabled>true</enabled></releases>
- <snapshots><enabled>true</enabled></snapshots>
- </repository>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>central</id>
- <url>http://central</url>
- <releases><enabled>true</enabled></releases>
- <snapshots><enabled>true</enabled></snapshots>
- </pluginRepository>
- </pluginRepositories>
- </profile>
- <profile>
<id>downloadSources</id>
<properties>
<downloadSources>true</downloadSources>
@@ -56,12 +12,6 @@
</profile>
</profiles>
<activeProfiles>
- <!--make the profile active all the time -->
- <!--
- <activeProfile>nexus</activeProfile>
- <activeProfile>fuse-repo</activeProfile>
- -->
- <activeProfile>signing-key</activeProfile>
<activeProfile>downloadSources</activeProfile>
</activeProfiles>
</settings>