This is an automated email from the git hooks/post-receive script. eugene-guest pushed a commit to branch master in repository sisu-guice.
commit 37ce057549d1c943630e110461f1725a9890e122 Author: Eugene Zhukov <[email protected]> Date: Thu Apr 24 15:58:49 2014 +0000 merge leftovers --- .../src/com/google/inject/multibindings/MapBinder.java | 1 - extensions/persist/pom.xml | 13 ------------- extensions/pom.xml | 3 --- 3 files changed, 17 deletions(-) diff --git a/extensions/multibindings/src/com/google/inject/multibindings/MapBinder.java b/extensions/multibindings/src/com/google/inject/multibindings/MapBinder.java index 3480b2a..c5b752e 100644 --- a/extensions/multibindings/src/com/google/inject/multibindings/MapBinder.java +++ b/extensions/multibindings/src/com/google/inject/multibindings/MapBinder.java @@ -43,7 +43,6 @@ import com.google.inject.Key; import com.google.inject.Module; import com.google.inject.Provider; import com.google.inject.TypeLiteral; -import com.google.inject.internal.Errors; import com.google.inject.binder.LinkedBindingBuilder; import com.google.inject.internal.Errors; import com.google.inject.multibindings.Multibinder.RealMultibinder; diff --git a/extensions/persist/pom.xml b/extensions/persist/pom.xml index 8f8b298..98b72e5 100644 --- a/extensions/persist/pom.xml +++ b/extensions/persist/pom.xml @@ -44,18 +44,5 @@ <version>2.0.0</version> <scope>test</scope> </dependency> - <!-- These are present for IDEs which will not be pulling in the jarjar'ed value. --> - <dependency> - <groupId>cglib</groupId> - <artifactId>cglib</artifactId> - <version>3.0</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.ow2.asm</groupId> - <artifactId>asm-util</artifactId> - <version>4.0</version> - <scope>test</scope> - </dependency> </dependencies> </project> diff --git a/extensions/pom.xml b/extensions/pom.xml index 8c5583a..0efd256 100644 --- a/extensions/pom.xml +++ b/extensions/pom.xml @@ -56,8 +56,6 @@ <scope>test</scope> </dependency> <!-- -<<<<<<< HEAD -======= | Some extension tests depend on guava test libs which are not inherited | from test scope. --> @@ -68,7 +66,6 @@ <scope>test</scope> </dependency> <!-- ->>>>>>> upstream/3.2.1+dfsg | Some extension tests depend on cglib which is not embedded | in an execution that doesn't include package. --> -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sisu-guice.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
