POM updates to reflect new core and compendium modules.
git-svn-id: https://svn.apache.org/repos/asf/incubator/felix/trunk@390230 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/org.apache.felix.main/pom.xml b/org.apache.felix.main/pom.xml
index f704347..957cc22 100644
--- a/org.apache.felix.main/pom.xml
+++ b/org.apache.felix.main/pom.xml
@@ -58,7 +58,7 @@
todir="${basedir}/conf"/>
<copy file="${basedir}/../org.apache.felix.framework/target/org.apache.felix.framework-${pom.version}.jar"
todir="${basedir}/lib"/>
-<copy file="${basedir}/../org.osgi/target/org.osgi-${pom.version}.jar"
+<copy file="${basedir}/../org.osgi.core/target/org.osgi.core-${pom.version}.jar"
todir="${basedir}/lib"/>
<copy file="${basedir}/../org.apache.felix.shell/target/org.apache.felix.shell-${pom.version}.jar"
todir="${basedir}/bundle"/>
diff --git a/org.apache.felix.servicebinder/pom.xml b/org.apache.felix.servicebinder/pom.xml
index 76b79eb..696ebb5 100644
--- a/org.apache.felix.servicebinder/pom.xml
+++ b/org.apache.felix.servicebinder/pom.xml
@@ -11,7 +11,7 @@
<dependencies>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>org.osgi</artifactId>
+ <artifactId>org.osgi.core</artifactId>
<version>${pom.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/org.osgi.compendium/pom.xml b/org.osgi.compendium/pom.xml
index 01d7a9d..15b0f40 100644
--- a/org.osgi.compendium/pom.xml
+++ b/org.osgi.compendium/pom.xml
@@ -5,13 +5,13 @@
<version>0.8.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <packaging>osgi-bundle</packaging>
- <artifactId>org.osgi.compendium</artifactId>
<name>OSGi R4 Compendium Bundle</name>
+ <artifactId>org.osgi.compendium</artifactId>
+ <packaging>osgi-bundle</packaging>
<dependencies>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>org.osgi</artifactId>
+ <artifactId>org.osgi.core</artifactId>
<version>${pom.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/pom.xml b/pom.xml
index 48ab0ec..d28bda8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,8 @@
<modules>
<!-- <module>javax.servlet</module> -->
<module>tools/maven2/maven-osgi-plugin</module>
- <module>org.osgi</module>
+ <module>org.osgi.core</module>
+ <module>org.osgi.compendium</module>
<module>org.apache.felix.framework</module>
<module>org.apache.felix.shell</module>
<module>org.apache.felix.shell.tui</module>
@@ -46,14 +47,14 @@
<name>Apache Snapshots</name>
<id>apache.snapshots</id>
<url>
- scpexe://apache.org/www/cvs.apache.org/maven-snapshot-repository
+ scp://apache.org/www/cvs.apache.org/maven-snapshot-repository
</url>
</snapshotRepository>
<repository>
<name>ASF Mirrored M2 Distributions</name>
<id>apache.distributions</id>
<url>
- scpexe://minotaur.apache.org/www/www.apache.org/dist/maven-repository
+ scp://minotaur.apache.org/www/www.apache.org/dist/maven-repository
</url>
</repository>
</distributionManagement>