diff --git a/build.sbt b/build.sbt index 7f1c07e..58f88fa 100644 --- a/build.sbt +++ b/build.sbt @@ -60,7 +60,9 @@ lazy val knockoutwhistweb = project.in(file("knockoutwhistweb")) libraryDependencies += "com.nimbusds" % "oauth2-oidc-sdk" % "11.31.1", libraryDependencies += "org.playframework" %% "play-ws" % "3.0.6", libraryDependencies += ws, - JsEngineKeys.engineType := JsEngineKeys.EngineType.Node + JsEngineKeys.engineType := JsEngineKeys.EngineType.Node, + + PlayKeys.externalizeResourcesExcludes += baseDirectory.value / "conf" / "META-INF" / "persistence.xml" ) lazy val root = (project in file(".")) diff --git a/knockoutwhistfrontend b/knockoutwhistfrontend index 86dcc61..c2dfa0e 160000 --- a/knockoutwhistfrontend +++ b/knockoutwhistfrontend @@ -1 +1 @@ -Subproject commit 86dcc6173c2780898803029d6c8da27c3f7590a3 +Subproject commit c2dfa0e701db7c7471392a6ddd4e90503ecb2de2 diff --git a/knockoutwhistweb/conf/persistence.xml b/knockoutwhistweb/conf/META-INF/persistence.xml similarity index 96% rename from knockoutwhistweb/conf/persistence.xml rename to knockoutwhistweb/conf/META-INF/persistence.xml index 7002250..cbe047a 100644 --- a/knockoutwhistweb/conf/persistence.xml +++ b/knockoutwhistweb/conf/META-INF/persistence.xml @@ -8,8 +8,6 @@ org.hibernate.jpa.HibernatePersistenceProvider - model.users.UserEntity - @@ -20,6 +18,7 @@ +