Skip to content
Permalink
Browse files

merge multibindings into the 'core' of guice.

This deletes the maven artifact 'com.google.inject.extensions:guice-multibindings' and moves all
classes/tests into 'com.google.inject:guice'.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=129637237
  • Loading branch information
lukesandberg authored and sameb committed Jul 18, 2016
1 parent 2c0910e commit 4f75f2f58578915b42b6bb907c2779127cf03707
@@ -59,11 +59,6 @@
<artifactId>guice-jndi</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.google.inject.extensions</groupId>
<artifactId>guice-multibindings</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.google.inject.extensions</groupId>
<artifactId>guice-persist</artifactId>
@@ -7,7 +7,6 @@ assistedinject.src.dir=extensions/assistedinject/src
jmx.src.dir=extensions/jmx/src
jndi.src.dir=extensions/jndi/src
throwingproviders.src.dir=extensions/throwingproviders/src
multibindings.src.dir=extensions/multibindings/src
daggeradapter.src.dir=extensions/dagger-adapter/src
privatemodules.src.dir=extensions/privatemodules/src
lifecycle.src.dir=extensions/lifecycle/src
@@ -34,7 +34,6 @@
<ant antfile="extensions/jmx/build.xml" target="distjars" inheritAll="false"/>
<ant antfile="extensions/jndi/build.xml" target="distjars" inheritAll="false"/>
<ant antfile="extensions/throwingproviders/build.xml" target="distjars" inheritAll="false"/>
<ant antfile="extensions/multibindings/build.xml" target="distjars" inheritAll="false"/>
<ant antfile="extensions/dagger-adapter/build.xml" target="distjars" inheritAll="false"/>
<ant antfile="extensions/persist/build.xml" target="distjars" inheritAll="false"/>
<ant antfile="extensions/grapher/build.xml" target="distjars" inheritAll="false"/>
@@ -61,9 +60,6 @@
<copy toDir="${build.dir}/dist">
<fileset dir="extensions/throwingproviders/build" includes="*.jar"/>
</copy>
<copy toDir="${build.dir}/dist">
<fileset dir="extensions/multibindings/build" includes="*.jar"/>
</copy>
<copy toDir="${build.dir}/dist">
<fileset dir="extensions/dagger-adapter/build" includes="*.jar"/>
</copy>
@@ -162,7 +158,6 @@
<fileset dir="${jmx.src.dir}"/>
<fileset dir="${jndi.src.dir}"/>
<fileset dir="${throwingproviders.src.dir}"/>
<fileset dir="${multibindings.src.dir}"/>
<fileset dir="${daggeradapter.src.dir}"/>
<fileset dir="${persist.src.dir}"/>
<fileset dir="${struts2.src.dir}"/>
@@ -204,7 +199,7 @@
windowtitle="Guice ${new.api} API"
author="false"
protected="true">
<group title="Guice Core" packages="com.google.inject:com.google.inject.util:com.google.inject.spi:com.google.inject.name:com.google.inject.matcher:com.google.inject.binder"/>
<group title="Guice Core" packages="com.google.inject:com.google.inject.util:com.google.inject.spi:com.google.inject.name:com.google.inject.matcher:com.google.inject.binder:com.google.inject.multibindings:"/>
<fileset dir="${src.dir}" defaultexcludes="yes">
<include name="com/google/inject/**"/>
<exclude name="com/google/inject/internal/**"/>
@@ -216,9 +211,6 @@
<group title="AssistedInject Extension" packages="com.google.inject.assistedinject"/>
<fileset dir="${assistedinject.src.dir}"/>

<group title="Multibinder Extension" packages="com.google.inject.multibindings"/>
<fileset dir="${multibindings.src.dir}"/>

<group title="Dagger Adapter" packages="com.google.inject.daggeradapter"/>
<fileset dir="${daggeradapter.src.dir}"/>

@@ -309,7 +301,6 @@
<ant dir="extensions/jmx" antfile="build.xml" target="clean"/>
<ant dir="extensions/jndi" antfile="build.xml" target="clean"/>
<ant dir="extensions/throwingproviders" antfile="build.xml" target="clean"/>
<ant dir="extensions/multibindings" antfile="build.xml" target="clean"/>
<ant dir="extensions/dagger-adapter" antfile="build.xml" target="clean"/>
<ant dir="extensions/persist" antfile="build.xml" target="clean"/>
<ant dir="extensions/grapher" antfile="build.xml" target="clean"/>
@@ -156,6 +156,13 @@ public static Test suite() {
suite.addTestSuite(com.googlecode.guice.OSGiContainerTest.class);
suite.addTestSuite(Jsr330Test.class);

// multibindings tests
suite.addTestSuite(com.google.inject.multibindings.MapBinderTest.class);
suite.addTestSuite(com.google.inject.multibindings.MultibinderTest.class);
suite.addTestSuite(com.google.inject.multibindings.OptionalBinderTest.class);
suite.addTestSuite(com.google.inject.multibindings.RealElementTest.class);
suite.addTestSuite(com.google.inject.multibindings.ProvidesIntoTest.class);

return SuiteUtils.removeSuppressedTests(suite, SUPPRESSED_TEST_NAMES);
}
}

This file was deleted.

@@ -8,7 +8,6 @@
<fileset dir="${lib.dir}" includes="*.jar"/>
<fileset dir="${ext.lib.dir}" includes="*.jar"/>
<pathelement path="../../build/classes"/>
<fileset dir="../multibindings/build" includes="*.jar"/>
</path>

<target name="jar" depends="compile, manifest" description="Build jar.">
@@ -10,11 +10,6 @@
<artifactId>guice-dagger-adapter</artifactId>
<name>Google Guice - Extensions - Dagger Adapter</name>
<dependencies>
<dependency>
<groupId>com.google.inject.extensions</groupId>
<artifactId>guice-multibindings</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.google.dagger</groupId>
<artifactId>dagger</artifactId>
@@ -19,11 +19,6 @@
<artifactId>guice-assistedinject</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.google.inject.extensions</groupId>
<artifactId>guice-multibindings</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

@@ -22,7 +22,6 @@
<module>grapher</module>
<module>jmx</module>
<module>jndi</module>
<module>multibindings</module>
<module>persist</module>
<module>servlet</module>
<module>spring</module>

0 comments on commit 4f75f2f

Please sign in to comment.
You can’t perform that action at this time.