Author: gk
Date: Tue Nov 26 15:47:17 2019
New Revision: 1870466
URL: http://svn.apache.org/viewvc?rev=1870466&view=rev
Log:
- fix apidocs location, move javadoc plugin into reports
- define surefire version in pluginManagement to set consistent version
- lower output to console
- add some docker hints in README.md
Modified:
db/torque/torque4/trunk/pom.xml
db/torque/torque4/trunk/torque-test/README.md
db/torque/torque4/trunk/torque-test/pom.xml
db/torque/torque4/trunk/torque-test/src/test/resources/log4j2-test.xml
Modified: db/torque/torque4/trunk/pom.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/pom.xml?rev=1870466&r1=1870465&r2=1870466&view=diff
==============================================================================
--- db/torque/torque4/trunk/pom.xml (original)
+++ db/torque/torque4/trunk/pom.xml Tue Nov 26 15:47:17 2019
@@ -414,12 +414,6 @@
<build>
<plugins>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <additionalparam>-Xdoclint:none</additionalparam>
- </configuration>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
@@ -552,6 +546,11 @@
<artifactId>xml-maven-plugin</artifactId>
<version>1.0.2</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>3.0.0-M3</version>
+ </plugin>
<plugin>
<groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId>
@@ -564,6 +563,12 @@
<reporting>
<plugins>
<plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <additionalparam>-Xdoclint:none</additionalparam>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>taglist-maven-plugin</artifactId>
<version>2.4</version>
Modified: db/torque/torque4/trunk/torque-test/README.md
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/README.md?rev=1870466&r1=1870465&r2=1870466&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/README.md (original)
+++ db/torque/torque4/trunk/torque-test/README.md Tue Nov 26 15:47:17 2019
@@ -18,7 +18,11 @@
# Test Module - Test against Databases
## General
-- Start mvn test -P<data-type>
+
+- Start
+```sh
+mvn test -P<data-type>
+```
* e.g. for database Hsqldb use "mvn test -Phsqldb".
@@ -39,8 +43,25 @@ Find more details about database and db
### MySql
+#### Existing host database
+
- user and database must exist, before running test, see profile mysql
+### Docker image
+
+Currently only supported for mysql adapter, and very few tests.
+
+#### OS System Adjustments
+
+* a windows system 7 below without hyperv may require starting docker using docker-machine start <id>, environment check with docker-machine env <id> and setting it in shell.
+* check a running mysql daemon, stop or disable docker-maven-plugin.
+
+- run it with profile:
+```sh
+mvn test -Pmysql,docker-testcontainer
+```
+
+
### Postgresql
...
Modified: db/torque/torque4/trunk/torque-test/pom.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/pom.xml?rev=1870466&r1=1870465&r2=1870466&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/pom.xml (original)
+++ db/torque/torque4/trunk/torque-test/pom.xml Tue Nov 26 15:47:17 2019
@@ -516,7 +516,9 @@
<exclude>**/BaseDatabaseTestCase.java</exclude>
<exclude>**/*Container*.java</exclude>
</excludes>
- <forkMode>pertest</forkMode><!-- normally pertest, if remote debugging with mvnDebug port 8000, setting in console -DforkMode=none seems to have no effect, set here -->
+ <forkCount>1</forkCount>
+ <reuseForks>false</reuseForks>
+ <!-- forkMode>pertest</forkMode--><!-- normally pertest, if remote debugging with mvnDebug port 8000, setting in console -DforkMode=none seems to have no effect, set here -->
<systemProperties>
<property>
<name>torque.configuration.file</name>
@@ -568,6 +570,7 @@
<exclude>checkstyle-cache.ccf</exclude>
<exclude>derby.log</exclude>
<exclude>src/main/generated-java/**/*</exclude>
+ <exclude>docker-java.properties</exclude><!-- ignored, not template -->
</excludes>
</configuration>
<executions>
Modified: db/torque/torque4/trunk/torque-test/src/test/resources/log4j2-test.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/resources/log4j2-test.xml?rev=1870466&r1=1870465&r2=1870466&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/src/test/resources/log4j2-test.xml (original)
+++ db/torque/torque4/trunk/torque-test/src/test/resources/log4j2-test.xml Tue Nov 26 15:47:17 2019
@@ -32,9 +32,9 @@
<AppenderRef ref="console" level="INFO"/>
</Logger>
<!-- get queries: -->
- <Logger name="org.apache.torque.util" additivity="false" level="DEBUG">
- <AppenderRef ref="torque"/>
- <AppenderRef ref="console"/>
+ <Logger name="org.apache.torque.util" additivity="false">
+ <AppenderRef ref="torque" level="DEBUG"/>
+ <AppenderRef ref="console" level="INFO"/>
</Logger>
<Root level="ERROR"><!-- log4j 1.2 has DEBUG -->
<AppenderRef ref="console"/>
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.