Author: gk
Date: Tue Oct 29 14:37:10 2019
New Revision: 1869114
URL: http://svn.apache.org/viewvc?rev=1869114&view=rev
Log:
- update owasp
- more custom log
- debug info in datetime / mysql, still error: call function time in mysql
(query) or generate time in java.
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/java/org/apache/torque/datatypes/DateTimeTimestampTest.java
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=1869114&r1=1869113&r2=1869114&view=diff
==============================================================================
--- db/torque/torque4/trunk/pom.xml (original)
+++ db/torque/torque4/trunk/pom.xml Tue Oct 29 14:37:10 2019
@@ -555,7 +555,7 @@
<plugin>
<groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId>
- <version>5.0.0-M1</version>
+ <version>5.2.2</version>
</plugin>
</plugins>
</pluginManagement>
Modified: db/torque/torque4/trunk/torque-test/README.md
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/README.md?rev=1869114&r1=1869113&r2=1869114&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/README.md (original)
+++ db/torque/torque4/trunk/torque-test/README.md Tue Oct 29 14:37:10 2019
@@ -17,14 +17,14 @@
# Test Module - Test against Databases
-## Generaal
+## General
- Start mvn test -P<data-type>
* e.g. for database Hsqldb use "mvn test -Phsqldb".
* Find profile names in pom.xml
-Find more details about database anddb user settings in the profile.
+Find more details about database and db user settings in the profile.
## Workflow
Modified: db/torque/torque4/trunk/torque-test/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/pom.xml?rev=1869114&r1=1869113&r2=1869114&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/pom.xml (original)
+++ db/torque/torque4/trunk/torque-test/pom.xml Tue Oct 29 14:37:10 2019
@@ -51,6 +51,7 @@
<torque.test.hsqldb.version>2.3.1</torque.test.hsqldb.version><!-- 2.5.0
as of june 2019 -->
<torque.test.mssql.version>1.2.7</torque.test.mssql.version>
<torque.test.mysql.version>8.0.13</torque.test.mysql.version>
+ <torque.test.mysql.log4j2.version>2.12.1</torque.test.mysql.log4j2.version>
<torque.test.oracle.version>10.2.0.3.0</torque.test.oracle.version>
<torque.test.postgres.version>9.1-901.jdbc4</torque.test.postgres.version>
</properties>
@@ -935,6 +936,12 @@
<version>${torque.test.mysql.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <version>${torque.test.mysql.log4j2.version}</version>
+ <scope>runtime</scope>
+ </dependency>
</dependencies>
<build>
<plugins>
Modified:
db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/datatypes/DateTimeTimestampTest.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/datatypes/DateTimeTimestampTest.java?rev=1869114&r1=1869113&r2=1869114&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/datatypes/DateTimeTimestampTest.java
(original)
+++
db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/datatypes/DateTimeTimestampTest.java
Tue Oct 29 14:37:10 2019
@@ -230,6 +230,14 @@ public class DateTimeTimestampTest exten
List<DateTimeTimestampType> result
= DateTimeTimestampTypePeer.doSelect(criteria);
assertEquals(0, result.size());
+
+ criteria = new Criteria().where(
+ DateTimeTimestampTypePeer.TIME_VALUE,
+ Criteria.CURRENT_TIME,
+ Criteria.LESS_EQUAL);
+ result
+ = DateTimeTimestampTypePeer.doSelect(criteria);
+ assertEquals(1, result.size());
}
/**
@@ -314,6 +322,7 @@ public class DateTimeTimestampTest exten
// execute select
Criteria criteria = new Criteria();
+ // mysql need function time('') or get time
criteria.where(DateTimeTimestampTypePeer.TIME_VALUE, new
Date(1234000));
List<DateTimeTimestampType> result
= DateTimeTimestampTypePeer.doSelect(criteria);
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=1869114&r1=1869113&r2=1869114&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
Oct 29 14:37:10 2019
@@ -22,17 +22,23 @@
<Console name="console" target="SYSTEM_OUT">
<PatternLayout pattern="%d [%t] %-5p | %c - %m%n"/>
</Console>
- <File name="torque" fileName="./target/torque-gen/log/torque-gen.log">
+ <File name="torque" fileName="./target/torque-test.log">
<PatternLayout pattern="%d [%t] %-5p %c - %m%n"/>
</File>
</Appenders>
<Loggers>
- <Logger name="org.apache.torque" additivity="false" level="DEBUG">
- <AppenderRef ref="torque" level="DEBUG"/>
+ <Logger name="org.apache.torque" additivity="false" level="INFO">
+ <AppenderRef ref="torque" level="INFO"/>
<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>
<Root level="ERROR"><!-- log4j 1.2 has DEBUG -->
<AppenderRef ref="console"/>
+ <AppenderRef ref="torque"/>
</Root>
</Loggers>
</Configuration>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org
For additional commands, e-mail: torque-dev-h...@db.apache.org
