diff --git a/.gitignore b/.gitignore index 4861887..99f0f18 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +.idea target/ /airhacksDB/ /derby.log diff --git a/pom.xml b/pom.xml index 9dd25f5..fcbb9aa 100644 --- a/pom.xml +++ b/pom.xml @@ -10,28 +10,62 @@ airhacks-control http://airhacks.com - - junit - junit - 4.11 - test - org.eclipse.persistence eclipselink - 2.5.1 + 4.0.0 org.apache.derby derby - 10.9.1.0 - compile + 10.16.1.1 - com.airhacks + org.apache.derby + derbytools + 10.16.1.1 + + + com.dlsc.afterburner afterburner.fx - 1.5.1 - compile + 2.2.0 + + + org.openjfx + javafx-controls + 19.0.2.1 + + + org.openjfx + javafx-fxml + 19.0.2.1 + + + javax.annotation + javax.annotation-api + 1.3.2 + + + javax.inject + javax.inject + 1 + + + jakarta.activation + jakarta.activation-api + 2.1.1 + + + jakarta.persistence + jakarta.persistence-api + 3.1.0 + + + + junit + junit + 4.11 + test org.mockito @@ -44,24 +78,59 @@ org.apache.maven.plugins - maven-shade-plugin - 2.3 + maven-compiler-plugin + 3.10.1 + + + + org.apache.maven.plugins + maven-jar-plugin + 3.3.0 + + + + true + com.airhacks.control.App + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + copy-dependencies package - shade + copy-dependencies - - - junit:junit - - + compile + target/bin + + + + copy-module + package + + copy + + + + + ${project.groupId} + ${project.artifactId} + ${project.version} + + + target/bin + org.codehaus.mojo exec-maven-plugin @@ -74,12 +143,15 @@ exec - /Library/Java/JavaVirtualMachines/jdk1.8.0.jdk/Contents/Home/bin/java + java -Djavafx.verbose=true - -cp - ./target/airhacks-control.jar - com.airhacks.control.App + --module-path + target/bin + --class-path + target/bin/* + --module + airhacks.control @@ -104,8 +176,8 @@ airhacks-control - 1.8 - 1.8 + 17 + 17 UTF-8 diff --git a/src/main/java/com/airhacks/control/business/registrations/boundary/RegistrationService.java b/src/main/java/com/airhacks/control/business/registrations/boundary/RegistrationService.java index 69b199c..2e507fe 100644 --- a/src/main/java/com/airhacks/control/business/registrations/boundary/RegistrationService.java +++ b/src/main/java/com/airhacks/control/business/registrations/boundary/RegistrationService.java @@ -3,10 +3,10 @@ import com.airhacks.control.business.registrations.entity.Attendee; import java.util.List; import javax.annotation.PostConstruct; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.EntityTransaction; -import javax.persistence.Persistence; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.Persistence; /** * diff --git a/src/main/java/com/airhacks/control/business/registrations/entity/Attendee.java b/src/main/java/com/airhacks/control/business/registrations/entity/Attendee.java index c5f880b..5c15722 100644 --- a/src/main/java/com/airhacks/control/business/registrations/entity/Attendee.java +++ b/src/main/java/com/airhacks/control/business/registrations/entity/Attendee.java @@ -5,10 +5,10 @@ import javafx.beans.property.SimpleBooleanProperty; import javafx.beans.property.SimpleStringProperty; import javafx.beans.property.StringProperty; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; /** * diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java new file mode 100644 index 0000000..dbd878e --- /dev/null +++ b/src/main/java/module-info.java @@ -0,0 +1,13 @@ +open module airhacks.control { + requires jakarta.persistence; + requires java.annotation; + requires javafx.controls; + requires javafx.fxml; + requires javax.inject; + requires org.apache.derby.engine; + requires eclipselink; + requires afterburner.fx; + requires jakarta.activation; + + exports com.airhacks.control; +} \ No newline at end of file diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml index ab174a4..7ad3383 100644 --- a/src/main/resources/META-INF/persistence.xml +++ b/src/main/resources/META-INF/persistence.xml @@ -5,8 +5,8 @@ com.airhacks.control.business.registrations.entity.Attendee - - + +