geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r812820 - in /geronimo/sandbox/blueprint: blueprint-api/pom.xml blueprint-bundle/pom.xml blueprint-cm/pom.xml blueprint-core/pom.xml blueprint-itests/pom.xml blueprint-sample/pom.xml pom.xml
Date Wed, 09 Sep 2009 08:34:04 GMT
Author: gnodet
Date: Wed Sep  9 08:34:04 2009
New Revision: 812820

URL: http://svn.apache.org/viewvc?rev=812820&view=rev
Log:
Clean poms for release

Modified:
    geronimo/sandbox/blueprint/blueprint-api/pom.xml
    geronimo/sandbox/blueprint/blueprint-bundle/pom.xml
    geronimo/sandbox/blueprint/blueprint-cm/pom.xml
    geronimo/sandbox/blueprint/blueprint-core/pom.xml
    geronimo/sandbox/blueprint/blueprint-itests/pom.xml
    geronimo/sandbox/blueprint/blueprint-sample/pom.xml
    geronimo/sandbox/blueprint/pom.xml

Modified: geronimo/sandbox/blueprint/blueprint-api/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-api/pom.xml?rev=812820&r1=812819&r2=812820&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-api/pom.xml (original)
+++ geronimo/sandbox/blueprint/blueprint-api/pom.xml Wed Sep  9 08:34:04 2009
@@ -28,8 +28,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.osgi.core</artifactId>
+            <groupId>org.eclipse</groupId>
+            <artifactId>osgi</artifactId>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -44,6 +44,9 @@
                     <instructions>
                         <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
                         <Export-Package>org.osgi.service.blueprint*;version="1.0"</Export-Package>
+                        <Import-Package>!org.osgi.service.blueprint*,*</Import-Package>
+                        <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
+                        <_removeheaders>Ignore-Package,Include-Resource,Private-Package,Bundle-DocURL</_removeheaders>
                     </instructions>
                 </configuration>
                 <executions>

Modified: geronimo/sandbox/blueprint/blueprint-bundle/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-bundle/pom.xml?rev=812820&r1=812819&r2=812820&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-bundle/pom.xml (original)
+++ geronimo/sandbox/blueprint/blueprint-bundle/pom.xml Wed Sep  9 08:34:04 2009
@@ -40,6 +40,16 @@
             <artifactId>org.apache.servicemix.bundles.cglib</artifactId>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse</groupId>
+            <artifactId>osgi</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.osgi.compendium</artifactId>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -86,6 +96,7 @@
                             -->
                         </Private-Package>
                         <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
+                        <_removeheaders>Ignore-Package,Include-Resource,Private-Package,Bundle-DocURL</_removeheaders>
                         <_failok>true</_failok>
                      </instructions>
                     <unpackBundle>true</unpackBundle>

Modified: geronimo/sandbox/blueprint/blueprint-cm/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-cm/pom.xml?rev=812820&r1=812819&r2=812820&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-cm/pom.xml (original)
+++ geronimo/sandbox/blueprint/blueprint-cm/pom.xml Wed Sep  9 08:34:04 2009
@@ -33,6 +33,16 @@
           <groupId>org.apache.geronimo</groupId>
           <artifactId>blueprint-core</artifactId>
       </dependency>
+      <dependency>
+          <groupId>org.eclipse</groupId>
+          <artifactId>osgi</artifactId>
+          <scope>provided</scope>
+      </dependency>
+      <dependency>
+          <groupId>org.apache.felix</groupId>
+          <artifactId>org.osgi.compendium</artifactId>
+          <scope>provided</scope>
+      </dependency>
   </dependencies>
 
     <build>
@@ -40,12 +50,14 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>2.0.0</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
-                        <Export-Package>org.apache.geronimo.blueprint.compendium.cm*;version="${pom.version}"</Export-Package>
                         <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.apache.geronimo.blueprint.compendium.cm*;version="${pom.version}"</Export-Package>
+                        <Import-Package>!org.apache.geronimo.blueprint.compendium.cm*,*</Import-Package>
+                        <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
+                        <_removeheaders>Ignore-Package,Include-Resource,Private-Package,Bundle-DocURL</_removeheaders>
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/sandbox/blueprint/blueprint-core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/pom.xml?rev=812820&r1=812819&r2=812820&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/pom.xml (original)
+++ geronimo/sandbox/blueprint/blueprint-core/pom.xml Wed Sep  9 08:34:04 2009
@@ -33,13 +33,16 @@
           <groupId>org.apache.geronimo</groupId>
           <artifactId>blueprint-api</artifactId>
       </dependency>
+      <!-- We should use the org.osgi:org.osgi.core:1.5 jar, but it has not been released
yet -->
       <dependency>
-          <groupId>org.apache.felix</groupId>
-          <artifactId>org.osgi.core</artifactId>
+          <groupId>org.eclipse</groupId>
+          <artifactId>osgi</artifactId>
+          <scope>provided</scope>
       </dependency>
       <dependency>
           <groupId>org.apache.felix</groupId>
           <artifactId>org.osgi.compendium</artifactId>
+          <scope>provided</scope>
       </dependency>
       <dependency>
           <groupId>org.apache.servicemix.bundles</groupId>
