You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by er...@apache.org on 2007/03/20 03:56:46 UTC
svn commit: r520244 - in /incubator/felix/trunk: bundlerepository/pom.xml
pom.xml servicebinder/pom.xml
Author: erodriguez
Date: Mon Mar 19 19:56:45 2007
New Revision: 520244
URL: http://svn.apache.org/viewvc?view=rev&rev=520244
Log:
Applied patch to resolve FELIX-260 (Make parent pom extend Apache pom for Apache wide policies).
Modified:
incubator/felix/trunk/bundlerepository/pom.xml
incubator/felix/trunk/pom.xml
incubator/felix/trunk/servicebinder/pom.xml
Modified: incubator/felix/trunk/bundlerepository/pom.xml
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/bundlerepository/pom.xml?view=diff&rev=520244&r1=520243&r2=520244
==============================================================================
--- incubator/felix/trunk/bundlerepository/pom.xml (original)
+++ incubator/felix/trunk/bundlerepository/pom.xml Mon Mar 19 19:56:45 2007
@@ -39,7 +39,7 @@
<version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>kxml2</groupId>
+ <groupId>net.sf.kxml</groupId>
<artifactId>kxml2</artifactId>
<version>2.2.2</version>
</dependency>
Modified: incubator/felix/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/pom.xml?view=diff&rev=520244&r1=520243&r2=520244
==============================================================================
--- incubator/felix/trunk/pom.xml (original)
+++ incubator/felix/trunk/pom.xml Mon Mar 19 19:56:45 2007
@@ -18,6 +18,13 @@
-->
<project>
<modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>4</version>
+ </parent>
+
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
<packaging>pom</packaging>
@@ -48,14 +55,6 @@
</mailingList>
</mailingLists>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
-
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/incubator/felix</connection>
<developerConnection>scm:svn:http://svn.apache.org/repos/asf/incubator/felix</developerConnection>
@@ -232,39 +231,15 @@
</dependencies>
</dependencyManagement>
- <repositories>
- <!-- For snapshots (no release jars or non-apache jars) -->
- <repository>
- <id>apache.snapshots</id>
- <name>Apache Snapshot Repository</name>
- <url>http://people.apache.org/repo/m2-snapshot-repository</url>
- </repository>
-
- <repository>
- <id>safehaus</id>
- <name>Alternate Repository for Missing Ibiblio Artifacts</name>
- <url>http://m2.safehaus.org</url>
- </repository>
- </repositories>
-
<distributionManagement>
<site>
<id>felix website</id>
<url>file:///${user.dir}/target/site-deployed/</url>
</site>
- <snapshotRepository>
- <id>apache.snapshots</id>
- <name>Apache Snapshot Repository</name>
- <url>
- scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository
- </url>
- </snapshotRepository>
<repository>
- <name>ASF Mirrored M2 Distributions</name>
- <id>apache.distributions</id>
- <url>
- scp://people.apache.org/www/people.apache.org/repo/m2-incubating-repository
- </url>
+ <id>apache.incubator.releases</id>
+ <name>Apache Incubator Release Distribution Repository</name>
+ <url>scp://people.apache.org/www/people.apache.org/repo/m2-incubating-repository</url>
</repository>
</distributionManagement>
Modified: incubator/felix/trunk/servicebinder/pom.xml
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/servicebinder/pom.xml?view=diff&rev=520244&r1=520243&r2=520244
==============================================================================
--- incubator/felix/trunk/servicebinder/pom.xml (original)
+++ incubator/felix/trunk/servicebinder/pom.xml Mon Mar 19 19:56:45 2007
@@ -16,7 +16,7 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>kxml2</groupId>
+ <groupId>net.sf.kxml</groupId>
<artifactId>kxml2</artifactId>
<version>2.2.2</version>
</dependency>