felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clem...@apache.org
Subject svn commit: r1495303 - in /felix/trunk/ipojo/manipulator/manipulator-it: ./ ipojo-manipulator-creation-test/ ipojo-manipulator-manipulation-metadata-test/ ipojo-manipulator-manipulation-test/ online-manipulator-it/ src/it/
Date Fri, 21 Jun 2013 07:30:11 GMT
Author: clement
Date: Fri Jun 21 07:30:11 2013
New Revision: 1495303

URL: http://svn.apache.org/r1495303
Log:
Start working on FELIX-4134

Move the manipulation integration tests in the reactor.

Added:
    felix/trunk/ipojo/manipulator/manipulator-it/ipojo-manipulator-creation-test/
      - copied from r1493460, felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-creation-test/
    felix/trunk/ipojo/manipulator/manipulator-it/ipojo-manipulator-creation-test/pom.xml
      - copied, changed from r1495127, felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-creation-test/pom.xml
    felix/trunk/ipojo/manipulator/manipulator-it/ipojo-manipulator-manipulation-metadata-test/
      - copied from r1493460, felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-manipulation-metadata-test/
    felix/trunk/ipojo/manipulator/manipulator-it/ipojo-manipulator-manipulation-metadata-test/pom.xml
      - copied, changed from r1495125, felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-manipulation-metadata-test/pom.xml
    felix/trunk/ipojo/manipulator/manipulator-it/ipojo-manipulator-manipulation-test/
      - copied from r1493460, felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-manipulation-test/
    felix/trunk/ipojo/manipulator/manipulator-it/ipojo-manipulator-manipulation-test/pom.xml
      - copied, changed from r1495125, felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-manipulation-test/pom.xml
    felix/trunk/ipojo/manipulator/manipulator-it/online-manipulator-it/
      - copied from r1493460, felix/trunk/ipojo/manipulator/manipulator-it/src/it/online-manipulator-it/
    felix/trunk/ipojo/manipulator/manipulator-it/online-manipulator-it/pom.xml
      - copied, changed from r1495125, felix/trunk/ipojo/manipulator/manipulator-it/src/it/online-manipulator-it/pom.xml
Removed:
    felix/trunk/ipojo/manipulator/manipulator-it/src/it/
Modified:
    felix/trunk/ipojo/manipulator/manipulator-it/pom.xml

Copied: felix/trunk/ipojo/manipulator/manipulator-it/ipojo-manipulator-creation-test/pom.xml
(from r1495127, felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-creation-test/pom.xml)
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/manipulator-it/ipojo-manipulator-creation-test/pom.xml?p2=felix/trunk/ipojo/manipulator/manipulator-it/ipojo-manipulator-creation-test/pom.xml&p1=felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-creation-test/pom.xml&r1=1495127&r2=1495303&rev=1495303&view=diff
==============================================================================
--- felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-creation-test/pom.xml
(original)
+++ felix/trunk/ipojo/manipulator/manipulator-it/ipojo-manipulator-creation-test/pom.xml Fri
Jun 21 07:30:11 2013
@@ -26,13 +26,10 @@
         <groupId>org.apache.felix</groupId>
         <artifactId>org.apache.felix.ipojo.manipulator.manipulator-it</artifactId>
         <version>1.10.2-SNAPSHOT</version>
-        <relativePath>../../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>ipojo-manipulator-creation-test</artifactId>
-
-    <name>${project.artifactId}</name>
-
+    <name>Apache Felix iPOJO Manipulator ~ Creation IT</name>
 </project>
\ No newline at end of file

Copied: felix/trunk/ipojo/manipulator/manipulator-it/ipojo-manipulator-manipulation-metadata-test/pom.xml
(from r1495125, felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-manipulation-metadata-test/pom.xml)
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/manipulator-it/ipojo-manipulator-manipulation-metadata-test/pom.xml?p2=felix/trunk/ipojo/manipulator/manipulator-it/ipojo-manipulator-manipulation-metadata-test/pom.xml&p1=felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-manipulation-metadata-test/pom.xml&r1=1495125&r2=1495303&rev=1495303&view=diff
==============================================================================
--- felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-manipulation-metadata-test/pom.xml
(original)
+++ felix/trunk/ipojo/manipulator/manipulator-it/ipojo-manipulator-manipulation-metadata-test/pom.xml
Fri Jun 21 07:30:11 2013
@@ -26,13 +26,12 @@
         <groupId>org.apache.felix</groupId>
         <artifactId>org.apache.felix.ipojo.manipulator.manipulator-it</artifactId>
         <version>1.10.2-SNAPSHOT</version>
-        <relativePath>../../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>ipojo-manipulator-manipulation-metadata-test</artifactId>
 