@@ -62,17 +65,17 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>2.0.0</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
-                        <Export-Package>
-                            org.apache.geronimo.blueprint;version="${pom.version}",
-                            org.apache.geronimo.blueprint.ext;version="${pom.version}"
-                            org.apache.geronimo.blueprint.mutable;version="${pom.version}"
-                        </Export-Package>
                         <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
                         <Bundle-Activator>org.apache.geronimo.blueprint.container.BlueprintExtender</Bundle-Activator>
+                        <Export-Package>
+                            org.apache.geronimo.blueprint*;version="${pom.version}"
+                        </Export-Package>
+                        <Import-Package>!org.apache.geronimo.blueprint*,*</Import-Package>
+                        <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
+                        <_removeheaders>Ignore-Package,Include-Resource,Private-Package,Bundle-DocURL</_removeheaders>
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/sandbox/blueprint/blueprint-itests/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-itests/pom.xml?rev=812820&r1=812819&r2=812820&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-itests/pom.xml (original)
+++ geronimo/sandbox/blueprint/blueprint-itests/pom.xml Wed Sep  9 08:34:04 2009
@@ -99,30 +99,6 @@
         </dependency>
     </dependencies>
 
-    <repositories>
-        <repository>
-            <id>ops4j.releases</id>
-            <url>http://repository.ops4j.org/maven2</url>
-        </repository>
-        <repository>
-            <id>ops4j.snapshots</id>
-            <url>http://repository.ops4j.org/mvn-snapshots</url>
-        </repository>
-        <repository>
-            <id>servicemix-repo</id>
-            <url>http://svn.apache.org/repos/asf/servicemix/m2-repo</url>
-        </repository>
-    </repositories>
-    <pluginRepositories>
-        <pluginRepository>
-            <id>ops4j.releases</id>
-            <url>http://repository.ops4j.org/maven2</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </pluginRepository>
-    </pluginRepositories>
-
     <build>
         <plugins>
             <plugin>

Modified: geronimo/sandbox/blueprint/blueprint-sample/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-sample/pom.xml?rev=812820&r1=812819&r2=812820&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-sample/pom.xml (original)
+++ geronimo/sandbox/blueprint/blueprint-sample/pom.xml Wed Sep  9 08:34:04 2009
@@ -49,8 +49,8 @@
     </build>
     <dependencies>
         <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.osgi.core</artifactId>
+            <groupId>org.eclipse</groupId>
+            <artifactId>osgi</artifactId>
             <scope>provided</scope>
         </dependency>
        <dependency>

Modified: geronimo/sandbox/blueprint/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/pom.xml?rev=812820&r1=812819&r2=812820&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/pom.xml (original)
+++ geronimo/sandbox/blueprint/pom.xml Wed Sep  9 08:34:04 2009
@@ -40,6 +40,20 @@
         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/sandbox/blueprint</developerConnection>
         <url>http://svn.apache.org/viewvc/geronimo/sandbox/blueprint</url>
     </scm>
+    
+    <repositories>
+        <repository>
+            <id>servicemix.m2</id>
+            <name>Apache ServiceMix Maven2 Repository</name>
+            <url>http://svn.apache.org/repos/asf/servicemix/m2-repo</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
 
     <dependencyManagement>
         <dependencies>
@@ -75,13 +89,22 @@
             </dependency>
             <dependency>
                 <groupId>org.apache.felix</groupId>
-                <artifactId>org.osgi.core</artifactId>
-                <version>1.3.0-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.felix</groupId>
                 <artifactId>org.osgi.compendium</artifactId>
                 <version>1.2.0</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.apache.felix</groupId>
+                        <artifactId>org.osgi.core</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.felix</groupId>
+                        <artifactId>org.osgi.foundation</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.felix</groupId>
+                        <artifactId>javax.servlet</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>junit</groupId>
@@ -138,36 +161,54 @@
             <dependency>
                 <groupId>org.ops4j.pax.logging</groupId>
                 <artifactId>pax-logging-api</artifactId>
-                <version>1.3.0</version>
+                <version>1.4</version>
             </dependency>
             <dependency>
                 <groupId>org.ops4j.pax.logging</groupId>
                 <artifactId>pax-logging-service</artifactId>
-                <version>1.3.0</version>
+                <version>1.4</version>
             </dependency>
             <dependency>
                 <groupId>org.ops4j.pax.url</groupId>
                 <artifactId>pax-url-mvn</artifactId>
                 <version>1.0.0</version>
             </dependency>
+            <!-- TODO: We need felix 2.0.0 which is not supported by pax exam yet,
+                 so tests are only enabled on equinox for now -->
             <dependency>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>org.apache.felix.main</artifactId>
-                <version>1.9.0-SNAPSHOT</version>
+                <version>1.8.0</version>
             </dependency>
             <dependency>
                 <groupId>org.eclipse</groupId>
                 <artifactId>osgi</artifactId>
-                <version>3.5.0.v20090429-1630</version>
+                <version>3.5.0.v20090520</version>
+            </dependency>
+            <dependency>
+                <groupId>log4j</groupId>
+                <artifactId>log4j</artifactId>
+                <version>1.2.14</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
+    
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.felix</groupId>
+                    <artifactId>maven-bundle-plugin</artifactId>
+                    <version>2.0.0</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
 
     <dependencies>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>3.8.1</version>
             <scope>test</scope>
         </dependency>
     </dependencies>



Mime
View raw message