felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From guilla...@apache.org
Subject svn commit: r1488558 - in /felix/trunk/ipojo: manipulator/ manipulator/annotations/ manipulator/bnd-ipojo-plugin/ manipulator/ipojo-ant-task/ manipulator/manipulator/ manipulator/maven-ipojo-plugin/ manipulator/online-manipulator/ runtime/ runtime/anno...
Date Sat, 01 Jun 2013 18:45:04 GMT
Author: guillaume
Date: Sat Jun  1 18:45:03 2013
New Revision: 1488558

URL: http://svn.apache.org/r1488558
Log:
FELIX-4092 Move 'annotation' module from 'runtime' to 'manipulator' project

* Moved project
* Introduced some properties for version references

Added:
    felix/trunk/ipojo/manipulator/annotations/
      - copied from r1488366, felix/trunk/ipojo/runtime/annotations/
Removed:
    felix/trunk/ipojo/runtime/annotations/
Modified:
    felix/trunk/ipojo/manipulator/bnd-ipojo-plugin/pom.xml
    felix/trunk/ipojo/manipulator/ipojo-ant-task/pom.xml
    felix/trunk/ipojo/manipulator/manipulator/pom.xml
    felix/trunk/ipojo/manipulator/maven-ipojo-plugin/pom.xml
    felix/trunk/ipojo/manipulator/online-manipulator/pom.xml
    felix/trunk/ipojo/manipulator/pom.xml
    felix/trunk/ipojo/runtime/core-it/pom.xml
    felix/trunk/ipojo/runtime/pom.xml

Modified: felix/trunk/ipojo/manipulator/bnd-ipojo-plugin/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/bnd-ipojo-plugin/pom.xml?rev=1488558&r1=1488557&r2=1488558&view=diff
==============================================================================
--- felix/trunk/ipojo/manipulator/bnd-ipojo-plugin/pom.xml (original)
+++ felix/trunk/ipojo/manipulator/bnd-ipojo-plugin/pom.xml Sat Jun  1 18:45:03 2013
@@ -40,12 +40,12 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.ipojo.manipulator</artifactId>
-            <version>1.10.1-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.ipojo.annotations</artifactId>
-            <version>1.8.0</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>

Modified: felix/trunk/ipojo/manipulator/ipojo-ant-task/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/ipojo-ant-task/pom.xml?rev=1488558&r1=1488557&r2=1488558&view=diff
==============================================================================
--- felix/trunk/ipojo/manipulator/ipojo-ant-task/pom.xml (original)
+++ felix/trunk/ipojo/manipulator/ipojo-ant-task/pom.xml Sat Jun  1 18:45:03 2013
@@ -46,7 +46,7 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.ipojo.manipulator</artifactId>
-            <version>1.10.1-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>xerces</groupId>

Modified: felix/trunk/ipojo/manipulator/manipulator/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/manipulator/pom.xml?rev=1488558&r1=1488557&r2=1488558&view=diff
==============================================================================
--- felix/trunk/ipojo/manipulator/manipulator/pom.xml (original)
+++ felix/trunk/ipojo/manipulator/manipulator/pom.xml Sat Jun  1 18:45:03 2013
@@ -51,7 +51,7 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.ipojo.annotations</artifactId>
-            <version>1.8.0</version>
+            <version>${project.version}</version>
         </dependency>
       <dependency>
           <groupId>org.mockito</groupId>

Modified: felix/trunk/ipojo/manipulator/maven-ipojo-plugin/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/maven-ipojo-plugin/pom.xml?rev=1488558&r1=1488557&r2=1488558&view=diff
==============================================================================
--- felix/trunk/ipojo/manipulator/maven-ipojo-plugin/pom.xml (original)
+++ felix/trunk/ipojo/manipulator/maven-ipojo-plugin/pom.xml Sat Jun  1 18:45:03 2013
@@ -76,7 +76,7 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.ipojo.manipulator</artifactId>
-            <version>1.10.1-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
     <build>

Modified: felix/trunk/ipojo/manipulator/online-manipulator/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/online-manipulator/pom.xml?rev=1488558&r1=1488557&r2=1488558&view=diff
==============================================================================
--- felix/trunk/ipojo/manipulator/online-manipulator/pom.xml (original)
+++ felix/trunk/ipojo/manipulator/online-manipulator/pom.xml Sat Jun  1 18:45:03 2013
@@ -132,7 +132,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-ipojo-plugin</artifactId>
-                <version>1.10.1-SNAPSHOT</version>
+                <version>${project.version}</version>
                 <executions>
                     <execution>
                         <goals>

Modified: felix/trunk/ipojo/manipulator/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/pom.xml?rev=1488558&r1=1488557&r2=1488558&view=diff
==============================================================================
--- felix/trunk/ipojo/manipulator/pom.xml (original)
+++ felix/trunk/ipojo/manipulator/pom.xml Sat Jun  1 18:45:03 2013
@@ -35,6 +35,7 @@
     </description>
 
     <modules>
+        <module>annotations</module>
         <module>manipulator</module>
         <module>manipulator-it</module>
         <module>ipojo-ant-task</module>

Modified: felix/trunk/ipojo/runtime/core-it/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/pom.xml?rev=1488558&r1=1488557&r2=1488558&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/pom.xml (original)
+++ felix/trunk/ipojo/runtime/core-it/pom.xml Sat Jun  1 18:45:03 2013
@@ -87,8 +87,7 @@
     <properties>
         <exam.version>3.0.1</exam.version>
         <url.version>1.5.1</url.version>
-
-
+        <manipulator.version>1.10.1-SNAPSHOT</manipulator.version>
     </properties>
 
     <dependencies>
@@ -171,7 +170,7 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.ipojo.manipulator</artifactId>
-            <version>1.10.1-SNAPSHOT</version>
+            <version>${manipulator.version}</version>
         </dependency>
 
         <dependency>
@@ -189,7 +188,7 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.ipojo.annotations</artifactId>
-            <version>1.10.1-SNAPSHOT</version>
+            <version>${manipulator.version}</version>
         </dependency>
 
         <dependency>

Modified: felix/trunk/ipojo/runtime/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/pom.xml?rev=1488558&r1=1488557&r2=1488558&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/pom.xml (original)
+++ felix/trunk/ipojo/runtime/pom.xml Sat Jun  1 18:45:03 2013
@@ -30,11 +30,10 @@
     <packaging>pom</packaging>
 
     <description>
-        The iPOJO runtime project contains the core iPOJO bundle, the composite support and
the annotations.
+        The iPOJO runtime project contains the core iPOJO bundle, the composite support and
the api.
     </description>
 
     <modules>
-        <module>annotations</module>
         <module>core</module>
         <module>core-it</module>
         <module>composite</module>



Mime
View raw message