[guice] Merge internal changes. (#920)

[Colin Decker]

`@since` and `package-info.java` changes.
You can view, comment on, or merge this pull request online at:

https://github.com/google/guice/pull/920

-- Commit Summary --

* Add more missing @since 4.0 and remove references to *-3.0.jar in extensions' package-info.java files.

-- File Changes --

M core/src/com/google/inject/internal/package-info.java (3)
M core/src/com/google/inject/spi/ElementVisitor.java (2)
M core/src/com/google/inject/spi/ProviderLookup.java (1)
M core/src/com/google/inject/spi/package-info.java (3)
M extensions/assistedinject/src/com/google/inject/assistedinject/package-info.java (4)
M extensions/grapher/src/com/google/inject/grapher/BindingEdge.java (1)
M extensions/grapher/src/com/google/inject/grapher/DependencyEdge.java (1)
M extensions/grapher/src/com/google/inject/grapher/ImplementationNode.java (2)
M extensions/grapher/src/com/google/inject/grapher/InjectorGrapher.java (3)
M extensions/grapher/src/com/google/inject/grapher/InterfaceNode.java (2)
M extensions/grapher/src/com/google/inject/grapher/NodeId.java (1)
M extensions/grapher/src/com/google/inject/grapher/TransitiveDependencyVisitor.java (3)
M extensions/grapher/src/com/google/inject/grapher/graphviz/GraphvizEdge.java (2)
M extensions/grapher/src/com/google/inject/grapher/graphviz/GraphvizNode.java (6)
M extensions/jmx/src/com/google/inject/tools/jmx/package-info.java (4)
M extensions/jndi/src/com/google/inject/jndi/package-info.java (4)
M extensions/multibindings/src/com/google/inject/multibindings/Multibinder.java (1)
M extensions/multibindings/src/com/google/inject/multibindings/StringMapKey.java (1)
M extensions/multibindings/src/com/google/inject/multibindings/package-info.java (4)
M extensions/persist/src/com/google/inject/persist/jpa/JpaPersistModule.java (3)
M extensions/persist/src/com/google/inject/persist/package-info.java (4)
M extensions/servlet/src/com/google/inject/servlet/package-info.java (4)
M extensions/spring/src/com/google/inject/spring/package-info.java (4)
M extensions/throwingproviders/src/com/google/inject/throwingproviders/CheckedProvides.java (4)
M extensions/throwingproviders/src/com/google/inject/throwingproviders/ThrowingProviderBinder.java (7)
M extensions/throwingproviders/src/com/google/inject/throwingproviders/package-info.java (4)

-- Patch Links --

https://github.com/google/guice/pull/920.patch
https://github.com/google/guice/pull/920.diff

---
Reply to this email directly or view it on GitHub:
https://github.com/google/guice/pull/920

[Sam Berlin]

@@ -17,5 +17,4 @@
/**
* <i>Guice</i> (sounds like like "juice")
*/
-
-package com.google.inject.internal;

This diff is hard to read. The diff *looks* like it's deleting the package line. But the file it's merging from has the package line (and so did the internal CL this was created from). The package line is staying, right?

---
Reply to this email directly or view it on GitHub:
https://github.com/google/guice/pull/920/files#r29270808

[Colin Decker]

@@ -17,5 +17,4 @@
/**
* <i>Guice</i> (sounds like like "juice")
*/
-
-package com.google.inject.internal;

It's staying. You can look at the full file at this revision here: https://github.com/google/guice/blob/merge-internal-changes/core/src/com/google/inject/internal/package-info.java

---
Reply to this email directly or view it on GitHub:
https://github.com/google/guice/pull/920/files#r29272013

[Sam Berlin]

LGTM

---
Reply to this email directly or view it on GitHub:
https://github.com/google/guice/pull/920#issuecomment-97167503