Merge remote-tracking branch 'origin/master' into code_bank
This commit is contained in:
commit
66f82cf894
|
@ -7,22 +7,120 @@
|
|||
<sourceOutputDir name="target/generated-sources/annotations" />
|
||||
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
|
||||
<outputRelativeToContentRoot value="true" />
|
||||
<module name="assertion-libraries" />
|
||||
<module name="core-java-annotations" />
|
||||
<module name="codebank" />
|
||||
<module name="core-java-collections-list" />
|
||||
<module name="junit5-migration" />
|
||||
<module name="discourse" />
|
||||
<module name="core-java-annotations" />
|
||||
<module name="core-java-8" />
|
||||
<module name="junit-5-basics" />
|
||||
<module name="discourse" />
|
||||
</profile>
|
||||
</annotationProcessing>
|
||||
<bytecodeTargetLevel>
|
||||
<module name="cucumber" target="14" />
|
||||
<module name="easy-random" target="11" />
|
||||
<module name="easymock" target="1.5" />
|
||||
<module name="assertion-libraries" target="1.8" />
|
||||
<module name="core-java" target="1.8" />
|
||||
<module name="core-java-8-2" target="1.8" />
|
||||
<module name="core-java-8-datetime" target="1.8" />
|
||||
<module name="core-java-8-datetime-2" target="1.8" />
|
||||
<module name="core-java-arrays-convert" target="1.8" />
|
||||
<module name="core-java-arrays-guides" target="1.8" />
|
||||
<module name="core-java-arrays-multidimensional" target="1.8" />
|
||||
<module name="core-java-arrays-operations-advanced" target="1.8" />
|
||||
<module name="core-java-arrays-operations-basic" target="1.8" />
|
||||
<module name="core-java-arrays-sorting" target="1.8" />
|
||||
<module name="core-java-char" target="1.8" />
|
||||
<module name="core-java-collections" target="1.8" />
|
||||
<module name="core-java-collections-2" target="1.8" />
|
||||
<module name="core-java-collections-3" target="1.8" />
|
||||
<module name="core-java-collections-4" target="1.8" />
|
||||
<module name="core-java-collections-array-list" target="1.8" />
|
||||
<module name="core-java-collections-list-2" target="1.8" />
|
||||
<module name="core-java-collections-list-3" target="1.8" />
|
||||
<module name="core-java-collections-maps" target="1.8" />
|
||||
<module name="core-java-collections-maps-2" target="1.8" />
|
||||
<module name="core-java-collections-maps-3" target="1.8" />
|
||||
<module name="core-java-concurrency-2" target="1.8" />
|
||||
<module name="core-java-concurrency-advanced" target="1.8" />
|
||||
<module name="core-java-concurrency-advanced-2" target="1.8" />
|
||||
<module name="core-java-concurrency-advanced-3" target="1.8" />
|
||||
<module name="core-java-concurrency-advanced-4" target="1.8" />
|
||||
<module name="core-java-concurrency-basic" target="1.8" />
|
||||
<module name="core-java-concurrency-basic-2" target="1.8" />
|
||||
<module name="core-java-concurrency-basic-3" target="1.8" />
|
||||
<module name="core-java-concurrency-collections" target="1.8" />
|
||||
<module name="core-java-concurrency-collections-2" target="1.8" />
|
||||
<module name="core-java-console" target="1.8" />
|
||||
<module name="core-java-date-operations-2" target="1.8" />
|
||||
<module name="core-java-exceptions" target="1.8" />
|
||||
<module name="core-java-exceptions-2" target="1.8" />
|
||||
<module name="core-java-exceptions-3" target="1.8" />
|
||||
<module name="core-java-exceptions-4" target="1.8" />
|
||||
<module name="core-java-function" target="1.8" />
|
||||
<module name="core-java-functional" target="1.8" />
|
||||
<module name="core-java-io" target="1.8" />
|
||||
<module name="core-java-io-2" target="1.8" />
|
||||
<module name="core-java-io-3" target="1.8" />
|
||||
<module name="core-java-io-4" target="1.8" />
|
||||
<module name="core-java-io-apis" target="1.8" />
|
||||
<module name="core-java-io-conversions" target="1.8" />
|
||||
<module name="core-java-jar" target="1.8" />
|
||||
<module name="core-java-jndi" target="1.8" />
|
||||
<module name="core-java-jvm" target="1.8" />
|
||||
<module name="core-java-jvm-2" target="1.8" />
|
||||
<module name="core-java-lambdas" target="1.8" />
|
||||
<module name="core-java-lang" target="1.8" />
|
||||
<module name="core-java-lang-2" target="1.8" />
|
||||
<module name="core-java-lang-3" target="1.8" />
|
||||
<module name="core-java-lang-4" target="1.8" />
|
||||
<module name="core-java-lang-math" target="1.8" />
|
||||
<module name="core-java-lang-math-2" target="1.8" />
|
||||
<module name="core-java-lang-math-3" target="1.8" />
|
||||
<module name="core-java-lang-oop-constructors" target="1.8" />
|
||||
<module name="core-java-lang-oop-generics" target="1.8" />
|
||||
<module name="core-java-lang-oop-inheritance" target="1.8" />
|
||||
<module name="core-java-lang-oop-methods" target="1.8" />
|
||||
<module name="core-java-lang-oop-modifiers" target="1.8" />
|
||||
<module name="core-java-lang-oop-others" target="1.8" />
|
||||
<module name="core-java-lang-oop-patterns" target="1.8" />
|
||||
<module name="core-java-lang-oop-types" target="1.8" />
|
||||
<module name="core-java-lang-oop-types-2" target="1.8" />
|
||||
<module name="core-java-lang-operators" target="1.8" />
|
||||
<module name="core-java-lang-operators-2" target="1.8" />
|
||||
<module name="core-java-lang-syntax" target="1.8" />
|
||||
<module name="core-java-lang-syntax-2" target="1.8" />
|
||||
<module name="core-java-networking" target="1.8" />
|
||||
<module name="core-java-networking-2" target="1.8" />
|
||||
<module name="core-java-nio" target="1.8" />
|
||||
<module name="core-java-nio-2" target="1.8" />
|
||||
<module name="core-java-optional" target="1.8" />
|
||||
<module name="core-java-perf" target="1.8" />
|
||||
<module name="core-java-reflection" target="1.8" />
|
||||
<module name="core-java-reflection-2" target="1.8" />
|
||||
<module name="core-java-regex" target="1.8" />
|
||||
<module name="core-java-regex-2" target="1.8" />
|
||||
<module name="core-java-security" target="1.8" />
|
||||
<module name="core-java-security-2" target="1.8" />
|
||||
<module name="core-java-security-3" target="1.8" />
|
||||
<module name="core-java-security-algorithms" target="1.8" />
|
||||
<module name="core-java-serialization" target="1.8" />
|
||||
<module name="core-java-streams" target="1.8" />
|
||||
<module name="core-java-streams-2" target="1.8" />
|
||||
<module name="core-java-streams-3" target="1.8" />
|
||||
<module name="core-java-streams-4" target="1.8" />
|
||||
<module name="core-java-string-algorithms" target="1.8" />
|
||||
<module name="core-java-string-algorithms-2" target="1.8" />
|
||||
<module name="core-java-string-apis" target="1.8" />
|
||||
<module name="core-java-string-conversions" target="1.8" />
|
||||
<module name="core-java-string-conversions-2" target="1.8" />
|
||||
<module name="core-java-string-operations" target="1.8" />
|
||||
<module name="core-java-string-operations-2" target="1.8" />
|
||||
<module name="core-java-sun" target="1.8" />
|
||||
<module name="core-java-uuid" target="1.8" />
|
||||
<module name="cucumber" target="1.8" />
|
||||
<module name="easy-random" target="1.8" />
|
||||
<module name="easymock" target="1.8" />
|
||||
<module name="gatling" target="1.8" />
|
||||
<module name="groovy-spock" target="11" />
|
||||
<module name="hamcrest" target="1.5" />
|
||||
<module name="groovy-spock" target="1.8" />
|
||||
<module name="hamcrest" target="1.8" />
|
||||
<module name="jackson" target="11" />
|
||||
<module name="jackson-annotations" target="11" />
|
||||
<module name="jackson-conversions" target="11" />
|
||||
|
@ -34,35 +132,37 @@
|
|||
<module name="java-numbers" target="11" />
|
||||
<module name="java-numbers-2" target="11" />
|
||||
<module name="jmh" target="11" />
|
||||
<module name="junit-4" target="1.5" />
|
||||
<module name="junit-5" target="11" />
|
||||
<module name="junit-5-advanced" target="11" />
|
||||
<module name="junit-5-basics" target="11" />
|
||||
<module name="junit5-annotations" target="11" />
|
||||
<module name="junit-4" target="1.8" />
|
||||
<module name="junit-5" target="1.8" />
|
||||
<module name="junit-5-advanced" target="1.8" />
|
||||
<module name="junit5-annotations" target="1.8" />
|
||||
<module name="junit5-migration" target="1.8" />
|
||||
<module name="load-testing-comparison" target="1.8" />
|
||||
<module name="math-test-functions" target="1.5" />
|
||||
<module name="mockito" target="1.5" />
|
||||
<module name="mockito-2" target="11" />
|
||||
<module name="mockito-3" target="1.5" />
|
||||
<module name="mocks" target="1.5" />
|
||||
<module name="mockserver" target="11" />
|
||||
<module name="parallel-tests-junit" target="1.5" />
|
||||
<module name="math-test-functions" target="1.8" />
|
||||
<module name="mockito" target="1.8" />
|
||||
<module name="mockito-2" target="1.8" />
|
||||
<module name="mockito-3" target="1.8" />
|
||||
<module name="mocks" target="1.8" />
|
||||
<module name="mockserver" target="1.8" />
|
||||
<module name="parallel-tests-junit" target="1.8" />
|
||||
<module name="parent-java" target="11" />
|
||||
<module name="powermock" target="1.5" />
|
||||
<module name="rest-assured" target="11" />
|
||||
<module name="rest-testing" target="11" />
|
||||
<module name="selenium-junit-testng" target="1.5" />
|
||||
<module name="spring-testing" target="11" />
|
||||
<module name="spring-testing-2" target="11" />
|
||||
<module name="string-test-functions" target="1.5" />
|
||||
<module name="test-containers" target="1.5" />
|
||||
<module name="powermock" target="1.8" />
|
||||
<module name="pre-jpms" target="1.8" />
|
||||
<module name="rest-assured" target="1.8" />
|
||||
<module name="rest-testing" target="1.8" />
|
||||
<module name="selenium-junit-testng" target="1.8" />
|
||||
<module name="spring-testing" target="1.8" />
|
||||
<module name="spring-testing-2" target="1.8" />
|
||||
<module name="string-test-functions" target="1.8" />
|
||||
<module name="test-containers" target="1.8" />
|
||||
<module name="testing-assertions" target="1.5" />
|
||||
<module name="testing-libraries" target="1.5" />
|
||||
<module name="testing-libraries-2" target="1.5" />
|
||||
<module name="testng" target="1.5" />
|
||||
<module name="testing-libraries" target="1.8" />
|
||||
<module name="testing-libraries-2" target="1.8" />
|
||||
<module name="testng" target="1.8" />
|
||||
<module name="testng-command-line" target="1.8" />
|
||||
<module name="xml" target="11" />
|
||||
<module name="xmlunit-2" target="1.5" />
|
||||
<module name="zerocode" target="8" />
|
||||
<module name="xmlunit-2" target="1.8" />
|
||||
<module name="zerocode" target="1.8" />
|
||||
</bytecodeTargetLevel>
|
||||
</component>
|
||||
<component name="JavacSettings">
|
||||
|
|
|
@ -8,6 +8,7 @@
|
|||
<option value="$PROJECT_DIR$/testing-modules/pom.xml" />
|
||||
<option value="$PROJECT_DIR$/core-java-modules/pom.xml" />
|
||||
<option value="$PROJECT_DIR$/testing-modules/junit5-migration/pom.xml" />
|
||||
<option value="$PROJECT_DIR$/testing-modules/junit-5-basics/pom.xml" />
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
|
|
|
@ -269,7 +269,7 @@
|
|||
<properties>
|
||||
|
||||
<!-- util -->
|
||||
<bouncycastle.version>1.55</bouncycastle.version>
|
||||
<bouncycastle.version>1.67</bouncycastle.version>
|
||||
<commons-codec.version>1.10</commons-codec.version>
|
||||
<commons-math3.version>3.6.1</commons-math3.version>
|
||||
<decimal4j.version>1.0.3</decimal4j.version>
|
||||
|
@ -289,7 +289,7 @@
|
|||
<!-- maven plugins -->
|
||||
<maven-javadoc-plugin.version>3.3.1</maven-javadoc-plugin.version>
|
||||
<hsqldb.version>2.4.0</hsqldb.version>
|
||||
<esapi.version>2.1.0.1</esapi.version>
|
||||
<esapi.version>2.3.0.0</esapi.version>
|
||||
<jmh-generator-annprocess.version>1.19</jmh-generator-annprocess.version>
|
||||
<async-http-client.version>2.4.5</async-http-client.version>
|
||||
<!-- Mime Type Libraries -->
|
||||
|
|
|
@ -55,7 +55,7 @@
|
|||
</repositories>
|
||||
|
||||
<properties>
|
||||
<hibernate-core.version>5.4.7.Final</hibernate-core.version>
|
||||
<hibernate-core.version>5.4.24.Final</hibernate-core.version>
|
||||
<commons-lang3.version>3.8.1</commons-lang3.version>
|
||||
<maven.deploy.skip>true</maven.deploy.skip>
|
||||
<spring-boot.version>2.1.7.RELEASE</spring-boot.version>
|
||||
|
|
|
@ -77,7 +77,7 @@
|
|||
</repositories>
|
||||
|
||||
<properties>
|
||||
<hibernate.version>5.4.12.Final</hibernate.version>
|
||||
<hibernate.version>5.4.24.Final</hibernate.version>
|
||||
<mysql.version>8.0.24</mysql.version>
|
||||
<mariaDB4j.version>2.2.3</mariaDB4j.version>
|
||||
<assertj-core.version>3.8.0</assertj-core.version>
|
||||
|
|
|
@ -55,7 +55,7 @@
|
|||
<!-- The main class to start by executing java -jar -->
|
||||
<start-class>com.ossez.h2db.demo.server.SpringBootApp</start-class>
|
||||
<spring-boot.version>2.2.4.RELEASE</spring-boot.version>
|
||||
<hibernate.version>5.3.11.Final</hibernate.version>
|
||||
<hibernate.version>5.4.24.Final</hibernate.version>
|
||||
<db-util.version>1.0.4</db-util.version>
|
||||
</properties>
|
||||
|
||||
|
|
6
pom.xml
6
pom.xml
|
@ -126,7 +126,7 @@
|
|||
<dependency>
|
||||
<groupId>org.apache.commons</groupId>
|
||||
<artifactId>commons-compress</artifactId>
|
||||
<version>1.20</version>
|
||||
<version>1.21</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.commons</groupId>
|
||||
|
@ -247,13 +247,13 @@
|
|||
<dependency>
|
||||
<groupId>org.jsoup</groupId>
|
||||
<artifactId>jsoup</artifactId>
|
||||
<version>1.7.2</version>
|
||||
<version>1.14.2</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>net.lingala.zip4j</groupId>
|
||||
<artifactId>zip4j</artifactId>
|
||||
<version>1.3.2</version>
|
||||
<version>2.9.1</version>
|
||||
</dependency>
|
||||
<!-- RETS -->
|
||||
|
||||
|
|
|
@ -0,0 +1,52 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>testing-modules</artifactId>
|
||||
<name>testing-modules</name>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
<parent>
|
||||
<groupId>com.ossez</groupId>
|
||||
<artifactId>parent-modules</artifactId>
|
||||
<version>0.0.2-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<modules>
|
||||
<!-- <module>assertion-libraries</module>-->
|
||||
<!-- <module>cucumber</module>-->
|
||||
<!-- <module>easy-random</module>-->
|
||||
<!-- <module>easymock</module>-->
|
||||
<!-- <module>gatling</module>-->
|
||||
<!-- <module>groovy-spock</module>-->
|
||||
<!-- <module>hamcrest</module>-->
|
||||
<!-- <module>junit-4</module>-->
|
||||
<!-- <module>junit-5-advanced</module>-->
|
||||
<module>junit-5-basics</module>
|
||||
<!-- <module>junit-5</module>-->
|
||||
<!-- <module>junit5-annotations</module>-->
|
||||
<!-- <module>junit5-migration</module>-->
|
||||
<!-- <module>load-testing-comparison</module>-->
|
||||
<!-- <module>mockito-2</module>-->
|
||||
<!-- <module>mockito-3</module>-->
|
||||
<!-- <module>mockito</module>-->
|
||||
<!-- <module>mocks</module>-->
|
||||
<!-- <module>mockserver</module>-->
|
||||
<!-- <module>parallel-tests-junit</module>-->
|
||||
<!-- <module>powermock</module>-->
|
||||
<!-- <module>rest-assured</module>-->
|
||||
<!-- <module>rest-testing</module>-->
|
||||
<!-- <module>selenium-junit-testng</module>-->
|
||||
<!-- <module>spring-testing-2</module>-->
|
||||
<!-- <module>spring-testing</module>-->
|
||||
<!-- <module>test-containers</module>-->
|
||||
<!-- <module>testing-libraries-2</module>-->
|
||||
<!-- <module>testing-libraries</module>-->
|
||||
<!-- <module>testng</module>-->
|
||||
<!-- <module>xmlunit-2</module>-->
|
||||
<!-- <module>zerocode</module>-->
|
||||
</modules>
|
||||
|
||||
</project>
|
|
@ -359,7 +359,7 @@
|
|||
</profiles>
|
||||
|
||||
<properties>
|
||||
<dom4j.version>2.1.1</dom4j.version>
|
||||
<dom4j.version>2.1.3</dom4j.version>
|
||||
<jaxen.version>1.2.0</jaxen.version>
|
||||
<jdom2.version>2.0.6</jdom2.version>
|
||||
<joox.version>1.6.2</joox.version>
|
||||
|
|
Loading…
Reference in New Issue