felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clem...@apache.org
Subject svn commit: r1482912 - in /felix/trunk/ipojo/runtime: annotations/pom.xml api-it/pom.xml api/pom.xml composite-it/pom.xml composite/pom.xml core-it/pom.xml core/pom.xml pom.xml
Date Wed, 15 May 2013 15:40:52 GMT
Author: clement
Date: Wed May 15 15:40:52 2013
New Revision: 1482912

URL: http://svn.apache.org/r1482912
Log:
Rollback release and fix composite metadata

Modified:
    felix/trunk/ipojo/runtime/annotations/pom.xml
    felix/trunk/ipojo/runtime/api-it/pom.xml
    felix/trunk/ipojo/runtime/api/pom.xml
    felix/trunk/ipojo/runtime/composite-it/pom.xml
    felix/trunk/ipojo/runtime/composite/pom.xml
    felix/trunk/ipojo/runtime/core-it/pom.xml
    felix/trunk/ipojo/runtime/core/pom.xml
    felix/trunk/ipojo/runtime/pom.xml

Modified: felix/trunk/ipojo/runtime/annotations/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/annotations/pom.xml?rev=1482912&r1=1482911&r2=1482912&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/annotations/pom.xml (original)
+++ felix/trunk/ipojo/runtime/annotations/pom.xml Wed May 15 15:40:52 2013
@@ -16,7 +16,8 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>org.apache.felix</groupId>
         <artifactId>felix-parent</artifactId>
@@ -25,7 +26,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.apache.felix.ipojo.annotations</artifactId>
-    <version>1.10.1-SNAPSHOT</version>
+    <version>1.9.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>Apache Felix iPOJO Annotations</name>
 

Modified: felix/trunk/ipojo/runtime/api-it/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/api-it/pom.xml?rev=1482912&r1=1482911&r2=1482912&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/api-it/pom.xml (original)
+++ felix/trunk/ipojo/runtime/api-it/pom.xml Wed May 15 15:40:52 2013
@@ -16,7 +16,9 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>org.apache.felix</groupId>
         <artifactId>felix-parent</artifactId>
@@ -25,7 +27,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.apache.felix.ipojo.runtime.api-it</artifactId>
-    <version>1.10.1-SNAPSHOT</version>
+    <version>1.9.0-SNAPSHOT</version>
     <name>Apache Felix iPOJO Runtime Project ~ API Integration Tests</name>
     <packaging>pom</packaging>
 
@@ -160,19 +162,19 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.ipojo</artifactId>
-            <version>1.10.1-SNAPSHOT</version>
+            <version>1.9.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.ipojo.api</artifactId>
-            <version>1.10.1-SNAPSHOT</version>
+            <version>1.9.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.ipojo.composite</artifactId>
-            <version>1.10.1-SNAPSHOT</version>
+            <version>1.9.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -210,7 +212,7 @@
         <dependency>
             <groupId>org.ow2.chameleon.testing</groupId>
             <artifactId>osgi-helpers</artifactId>
-            <version>0.6.1</version>
+            <version>0.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 

Modified: felix/trunk/ipojo/runtime/api/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/api/pom.xml?rev=1482912&r1=1482911&r2=1482912&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/api/pom.xml (original)
+++ felix/trunk/ipojo/runtime/api/pom.xml Wed May 15 15:40:52 2013
@@ -16,7 +16,8 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
         <groupId>org.apache.felix</groupId>
         <artifactId>felix-parent</artifactId>
@@ -26,7 +27,7 @@
     <modelVersion>4.0.0</modelVersion>
     <packaging>bundle</packaging>
     <artifactId>org.apache.felix.ipojo.api</artifactId>
-    <version>1.10.1-SNAPSHOT</version>
+    <version>1.9.0-SNAPSHOT</version>
     <name>Apache Felix iPOJO API</name>
 
     <description>
@@ -104,12 +105,12 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.ipojo</artifactId>
-            <version>1.10.1-SNAPSHOT</version>
+            <version>1.9.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.ipojo.composite</artifactId>
-            <version>1.10.1-SNAPSHOT</version>
+            <version>1.9.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>

Modified: felix/trunk/ipojo/runtime/composite-it/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/composite-it/pom.xml?rev=1482912&r1=1482911&r2=1482912&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/composite-it/pom.xml (original)
+++ felix/trunk/ipojo/runtime/composite-it/pom.xml Wed May 15 15:40:52 2013
@@ -16,7 +16,9 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>org.apache.felix</groupId>
         <artifactId>felix-parent</artifactId>
@@ -25,7 +27,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.apache.felix.ipojo.runtime.composite-it</artifactId>
-    <version>1.10.1-SNAPSHOT</version>
+    <version>1.9.0-SNAPSHOT</version>
     <name>Apache Felix iPOJO Runtime Project ~ Composite Integration Tests</name>
     <packaging>pom</packaging>
 