-    <name>${project.artifactId}</name>
+    <name>Apache Felix iPOJO Manipulator ~ Metadata IT</name>
     
 </project>
\ No newline at end of file

Copied: felix/trunk/ipojo/manipulator/manipulator-it/ipojo-manipulator-manipulation-test/pom.xml
(from r1495125, felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-manipulation-test/pom.xml)
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/manipulator-it/ipojo-manipulator-manipulation-test/pom.xml?p2=felix/trunk/ipojo/manipulator/manipulator-it/ipojo-manipulator-manipulation-test/pom.xml&p1=felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-manipulation-test/pom.xml&r1=1495125&r2=1495303&rev=1495303&view=diff
==============================================================================
--- felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-manipulation-test/pom.xml
(original)
+++ felix/trunk/ipojo/manipulator/manipulator-it/ipojo-manipulator-manipulation-test/pom.xml
Fri Jun 21 07:30:11 2013
@@ -26,13 +26,12 @@
         <groupId>org.apache.felix</groupId>
         <artifactId>org.apache.felix.ipojo.manipulator.manipulator-it</artifactId>
         <version>1.10.2-SNAPSHOT</version>
-        <relativePath>../../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>ipojo-manipulator-manipulation-test</artifactId>
 
-    <name>${project.artifactId}</name>
+    <name>Apache Felix iPOJO Manipulator ~ Manipulation IT</name>
     
 </project>
\ No newline at end of file

Copied: felix/trunk/ipojo/manipulator/manipulator-it/online-manipulator-it/pom.xml (from r1495125,
felix/trunk/ipojo/manipulator/manipulator-it/src/it/online-manipulator-it/pom.xml)
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/manipulator-it/online-manipulator-it/pom.xml?p2=felix/trunk/ipojo/manipulator/manipulator-it/online-manipulator-it/pom.xml&p1=felix/trunk/ipojo/manipulator/manipulator-it/src/it/online-manipulator-it/pom.xml&r1=1495125&r2=1495303&rev=1495303&view=diff
==============================================================================
--- felix/trunk/ipojo/manipulator/manipulator-it/src/it/online-manipulator-it/pom.xml (original)
+++ felix/trunk/ipojo/manipulator/manipulator-it/online-manipulator-it/pom.xml Fri Jun 21
07:30:11 2013
@@ -26,13 +26,12 @@
         <groupId>org.apache.felix</groupId>
         <artifactId>org.apache.felix.ipojo.manipulator.manipulator-it</artifactId>
         <version>1.10.2-SNAPSHOT</version>
-        <relativePath>../../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>ipojo-online-manipulator-test</artifactId>
 
-    <name>${project.artifactId}</name>
+    <name>Apache Felix iPOJO Manipulator ~ Online IT</name>
 
 </project>
\ No newline at end of file

Modified: felix/trunk/ipojo/manipulator/manipulator-it/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/manipulator-it/pom.xml?rev=1495303&r1=1495302&r2=1495303&view=diff
==============================================================================
--- felix/trunk/ipojo/manipulator/manipulator-it/pom.xml (original)
+++ felix/trunk/ipojo/manipulator/manipulator-it/pom.xml Fri Jun 21 07:30:11 2013
@@ -16,19 +16,40 @@
   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>
         <version>2.1</version>
         <relativePath>../../../pom/pom.xml</relativePath>
     </parent>
+
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.apache.felix.ipojo.manipulator.manipulator-it</artifactId>
     <version>1.10.2-SNAPSHOT</version>
     <name>Apache Felix iPOJO Manipulator ~ Integration Tests</name>
     <packaging>pom</packaging>
 
+    <properties>
+        <!-- Tests are enabled only when the 'test' profile is activated  -->
+        <skipTestExecution>true</skipTestExecution>
+
+        <exam.version>3.0.0</exam.version>
+        <url.version>1.5.1</url.version>
+
+        <felix.version>4.2.0</felix.version>
+        <equinox.version>3.8.1.v20120830-144521</equinox.version>
+        <knoperflerfish.version>5.3.3</knoperflerfish.version>
+    </properties>
+
+    <modules>
+        <module>ipojo-manipulator-manipulation-test</module>
+        <module>ipojo-manipulator-creation-test</module>
+        <module>ipojo-manipulator-manipulation-metadata-test</module>
+        <module>online-manipulator-it</module>
+    </modules>
+
     <build>
         <plugins>
             <plugin>
@@ -86,17 +107,24 @@
                     <skip>true</skip>
                 </configuration>
             </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.15</version>
