Skip to content

Commit

Permalink
Clean and upgrade version dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@ron190
ron190 committed Jul 7, 2023
1 parent 992f7fd commit 1e153a7
Show file tree
Hide file tree
Showing 74 changed files with 317 additions and 376 deletions.
98 changes: 40 additions & 58 deletions model/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@

<build>
<plugins>

<!-- Spock -->
<plugin>
<groupId>org.codehaus.gmavenplus</groupId>
Expand Down Expand Up @@ -76,7 +75,6 @@
</execution>
</executions>
</plugin>

<!-- Unit tests -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -92,7 +90,6 @@
<reportFormat>plain</reportFormat>
</configuration>
</plugin>

<!-- Integration tests -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -119,13 +116,11 @@
<reportFormat>plain</reportFormat>
</configuration>
</plugin>

<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>2.3.4.RELEASE</version>
<version>2.5.15</version>
</plugin>

</plugins>
</build>

Expand All @@ -135,96 +130,84 @@
<!-- Import dependency management from Spring Boot -->
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>2.4.5</version>
<version>2.5.15</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>

<!-- jSQL purpose -->

<!-- Standalone Nashorn build compatible with jdk11 -->
<dependency>
<groupId>org.openjdk.nashorn</groupId>
<artifactId>nashorn-core</artifactId>
<version>15.2</version>
<version>15.4</version>
</dependency>

<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</dependency>

<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
<version>1.15.3</version>
<version>1.15.4</version>
</dependency>

<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>

<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20200518</version>
<version>20230227</version>
</dependency>

<dependency>
<groupId>com.googlecode.juniversalchardet</groupId>
<artifactId>juniversalchardet</artifactId>
<version>1.0.3</version>
</dependency>

<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>1.31</version>
</dependency>

<!-- Log4j2 -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
</dependency>
<!-- Logger -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
</dependency>

<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>


<!-- Test purpose -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-websocket</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-messaging</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-messaging</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-messaging</artifactId>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -280,7 +263,7 @@
<dependency>
<groupId>org.webjars</groupId>
<artifactId>jquery</artifactId>
<version>3.1.1-1</version>
<version>3.6.4</version>
<scope>test</scope>
</dependency>

Expand Down Expand Up @@ -321,28 +304,22 @@
<version>5.0.2</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>


<!-- Spock -->
<dependency>
<groupId>org.codehaus.groovy</groupId>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy-test-junit5</artifactId>
<version>4.0.10</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.spockframework</groupId>
<artifactId>spock-core</artifactId>
<version>1.3-groovy-2.5</version>
<version>2.4-M1-groovy-4.0</version>
<scope>test</scope>
</dependency>
<dependency>
<!--Only necessary for surefire to run spock tests during the
maven build -->
<!-- For surefire to run spock tests during build -->
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<scope>test</scope>
Expand Down Expand Up @@ -379,11 +356,20 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
<version>5.6.15.Final</version>
<scope>test</scope>
</dependency>
<dependency>
<!-- display c3p0 logs -->
<groupId>org.hibernate</groupId>
<artifactId>hibernate-c3p0</artifactId>
<version>5.6.15.Final</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.1</version>
<scope>test</scope>
</dependency>

Expand All @@ -401,14 +387,15 @@
<dependency>
<groupId>org.junit-pioneer</groupId>
<artifactId>junit-pioneer</artifactId>
<version>0.4.2</version>
<version>2.0.0</version>
<scope>test</scope>
</dependency>

<dependency>
<!-- Colors in logs -->
<groupId>com.jcabi</groupId>
<artifactId>jcabi-log</artifactId>
<version>0.18.1</version>
<version>0.22.0</version>
<scope>test</scope>
</dependency>

