From f9b45581e2055271581d945ff7e153343f4d37a7 Mon Sep 17 00:00:00 2001
From: Isaac Parenteau <locus2k@gmail.com>
Date: Sun, 6 Oct 2019 22:17:25 -0500
Subject: [PATCH] #5 Fixed issue with persistence.xml and pom referencing the
 wrong jpa

---
 pom.xml                                     | 27 ++-------------------
 src/main/resources/META-INF/persistence.xml |  4 +--
 2 files changed, 4 insertions(+), 27 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4dd03d9..00ca576 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,6 +18,7 @@
 	</scm>
 
 	<properties>
+	
 		<flyway.version>6.0.3</flyway.version>
 		<mariadb.version>2.4.4</mariadb.version>
 		<hibernate.version>5.4.4.Final</hibernate.version>
@@ -46,7 +47,7 @@
 			</plugin>
 			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.1</version>
+				<version>3.8.1</version>
 				<configuration>
 					<source>1.8</source>
 					<target>1.8</target>
@@ -332,32 +333,8 @@
 			<artifactId>activation</artifactId>
 			<version>1.1.1</version>
 		</dependency>
-	 <dependency>
-	  <groupId>org.eclipse.persistence</groupId>
-	  <artifactId>eclipselink</artifactId>
-	  <version>2.5.2</version>
-	 </dependency>
-	 <dependency>
-	  <groupId>org.eclipse.persistence</groupId>
-	  <artifactId>org.eclipse.persistence.jpa.modelgen.processor</artifactId>
-	  <version>2.5.2</version>
-	  <scope>provided</scope>
-	 </dependency>
 	</dependencies>
 
-	<repositories>
-		<repository>
-			<id>nexus-proxy-public</id>
-			<url>${nexus.repo}/repository/maven-public/</url>
-		</repository>
-	</repositories>
-	<pluginRepositories>
-		<pluginRepository>
-			<id>nexus-proxy-public</id>
-			<url>${nexus.repo}/repository/maven-public/</url>
-		</pluginRepository>
-	</pluginRepositories>
-
 	<distributionManagement>
 		<snapshotRepository>
 			<id>nexus-snapshot</id>
diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml
index eb8ffd7..d7ae59a 100644
--- a/src/main/resources/META-INF/persistence.xml
+++ b/src/main/resources/META-INF/persistence.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <persistence version="2.1" xmlns="http://xmlns.jcp.org/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd">
-  <persistence-unit name="net.locusworks.discord_eight-track_jar_0.0.1-SNAPSHOTPU" transaction-type="RESOURCE_LOCAL">
-    <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
+  <persistence-unit name="eighttrack_pu" transaction-type="RESOURCE_LOCAL">
+    <provider>org.hibernate.ejb.HibernatePersistence</provider>
     <class>net.locusworks.discord.eighttrack.database.entities.GuildSong</class>
     <class>net.locusworks.discord.eighttrack.database.entities.GuildPlaylist</class>
     <class>net.locusworks.discord.eighttrack.database.entities.DiscordGuild</class>