+                <configuration>
+                    <skipTests>${skipTestExecution}</skipTests>
+                    <systemPropertyVariables>
+                        <!-- TIME_FACTOR can be set from the command line with -DTIME_FACTOR=9-->
+                        <TIME_FACTOR>${TIME_FACTOR}</TIME_FACTOR>
+                    </systemPropertyVariables>
+                </configuration>
+            </plugin>
         </plugins>
 
     </build>
 
-    <properties>
-        <exam.version>3.0.0</exam.version>
-        <url.version>1.5.1</url.version>
-    </properties>
-
     <dependencies>
-
         <dependency>
             <groupId>org.ops4j.pax.exam</groupId>
             <artifactId>pax-exam-container-native</artifactId>
@@ -128,7 +156,7 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.framework</artifactId>
-            <version>4.2.0</version>
+            <version>${felix.version}</version>
             <scope>test</scope>
         </dependency>
 
@@ -252,7 +280,7 @@
                 <dependency>
                     <groupId>org.knopflerfish</groupId>
                     <artifactId>framework</artifactId>
-                    <version>5.2.0</version>
+                    <version>${knoperflerfish.version}</version>
                     <scope>test</scope>
                 </dependency>
             </dependencies>
@@ -274,7 +302,7 @@
                 <dependency>
                     <groupId>org.eclipse.tycho</groupId>
                     <artifactId>org.eclipse.osgi</artifactId>
-                    <version>3.8.1.v20120830-144521</version>
+                    <version>${equinox.version}</version>
                     <scope>test</scope>
                 </dependency>
             </dependencies>
@@ -296,7 +324,7 @@
                 <dependency>
                     <groupId>org.apache.felix</groupId>
                     <artifactId>org.apache.felix.framework</artifactId>
-                    <version>4.2.0</version>
+                    <version>${felix.version}</version>
                     <scope>test</scope>
                 </dependency>
             </dependencies>
@@ -304,134 +332,9 @@
 
         <profile>
             <id>test</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-invoker-plugin</artifactId>
-                        <version>1.8</version>
-                        <configuration>
-                            <streamLogs>true</streamLogs>
-                            <goals>
-                                <goal>clean</goal>
-                                <goal>test</goal>
-                            </goals>
-                            <cloneClean>true</cloneClean>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <id>regular</id>
-                                <goals>
-                                    <goal>run</goal>
-                                </goals>
-                                <configuration>
-                                    <profiles>
-                                        <profile>felix</profile>
-                                    </profiles>
-                                    <cloneProjectsTo>${project.build.directory}/regular</cloneProjectsTo>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
-        <profile>
-            <id>test-all</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-invoker-plugin</artifactId>
-                        <version>1.8</version>
-                        <configuration>
-                            <streamLogs>true</streamLogs>
-                            <goals>
-                                <goal>clean</goal>
-                                <goal>test</goal>
-                            </goals>
-                            <cloneClean>true</cloneClean>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <id>equinox-native</id>
-                                <goals>
-                                    <goal>run</goal>
-                                </goals>
-                                <configuration>
-                                    <profiles>
-                                        <profile>equinox</profile>
-                                    </profiles>
-                                    <cloneProjectsTo>${project.build.directory}/equinox-native</cloneProjectsTo>
-
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>felix-native</id>
-                                <goals>
-                                    <goal>run</goal>
-                                </goals>
-                                <configuration>
-                                    <profiles>
-                                        <profile>felix</profile>
-                                    </profiles>
-                                    <cloneProjectsTo>${project.build.directory}/felix-native</cloneProjectsTo>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>knopflerfish-native</id>
-                                <goals>
-                                    <goal>run</goal>
-                                </goals>
-                                <configuration>
-                                    <profiles>
-                                        <profile>knopflerfish</profile>
-                                    </profiles>
-                                    <cloneProjectsTo>${project.build.directory}/knopflerfish-native</cloneProjectsTo>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
-        <profile>
-            <id>apache-release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-assembly-plugin</artifactId>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.apache.resources</groupId>
-                                <artifactId>apache-source-release-assembly-descriptor</artifactId>
-                                <version>1.0.3</version>
-                            </dependency>
-                        </dependencies>
-                        <executions>
-                            <execution>
-                                <id>source-release-assembly</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>single</goal>
-                                </goals>
-                                <configuration>
-                                    <runOnlyAtExecutionRoot>false</runOnlyAtExecutionRoot>
-                                    <descriptorRefs>
-                                        <descriptorRef>${sourceReleaseAssemblyDescriptor}</descriptorRef>
-                                    </descriptorRefs>
-                                    <tarLongFileMode>gnu</tarLongFileMode>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
+            <properties>
+                <skipTestExecution>false</skipTestExecution>
+            </properties>
         </profile>
     </profiles>
 </project>



Mime
View raw message