Skip to content

Commit

Permalink
Merge pull request #314 from Kranthi-Guribilli/software-updates
Browse files Browse the repository at this point in the history
Software updates
  • Loading branch information
pranavrd authored Mar 13, 2024
2 parents cca64ae + 3910d3c commit f818177
Show file tree
Hide file tree
Showing 4 changed files with 114 additions and 85 deletions.
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ pipeline {
sh 'mvn clean test checkstyle:checkstyle pmd:pmd'
}
xunit (
thresholds: [ skipped(failureThreshold: '6'), failed(failureThreshold: '0') ],
thresholds: [ skipped(failureThreshold: '75'), failed(failureThreshold: '0') ],
tools: [ JUnit(pattern: 'target/surefire-reports/*.xml') ]
)
jacoco classPattern: 'target/classes', execPattern: 'target/*.exec', sourcePattern: 'src/main/java', exclusionPattern: 'iudx/catalogue/server/apiserver/*,iudx/catalogue/server/deploy/*,iudx/catalogue/server/mockauthenticator/*,iudx/catalogue/server/**/*EBProxy.*,iudx/catalogue/server/**/*ProxyHandler.*,iudx/catalogue/server/**/reactivex/*,**/Constants.class,**/*Verticle.class,iudx/catalogue/server/auditing/util/Constants.class,iudx/catalogue/server/database/DatabaseService.class,iudx/catalogue/server/database/postgres/PostgresService.class'
Expand Down
189 changes: 109 additions & 80 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,30 +7,29 @@
<artifactId>iudx.catalogue.server</artifactId>
<version>0.0.1-SNAPSHOT</version>
<properties>
<vertx.version>4.3.2</vertx.version>
<vertx.version>4.5.4</vertx.version>
<openjdk.version>11</openjdk.version>
<hazelcast.version>4.0.2</hazelcast.version>
<micrometer.version>1.9.2</micrometer.version>
<curator.version>5.3.0</curator.version>
<junit-jupiter-engine.version>5.8.2</junit-jupiter-engine.version>
<apache-log4j2.version>2.17.1</apache-log4j2.version>
<lmax-disruptor.version>3.4.4</lmax-disruptor.version>
<jacoco-maven-plugin.version>0.8.8</jacoco-maven-plugin.version>
<checkstyle.version>10.5.0</checkstyle.version>
<maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
<maven-shade-plugin.version>3.3.0</maven-shade-plugin.version>
<maven-javadoc-plugin.version>3.4.0</maven-javadoc-plugin.version>
<exec-maven-plugin.version>3.1.0</exec-maven-plugin.version>
<maven-pmd-plugin.version>3.17.0</maven-pmd-plugin.version>
<maven-checkstyle-plugin-google.version>3.1.2</maven-checkstyle-plugin-google.version>
<maven-surefire-report-plugin.version>3.0.0-M7</maven-surefire-report-plugin.version>
<elastic-search-rest-client>8.3.3</elastic-search-rest-client>
<slf4j.version>1.7.25</slf4j.version>
<micrometer.version>1.12.3</micrometer.version>
<curator.version>5.6.0</curator.version>
<junit-jupiter-engine.version>5.10.2</junit-jupiter-engine.version>
<apache-log4j2.version>2.23.0</apache-log4j2.version>
<lmax-disruptor.version>4.0.0</lmax-disruptor.version>
<jacoco-maven-plugin.version>0.8.11</jacoco-maven-plugin.version>
<checkstyle.version>10.13.0</checkstyle.version>
<maven-compiler-plugin.version>3.12.1</maven-compiler-plugin.version>
<maven-shade-plugin.version>3.5.1</maven-shade-plugin.version>
<maven-javadoc-plugin.version>3.6.3</maven-javadoc-plugin.version>
<exec-maven-plugin.version>3.1.1</exec-maven-plugin.version>
<maven-pmd-plugin.version>3.21.2</maven-pmd-plugin.version>
<maven-checkstyle-plugin-google.version>3.3.1</maven-checkstyle-plugin-google.version>
<maven-surefire-report-plugin.version>3.2.5</maven-surefire-report-plugin.version>
<elastic-search-rest-client>8.12.1</elastic-search-rest-client>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<exec.mainClass>iudx.catalogue.server.deploy.Deployer</exec.mainClass>
<exec.mainClassDev>iudx.catalogue.server.deploy.DeployerDev</exec.mainClassDev>
<testcontainer.params>1.17.3</testcontainer.params>
<testcontainer-postgres.version>1.17.3</testcontainer-postgres.version>
<testcontainer.params>1.19.6</testcontainer.params>
<testcontainer-postgres.version>1.19.6</testcontainer-postgres.version>
</properties>
<dependencyManagement>
<dependencies>
Expand Down Expand Up @@ -61,7 +60,7 @@
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>42.3.8</version>
<version>42.7.2</version>
</dependency>
<dependency>
<groupId>com.ongres.scram</groupId>
Expand All @@ -72,7 +71,6 @@
<groupId>io.vertx</groupId>
<artifactId>vertx-service-proxy</artifactId>
</dependency>
<!-- Packages for Vertx Hazelcast cluster manager -->
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-hazelcast</artifactId>
Expand Down Expand Up @@ -102,6 +100,28 @@
<artifactId>vertx-rx-java2</artifactId>
<version>${vertx.version}</version>
</dependency>
<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.16.1</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.16.1</version>
</dependency>
<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-annotations -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>2.16.1</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>33.0.0-jre</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
Expand All @@ -124,14 +144,14 @@
<dependency>
<groupId>com.github.java-json-tools</groupId>
<artifactId>json-schema-validator</artifactId>
<version>2.2.12</version>
<version>2.2.14</version>
</dependency>
<!-- Packages for Vertx metrics through micrometer -->
<!-- Packages for Vertx metrics through micrometer -->
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-micrometer-metrics</artifactId>
</dependency>
<!-- micrometer core package -->
<!-- micrometer core package -->
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-core</artifactId>
Expand All @@ -143,6 +163,11 @@
<artifactId>micrometer-registry-prometheus</artifactId>
<version>${micrometer.version}</version>
</dependency>
<!-- Packages for Vertx Hazelcast cluster manager -->
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-hazelcast</artifactId>
</dependency>
<!-- package for hazelcast based clustering using zookeeper -->
<dependency>
<groupId>com.hazelcast</groupId>
Expand All @@ -159,15 +184,19 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>${apache-log4j2.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>${apache-log4j2.version}</version>
</dependency>
<!-- slf4j to log4j2 bridge adapter, needed for 'io.netty' logs -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<artifactId>log4j-slf4j2-impl</artifactId>
<version>${apache-log4j2.version}</version>
</dependency>
<!--LMAX Disruptor for enabling Asynchronous log4j2 Logging -->
<dependency>
Expand All @@ -178,20 +207,20 @@
<dependency>
<groupId>io.qameta.allure</groupId>
<artifactId>allure-junit5</artifactId>
<version>2.19.0</version>
<version>2.25.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-commons</artifactId>
<version>1.9.0</version>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-engine</artifactId>
<version>1.9.0</version>
<scope>test</scope>
</dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-commons</artifactId>
<version>1.10.2</version>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-engine</artifactId>
<version>1.10.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-auth-jwt</artifactId>
Expand All @@ -207,20 +236,20 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-inline</artifactId>
<version>3.11.1</version>
<version>5.2.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
<version>3.11.1</version>
<version>5.10.0</version>
<scope>test</scope>
</dependency>
<!-- Rest Assured -->
<dependency>
<groupId>io.rest-assured</groupId>
<artifactId>rest-assured</artifactId>
<version>5.3.2</version>
<version>5.4.0</version>
<scope>test</scope>
</dependency>
<!-- test container dependency-->
Expand All @@ -247,7 +276,7 @@
<dependency>
<groupId>com.nimbusds</groupId>
<artifactId>nimbus-jose-jwt</artifactId>
<version>8.2</version>
<version>9.37.3</version>
</dependency>
</dependencies>
<build>
Expand Down Expand Up @@ -338,7 +367,7 @@
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/services/io.vertx.core.spi.VerticleFactory</resource>
<resource>META-INF/services/io.vertx.core.spi.VertxServiceProvider</resource>
<resource>META-INF/services/io.vertx.core.spi.VertxServiceProvider</resource>
</transformer>
</transformers>
<artifactSet></artifactSet>
Expand Down Expand Up @@ -403,77 +432,77 @@
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${maven-javadoc-plugin.version}</version>
<configuration>
<source>${openjdk.version}</source>
<target>${openjdk.version}</target>
</configuration>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${maven-javadoc-plugin.version}</version>
<configuration>
<source>${openjdk.version}</source>
<target>${openjdk.version}</target>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>${exec-maven-plugin.version}</version>
<executions>
<execution>
<id>catalogue-server</id>
<configuration>
<mainClass>iudx.catalogue.server.deploy.DeployerDev </mainClass>
<execution>
<id>catalogue-server</id>
<configuration>
<mainClass>iudx.catalogue.server.deploy.DeployerDev </mainClass>
<classpathScope>test</classpathScope>
<arguments>
<argument>-jar</argument>
<argument>{project.build.directory}/${project.artifactId}-dev-${project.version}-fat.jar</argument>
<argument>-c</argument>
<argument>./configs/config-dev.json</argument>
</arguments>
</configuration>
</execution>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire-report-plugin.version}</version>
<configuration>
<useSystemClassLoader>true</useSystemClassLoader>
<testFailureIgnore>true</testFailureIgnore>
<argLine>
@{argLine} -javaagent:"${settings.localRepository}/org/aspectj/aspectjweaver/1.9.6/aspectjweaver-1.9.6.jar"
</argLine>
<systemProperties>
<property>
<name>allure.results.directory</name>
<value>target/allure-results</value>
</property>
</systemProperties>
</configuration>
<dependencies>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
<version>1.9.6</version>
</dependency>
</dependencies>
<useSystemClassLoader>true</useSystemClassLoader>
<testFailureIgnore>true</testFailureIgnore>
<argLine>
@{argLine} -javaagent:"${settings.localRepository}/org/aspectj/aspectjweaver/1.9.21.1/aspectjweaver-1.9.21.1.jar"
</argLine>
<systemProperties>
<property>
<name>allure.results.directory</name>
<value>target/allure-results</value>
</property>
</systemProperties>
</configuration>
<dependencies>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
<version>1.9.21.1</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>io.qameta.allure</groupId>
<artifactId>allure-maven</artifactId>
<version>2.10.0</version>
<version>2.12.0</version>
<configuration>
<reportVersion>2.4.1</reportVersion>
</configuration>
<reportVersion>2.4.1</reportVersion>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
<version>${maven-compiler-plugin.version}</version>
<configuration>
<source>${openjdk.version}</source>
<target>${openjdk.version}</target>
<annotationProcessors>
<annotationProcessor>io.vertx.codegen.CodeGenProcessor</annotationProcessor>
</annotationProcessors>
<annotationProcessors>
<annotationProcessor>io.vertx.codegen.CodeGenProcessor</annotationProcessor>
</annotationProcessors>
</configuration>
</plugin>
<plugin>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import iudx.catalogue.server.geocoding.GeocodingService;
import iudx.catalogue.server.nlpsearch.NLPSearchService;
import java.util.*;
import java.util.Timer;
import java.util.stream.Collectors;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
import io.vertx.core.json.JsonObject;
import iudx.catalogue.server.Configuration;
import iudx.catalogue.server.authenticator.TokenSetup;
import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.junit.jupiter.api.extension.BeforeAllCallback;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.api.extension.ExtensionContext;
Expand All @@ -34,12 +34,11 @@ public void beforeAll(ExtensionContext context) {
// String authUrl=config.getString("authUrl");
boolean testOnDepl = Boolean.parseBoolean(System.getProperty("intTestDepl"));
if (testOnDepl) {
String testHost = "api.cat-test.iudx.io";
String testHost = config.getString("testHost");;
baseURI = "https://" + testHost;
port = 443;
} else {
String testHost = System.getProperty("intTestHost");

if (testHost != null) {
baseURI = "http://" + testHost;
} else {
Expand Down

0 comments on commit f818177

Please sign in to comment.