Introduce check-osgi profile
authorMathieu Baudier <mbaudier@argeo.org>
Wed, 28 Mar 2012 10:17:52 +0000 (10:17 +0000)
committerMathieu Baudier <mbaudier@argeo.org>
Wed, 28 Mar 2012 10:17:52 +0000 (10:17 +0000)
git-svn-id: https://svn.argeo.org/slc/trunk@5250 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

dep/org.argeo.slc.dep.backend/pom.xml
dep/org.argeo.slc.dep.rap/pom.xml
dep/org.argeo.slc.dep.rcp/pom.xml

index c4455ac8f72e991bac581bf7eb67089da38c16bd..25ae9b3a807c5c2b6ff16f247fd140ece1211931 100644 (file)
@@ -1,4 +1,5 @@
-<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">
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.slc</groupId>
                                                </goals>
                                                <phase>generate-resources</phase>
                                        </execution>
-                                       <execution>
-                                               <id>check-osgi</id>
-                                               <phase>test</phase>
-                                               <goals>
-                                                       <goal>equinox</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <onlyCheck>true</onlyCheck>
-                                                       <argsToAppend>
-                                                               <arg>-clean</arg>
-                                                       </argsToAppend>
-                                               </configuration>
-                                       </execution>
                                </executions>
                        </plugin>
                </plugins>
        </build>
        <dependencies>
-               <!-- HACK because of dependencies pb with Maven: version 2.4.0 is required 
-                       by Spring-LDAP while Apache Directory takes 2.1.0 -->
-               <!-- <dependency> -->
-               <!-- <groupId>org.apache.commons</groupId> -->
-               <!-- <artifactId>com.springsource.org.apache.commons.lang</artifactId> -->
-               <!-- <version>2.4.0</version> -->
-               <!-- </dependency> -->
-
                <!-- SLC Agent -->
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                </dependency>
        </dependencies>
        <profiles>
+               <profile>
+                       <id>check-osgi</id>
+                       <build>
+                               <plugins>
+                                       <plugin>
+                                               <groupId>org.argeo.maven.plugins</groupId>
+                                               <artifactId>maven-argeo-osgi-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <id>check-osgi</id>
+                                                               <phase>test</phase>
+                                                               <goals>
+                                                                       <goal>equinox</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <onlyCheck>true</onlyCheck>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                               </plugins>
+                       </build>
+               </profile>
                <profile>
                        <id>rpmbuild</id>
                        <build>
index 35c7e1cea118e1f1e5f461287ae3e180bbd05ca2..3cf21424aec6eada2c7d9451b512a32fe37a861b 100644 (file)
                                                </goals>
                                                <phase>generate-resources</phase>
                                        </execution>
-                                       <execution>
-                                               <id>check-osgi</id>
-                                               <phase>test</phase>
-                                               <goals>
-                                                       <goal>equinox</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <onlyCheck>true</onlyCheck>
-                                                       <argsToAppend>
-                                                               <arg>-clean</arg>
-                                                       </argsToAppend>
-                                               </configuration>
-                                       </execution>
                                </executions>
                        </plugin>
                </plugins>
                </dependency>
        </dependencies>
        <profiles>
+               <profile>
+                       <id>check-osgi</id>
+                       <build>
+                               <plugins>
+                                       <plugin>
+                                               <groupId>org.argeo.maven.plugins</groupId>
+                                               <artifactId>maven-argeo-osgi-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <id>check-osgi</id>
+                                                               <phase>test</phase>
+                                                               <goals>
+                                                                       <goal>equinox</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <onlyCheck>true</onlyCheck>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                               </plugins>
+                       </build>
+               </profile>
                <profile>
                        <id>rpmbuild</id>
                        <build>
index 74688d550d85690e9f5cf6b08cb290cd47a87489..bd5efe2c3f031d52e20ba42791eeaa937e6c0e9d 100644 (file)
                                                </goals>
                                                <phase>generate-resources</phase>
                                        </execution>
-                                       <execution>
-                                               <id>check-osgi</id>
-                                               <phase>test</phase>
-                                               <goals>
-                                                       <goal>equinox</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <onlyCheck>true</onlyCheck>
-                                                       <argsToAppend>
-                                                               <arg>-clean</arg>
-                                                       </argsToAppend>
-                                               </configuration>
-                                       </execution>
                                </executions>
                        </plugin>
                </plugins>
                </dependency>
        </dependencies>
        <profiles>
+               <profile>
+                       <id>check-osgi</id>
+                       <build>
+                               <plugins>
+                                       <plugin>
+                                               <groupId>org.argeo.maven.plugins</groupId>
+                                               <artifactId>maven-argeo-osgi-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <id>check-osgi</id>
+                                                               <phase>test</phase>
+                                                               <goals>
+                                                                       <goal>equinox</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <onlyCheck>true</onlyCheck>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                               </plugins>
+                       </build>
+               </profile>
                <profile>
                        <id>rpmbuild</id>
                        <build>