karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject [2/2] git commit: Enable karaf-maven-plugin itests by default (use -Dinvoker.skip=true to skip)
Date Thu, 06 Mar 2014 05:45:35 GMT
Enable karaf-maven-plugin itests by default (use -Dinvoker.skip=true to skip)


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/7c8b5a72
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/7c8b5a72
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/7c8b5a72

Branch: refs/heads/master
Commit: 7c8b5a720716d781bbd92d486ef9fba34e6d81c1
Parents: 19900b4
Author: Jean-Baptiste Onofré <jbonofre@apache.org>
Authored: Thu Mar 6 06:44:56 2014 +0100
Committer: Jean-Baptiste Onofré <jbonofre@apache.org>
Committed: Thu Mar 6 06:44:56 2014 +0100

----------------------------------------------------------------------
 tooling/karaf-maven-plugin/pom.xml | 112 +++++++++++++++-----------------
 1 file changed, 54 insertions(+), 58 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/7c8b5a72/tooling/karaf-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/pom.xml b/tooling/karaf-maven-plugin/pom.xml
index dcce4a8..33f8570 100644
--- a/tooling/karaf-maven-plugin/pom.xml
+++ b/tooling/karaf-maven-plugin/pom.xml
@@ -44,15 +44,15 @@
             <version>3.0.3</version>
         </dependency>
         <dependency>
-           <groupId>org.sonatype.aether</groupId>
-           <artifactId>aether-api</artifactId>
-           <version>1.11</version>
-         </dependency>
-         <dependency>
-           <groupId>org.sonatype.aether</groupId>
-           <artifactId>aether-util</artifactId>
-           <version>1.11</version>
-         </dependency>
+            <groupId>org.sonatype.aether</groupId>
+            <artifactId>aether-api</artifactId>
+            <version>1.11</version>
+        </dependency>
+        <dependency>
+            <groupId>org.sonatype.aether</groupId>
+            <artifactId>aether-util</artifactId>
+            <version>1.11</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-artifact</artifactId>
@@ -142,8 +142,8 @@
             <artifactId>org.apache.servicemix.bundles.ant</artifactId>
         </dependency>
         <dependency>
-          <groupId>org.apache.karaf.shell</groupId>
-          <artifactId>org.apache.karaf.shell.console</artifactId>
+            <groupId>org.apache.karaf.shell</groupId>
+            <artifactId>org.apache.karaf.shell.console</artifactId>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
@@ -151,8 +151,8 @@
             <scope>compile</scope>
         </dependency>
         <dependency>
-          <groupId>org.apache.xbean</groupId>
-          <artifactId>xbean-finder-shaded</artifactId>
+            <groupId>org.apache.xbean</groupId>
+            <artifactId>xbean-finder-shaded</artifactId>
         </dependency>
         <dependency>
             <groupId>org.easymock</groupId>
@@ -161,51 +161,47 @@
         </dependency>
     </dependencies>
 
-    <profiles>
-        <profile>
-            <id>ci-build-profile</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-invoker-plugin</artifactId>
-                        <version>1.6</version>
-                        <configuration>
-                            <debug>true</debug>
-                            <projectsDirectory>src/it</projectsDirectory>
-                            <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
-                            <pomIncludes>
-                                <pomInclude>*/pom.xml</pomInclude>
-                            </pomIncludes>
-                            <postBuildHookScript>verify</postBuildHookScript>
-                            <localRepositoryPath>${project.build.directory}/system</localRepositoryPath>
-                            <!--<settingsFile>src/it/settings.xml</settingsFile>-->
-                            <mavenOpts>-Djava.io.tmpdir=${project.build.directory}</mavenOpts>
-                            <goals>
-                                <goal>install</goal>
-                            </goals>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <id>integration-test</id>
-                                <goals>
-                                    <goal>install</goal>
-                                    <goal>run</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>xmlunit</groupId>
-                                <artifactId>xmlunit</artifactId>
-                                <version>1.3</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-invoker-plugin</artifactId>
+                <version>1.6</version>
+                <configuration>
+                    <debug>true</debug>
+                    <projectsDirectory>src/it</projectsDirectory>
+                    <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
+                    <pomIncludes>
+                        <pomInclude>*/pom.xml</pomInclude>
+                    </pomIncludes>
+                    <postBuildHookScript>verify</postBuildHookScript>
+                    <localRepositoryPath>${project.build.directory}/system</localRepositoryPath>
+                    <!--<settingsFile>src/it/settings.xml</settingsFile>-->
+                    <mavenOpts>-Djava.io.tmpdir=${project.build.directory}</mavenOpts>
+                    <goals>
+                        <goal>install</goal>
+                    </goals>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>integration-test</id>
+                        <goals>
+                            <goal>install</goal>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <dependencies>
+                    <dependency>
+                        <groupId>xmlunit</groupId>
+                        <artifactId>xmlunit</artifactId>
+                        <version>1.3</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+        </plugins>
+    </build>
+
     <reporting>
         <!--<outputDirectory>target/site</outputDirectory>-->
         <plugins>


Mime
View raw message