Simplify POM, add more precise JPA annotations.
Change-Id: I2ad299c90d578c2151b2f0b0394d50d3dab3d24f
diff --git a/src/main/java/eu/mulk/mulkcms2/benki/users/UserRolePK.java b/src/main/java/eu/mulk/mulkcms2/benki/users/UserRolePK.java
index b84e02b..c424617 100644
--- a/src/main/java/eu/mulk/mulkcms2/benki/users/UserRolePK.java
+++ b/src/main/java/eu/mulk/mulkcms2/benki/users/UserRolePK.java
@@ -6,11 +6,14 @@
public class UserRolePK implements Serializable {
- private int userId;
- private int roleId;
-
@Column(name = "user", nullable = false)
@Id
+ private int userId;
+
+ @Column(name = "role", nullable = false)
+ @Id
+ private int roleId;
+
public int getUserId() {
return userId;
}
@@ -19,8 +22,6 @@
this.userId = userId;
}
- @Column(name = "role", nullable = false)
- @Id
public int getRoleId() {
return roleId;
}
diff --git a/src/main/resources/META-INF/beans.xml b/src/main/resources/META-INF/beans.xml
new file mode 100644
index 0000000..6bb944c
--- /dev/null
+++ b/src/main/resources/META-INF/beans.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="https://jakarta.ee/xml/ns/jakartaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_4_0.xsd">
+</beans>
\ No newline at end of file
diff --git a/src/main/resources/hibernate-types.properties b/src/main/resources/hypersistence-utils.properties
similarity index 100%
rename from src/main/resources/hibernate-types.properties
rename to src/main/resources/hypersistence-utils.properties