Updated packages, fixed orion (#118)

* Updated Solr to version 8.11.1 * Added war * Updated Log4j, jsoup, guava, rdf4j, hibernate-core * Checkstyle fix * Updated packages * Updated hibernate and mysql-connector * Checkstyle pom * Fixed docker-compose * Fixed docker-compose-test-orion
OPSILab · Feb 23, 2022 · 21cb429 · 21cb429
1 parent 72f55b5
commit 21cb429
Show file tree

Hide file tree

Showing 9 changed files with 629 additions and 630 deletions.
diff --git a/Idra/pom.xml b/Idra/pom.xml
diff --git a/Idra/src/main/java/it/eng/idra/cache/LodCacheManager.java b/Idra/src/main/java/it/eng/idra/cache/LodCacheManager.java
@@ -104,8 +104,8 @@ private static Repository getRepository() throws RepositoryException {
   private static Repository getRepository(String repoUrl) throws RepositoryException {
     if (repo == null) {
       repo = new HTTPRepository(repoUrl);
-
-      repo.initialize();
+      
+      repo.init();
     }
     return repo;
   }

diff --git a/Idra/src/main/java/it/eng/idra/cache/MetadataCacheManager.java b/Idra/src/main/java/it/eng/idra/cache/MetadataCacheManager.java
@@ -34,6 +34,7 @@
 import it.eng.idra.utils.PropertyManager;
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
+import java.nio.file.Paths;
 import java.time.Duration;
 import java.time.LocalTime;
 import java.util.ArrayList;
@@ -1396,10 +1397,8 @@ public static void init(boolean createCache, String configPath) {
 
     // *************** Initializes SOLR Embedded Server
     // ***********************/
-    logger.info("SOLR SERVER - init - start");
-    CoreContainer container = new CoreContainer(configPath);
-    container.load();
-    server = new EmbeddedSolrServer(container, "core");
+    logger.info("SOLR SERVER - init - start");    
+    server = new EmbeddedSolrServer(CoreContainer.createAndLoad(Paths.get(configPath)), "core");
 
     logger.info("SOLR SERVER - init - end");
 

diff --git a/Idra/src/main/java/it/eng/idra/connectors/NgsiLdCbDcatConnector.java b/Idra/src/main/java/it/eng/idra/connectors/NgsiLdCbDcatConnector.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Sets;
 import com.google.common.collect.Sets.SetView;
-
 import it.eng.idra.beans.IdraProperty;
 import it.eng.idra.beans.dcat.DcatDataset;
 import it.eng.idra.beans.dcat.DcatDistribution;

diff --git a/Idra/src/main/resources/hibernate.properties b/Idra/src/main/resources/hibernate.properties
@@ -21,7 +21,7 @@ hibernate.connection.provider_class=it.eng.idra.management.CustomConnectionProvi
 hibernate.hikari.minimumIdle=5
 hibernate.hikari.maximumPoolSize=10
 hibernate.hikari.idleTimeout=30000
-hibernate.hikari.dataSourceClassName=com.mysql.jdbc.jdbc2.optional.MysqlDataSource
+hibernate.hikari.dataSourceClassName=com.mysql.cj.jdbc.MysqlDataSource
 hibernate.hikari.dataSource.url=jdbc:mysql://localhost:3306/idra_db?serverTimezone\=UTC&useLegacyDatetimeCode\=false&useEncoding\=true&characterEncoding\=UTF-8&useSSL\=false
 hibernate.hikari.dataSource.user=root
 hibernate.hikari.dataSource.password=root

diff --git a/Idra/src/main/resources/quartz.properties b/Idra/src/main/resources/quartz.properties
@@ -40,7 +40,7 @@ org.quartz.jobStore.clusterCheckinInterval = 20000
 
 # Configure Datasources
 
-org.quartz.dataSource.myDS.driver = com.mysql.jdbc.Driver
+org.quartz.dataSource.myDS.driver = com.mysql.cj.jdbc.Driver
 org.quartz.dataSource.myDS.URL = jdbc:mysql://localhost:3306/idra_db?serverTimezone\=UTC&useLegacyDatetimeCode\=false&useEncoding\=true&characterEncoding\=UTF-8&useSSL\=false
 org.quartz.dataSource.myDS.user = root
 org.quartz.dataSource.myDS.password = root

diff --git a/IdraPortal/pom.xml b/IdraPortal/pom.xml
@@ -82,7 +82,7 @@
 			</plugin>
 			<plugin>
 				<artifactId>maven-war-plugin</artifactId>
-				<version>2.6</version>
+				<version>3.3.1</version>
 				<configuration>
 
 					<failOnMissingWebXml>false</failOnMissingWebXml>

diff --git a/docker-compose-test-orion.yml b/docker-compose-test-orion.yml
@@ -21,7 +21,7 @@ services :
             image: mysql:5.7
             restart: always
             ports:
-                - 3306:3306
+                - 3310:3306
             volumes:
                 - mysql-data:/var/lib/mysql
                 - ./idra_db.sql:/docker-entrypoint-initdb.d/idra_db.sql
@@ -44,7 +44,7 @@ services :
                 - db
             command: ["./wait-for-it.sh", "db:3306", "--timeout=0", "--", "catalina.sh", "run"]
             environment:
-                - idra.db.host=jdbc:mysql://db:3306/idra_db?serverTimezone=UTC&useLegacyDatetimeCode=false&useEncoding=true&characterEncoding=UTF-8&useSSL\=false
+                - idra.db.host=jdbc:mysql://db:3306/idra_db?serverTimezone=UTC&useLegacyDatetimeCode=false&useEncoding=true&characterEncoding=UTF-8&useSSL=false
                 - idra.db.host.min=jdbc:mysql://db:3306
                 - idra.db.user_FILE=/run/secrets/my_secret_data
                 - idra.db.password_FILE=/run/secrets/my_secret_data

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -54,7 +54,7 @@ services :
             command: ["./wait-for-it.sh", "db:3306", "--timeout=0", "--", "catalina.sh", "run"]
 
             environment:
-                - idra.db.host=jdbc:mysql://db:3306/idra_db?serverTimezone=UTC&useLegacyDatetimeCode=false&useEncoding=true&characterEncoding=UTF-8&useSSL\=false
+                - idra.db.host=jdbc:mysql://db:3306/idra_db?serverTimezone=UTC&useLegacyDatetimeCode=false&useEncoding=true&characterEncoding=UTF-8&useSSL=false
                 - idra.db.host.min=jdbc:mysql://db:3306
                 - idra.db.user_FILE=/run/secrets/my_secret_data
                 - idra.db.password_FILE=/run/secrets/my_secret_data