You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ge...@apache.org on 2011/10/28 15:39:03 UTC

svn commit: r1190311 - in /servicemix/smx4/specs/trunk: locator/pom.xml pom.xml

Author: gertv
Date: Fri Oct 28 13:39:02 2011
New Revision: 1190311

URL: http://svn.apache.org/viewvc?rev=1190311&view=rev
Log:
SMX4-958: Javadoc warnings during release build

Modified:
    servicemix/smx4/specs/trunk/locator/pom.xml
    servicemix/smx4/specs/trunk/pom.xml

Modified: servicemix/smx4/specs/trunk/locator/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/specs/trunk/locator/pom.xml?rev=1190311&r1=1190310&r2=1190311&view=diff
==============================================================================
--- servicemix/smx4/specs/trunk/locator/pom.xml (original)
+++ servicemix/smx4/specs/trunk/locator/pom.xml Fri Oct 28 13:39:02 2011
@@ -34,12 +34,6 @@
     <name>Apache ServiceMix :: Specs :: Locator</name>
 
     <dependencies>
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.osgi.core</artifactId>
-            <version>1.2.0</version>
-            <scope>provided</scope>
-        </dependency>
          <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

Modified: servicemix/smx4/specs/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/specs/trunk/pom.xml?rev=1190311&r1=1190310&r2=1190311&view=diff
==============================================================================
--- servicemix/smx4/specs/trunk/pom.xml (original)
+++ servicemix/smx4/specs/trunk/pom.xml Fri Oct 28 13:39:02 2011
@@ -78,6 +78,10 @@
         <maven>2.0.7</maven>
     </prerequisites>
 
+    <properties>
+        <osgi.version>4.2.0</osgi.version>
+    </properties>
+
     <repositories>
         <!-- Default repository -->
         <repository>
@@ -108,6 +112,16 @@
         </pluginRepository>
     </pluginRepositories>
 
+    <dependencies>
+        <!-- adding the OSGi JAR everywhere to ensure javadoc can get built -->
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+            <version>${osgi.version}</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
     <dependencyManagement>
         <dependencies>
             <dependency>