Skip to content

Commit

Permalink
Revert the workaround to classpath issues caused by google-java-forma…
Browse files Browse the repository at this point in the history
…t bundling but not relocating their copy of guava, which affected 2.3. The issue is no longer there, and the tests should fail if it regresses.

relates to #288 and was partly resolved by google/google-java-format#20 and depending on the newer released (unshaded) formatter.
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=120469748
  • Loading branch information
cgruber authored and ronshapiro committed Apr 22, 2016
1 parent f60266a commit 95f0861
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 9 deletions.
4 changes: 0 additions & 4 deletions compiler/src/it/functional-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@ limitations under the License.
<artifactId>functional-tests</artifactId>
<name>Functional Tests</name>
<dependencies>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>com.google.dagger</groupId>
<artifactId>dagger</artifactId>
Expand Down
5 changes: 0 additions & 5 deletions compiler/src/it/tck/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,6 @@ limitations under the License.
<artifactId>tck</artifactId>
<name>TCK</name>
<dependencies>
<dependency>
<!-- Force the correct version of Guava to be on the classpath. -->
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>com.google.dagger</groupId>
<artifactId>dagger</artifactId>
Expand Down

0 comments on commit 95f0861

Please sign in to comment.