Merge remote-tracking branch 'origin/master'

# Conflicts:
#	pom.xml

pom.xml

@@ -36,6 +36,7 @@
         <dependency>
         <dependency>
             <groupId>mysql</groupId>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
             <artifactId>mysql-connector-java</artifactId>
+            <version>8.0.31</version>
         </dependency>
         </dependency>
 
 
         <dependency>
         <dependency>
@@ -44,8 +45,13 @@
             <version>3.1.4</version>
             <version>3.1.4</version>
         </dependency>
         </dependency>
         <dependency>
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-jpa</artifactId>
+            <groupId>javax.validation</groupId>
+            <artifactId>validation-api</artifactId>
+            <version>2.0.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.jayway.jsonpath</groupId>
+            <artifactId>json-path</artifactId>
         </dependency>
         </dependency>
 
 
     </dependencies>
     </dependencies>

src/main/java/com/carpooling/carpoolingaoraha/CarPoolingAorAhaApplication.java

@@ -2,8 +2,10 @@ package com.carpooling.carpoolingaoraha;
 
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.domain.EntityScan;
 
 
 @SpringBootApplication
 @SpringBootApplication
+@EntityScan(basePackages = "com.carpooling.carpoolingaoraha.entidades")
 public class CarPoolingAorAhaApplication {
 public class CarPoolingAorAhaApplication {
 
 
     public static void main(String[] args) {
     public static void main(String[] args) {

src/main/java/com/carpooling/carpoolingaoraha/entidades/Reserva.java

@@ -5,16 +5,30 @@ import java.util.Arrays;
 import java.util.Date;
 import java.util.Date;
 import java.util.List;
 import java.util.List;
 
 
+
+
 import com.carpooling.carpoolingaoraha.entidades.*;
 import com.carpooling.carpoolingaoraha.entidades.*;
+import jakarta.persistence.*;
 
 
+@Entity
+@Table (name = "Reservas")
 public class Reserva {
 public class Reserva {
+    @Transient
     private static int incrementaReserva = 0;
     private static int incrementaReserva = 0;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     private int idReserva;
     private int idReserva;
+    @Transient
     private Usuario conductor;
     private Usuario conductor;
+    @Transient
     private ArrayList<String> pasajeros;
     private ArrayList<String> pasajeros;
+
     private int puntuacion;
     private int puntuacion;
     private int numPasajeros;
     private int numPasajeros;
+    @Transient
     private Viaje viaje;
     private Viaje viaje;
+    @Transient
     SistemaCarPooling sistema;
     SistemaCarPooling sistema;
 
 
     public Reserva(){}
     public Reserva(){}