diff --git a/Dockerfile b/Dockerfile
index 3090d107a5878ed24086fa14f8b17c323d22b568..38d1bbd8d4d6f0e2a95908e1b2cc32cc2dbfd519 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,8 @@
-FROM maven:latest
+FROM maven:amazoncorretto
WORKDIR /app/nutricraft-soap
COPY . .
-RUN mvn clean
-RUN mvn compile
-RUN mvn package
+RUN mvn clean package -DskipTests
ENTRYPOINT ["java", "-jar", "target/nutricraft-soap.jar"]
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 64d846d2ce1fa1961e337aecc6ec8a7af9699803..748c0560f1c8c51ba8faa46261e4f6ddd0988954 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,11 +14,6 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
- <dependency>
- <groupId>io.github.cdimascio</groupId>
- <artifactId>dotenv-java</artifactId>
- <version>2.3.1</version>
- </dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
@@ -27,13 +22,24 @@
<dependency>
<groupId>jakarta.xml.ws</groupId>
<artifactId>jakarta.xml.ws-api</artifactId>
- <version>2.3.3</version>
+ <version>4.0.0</version>
</dependency>
<dependency>
<groupId>com.sun.xml.ws</groupId>
<artifactId>jaxws-rt</artifactId>
<version>2.3.2</version>
</dependency>
+ <dependency>
+ <groupId>com.sun.xml.messaging.saaj</groupId>
+ <artifactId>saaj-impl</artifactId>
+ <version>1.5.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.xml.soap</groupId>
+ <artifactId>javax.xml.soap-api</artifactId>
+ <version>1.4.0</version>
+ </dependency>
<dependency>
<groupId>com.sun.xml.ws</groupId>
<artifactId>jaxws-ri</artifactId>
@@ -43,7 +49,7 @@
<dependency>
<groupId>javax.xml.ws</groupId>
<artifactId>jaxws-api</artifactId>
- <version>2.2.8</version>
+ <version>2.3.1</version>
</dependency>
</dependencies>
@@ -51,6 +57,26 @@
<build>
<plugins>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <configuration>
+ <transformers>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+ <mainClass>org.nutricraft.Main</mainClass>
+ </transformer>
+ </transformers>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<version>3.1.0</version>
@@ -68,31 +94,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>2.22.1</version>
</plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <version>3.0.2</version>
- <configuration>
- <archive>
- <manifest>
- <addClasspath>true</addClasspath>
- <mainClass>org.nutricraft.Main</mainClass>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <mainClass>org.nutricraft.Main</mainClass>
- </manifest>
- </archive>
- <descriptorRefs>
- <descriptorRef>jar-with-dependencies</descriptorRef>
- </descriptorRefs>
- </configuration>
- </plugin>
<plugin>
<artifactId>maven-install-plugin</artifactId>
<version>2.5.2</version>
diff --git a/src/main/java/org/nutricraft/Database/Database.java b/src/main/java/org/nutricraft/Database/Database.java
index e5b852d8527c1c53991accaa53431f43dc97b192..7f3e7dda0e7bef0598fc4f0114efc9efb37c21be 100644
--- a/src/main/java/org/nutricraft/Database/Database.java
+++ b/src/main/java/org/nutricraft/Database/Database.java
@@ -1,5 +1,4 @@
package org.nutricraft.Database;
-import io.github.cdimascio.dotenv.Dotenv;
import java.sql.Connection;
import java.sql.DriverManager;
@@ -10,17 +9,9 @@ public class Database {
public Database(){
try{
- Dotenv dotenv = Dotenv.load();
- String url = dotenv.get("DATABASE_URL_SOAP");
- String username = dotenv.get("DB_USER");
- String password = dotenv.get("DB_PASSWORD");
- String dbname = dotenv.get("DB_NAME");
- String port = dotenv.get("DB_PORT_SOAP");
- System.out.println(url);
- System.out.println(username);
- System.out.println(password);
- System.out.println(dbname);
- System.out.println(port);
+ String url = System.getenv("DATABASE_URL");
+ String username = System.getenv("DB_USER");
+ String password = System.getenv("DB_PASSWORD");
Connection connection = DriverManager.getConnection(url, username, password);
System.out.println("create database");
diff --git a/src/main/java/org/nutricraft/Main.java b/src/main/java/org/nutricraft/Main.java
index 0c89651437ad345ca516eb0705e7d3e923876dc4..81ea49378df7e8f507bd5b18708efc423421abd5 100644
--- a/src/main/java/org/nutricraft/Main.java
+++ b/src/main/java/org/nutricraft/Main.java
@@ -1,27 +1,20 @@
package org.nutricraft;
-
import org.nutricraft.Database.Database;
import org.nutricraft.Services.SubscriptionServicesImplement;
-
+import java.lang.reflect.Field;
import javax.xml.ws.Endpoint;
-//import javax.xml.ws.Endpoint;
-
-
-// import javax.xml.ws.Endpoint;
-
-// Press Shift twice to open the Search Everywhere dialog and type `show whitespaces`,
-// then press Enter. You can now see whitespace characters in your code.
public class Main {
public static void main(String[] args) {
try {
-// Endpoint.publish("http://localhost:8081/ws/subscription", new SubscriptionServicesImplement());
+
+ Endpoint.publish("http://nutricraft-soap:8081/ws/subscription", new SubscriptionServicesImplement());
Database a = new Database();
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
System.out.println("woiii");
}
}
-}
\ No newline at end of file
+}