You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2014/03/06 06:45:34 UTC
[1/2] git commit: Fix karaf-maven-plugin itests
Repository: karaf
Updated Branches:
refs/heads/master 427871032 -> 7c8b5a720
Fix karaf-maven-plugin itests
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/19900b4d
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/19900b4d
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/19900b4d
Branch: refs/heads/master
Commit: 19900b4d7965e22ab09254d238eab91c85e94019
Parents: 4278710
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Thu Mar 6 06:39:37 2014 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Thu Mar 6 06:39:37 2014 +0100
----------------------------------------------------------------------
.../it/test-aggregate-features/aggregate-recursive-module-d/pom.xml | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/19900b4d/tooling/karaf-maven-plugin/src/it/test-aggregate-features/aggregate-recursive-module-d/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/it/test-aggregate-features/aggregate-recursive-module-d/pom.xml b/tooling/karaf-maven-plugin/src/it/test-aggregate-features/aggregate-recursive-module-d/pom.xml
index 09ac051..aab71cc 100644
--- a/tooling/karaf-maven-plugin/src/it/test-aggregate-features/aggregate-recursive-module-d/pom.xml
+++ b/tooling/karaf-maven-plugin/src/it/test-aggregate-features/aggregate-recursive-module-d/pom.xml
@@ -43,7 +43,6 @@
<groupId>test</groupId>
<artifactId>aggregate-recursive-module-a</artifactId>
<version>1.0-SNAPSHOT</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>test</groupId>
[2/2] git commit: Enable karaf-maven-plugin itests by default (use
-Dinvoker.skip=true to skip)
Posted by jb...@apache.org.
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é <jb...@apache.org>
Authored: Thu Mar 6 06:44:56 2014 +0100
Committer: Jean-Baptiste Onofré <jb...@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>