You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by cs...@apache.org on 2014/07/08 10:56:21 UTC
[6/6] git commit: POM cleanup after merges
POM cleanup after merges
sisu-maven-plugin not needed as project
is Java7 now, and index is automagically
generated
Project: http://git-wip-us.apache.org/repos/asf/maven-indexer/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-indexer/commit/7d5ed7af
Tree: http://git-wip-us.apache.org/repos/asf/maven-indexer/tree/7d5ed7af
Diff: http://git-wip-us.apache.org/repos/asf/maven-indexer/diff/7d5ed7af
Branch: refs/heads/master
Commit: 7d5ed7af1eff148ab509ae8c89d61f936e37bf2a
Parents: 0ad0a17
Author: Tamas Cservenak <ta...@cservenak.net>
Authored: Tue Jul 8 10:55:45 2014 +0200
Committer: Tamas Cservenak <ta...@cservenak.net>
Committed: Tue Jul 8 10:55:45 2014 +0200
----------------------------------------------------------------------
indexer-examples/pom.xml | 14 +++-----------
pom.xml | 24 ++----------------------
2 files changed, 5 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/7d5ed7af/indexer-examples/pom.xml
----------------------------------------------------------------------
diff --git a/indexer-examples/pom.xml b/indexer-examples/pom.xml
index c401813..5a5fcc7 100644
--- a/indexer-examples/pom.xml
+++ b/indexer-examples/pom.xml
@@ -38,8 +38,6 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.17</version>
-
<configuration>
<skipTests>true</skipTests>
</configuration>
@@ -55,15 +53,16 @@ under the License.
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.5</version>
<scope>compile</scope>
</dependency>
+
<dependency>
<groupId>org.apache.maven.indexer</groupId>
<artifactId>indexer-core</artifactId>
<version>6.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
+
<!-- For ResourceFetcher implementation, if used -->
<dependency>
<groupId>org.apache.maven.wagon</groupId>
@@ -76,43 +75,36 @@ under the License.
<dependency>
<groupId>org.eclipse.sisu</groupId>
<artifactId>org.eclipse.sisu.plexus</artifactId>
- <version>0.2.1</version>
</dependency>
<dependency>
<groupId>org.sonatype.sisu</groupId>
<artifactId>sisu-guice</artifactId>
- <version>3.2.2</version>
</dependency>
<!-- Test -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.11</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
- <version>1.7.5</version>
<scope>test</scope>
</dependency>
</dependencies>
<profiles>
<profile>
- <id>tests</id>
+ <id>examples</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
-
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.17</version>
-
<configuration>
<skipTests>false</skipTests>
</configuration>
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/7d5ed7af/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8e07b0f..15c98fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -348,26 +348,6 @@ under the License.
<build>
<plugins>
<plugin>
- <groupId>org.sonatype.plugins</groupId>
- <artifactId>sisu-maven-plugin</artifactId>
- <version>1.4</version>
- <executions>
- <execution>
- <id>process-classes</id>
- <goals>
- <goal>main-index</goal>
- </goals>
- </execution>
- <execution>
- <id>process-test-classes</id>
- <goals>
- <goal>test-index</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
@@ -463,12 +443,12 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.16</version>
+ <version>2.17</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.16</version>
+ <version>2.17</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>