Repository: maven-indexer
Updated Branches:
  refs/heads/master dfebb615d -> fc801678e


Prepare for next major release (6.x)

Changes:
- update parent pom
- update dependencies (but remain Java7!)
- update sisu (drop sonatype guice, use vanilla guice)
- update to maven-resolver (from aether)

No source changes happened.


Project: http://git-wip-us.apache.org/repos/asf/maven-indexer/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-indexer/commit/ad07405c
Tree: http://git-wip-us.apache.org/repos/asf/maven-indexer/tree/ad07405c
Diff: http://git-wip-us.apache.org/repos/asf/maven-indexer/diff/ad07405c

Branch: refs/heads/master
Commit: ad07405c06b422cb529d3badaa1b6b376699c9c1
Parents: dfebb61
Author: Tamas Cservenak <[email protected]>
Authored: Thu Nov 23 12:01:56 2017 +0100
Committer: Tamas Cservenak <[email protected]>
Committed: Thu Nov 23 12:01:56 2017 +0100

----------------------------------------------------------------------
 indexer-cli/pom.xml                             |  33 +++--
 indexer-core/pom.xml                            |  50 ++++----
 indexer-examples/indexer-examples-basic/pom.xml |   6 +-
 .../indexer-examples-spring/pom.xml             |   8 +-
 indexer-reader/pom.xml                          |   1 -
 pom.xml                                         | 123 +++++++++++++------
 6 files changed, 129 insertions(+), 92 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/ad07405c/indexer-cli/pom.xml
----------------------------------------------------------------------
diff --git a/indexer-cli/pom.xml b/indexer-cli/pom.xml
index be41097..f187f50 100644
--- a/indexer-cli/pom.xml
+++ b/indexer-cli/pom.xml
@@ -50,8 +50,8 @@ under the License.
     </dependency>
 
     <dependency>
-      <groupId>org.sonatype.sisu</groupId>
-      <artifactId>sisu-guice</artifactId>
+      <groupId>com.google.inject</groupId>
+      <artifactId>guice</artifactId>
     </dependency>
 
     <dependency>
@@ -115,7 +115,6 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>1.7.1</version>
         <executions>
           <execution>
             <id>jdk15</id>
@@ -156,7 +155,7 @@ under the License.
               <goal>verify</goal>
             </goals>
             <configuration>
-              
<redirectTestOutputToFile>${surefire.redirectTestOutputToFile}</redirectTestOutputToFile>
+              
<redirectTestOutputToFile>${failsafe.redirectTestOutputToFile}</redirectTestOutputToFile>
               <systemPropertyVariables>
                 <java.io.tmpdir>${project.build.directory}</java.io.tmpdir>
                 
