Merge release update changes

ISAITB · Nov 29, 2024 · e6af378 · e6af378
2 parents a679559 + 15c08f4
commit e6af378
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/jsonvalidator-jar/src/main/java/eu/europa/ec/itb/json/standalone/Application.java b/jsonvalidator-jar/src/main/java/eu/europa/ec/itb/json/standalone/Application.java
@@ -2,14 +2,17 @@
 
 import eu.europa.ec.itb.validation.commons.jar.CommandLineValidator;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.freemarker.FreeMarkerAutoConfiguration;
+import org.springframework.boot.autoconfigure.gson.GsonAutoConfiguration;
+import org.springframework.boot.autoconfigure.security.servlet.UserDetailsServiceAutoConfiguration;
 import org.springframework.context.annotation.ComponentScan;
 
 import java.io.IOException;
 
 /**
  * Application entry point when running the validator as a command-line tool.
  */
-@SpringBootApplication
+@SpringBootApplication(exclude = {UserDetailsServiceAutoConfiguration.class, FreeMarkerAutoConfiguration.class, GsonAutoConfiguration.class})
 @ComponentScan("eu.europa.ec.itb")
 public class Application {
 

diff --git a/jsonvalidator-war/src/main/java/eu/europa/ec/itb/json/Application.java b/jsonvalidator-war/src/main/java/eu/europa/ec/itb/json/Application.java
@@ -2,6 +2,8 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.freemarker.FreeMarkerAutoConfiguration;
+import org.springframework.boot.autoconfigure.gson.GsonAutoConfiguration;
 import org.springframework.boot.autoconfigure.security.servlet.UserDetailsServiceAutoConfiguration;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;
@@ -10,7 +12,7 @@
 /**
  * Entry point to bootstrap the application.
  */
-@SpringBootApplication(exclude = {UserDetailsServiceAutoConfiguration.class})
+@SpringBootApplication(exclude = {UserDetailsServiceAutoConfiguration.class, FreeMarkerAutoConfiguration.class, GsonAutoConfiguration.class})
 @EnableScheduling
 @ComponentScan("eu.europa.ec.itb")
 @EnableAspectJAutoProxy

diff --git a/pom.xml b/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>eu.europa.ec.itb.commons</groupId>
         <artifactId>validator-parent</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
+        <version>1.7.0</version>
         <relativePath/>
     </parent>
 
@@ -43,7 +43,7 @@
     </developers>
 
     <properties>
-        <version.itbCommons>1.8.0-SNAPSHOT</version.itbCommons>
+        <version.itbCommons>1.7.0</version.itbCommons>
     </properties>
 
     <dependencyManagement>