@@ -158,7 +160,7 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.ipojo</artifactId>
-            <version>1.10.1-SNAPSHOT</version>
+            <version>1.9.0-SNAPSHOT</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.osgi</groupId>
@@ -170,7 +172,7 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.ipojo.composite</artifactId>
-            <version>1.10.1-SNAPSHOT</version>
+            <version>1.9.0-SNAPSHOT</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.osgi</groupId>
@@ -201,7 +203,7 @@
         <dependency>
             <groupId>org.ow2.chameleon.testing</groupId>
             <artifactId>osgi-helpers</artifactId>
-            <version>0.6.1</version>
+            <version>0.6.1-SNAPSHOT</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>

Modified: felix/trunk/ipojo/runtime/composite/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/composite/pom.xml?rev=1482912&r1=1482911&r2=1482912&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/composite/pom.xml (original)
+++ felix/trunk/ipojo/runtime/composite/pom.xml Wed May 15 15:40:52 2013
@@ -27,7 +27,7 @@
     <packaging>bundle</packaging>
     <name>Apache Felix iPOJO Composite</name>
     <artifactId>org.apache.felix.ipojo.composite</artifactId>
-    <version>1.10.1-SNAPSHOT</version>
+    <version>1.9.0-SNAPSHOT</version>
 
     <properties>
         <ipojo.package.version>1.8.4</ipojo.package.version>
@@ -52,7 +52,7 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.ipojo</artifactId>
-            <version>1.10.1-SNAPSHOT</version>
+            <version>1.9.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>
@@ -67,7 +67,7 @@
                         <Bundle-Name>Apache Felix iPOJO Composite</Bundle-Name>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
-                        <Bundle-Description>iPOJO Composititon Framework
+                        <Bundle-Description>iPOJO Composition Layer
                         </Bundle-Description>
                         <Bundle-DocURL>
                             http://felix.apache.org/site/ipojo-composition-tutorial.html
@@ -81,6 +81,8 @@
                             org.apache.felix.ipojo.util,
                             org.osgi.framework;version=1.3,
                             !org.objectweb.asm.tree,
+                            !org.apache.felix.ipojo.xml.parser,
+                            !org.apache.felix.ipojo.annotations,
                             *
                         </Import-Package>
                         <Private-Package>
@@ -92,7 +94,8 @@
                             org.objectweb.asm.commons,
                             org.objectweb.asm.signature,
                             org.objectweb.asm,
-                            org.apache.felix.ipojo.manipulation*
+                            org.apache.felix.ipojo.manipulation*,
+                            org.apache.felix.ipojo.manipulator*
                         </Private-Package>
                         <Export-Package>
                             org.apache.felix.ipojo.composite; version="${ipojo.package.version}"

Modified: felix/trunk/ipojo/runtime/core-it/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/pom.xml?rev=1482912&r1=1482911&r2=1482912&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/pom.xml (original)
+++ felix/trunk/ipojo/runtime/core-it/pom.xml Wed May 15 15:40:52 2013
@@ -16,7 +16,9 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>org.apache.felix</groupId>
         <artifactId>felix-parent</artifactId>
@@ -25,7 +27,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.apache.felix.ipojo.runtime.core-it</artifactId>
-    <version>1.10.1-SNAPSHOT</version>
+    <version>1.9.0-SNAPSHOT</version>
     <name>Apache Felix iPOJO Runtime Project ~ Core Integration Tests</name>
     <packaging>pom</packaging>
 
@@ -177,7 +179,7 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.ipojo</artifactId>
-            <version>1.10.1-SNAPSHOT</version>
+            <version>1.9.0-SNAPSHOT</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.osgi</groupId>
@@ -189,7 +191,7 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.ipojo.annotations</artifactId>
-            <version>1.10.1-SNAPSHOT</version>
+            <version>1.9.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -208,7 +210,7 @@
         <dependency>
             <groupId>org.ow2.chameleon.testing</groupId>
             <artifactId>osgi-helpers</artifactId>
-            <version>0.6.1</version>
+            <version>0.6.1-SNAPSHOT</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>

Modified: felix/trunk/ipojo/runtime/core/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core/pom.xml?rev=1482912&r1=1482911&r2=1482912&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core/pom.xml (original)
+++ felix/trunk/ipojo/runtime/core/pom.xml Wed May 15 15:40:52 2013
@@ -27,7 +27,7 @@
     <packaging>bundle</packaging>
     <name>Apache Felix iPOJO</name>
     <artifactId>org.apache.felix.ipojo</artifactId>
-    <version>1.10.1-SNAPSHOT</version>
+    <version>1.9.0-SNAPSHOT</version>
 
     <properties>
         <!--

Modified: felix/trunk/ipojo/runtime/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/pom.xml?rev=1482912&r1=1482911&r2=1482912&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/pom.xml (original)
+++ felix/trunk/ipojo/runtime/pom.xml Wed May 15 15:40:52 2013
@@ -25,7 +25,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.apache.felix.ipojo.runtime-project</artifactId>
-    <version>1.10.1-SNAPSHOT</version>
+    <version>1.9.0-SNAPSHOT</version>
     <name>Apache Felix iPOJO Runtime Project</name>
     <packaging>pom</packaging>
 



Mime
View raw message