Expand Down Expand Up @@ -437,30 +424,25 @@
<dependency>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>mssql-jdbc</artifactId>
<version>8.2.1.jre8</version>
<version>9.4.1.jre8</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.xerial</groupId>
<artifactId>sqlite-jdbc</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.github.gwenn</groupId>
<artifactId>sqlite-dialect</artifactId>
<version>0.1.0</version>
<version>3.42.0.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.neo4j.driver</groupId>
<artifactId>neo4j-java-driver</artifactId>
<version>4.0.1</version>
<version>4.3.8</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.neo4j</groupId>
<artifactId>neo4j-jdbc-driver</artifactId>
<version>4.0.0</version>
<version>4.0.9</version>
<scope>test</scope>
</dependency>
<!-- <dependency> -->
Expand All @@ -477,8 +459,7 @@
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<!-- Version 2.5.1 fails on test listValues() -->
<version>2.5.0</version>
<version>2.7.2</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -493,8 +474,9 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.oracle.ojdbc</groupId>
<groupId>com.oracle.database.jdbc</groupId>
<artifactId>ojdbc8</artifactId>
<version>23.2.0.0</version>
<scope>test</scope>
</dependency>

Expand Down
40 changes: 14 additions & 26 deletions model/src/test/java/com/test/AbstractTestSuite.java
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,12 @@
package com.test;

import static org.junit.Assert.assertTrue;

import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.TreeSet;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Collectors;
import java.util.stream.Stream;

import com.jsql.model.InjectionModel;
import com.jsql.model.bean.database.Column;
import com.jsql.model.bean.database.Database;
import com.jsql.model.bean.database.Table;
import com.jsql.model.exception.InjectionFailureException;
import com.jsql.model.exception.JSqlException;
import com.jsql.util.LogLevelUtil;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.awaitility.Awaitility;
Expand All @@ -29,16 +18,15 @@
import org.junit.jupiter.api.parallel.Execution;
import org.junit.jupiter.api.parallel.ExecutionMode;
import org.springframework.boot.SpringApplication;
import spring.SpringTargetApplication;

import com.jsql.model.InjectionModel;
import com.jsql.model.bean.database.Column;
import com.jsql.model.bean.database.Database;
import com.jsql.model.bean.database.Table;
import com.jsql.model.exception.InjectionFailureException;
import com.jsql.model.exception.JSqlException;
import com.jsql.util.LogLevelUtil;
import java.sql.*;
import java.util.*;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Collectors;
import java.util.stream.Stream;

import spring.SpringTargetApplication;
import static org.junit.Assert.assertTrue;

@TestInstance(Lifecycle.PER_CLASS)
@Execution(ExecutionMode.CONCURRENT)
Expand Down
11 changes: 5 additions & 6 deletions model/src/test/java/com/test/insertion/BadValueErrorTestSuite.java
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
package com.test.insertion;

import java.util.AbstractMap.SimpleEntry;
import java.util.Arrays;

import org.junitpioneer.jupiter.RepeatFailedTest;

import com.jsql.model.InjectionModel;
import com.jsql.model.exception.JSqlException;
import com.jsql.view.terminal.SystemOutTerminal;
import com.test.vendor.mysql.ConcreteMySqlErrorTestSuite;
import org.junitpioneer.jupiter.RetryingTest;

import java.util.AbstractMap.SimpleEntry;
import java.util.Arrays;

public class BadValueErrorTestSuite extends ConcreteMySqlErrorTestSuite {

Expand Down Expand Up @@ -38,7 +37,7 @@ public void setupInjection() throws Exception {
}

@Override
@RepeatFailedTest(3)
@RetryingTest(3)
public void listDatabases() throws JSqlException {
super.listDatabases();
}
Expand Down
4 changes: 2 additions & 2 deletions model/src/test/java/com/test/insertion/BadValueTestSuite.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import java.util.AbstractMap.SimpleEntry;
import java.util.Arrays;

import org.junitpioneer.jupiter.RepeatFailedTest;
import org.junitpioneer.jupiter.RetryingTest;

import com.jsql.model.InjectionModel;
import com.jsql.model.exception.JSqlException;
Expand Down Expand Up @@ -38,7 +38,7 @@ public void setupInjection() throws Exception {
}

@Override
@RepeatFailedTest(3)
@RetryingTest(3)
public void listDatabases() throws JSqlException {
super.listDatabases();
}
Expand Down
Loading

0 comments on commit 1e153a7

Please sign in to comment.