locusworks/eight-track
4
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

#5 Fixed issue with persistence.xml and pom referencing the wrong jpa

Browse Source
This commit is contained in:
Isaac Parenteau
2019-10-06 22:17:25 -05:00
parent 4d5ee13616
commit f9b45581e2
2 changed files with 4 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
pom.xml
View File

@ -18,6 +18,7 @@
</scm> </scm>
<properties> <properties>
<flyway.version>6.0.3</flyway.version> <flyway.version>6.0.3</flyway.version>
<mariadb.version>2.4.4</mariadb.version> <mariadb.version>2.4.4</mariadb.version>
<hibernate.version>5.4.4.Final</hibernate.version> <hibernate.version>5.4.4.Final</hibernate.version>
@ -46,7 +47,7 @@
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version> <version>3.8.1</version>
<configuration> <configuration>
<source>1.8</source> <source>1.8</source>
<target>1.8</target> <target>1.8</target>
@ -332,32 +333,8 @@
<artifactId>activation</artifactId> <artifactId>activation</artifactId>
<version>1.1.1</version> <version>1.1.1</version>
</dependency> </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> </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> <distributionManagement>
<snapshotRepository> <snapshotRepository>
<id>nexus-snapshot</id> <id>nexus-snapshot</id>

4
src/main/resources/META-INF/persistence.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?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 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"> <persistence-unit name="eighttrack_pu" transaction-type="RESOURCE_LOCAL">
<provider>org.eclipse.persistence.jpa.PersistenceProvider</provider> <provider>org.hibernate.ejb.HibernatePersistence</provider>
<class>net.locusworks.discord.eighttrack.database.entities.GuildSong</class> <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.GuildPlaylist</class>
<class>net.locusworks.discord.eighttrack.database.entities.DiscordGuild</class> <class>net.locusworks.discord.eighttrack.database.entities.DiscordGuild</class>