<indexerJar>${project.build.directory}/${project.artifactId}-${project.version}.jar</indexerJar>
@@ -165,22 +164,18 @@ under the License.
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.rat</groupId>
+        <artifactId>apache-rat-plugin</artifactId>
+        <configuration>
+          <!-- Combine the excludes from the parent with the ones defined in 
this project -->
+          <excludes combine.children="append">
+            <!-- This directory is a repository -->
+            <exclude>src/test/repo/**</exclude>
+          </excludes>
+        </configuration>
+      </plugin>
     </plugins>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.rat</groupId>
-          <artifactId>apache-rat-plugin</artifactId>
-          <configuration>
-            <!-- Combine the excludes from the parent with the ones defined in 
this project -->
-            <excludes combine.children="append">
-              <!-- This directory is a repository -->
-              <exclude>src/test/repo/**</exclude>
-            </excludes>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
   </build>
 
 </project>

http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/ad07405c/indexer-core/pom.xml
----------------------------------------------------------------------
diff --git a/indexer-core/pom.xml b/indexer-core/pom.xml
index 4caf582..adde18b 100644
--- a/indexer-core/pom.xml
+++ b/indexer-core/pom.xml
@@ -69,9 +69,8 @@ under the License.
     </dependency>
 
     <dependency>
-      <groupId>org.sonatype.sisu</groupId>
-      <artifactId>sisu-guice</artifactId>
-      <scope>provided</scope>
+      <groupId>com.google.inject</groupId>
+      <artifactId>guice</artifactId>
     </dependency>
 
     <dependency>
@@ -106,15 +105,15 @@ under the License.
       <artifactId>lucene-highlighter</artifactId>
     </dependency>
 
-    <!-- Aether -->
+    <!-- Resolver -->
     <dependency>
-      <groupId>org.eclipse.aether</groupId>
-      <artifactId>aether-api</artifactId>
+      <groupId>org.apache.maven.resolver</groupId>
+      <artifactId>maven-resolver-api</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.eclipse.aether</groupId>
-      <artifactId>aether-util</artifactId>
+      <groupId>org.apache.maven.resolver</groupId>
+      <artifactId>maven-resolver-util</artifactId>
     </dependency>
 
     <!-- Maven -->
@@ -194,7 +193,7 @@ under the License.
               <goal>verify</goal>
             </goals>
             <configuration>
-              
<redirectTestOutputToFile>${surefire.redirectTestOutputToFile}</redirectTestOutputToFile>
+              
<redirectTestOutputToFile>${failsafe.redirectTestOutputToFile}</redirectTestOutputToFile>
               <systemPropertyVariables>
                 <java.io.tmpdir>${project.build.directory}</java.io.tmpdir>
                 
<indexerJar>${project.build.directory}/${project.artifactId}-${project.version}-cli.jar</indexerJar>
@@ -206,7 +205,6 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>3.0.0</version>
         <executions>
           <execution>
             <phase>package</phase>
@@ -276,25 +274,21 @@ under the License.
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.rat</groupId>
+        <artifactId>apache-rat-plugin</artifactId>
+        <configuration>
+          <!-- Combine the excludes from the parent with the ones defined in 
this project -->
+          <excludes combine.children="append">
+            <!-- The following directories are repositories -->
+            <exclude>src/test/repo*/**</exclude>
+            <exclude>src/test/mindexer-35/**</exclude>
+            <exclude>src/test/nexus-*/**</exclude>
+            <exclude>src/test/resources/**</exclude>
+          </excludes>
+        </configuration>
+      </plugin>
     </plugins>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.rat</groupId>
-          <artifactId>apache-rat-plugin</artifactId>
-          <configuration>
-            <!-- Combine the excludes from the parent with the ones defined in 
this project -->
-            <excludes combine.children="append">
-              <!-- The following directories are repositories -->
-              <exclude>src/test/repo*/**</exclude>
-              <exclude>src/test/mindexer-35/**</exclude>
-              <exclude>src/test/nexus-*/**</exclude>
-              <exclude>src/test/resources/**</exclude>
-            </excludes>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
   </build>
 
 </project>

http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/ad07405c/indexer-examples/indexer-examples-basic/pom.xml
----------------------------------------------------------------------
diff --git a/indexer-examples/indexer-examples-basic/pom.xml 
b/indexer-examples/indexer-examples-basic/pom.xml
index 3d2d782..595955b 100644
--- a/indexer-examples/indexer-examples-basic/pom.xml
+++ b/indexer-examples/indexer-examples-basic/pom.xml
@@ -66,7 +66,7 @@ under the License.
       <dependency>
         <groupId>org.apache.maven.wagon</groupId>
         <artifactId>wagon-http-lightweight</artifactId>
-        <version>2.3</version>
+        <version>${wagon.version}</version>
         <scope>compile</scope>
       </dependency>
 
@@ -76,8 +76,8 @@ under the License.
         <artifactId>org.eclipse.sisu.plexus</artifactId>
       </dependency>
       <dependency>
-        <groupId>org.sonatype.sisu</groupId>
-        <artifactId>sisu-guice</artifactId>
+        <groupId>com.google.inject</groupId>
+        <artifactId>guice</artifactId>
       </dependency>
 
       <!-- Test -->

http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/ad07405c/indexer-examples/indexer-examples-spring/pom.xml
----------------------------------------------------------------------
diff --git a/indexer-examples/indexer-examples-spring/pom.xml 
b/indexer-examples/indexer-examples-spring/pom.xml
index 4186cbe..11afa7c 100644
--- a/indexer-examples/indexer-examples-spring/pom.xml
+++ b/indexer-examples/indexer-examples-spring/pom.xml
@@ -86,7 +86,7 @@ under the License.
       <dependency>
           <groupId>org.apache.maven</groupId>
           <artifactId>maven-model-builder</artifactId>
-          <version>3.2.3</version>
+          <version>${maven.version}</version>
           <scope>test</scope>
       </dependency>
 
@@ -94,7 +94,7 @@ under the License.
       <dependency>
         <groupId>org.apache.maven.wagon</groupId>
         <artifactId>wagon-http-lightweight</artifactId>
-        <version>2.10</version>
+        <version>${wagon.version}</version>
         <scope>compile</scope>
       </dependency>
 
@@ -104,8 +104,8 @@ under the License.
         <artifactId>org.eclipse.sisu.plexus</artifactId>
       </dependency>
       <dependency>
-        <groupId>org.sonatype.sisu</groupId>
-        <artifactId>sisu-guice</artifactId>
+        <groupId>com.google.inject</groupId>
+        <artifactId>guice</artifactId>
       </dependency>
 
       <!-- Spring dependencies start: -->

http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/ad07405c/indexer-reader/pom.xml
----------------------------------------------------------------------
diff --git a/indexer-reader/pom.xml b/indexer-reader/pom.xml
index 3f91847..11a9ffe 100644
--- a/indexer-reader/pom.xml
+++ b/indexer-reader/pom.xml
@@ -47,7 +47,6 @@ under the License.
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>18.0</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/ad07405c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9dafddb..0118b7b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@ under the License.
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven-parent</artifactId>
-    <version>27</version>
+    <version>30</version>
   </parent>
 
   <groupId>org.apache.maven.indexer</groupId>
@@ -84,17 +84,16 @@ under the License.
 
   <properties>
     <javaVersion>7</javaVersion>
+    <surefire.redirectTestOutputToFile>true</surefire.redirectTestOutputToFile>
+    <failsafe.redirectTestOutputToFile>true</failsafe.redirectTestOutputToFile>
 
-    <eclipse-sisu.version>0.2.1</eclipse-sisu.version>
-    <sisu-guice.version>3.2.2</sisu-guice.version>
-
+    <eclipse-sisu.version>0.3.3</eclipse-sisu.version>
     <lucene.version>5.5.4</lucene.version>
-    <maven.version>3.0.5</maven.version>
-    <aether.version>1.0.0.v20140518</aether.version>
-
-    <truezip.version>7.6.6</truezip.version>
-    <archetype.version>2.2</archetype.version>
-    <wagon.version>2.3</wagon.version>
+    <maven.version>3.5.2</maven.version>
+    <resolver.version>1.1.0</resolver.version>
+    <truezip.version>7.7.10</truezip.version>
+    <archetype.version>2.4</archetype.version>
+    <wagon.version>2.12</wagon.version>
 
     
<maven.site.path>maven-indexer-archives/maven-indexer-LATEST</maven.site.path>
   </properties>
@@ -109,18 +108,18 @@ under the License.
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-api</artifactId>
-        <version>1.7.5</version>
+        <version>1.7.25</version>
       </dependency>
       <dependency>
         <groupId>ch.qos.logback</groupId>
         <artifactId>logback-classic</artifactId>
-        <version>1.1.2</version>
+        <version>1.2.3</version>
         <scope>optional</scope>
       </dependency>
       <dependency>
         <groupId>ch.qos.logback</groupId>
         <artifactId>logback-core</artifactId>
-        <version>1.1.2</version>
+        <version>1.2.3</version>
         <scope>optional</scope>
       </dependency>
       <dependency>
@@ -128,26 +127,20 @@ under the License.
              as it would otherwise use commons-logging and do it's own other 
thing. -->
         <groupId>org.slf4j</groupId>
         <artifactId>jcl-over-slf4j</artifactId>
-        <version>1.7.7</version>
+        <version>1.7.25</version>
         <scope>optional</scope>
       </dependency>
 
       <dependency>
         <groupId>com.google.guava</groupId>
         <artifactId>guava</artifactId>
-        <version>16.0.1</version>
-      </dependency>
-
-      <dependency>
-        <groupId>joda-time</groupId>
-        <artifactId>joda-time</artifactId>
-        <version>2.3</version>
+        <version>20.0</version>
       </dependency>
 
       <dependency>
         <groupId>com.google.code.findbugs</groupId>
         <artifactId>jsr305</artifactId>
-        <version>2.0.3</version>
+        <version>3.0.2</version>
       </dependency>
 
       <!-- DI -->
@@ -170,21 +163,21 @@ under the License.
       </dependency>
 
       <dependency>
-        <groupId>org.sonatype.sisu</groupId>
-        <artifactId>sisu-guice</artifactId>
-        <version>${sisu-guice.version}</version>
+        <groupId>com.google.inject</groupId>
+        <artifactId>guice</artifactId>
+        <version>4.1.0</version>
       </dependency>
 
       <dependency>
-        <groupId>org.sonatype.sisu.inject</groupId>
+        <groupId>com.google.inject.extensions</groupId>
         <artifactId>guice-multibindings</artifactId>
-        <version>${sisu-guice.version}</version>
+        <version>4.1.0</version>
       </dependency>
 
       <dependency>
-        <groupId>org.sonatype.sisu.inject</groupId>
+        <groupId>com.google.inject.extensions</groupId>
         <artifactId>guice-assistedinject</artifactId>
-        <version>${sisu-guice.version}</version>
+        <version>4.1.0</version>
       </dependency>
 
       <dependency>
@@ -197,6 +190,12 @@ under the License.
         <groupId>org.eclipse.sisu</groupId>
         <artifactId>org.eclipse.sisu.plexus</artifactId>
         <version>${eclipse-sisu.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>javax.annotation</groupId>
+            <artifactId>jsr250-api</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
 
       <!-- Lucene -->
@@ -231,17 +230,17 @@ under the License.
         <version>${lucene.version}</version>
       </dependency>
 
-      <!-- Aether -->
+      <!-- Maven Resolver -->
       <dependency>
-        <groupId>org.eclipse.aether</groupId>
-        <artifactId>aether-api</artifactId>
-        <version>${aether.version}</version>
+        <groupId>org.apache.maven.resolver</groupId>
+        <artifactId>maven-resolver-api</artifactId>
+        <version>${resolver.version}</version>
       </dependency>
 
       <dependency>
-        <groupId>org.eclipse.aether</groupId>
-        <artifactId>aether-util</artifactId>
-        <version>${aether.version}</version>
+        <groupId>org.apache.maven.resolver</groupId>
+        <artifactId>maven-resolver-util</artifactId>
+        <version>${resolver.version}</version>
       </dependency>
 
       <!-- Maven -->
@@ -326,6 +325,18 @@ under the License.
       <!-- ZipFacade -->
       <dependency>
         <groupId>de.schlichtherle.truezip</groupId>
+        <artifactId>truezip-kernel</artifactId>
+        <version>${truezip.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>annotations</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+
+      <dependency>
+        <groupId>de.schlichtherle.truezip</groupId>
         <artifactId>truezip-file</artifactId>
         <version>${truezip.version}</version>
       </dependency>
@@ -403,7 +414,6 @@ under the License.
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>animal-sniffer-maven-plugin</artifactId>
-        <version>1.15</version>
         <configuration>
           <signature>
             <groupId>org.codehaus.mojo.signature</groupId>
@@ -473,7 +483,45 @@ under the License.
       <plugins>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>2.20.1</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-failsafe-plugin</artifactId>
+          <version>2.20.1</version>
+        </plugin>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>animal-sniffer-maven-plugin</artifactId>
+          <version>1.16</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.rat</groupId>
+          <artifactId>apache-rat-plugin</artifactId>
+          <version>0.12</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-checkstyle-plugin</artifactId>
+          <version>2.17</version>
+          <dependencies>
+            <dependency>
+              <groupId>org.apache.maven.shared</groupId>
+              <artifactId>maven-shared-resources</artifactId>
+              <version>2</version>
+            </dependency>
+          </dependencies>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-shade-plugin</artifactId>
+          <version>3.1.0</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-site-plugin</artifactId>
+          <version>3.6</version>
           <configuration>
             
<topSiteURL>scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/components/${maven.site.path}</topSiteURL>
           </configuration>
@@ -494,6 +542,7 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
+        <version>2.10.4</version>
         <configuration>
           <groups>
             <group>

Reply via email to