Skip to content

D
daaexample
Commit 587a343e authored by Administrator's avatar Administrator
Browse files
Options

Updates dependencies version 

The dependencies version has been updated in the POM file to the latest
versions. In addition, the POM file format has been unified.
parent c2b7a0f1
Show whitespace changes
Inline Side-by-side
Showing with 148 additions and 140 deletions
pom.xml
View file @ 587a343e
...@@ -24,38 +24,37 @@ ...@@ -24,38 +24,37 @@
<project.servers.directory>${project.basedir}/servers</project.servers.directory> <project.servers.directory>${project.basedir}/servers</project.servers.directory>
<cargo.tomcat.start.skip>false</cargo.tomcat.start.skip> <cargo.tomcat.start.skip>false</cargo.tomcat.start.skip>
<cargo.tomcat.run.skip>true</cargo.tomcat.run.skip> <cargo.tomcat.run.skip>true</cargo.tomcat.run.skip>
<tomcat.version>8.5.11</tomcat.version> <tomcat.version>8.5.27</tomcat.version>
<jacoco.port>6300</jacoco.port> <jacoco.port>6300</jacoco.port>
<acceptance.tests>true</acceptance.tests>
<!-- General dependencies --> <!-- General dependencies -->
<java.servlet.version>3.1.0</java.servlet.version> <java.servlet.version>3.1.0</java.servlet.version>
<jersey.version>2.25</jersey.version> <jersey.version>2.25</jersey.version>
<commons-dbcp2.version>2.1.1</commons-dbcp2.version> <commons-dbcp2.version>2.2.0</commons-dbcp2.version>
<slf4j-jdk14.version>1.7.22</slf4j-jdk14.version> <slf4j-jdk14.version>1.7.21</slf4j-jdk14.version>
<!-- Tests dependencies --> <!-- Tests dependencies -->
<junit.version>4.12</junit.version> <junit.version>4.12</junit.version>
<java-hamcrest.version>2.0.0.0</java-hamcrest.version> <java-hamcrest.version>2.0.0.0</java-hamcrest.version>
<easymock.version>3.4</easymock.version> <easymock.version>3.5.1</easymock.version>
<selenium-java.version>3.0.1</selenium-java.version> <selenium-java.version>3.8.1</selenium-java.version>
<spring-test.version>4.3.6.RELEASE</spring-test.version> <spring-test.version>4.3.14.RELEASE</spring-test.version>
<dbunit.version>2.5.1</dbunit.version> <dbunit.version>2.5.1</dbunit.version>
<spring-test-dbunit.version>1.2.1</spring-test-dbunit.version> <spring-test-dbunit.version>1.3.0</spring-test-dbunit.version>
<hsqldb.version>2.3.1</hsqldb.version> <hsqldb.version>2.3.3</hsqldb.version>
<mysql.version>5.1.40</mysql.version> <mysql.version>5.1.45</mysql.version>
<geckodriver.version>v0.14.0</geckodriver.version> <geckodriver.version>v0.19.1</geckodriver.version>
<equalsverifier.version>2.2.1</equalsverifier.version> <equalsverifier.version>2.4.2</equalsverifier.version>
<!-- Plugins --> <!-- Plugins -->
<maven-failsafe-plugin.version>2.19.1</maven-failsafe-plugin.version> <maven-failsafe-plugin.version>2.20.1</maven-failsafe-plugin.version>
<maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version> <maven-surefire-plugin.version>2.20.1</maven-surefire-plugin.version>
<maven-surefire-report-plugin.version>2.19.1</maven-surefire-report-plugin.version> <maven-surefire-report-plugin.version>2.20.1</maven-surefire-report-plugin.version>
<maven.war.plugin.version>2.6</maven.war.plugin.version> <maven-war-plugin.version>3.2.0</maven-war-plugin.version>
<jacoco-maven-plugin.version>0.7.8</jacoco-maven-plugin.version> <jacoco-maven-plugin.version>0.8.0</jacoco-maven-plugin.version>
<cargo-maven2-plugin.version>1.6.2</cargo-maven2-plugin.version> <cargo-maven2-plugin.version>1.6.6</cargo-maven2-plugin.version>
<hsqldb-maven-plugin.version>1.0.0</hsqldb-maven-plugin.version> <hsqldb-maven-plugin.version>1.0.0</hsqldb-maven-plugin.version>
<maven.antrun.plugin.version>1.8</maven.antrun.plugin.version> <maven-antrun-plugin.version>1.8</maven-antrun-plugin.version>
<fizzed-watcher-maven-plugin.version>1.0.6</fizzed-watcher-maven-plugin.version> <fizzed-watcher-maven-plugin.version>1.0.6</fizzed-watcher-maven-plugin.version>
</properties> </properties>
...@@ -191,7 +190,7 @@ ...@@ -191,7 +190,7 @@
<plugin> <plugin>
<artifactId>maven-war-plugin</artifactId> <artifactId>maven-war-plugin</artifactId>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<version>${maven.war.plugin.version}</version> <version>${maven-war-plugin.version}</version>
<configuration> <configuration>
<warName>${project.finalName}</warName> <warName>${project.finalName}</warName>
</configuration> </configuration>
...@@ -260,7 +259,7 @@ ...@@ -260,7 +259,7 @@
<artifactId>jacoco-maven-plugin</artifactId> <artifactId>jacoco-maven-plugin</artifactId>
<version>${jacoco-maven-plugin.version}</version> <version>${jacoco-maven-plugin.version}</version>
<configuration> <configuration>
<rules/> <rules />
<port>${jacoco.port}</port> <port>${jacoco.port}</port>
</configuration> </configuration>
<executions> <executions>
...@@ -298,7 +297,8 @@ ...@@ -298,7 +297,8 @@
</plugins> </plugins>
<pluginManagement> <pluginManagement>
<plugins> <plugins>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.--> <!--This plugin's configuration is used to store Eclipse m2e settings
only. It has no influence on the Maven build itself. -->
<plugin> <plugin>
<groupId>org.eclipse.m2e</groupId> <groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId> <artifactId>lifecycle-mapping</artifactId>
...@@ -402,10 +402,8 @@ ...@@ -402,10 +402,8 @@
<artifactId>hsqldb-maven-plugin</artifactId> <artifactId>hsqldb-maven-plugin</artifactId>
<version>${hsqldb-maven-plugin.version}</version> <version>${hsqldb-maven-plugin.version}</version>
<!-- <!-- default value for in memory jdbc:hsqldb:hsql://localhost/xdb override
default value for in memory jdbc:hsqldb:hsql://localhost/xdb only values you want to change -->
override only values you want to change
-->
<configuration> <configuration>
<driver>org.hsqldb.jdbc.JDBCDriver</driver> <driver>org.hsqldb.jdbc.JDBCDriver</driver>
<path>mem:daatestdb</path> <path>mem:daatestdb</path>
...@@ -457,7 +455,8 @@ ...@@ -457,7 +455,8 @@
<configuration> <configuration>
<home>${project.build.directory}/catalina-base</home> <home>${project.build.directory}/catalina-base</home>
<properties> <properties>
<cargo.jvmargs>${jacoco.agent.itArgLine},output=tcpserver,port=${jacoco.port} -Drunmode=TEST</cargo.jvmargs> <cargo.jvmargs>${jacoco.agent.itArgLine},output=tcpserver,port=${jacoco.port}
-Drunmode=TEST</cargo.jvmargs>
<cargo.servlet.port>9080</cargo.servlet.port> <cargo.servlet.port>9080</cargo.servlet.port>
<cargo.datasource.datasource.h2> <cargo.datasource.datasource.h2>
cargo.datasource.jndi=jdbc/daaexample| cargo.datasource.jndi=jdbc/daaexample|
...@@ -577,7 +576,9 @@ ...@@ -577,7 +576,9 @@
<profile> <profile>
<id>geckodriver-download-unix</id> <id>geckodriver-download-unix</id>
<activation> <activation>
<os><family>unix</family></os> <os>
<family>unix</family>
</os>
</activation> </activation>
<properties> <properties>
<geckodriver.url>https://github.com/mozilla/geckodriver/releases/download/${geckodriver.version}/geckodriver-${geckodriver.version}-${geckodriver.suffix}.tar.gz</geckodriver.url> <geckodriver.url>https://github.com/mozilla/geckodriver/releases/download/${geckodriver.version}/geckodriver-${geckodriver.version}-${geckodriver.suffix}.tar.gz</geckodriver.url>
...@@ -590,17 +591,19 @@ ...@@ -590,17 +591,19 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId> <artifactId>maven-antrun-plugin</artifactId>
<version>${maven.antrun.plugin.version}</version> <version>${maven-antrun-plugin.version}</version>
<executions> <executions>
<execution> <execution>
<id>download-geckodriver</id> <id>download-geckodriver</id>
<phase>process-test-resources</phase> <phase>process-test-resources</phase>
<configuration> <configuration>
<tasks> <tasks>
<mkdir dir="${geckodriver.basepath}"/> <mkdir dir="${geckodriver.basepath}" />
<get src="${geckodriver.url}" dest="${geckodriver.compressed.path}" skipexisting="true"/> <get src="${geckodriver.url}" dest="${geckodriver.compressed.path}"
<untar src="${geckodriver.compressed.path}" dest="${geckodriver.basepath}" compression="gzip"/> skipexisting="true" />
<chmod file="${geckodriver.uncompressed.path}" perm="a+x"/> <untar src="${geckodriver.compressed.path}" dest="${geckodriver.basepath}"
compression="gzip" />
<chmod file="${geckodriver.uncompressed.path}" perm="a+x" />
</tasks> </tasks>
</configuration> </configuration>
<goals> <goals>
...@@ -616,7 +619,9 @@ ...@@ -616,7 +619,9 @@
<profile> <profile>
<id>geckodriver-download-windows</id> <id>geckodriver-download-windows</id>
<activation> <activation>
<os><family>windows</family></os> <os>
<family>windows</family>
</os>
</activation> </activation>
<properties> <properties>
<geckodriver.url>https://github.com/mozilla/geckodriver/releases/download/${geckodriver.version}/geckodriver-${geckodriver.version}-${geckodriver.suffix}.zip</geckodriver.url> <geckodriver.url>https://github.com/mozilla/geckodriver/releases/download/${geckodriver.version}/geckodriver-${geckodriver.version}-${geckodriver.suffix}.zip</geckodriver.url>
...@@ -629,17 +634,18 @@ ...@@ -629,17 +634,18 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId> <artifactId>maven-antrun-plugin</artifactId>
<version>${maven.antrun.plugin.version}</version> <version>${maven-antrun-plugin.version}</version>
<executions> <executions>
<execution> <execution>
<id>download-geckodriver</id> <id>download-geckodriver</id>
<phase>process-test-resources</phase> <phase>process-test-resources</phase>
<configuration> <configuration>
<tasks> <tasks>
<mkdir dir="${geckodriver.basepath}"/> <mkdir dir="${geckodriver.basepath}" />
<get src="${geckodriver.url}" dest="${geckodriver.compressed.path}" skipexisting="true"/> <get src="${geckodriver.url}" dest="${geckodriver.compressed.path}"
<unzip src="${geckodriver.compressed.path}" dest="${file.separator}${geckodriver.basepath}"/> skipexisting="true" />
<chmod file="${geckodriver.uncompressed.path}" perm="a+x"/> <unzip src="${geckodriver.compressed.path}" dest="${file.separator}${geckodriver.basepath}" />
<chmod file="${geckodriver.uncompressed.path}" perm="a+x" />
</tasks> </tasks>
</configuration> </configuration>
<goals> <goals>
...@@ -723,17 +729,19 @@ ...@@ -723,17 +729,19 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId> <artifactId>maven-antrun-plugin</artifactId>
<version>${maven.antrun.plugin.version}</version> <version>${maven-antrun-plugin.version}</version>
<executions> <executions>
<execution> <execution>
<id>download-geckodriver</id> <id>download-geckodriver</id>
<phase>process-test-resources</phase> <phase>process-test-resources</phase>
<configuration> <configuration>
<tasks> <tasks>
<mkdir dir="${geckodriver.basepath}"/> <mkdir dir="${geckodriver.basepath}" />
<get src="${geckodriver.url}" dest="${geckodriver.compressed.path}" skipexisting="true"/> <get src="${geckodriver.url}" dest="${geckodriver.compressed.path}"
<untar src="${geckodriver.compressed.path}" dest="${geckodriver.basepath}" compression="gzip"/> skipexisting="true" />
<chmod file="${geckodriver.uncompressed.path}" perm="a+x"/> <untar src="${geckodriver.compressed.path}" dest="${geckodriver.basepath}"
compression="gzip" />
<chmod file="${geckodriver.uncompressed.path}" perm="a+x" />
</tasks> </tasks>
</configuration> </configuration>
<goals> <goals>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment