From 5d58be6f0aa5355b4dc6cd62783fb915eb3f2df5 Mon Sep 17 00:00:00 2001
From: Michael Muller <mmuller@google.com>
Date: Thu, 23 Apr 2020 13:35:37 -0400
Subject: [PATCH] Remove separate deployment of persistence.xml (#563)

* Remove separate deployment of persistence.xml

We added a step to explicitly copy persistence.xml because for some reason it
wasn't originally getting deployed to app-engine, resulting in failures on
startup.  However, this file is now included in core.jar and we are now
getting a warning about multiple persistence units with the same name as it
reads the files from both the filesystem and core.jar.
---
 appengine_war.gradle | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/appengine_war.gradle b/appengine_war.gradle
index ded8b9b25..44140dfcc 100644
--- a/appengine_war.gradle
+++ b/appengine_war.gradle
@@ -31,10 +31,6 @@ def coreResourcesDir = "${rootDir}/core/build/resources/main"
 war {
     webInf {
         from "../../core/src/main/java/google/registry/env/common/${project.name}/WEB-INF"
-
-        from("${coreResourcesDir}/META-INF/persistence.xml") {
-            into "classes/META-INF"
-        }
     }
 }