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 2006/03/30 21:57:33 UTC

svn commit: r390230 - in /incubator/felix/trunk: org.apache.felix.main/pom.xml org.apache.felix.servicebinder/pom.xml org.osgi.compendium/pom.xml pom.xml

Author: erodriguez
Date: Thu Mar 30 11:57:31 2006
New Revision: 390230

URL: http://svn.apache.org/viewcvs?rev=390230&view=rev
Log:
POM updates to reflect new core and compendium modules.

Modified:
    incubator/felix/trunk/org.apache.felix.main/pom.xml
    incubator/felix/trunk/org.apache.felix.servicebinder/pom.xml
    incubator/felix/trunk/org.osgi.compendium/pom.xml
    incubator/felix/trunk/pom.xml

Modified: incubator/felix/trunk/org.apache.felix.main/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/org.apache.felix.main/pom.xml?rev=390230&r1=390229&r2=390230&view=diff
==============================================================================
--- incubator/felix/trunk/org.apache.felix.main/pom.xml (original)
+++ incubator/felix/trunk/org.apache.felix.main/pom.xml Thu Mar 30 11:57:31 2006
@@ -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"/>

Modified: incubator/felix/trunk/org.apache.felix.servicebinder/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/org.apache.felix.servicebinder/pom.xml?rev=390230&r1=390229&r2=390230&view=diff
==============================================================================
--- incubator/felix/trunk/org.apache.felix.servicebinder/pom.xml (original)
+++ incubator/felix/trunk/org.apache.felix.servicebinder/pom.xml Thu Mar 30 11:57:31 2006
@@ -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>

Modified: incubator/felix/trunk/org.osgi.compendium/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/org.osgi.compendium/pom.xml?rev=390230&r1=390229&r2=390230&view=diff
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/pom.xml (original)
+++ incubator/felix/trunk/org.osgi.compendium/pom.xml Thu Mar 30 11:57:31 2006
@@ -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>

Modified: incubator/felix/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/pom.xml?rev=390230&r1=390229&r2=390230&view=diff
==============================================================================
--- incubator/felix/trunk/pom.xml (original)
+++ incubator/felix/trunk/pom.xml Thu Mar 30 11:57:31 2006
@@ -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>