diff --git a/airports-flight-service/pom.xml b/airports-flight-service/pom.xml index 13dbd69ab9dd20ca0030f875c4fb41b837cf1363..a480bcd29300c37344e24f697304e2c2143ff7f8 100644 --- a/airports-flight-service/pom.xml +++ b/airports-flight-service/pom.xml @@ -39,7 +39,7 @@ <dependency> <groupId>org.postgresql</groupId> <artifactId>postgresql</artifactId> - <version>42.2.23</version> <!-- Replace with the desired version --> + <scope>runtime</scope> </dependency> <dependency> <groupId>cz.muni.fi.pa165</groupId> @@ -48,5 +48,19 @@ <scope>compile</scope> </dependency> </dependencies> - + <build> + <plugins> + <plugin> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-maven-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + </plugins> + </build> </project> \ No newline at end of file diff --git a/airports-flight-service/src/main/resources/application.properties b/airports-flight-service/src/main/resources/application.properties index d5ae90096a1db25d46377a7210bc66027264736e..b6370b98faf8695aaa74fa2e56b2af4a62fedf24 100644 --- a/airports-flight-service/src/main/resources/application.properties +++ b/airports-flight-service/src/main/resources/application.properties @@ -1,15 +1,24 @@ -spring.jpa.database-platform=org.hibernate.dialect.MySQL8Dialect spring.jpa.hibernate.ddl-auto=update spring.jpa.generate-ddl=true hibernate.physical_naming_strategy=org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy hibernate.implicit_naming_strategy=org.springframework.boot.orm.jpa.hibernate.SpringImplicitNamingStrategy -spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.url=jdbc:mysql://localhost:3306/airport_manager -spring.datasource.username=root -spring.datasource.password=root1120 spring.jpa.properties.hibernate.hbm2ddl.create_namespaces=true -# Specify the table engine -hibernate.dialect.storage_engine=innodb + +spring.jpa.database-platform=org.hibernate.dialect.PostgreSQLDialect +spring.datasource.driver-class-name=org.postgresql.Driver +spring.datasource.url=jdbc:postgresql://localhost:5432/airport-manager +spring.datasource.username=root +spring.datasource.password=123 +jakarta.peristence.create-database-schemas=true + +#spring.jpa.database-platform=org.hibernate.dialect.MySQL8Dialect +#spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver +#spring.datasource.url=jdbc:mysql://localhost:3306/airport_manager +#spring.datasource.username=root +#spring.datasource.password=root1120 +## Specify the table engine +#hibernate.dialect.storage_engine=innodb + springdoc.swagger-ui.path=/swagger-ui.html application-description=API Description diff --git a/airports-hr-service/src/main/java/cz/muni/fi/pa165/hr/dao/Employee.java b/airports-hr-service/src/main/java/cz/muni/fi/pa165/hr/dao/Employee.java index 0130a043602afb855021f26ab6e95b82f6db7bb0..ca5624026d63b2fd4d683e9654c3e43fc32673ed 100644 --- a/airports-hr-service/src/main/java/cz/muni/fi/pa165/hr/dao/Employee.java +++ b/airports-hr-service/src/main/java/cz/muni/fi/pa165/hr/dao/Employee.java @@ -17,7 +17,7 @@ import javax.persistence.*; @Entity @Table(name = "employee", schema = Constants.HR_SCHEMA) @Inheritance(strategy = InheritanceType.JOINED) -@ + public class Employee implements Serializable { @Id