Switch AutoValue to using the separate EscapeVelocity project rather …

…than its own copy. A later change will delete that copy. RELNOTES=Use separate EscapeVelocity project rather than AutoValue's own copy. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=199709073
google · Jun 12, 2018 · b5b51db · b5b51db
1 parent 96370f3
commit b5b51db
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 6 deletions.
diff --git a/value/processor/pom.xml b/value/processor/pom.xml
@@ -51,6 +51,11 @@
       <version>1.0-rc4</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>com.google.escapevelocity</groupId>
+      <artifactId>escapevelocity</artifactId>
+      <version>0.9</version>
+    </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>

diff --git a/value/src/main/java/com/google/auto/value/processor/AutoAnnotationTemplateVars.java b/value/src/main/java/com/google/auto/value/processor/AutoAnnotationTemplateVars.java
@@ -15,7 +15,7 @@
  */
 package com.google.auto.value.processor;
 
-import com.google.auto.value.processor.escapevelocity.Template;
+import com.google.escapevelocity.Template;
 import java.util.Map;
 import java.util.Set;
 

diff --git a/value/src/main/java/com/google/auto/value/processor/AutoOneOfTemplateVars.java b/value/src/main/java/com/google/auto/value/processor/AutoOneOfTemplateVars.java
@@ -15,8 +15,8 @@
  */
 package com.google.auto.value.processor;
 
-import com.google.auto.value.processor.escapevelocity.Template;
 import com.google.common.collect.ImmutableSet;
+import com.google.escapevelocity.Template;
 import java.util.Map;
 
 /**

diff --git a/value/src/main/java/com/google/auto/value/processor/AutoValueTemplateVars.java b/value/src/main/java/com/google/auto/value/processor/AutoValueTemplateVars.java
@@ -16,11 +16,11 @@
 package com.google.auto.value.processor;
 
 import com.google.auto.value.processor.PropertyBuilderClassifier.PropertyBuilder;
-import com.google.auto.value.processor.escapevelocity.Template;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableMultimap;
 import com.google.common.collect.ImmutableSet;
+import com.google.escapevelocity.Template;
 import java.util.Optional;
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.util.Types;

diff --git a/value/src/main/java/com/google/auto/value/processor/GwtSerialization.java b/value/src/main/java/com/google/auto/value/processor/GwtSerialization.java
@@ -18,8 +18,8 @@
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.stream.Collectors.toList;
 
-import com.google.auto.value.processor.escapevelocity.Template;
 import com.google.common.collect.Multimap;
+import com.google.escapevelocity.Template;
 import java.io.IOException;
 import java.io.Writer;
 import java.util.List;

diff --git a/value/src/main/java/com/google/auto/value/processor/TemplateVars.java b/value/src/main/java/com/google/auto/value/processor/TemplateVars.java
@@ -15,10 +15,10 @@
  */
 package com.google.auto.value.processor;
 
-import com.google.auto.value.processor.escapevelocity.Template;
 import com.google.common.base.Throwables;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import com.google.escapevelocity.Template;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FilterInputStream;

diff --git a/value/src/test/java/com/google/auto/value/processor/TemplateVarsTest.java b/value/src/test/java/com/google/auto/value/processor/TemplateVarsTest.java
@@ -21,10 +21,10 @@
 import static java.util.logging.Level.WARNING;
 import static org.junit.Assert.fail;
 
-import com.google.auto.value.processor.escapevelocity.Template;
 import com.google.common.base.Splitter;
 import com.google.common.collect.ImmutableList;
 import com.google.common.reflect.Reflection;
+import com.google.escapevelocity.Template;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;