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.

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>

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>

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 -->

indexer-examples/indexer-examples-spring/pom.xml

@@ -86,15 +86,15 @@ 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>
 
       <!-- For ResourceFetcher implementation, if used -->
       <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: -->

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>