[sling-org-apache-sling-feature-cpconverter] branch guice_di updated: switched to the minimal set of Guice dependencies dropped useless bindings

[si...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

simonetripodi pushed a commit to branch guice_di
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-cpconverter.git


The following commit(s) were added to refs/heads/guice_di by this push:
     new 5de3334  switched to the minimal set of Guice dependencies dropped useless bindings
5de3334 is described below

commit 5de3334545d390f62b741dbdadd9cda49602b096
Author: Simo Tripodi <st...@adobe.com>
AuthorDate: Mon May 27 12:02:37 2019 +0200

    switched to the minimal set of Guice dependencies
    dropped useless bindings
---
 pom.xml                                             | 21 ++++++++++++++++++++-
 .../sling/feature/cpconverter/IdOverrideTest.java   | 10 +---------
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1a88303..ba3777a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,6 +35,7 @@
 
   <properties>
     <sling.java.version>8</sling.java.version>
+    <guice.version>3.0</guice.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 
@@ -58,7 +59,25 @@
     <dependency>
       <groupId>com.google.inject</groupId>
       <artifactId>guice</artifactId>
-      <version>4.2.2</version>
+      <version>${guice.version}</version>
+      <classifier>no_aop</classifier>
+      <exclusions>
+        <exclusion>
+          <groupId>aopalliance</groupId>
+          <artifactId>aopalliance</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>com.google.inject.extensions</groupId>
+      <artifactId>guice-multibindings</artifactId>
+      <version>${guice.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>aopalliance</groupId>
+          <artifactId>aopalliance</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <!--
diff --git a/src/test/java/org/apache/sling/feature/cpconverter/IdOverrideTest.java b/src/test/java/org/apache/sling/feature/cpconverter/IdOverrideTest.java
index adc08cd..17a4e92 100644
--- a/src/test/java/org/apache/sling/feature/cpconverter/IdOverrideTest.java
+++ b/src/test/java/org/apache/sling/feature/cpconverter/IdOverrideTest.java
@@ -17,6 +17,7 @@
 package org.apache.sling.feature.cpconverter;
 
 import static com.google.inject.name.Names.named;
+import static org.junit.Assert.assertNotNull;
 
 import java.io.File;
 import java.net.URL;
@@ -24,11 +25,8 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.zip.ZipFile;
 
-import static org.junit.Assert.assertNotNull;
-
 import org.apache.commons.io.FileUtils;
 import org.apache.sling.feature.cpconverter.artifacts.ArtifactsDeployer;
-import org.apache.sling.feature.cpconverter.inject.ContentPackage2FeatureModelConverterModule;
 import org.apache.sling.feature.cpconverter.shared.AbstractContentPackage2FeatureModelConverterTest;
 import org.junit.Test;
 
@@ -46,12 +44,6 @@ public class IdOverrideTest extends AbstractContentPackage2FeatureModelConverter
     protected void configure() {
         super.configure();
 
-        install(new ContentPackage2FeatureModelConverterModule());
-
-        bindConstant().annotatedWith(named("packagemanager.validation.strict")).to(true);
-        bindConstant().annotatedWith(named("features.configurations.merge")).to(true);
-        bindConstant().annotatedWith(named("features.bundles.startOrder")).to(5);
-
         bindConstant().annotatedWith(named("features.artifacts.idoverride")).to("${project.groupId}:${project.artifactId}:slingosgifeature:asd.test.all-1.0.0:${project.version}");
     }