[guice] Merge internal changes. (#920)

Colin Decker

unread,

Apr 28, 2015, 1:36:07 PM4/28/15

to google/guice

@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

Patch Links:

—
Reply to this email directly or view it on GitHub.

Sam Berlin

unread,

Apr 28, 2015, 2:08:04 PM4/28/15

to google/guice

In core/src/com/google/inject/internal/package-info.java:

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

Colin Decker

unread,

Apr 28, 2015, 2:19:03 PM4/28/15

to google/guice

In core/src/com/google/inject/internal/package-info.java:

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

Sam Berlin

unread,

Apr 28, 2015, 2:46:38 PM4/28/15

to google/guice

LGTM

Colin Decker

unread,

Apr 28, 2015, 3:43:45 PM4/28/15

to google/guice

Merged #920.

Reply all

Reply to author

Forward