svn commit: r1879929 [1/2] - in /db/torque/torque4/trunk: ./ torque-runtime/ torque-runtime/src/main/java/org/apache/torque/ torque-runtime/src/main/java/org/apache/torque/util/ torque-templates/ torque-test/
[email protected] Thu, 16 Jul 2020 07:42:58 -0000
Newsgroups
gmane.comp.jakarta.turbine.torque.devel
Message-ID
<[email protected] >
Author: gk
Date: Thu Jul 16 07:42:57 2020
New Revision: 1879929
URL: http://svn.apache.org/viewvc?rev=1879929&view=rev
Log:
add msising dependency in torque-runtime, format pom.xml, fix some pmd issues in torque-runtime, use lazy debugging, update readme.md
Modified:
db/torque/torque4/trunk/README.md
db/torque/torque4/trunk/pom.xml
db/torque/torque4/trunk/torque-runtime/pom.xml
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/ColumnImpl.java
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueInstance.java
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/BasePeerImpl.java
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/LargeSelect.java
db/torque/torque4/trunk/torque-templates/pom.xml
db/torque/torque4/trunk/torque-test/README.md
db/torque/torque4/trunk/torque-test/pom.xml
Modified: db/torque/torque4/trunk/README.md
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/README.md?rev=1879929&r1=1879928&r2=1879929&view=diff
==============================================================================
--- db/torque/torque4/trunk/README.md (original)
+++ db/torque/torque4/trunk/README.md Thu Jul 16 07:42:57 2020
@@ -78,7 +78,8 @@ To build all with checksums run in root
mvn clean install -Papache-release,beans,managers,owasp
```
-You need to add at least one "database" profile (setting torque.driver).
+- one "database" profile (setting torque.driver) is required to be active
+- managers and beans profile currently are required to be activated
#### Provided database profiles
@@ -92,3 +93,4 @@ You need to add at least one "database"
- derbyEmbedded-jenkins: derby profile with default settings. Can only be run from parent project with `mvn -Ptest,derbyEmbedded-jenkins install`
- hsqldb-jenkins: see above
- apache-release: sets as database derbyEmbedded
+
Modified: db/torque/torque4/trunk/pom.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/pom.xml?rev=1879929&r1=1879928&r2=1879929&view=diff
==============================================================================
--- db/torque/torque4/trunk/pom.xml (original)
+++ db/torque/torque4/trunk/pom.xml Thu Jul 16 07:42:57 2020
@@ -18,741 +18,742 @@
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache</groupId>
- <artifactId>apache</artifactId>
- <version>23</version>
- </parent>
-
- <groupId>org.apache.torque</groupId>
- <artifactId>torque</artifactId>
- <packaging>pom</packaging>
- <name>Torque Maven Parent</name>
- <version>5.0-SNAPSHOT</version>
- <description>Torque parent project</description>
- <url>http://db.apache.org/torque/releases/torque-5.0</url>
-
- <modules>
- <module>torque-runtime</module>
- <module>torque-generator</module>
- <module>torque-templates</module>
- <module>torque-maven-plugin</module>
- <module>torque-ant-tasks</module>
- <module>torque-site</module>
- </modules>
-
- <issueManagement>
- <system>JIRA</system>
- <url>http://issues.apache.org/jira/browse/TORQUE</url>
- </issueManagement>
-
- <ciManagement>
- <system>jenkins</system>
- <url>http://builds.apache.org/</url>
- <notifiers>
- <notifier>
- <type>email</type>
- <sendOnError>true</sendOnError>
- <sendOnFailure>true</sendOnFailure>
- </notifier>
- </notifiers>
- </ciManagement>
-
- <inceptionYear>2000</inceptionYear>
-
- <mailingLists>
- <mailingList>
- <name>Torque User List</name>
- <subscribe>[email protected] </subscribe>
- <unsubscribe>[email protected] </unsubscribe>
- <archive>http://mail-archives.apache.org/mod_mbox/db-torque-user/</archive>
- </mailingList>
- <mailingList>
- <name>Torque Developer List</name>
- <subscribe>[email protected] </subscribe>
- <unsubscribe>[email protected] </unsubscribe>
- <archive>http://mail-archives.apache.org/mod_mbox/db-torque-dev/</archive>
- </mailingList>
- </mailingLists>
-
- <developers>
- <developer>
- <name>Jeffrey D. Brekke</name>
- <id>brekke</id>
- <email>[email protected] </email>
- <organization />
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
- <developer>
- <name>Eric Dobbs</name>
- <id>dobbs</id>
- <email>[email protected] </email>
- <organization />
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
- <developer>
- <name>Scott Eade</name>
- <id>seade</id>
- <email>[email protected] </email>
- <organization>Backstage Technologies Pty. Ltd.</organization>
- <roles>
- <role>Java Developer</role>
- </roles>
- <timezone>+10</timezone>
- </developer>
- <developer>
- <name>Thomas Fox</name>
- <id>tfischer</id>
- <email>[email protected] </email>
- <organization>Seitenbau GmbH</organization>
- <roles>
- <role>Java Developer</role>
- </roles>
- <timezone>+1</timezone>
- </developer>
- <developer>
- <name>Stephen Haberman</name>
- <id>stephenh</id>
- <email>[email protected] </email>
- <organization />
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
- <developer>
- <name>Humberto Hernandez</name>
- <id>hhernandez</id>
- <email>[email protected] </email>
- <organization>Integrated Technology S.C.</organization>
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
- <developer>
- <name>Fedor Karpelevitch</name>
- <id>fedor</id>
- <email>[email protected] </email>
- <organization />
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
- <developer>
- <name>Quinton McCombs</name>
- <id>quintonm</id>
- <email>[email protected] </email>
- <organization>NEqualsOne</organization>
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
- <developer>
- <name>John McNally</name>
- <id>jmcnally</id>
- <email>[email protected] </email>
- <organization>CollabNet</organization>
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
- <developer>
- <name>Greg Monroe</name>
- <id>gmonroe</id>
- <email>[email protected] </email>
- <organization>Duke Corporate Education</organization>
- <timezone>-5</timezone>
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
- <developer>
- <name>Martin Poeschl</name>
- <id>mpoeschl</id>
- <email>[email protected] </email>
- <organization>Tucana.at</organization>
- <roles>
- <role>Java Developer</role>
- </roles>
- <timezone>+18</timezone>
- </developer>
- <developer>
- <name>Daniel Rall</name>
- <id>dlr</id>
- <email>[email protected] </email>
- <organization>CollabNet, Inc.</organization>
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
- <developer>
- <name>Henning P. Schmiedehausen</name>
- <id>henning</id>
- <email>[email protected] </email>
- <organization>INTERMETA - Gesellschaft fuer Mehrwertdienste mbH</organization>
- <roles>
- <role>Java Developer</role>
- </roles>
- <timezone>+2</timezone>
- </developer>
- <developer>
- <name>Kurt Schrader</name>
- <id>kschrader</id>
- <email>[email protected] </email>
- <organization />
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
- <developer>
- <name>Jon Scott Stevens</name>
- <id>jon</id>
- <email>[email protected] </email>
- <organization>CollabNet, Inc.</organization>
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
- <developer>
- <name>James Taylor</name>
- <id>jtaylor</id>
- <email>[email protected] </email>
- <organization />
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
- <developer>
- <name>Thomas Vandahl</name>
- <id>tv</id>
- <email>[email protected] </email>
- <organization />
- <roles>
- <role>Java Developer</role>
- </roles>
- <timezone>+1</timezone>
- </developer>
- <developer>
- <name>Georg Kallidis</name>
- <id>gk</id>
- <email>[email protected] </email>
- <organization />
- <roles>
- <role>Java Developer</role>
- </roles>
- <timezone>+1</timezone>
- </developer>
- </developers>
-
- <contributors>
- <contributor>
- <name>Patrick Carl</name>
- <email>[email protected] </email>
- </contributor>
- <contributor>
- <name>Roger A. Caron</name>
- <email>[email protected] </email>
- </contributor>
- <contributor>
- <name>Martin Goulet</name>
- <email>[email protected] </email>
- </contributor>
- <contributor>
- <name>M. Sean Gilligan</name>
- <email>[email protected] </email>
- </contributor>
- <contributor>
- <name>James Hillyerd</name>
- <email>[email protected] </email>
- </contributor>
- <contributor>
- <name>Thierry Lach</name>
- <email>[email protected] </email>
- </contributor>
- <contributor>
- <name>Johnny Macchione</name>
- <email>[email protected] </email>
- </contributor>
- <contributor>
- <name>Markus M. May</name>
- <email>[email protected] </email>
- </contributor>
- <contributor>
- <name>Raphael Pieroni</name>
- <email>rafale_at_codehaus.org</email>
- </contributor>
- <contributor>
- <name>Jonathan Purvis</name>
- <email>[email protected] </email>
- </contributor>
- <contributor>
- <name>Thoralf Rickert</name>
- <email>[email protected] </email>
- </contributor>
- <contributor>
- <name>J. Russell Smyth</name>
- <email>[email protected] </email>
- </contributor>
- <contributor>
- <name>Tarlika Elisabeth Schmitz</name>
- <email>[email protected] </email>
- </contributor>
- <contributor>
- <name>Hilco Wijbenga</name>
- <email>[email protected] </email>
- </contributor>
- <contributor>
- <name>Christoph Zenger</name>
- <email>[email protected] </email>
- </contributor>
- </contributors>
-
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/db/torque/torque4/trunk</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/torque/torque4/trunk</developerConnection>
- <url>http://svn.apache.org/viewvc/db/torque/torque4/trunk</url>
- </scm>
-
- <dependencyManagement>
- <dependencies>
-
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-jcl</artifactId>
- <version>${log4j2.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- <version>${log4j2.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <version>${log4j2.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-1.2-api</artifactId>
- <version>${log4j2.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-configuration2</artifactId>
- <version>2.7</version>
- </dependency>
-
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>1.9.4</version>
- </dependency>
-
- <dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- <version>1.4</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-dbcp2</artifactId>
- <version>2.7.0</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-jcs-core</artifactId>
- <version>2.2.1</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>3.10</version>
- </dependency>
-
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>2.7</version>
- </dependency>
-
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <version>3.4.0</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.avalon.framework</groupId>
- <artifactId>avalon-framework-api</artifactId>
- <version>4.3.1</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.avalon.framework</groupId>
- <artifactId>avalon-framework-impl</artifactId>
- <version>4.3.1</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter</artifactId>
- <version>${junit.jupiter.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.junit.platform</groupId>
- <artifactId>junit-platform-launcher</artifactId>
- <version>${junit.launcher.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.13</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.fulcrum</groupId>
- <artifactId>fulcrum-yaafi</artifactId>
- <version>1.0.8</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-eclipse-plugin</artifactId>
- <version>2.10</version>
- <configuration>
- <workspace>..</workspace>
- <downloadSources>true</downloadSources>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>velocity.log</exclude>
- <exclude>.checkstyle</exclude>
- <exclude>checkstyle-cache.ccf</exclude>
- <exclude>**/derby.log</exclude>
- <exclude>**/LICENSE-EDL.txt</exclude>
- <exclude>DEPENDENCIES</exclude>
- <!-- special excludes for torque-test because this is not a module
- in the normal build process -->
- <exclude>torque-test/src/main/generated-java/**/*</exclude>
- <!-- hsqldb-jenkins -->
- <exclude>torque-test/torque-test/**</exclude>
- <exclude>torque-test/README.md</exclude>
- <exclude>**/target/**</exclude>
- <exclude>**/.classpath</exclude>
- <exclude>**/.project</exclude>
- <exclude>**/.settings/**</exclude>
- <exclude>**/torque.usersettings.properties</exclude>
- </excludes>
- </configuration>
- <executions>
- <execution>
- <phase>verify</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <version>2.7</version>
- <configuration>
- <formats>
- <format>html</format>
- <format>xml</format>
- </formats>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <configuration>
- <linkXref>true</linkXref>
- <targetJdk>${maven.compiler.source}</targetJdk>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <configuration>
- <excludeFilterFile>${basedir}/src/main/plugin-config/findbugs-exclude.xml</excludeFilterFile>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>3.0.0-M5</version>
- <configuration>
- <!--default setting is forkCount=1/reuseForks=true -->
- <reuseForks>false</reuseForks>
- <forkCount>1</forkCount>
- <systemPropertyVariables>
- <derby.stream.error.file>target/derby.log</derby.stream.error.file>
- </systemPropertyVariables>
- </configuration>
- </plugin>
- <!-- hint: mvn verify -Ddependency.check.skip=false -->
- <plugin>
- <groupId>org.owasp</groupId>
- <artifactId>dependency-check-maven</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <skip>${dependency.check.skip}</skip>
- <!-- include in sub modules if needed -->
- <!-- suppressionFiles>
- <suppressionFile>${project.basedir}/suppression-owasp-fp.xml</suppressionFile>
- </suppressionFiles-->
- </configuration>
- </plugin>
- </plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>3.13.0</version>
- <configuration>
- <linkXref>true</linkXref>
- <targetJdk>${maven.compiler.source}</targetJdk>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- <version>3.0.0</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>3.0.5</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.15</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <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-M5</version>
- </plugin>
- <plugin>
- <groupId>org.owasp</groupId>
- <artifactId>dependency-check-maven</artifactId>
- <version>5.3.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>3.8.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.1</version>
- <configuration>
- <source>${maven.compiler.source}</source>
- <target>${maven.compiler.target}</target>
- <encoding>${project.build.sourceEncoding}</encoding>
- <fork>${torque.compiler.fork}</fork>
- <compilerVersion>${torque.compiler.compilerVersion}</compilerVersion>
- <executable>${torque.compiler.javac}</executable>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>3.2.0</version>
- <configuration>
- <additionalparam>-Xdoclint:none</additionalparam>
- <source>1.8</source>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
- <reporting>
- <plugins>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>taglist-maven-plugin</artifactId>
- <version>2.4</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jdepend-maven-plugin</artifactId>
- <version>2.0</version>
- </plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <version>0.13</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <configuration>
- <minimumTokens>200</minimumTokens>
- <rulesets>
- <ruleset>/category/java/bestpractices.xml</ruleset>
- <ruleset>/category/java/codestyle.xml</ruleset>
- <ruleset>/category/java/errorprone.xml</ruleset>
- <ruleset>/category/java/multithreading.xml</ruleset>
- <ruleset>/category/java/performance.xml</ruleset>
- <ruleset>/category/java/design.xml</ruleset>
- <!-- comment default rule sets: basic, imports, unusedcode -->
- <!--ruleset>/rulesets/java/basic.xml</ruleset>
- <ruleset>/rulesets/java/finalizers.xml</ruleset>
- <ruleset>/rulesets/java/imports.xml</ruleset>
- <ruleset>/rulesets/java/unusedcode.xml</ruleset-->
- </rulesets>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>3.0.5</version>
- <configuration>
- <threshold>Normal</threshold>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-changes-plugin</artifactId>
- <version>2.12.1</version>
- <reportSets>
- <reportSet>
- <reports>
- <report>changes-report</report>
- </reports>
- <configuration>
- <xmlPath>src/changes/changes.xml</xmlPath>
- </configuration>
- </reportSet>
- </reportSets>
- </plugin>
- </plugins>
- </reporting>
-
- <properties>
- <project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding>
- <maven.compiler.source>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target>
- <dependency.check.skip>true</dependency.check.skip>
-
- <junit.jupiter.version>5.6.2</junit.jupiter.version>
- <junit.launcher.version>1.6.2</junit.launcher.version>
- <log4j2.version>2.13.3</log4j2.version>
-
- <maven.compiler.source>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target>
-
- <torque.compiler.fork>false</torque.compiler.fork>
- <torque.compiler.compilerVersion>1.8</torque.compiler.compilerVersion>
- <torque.compiler.javac>${JAVA_HOME}/bin/javac</torque.compiler.javac>
-
-
- </properties>
-
- <profiles>
- <profile>
- <id>apache-release</id>
- <build>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>23</version>
+ </parent>
+
+ <groupId>org.apache.torque</groupId>
+ <artifactId>torque</artifactId>
+ <packaging>pom</packaging>
+ <name>Torque Maven Parent</name>
+ <version>5.0-SNAPSHOT</version>
+ <description>Torque parent project</description>
+ <url>http://db.apache.org/torque/releases/torque-5.0</url>
+
+ <modules>
+ <module>torque-runtime</module>
+ <module>torque-generator</module>
+ <module>torque-templates</module>
+ <module>torque-maven-plugin</module>
+ <module>torque-ant-tasks</module>
+ <module>torque-site</module>
+ </modules>
+
+ <issueManagement>
+ <system>JIRA</system>
+ <url>http://issues.apache.org/jira/browse/TORQUE</url>
+ </issueManagement>
+
+ <ciManagement>
+ <system>jenkins</system>
+ <url>http://builds.apache.org/</url>
+ <notifiers>
+ <notifier>
+ <type>email</type>
+ <sendOnError>true</sendOnError>
+ <sendOnFailure>true</sendOnFailure>
+ </notifier>
+ </notifiers>
+ </ciManagement>
+
+ <inceptionYear>2000</inceptionYear>
+
+ <mailingLists>
+ <mailingList>
+ <name>Torque User List</name>
+ <subscribe>[email protected] </subscribe>
+ <unsubscribe>[email protected] </unsubscribe>
+ <archive>http://mail-archives.apache.org/mod_mbox/db-torque-user/</archive>
+ </mailingList>
+ <mailingList>
+ <name>Torque Developer List</name>
+ <subscribe>[email protected] </subscribe>
+ <unsubscribe>[email protected] </unsubscribe>
+ <archive>http://mail-archives.apache.org/mod_mbox/db-torque-dev/</archive>
+ </mailingList>
+ </mailingLists>
+
+ <developers>
+ <developer>
+ <name>Jeffrey D. Brekke</name>
+ <id>brekke</id>
+ <email>[email protected] </email>
+ <organization/>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Eric Dobbs</name>
+ <id>dobbs</id>
+ <email>[email protected] </email>
+ <organization/>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Scott Eade</name>
+ <id>seade</id>
+ <email>[email protected] </email>
+ <organization>Backstage Technologies Pty. Ltd.</organization>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ <timezone>+10</timezone>
+ </developer>
+ <developer>
+ <name>Thomas Fox</name>
+ <id>tfischer</id>
+ <email>[email protected] </email>
+ <organization>Seitenbau GmbH</organization>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ <timezone>+1</timezone>
+ </developer>
+ <developer>
+ <name>Stephen Haberman</name>
+ <id>stephenh</id>
+ <email>[email protected] </email>
+ <organization/>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Humberto Hernandez</name>
+ <id>hhernandez</id>
+ <email>[email protected] </email>
+ <organization>Integrated Technology S.C.</organization>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Fedor Karpelevitch</name>
+ <id>fedor</id>
+ <email>[email protected] </email>
+ <organization/>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Quinton McCombs</name>
+ <id>quintonm</id>
+ <email>[email protected] </email>
+ <organization>NEqualsOne</organization>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>John McNally</name>
+ <id>jmcnally</id>
+ <email>[email protected] </email>
+ <organization>CollabNet</organization>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Greg Monroe</name>
+ <id>gmonroe</id>
+ <email>[email protected] </email>
+ <organization>Duke Corporate Education</organization>
+ <timezone>-5</timezone>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Martin Poeschl</name>
+ <id>mpoeschl</id>
+ <email>[email protected] </email>
+ <organization>Tucana.at</organization>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ <timezone>+18</timezone>
+ </developer>
+ <developer>
+ <name>Daniel Rall</name>
+ <id>dlr</id>
+ <email>[email protected] </email>
+ <organization>CollabNet, Inc.</organization>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Henning P. Schmiedehausen</name>
+ <id>henning</id>
+ <email>[email protected] </email>
+ <organization>INTERMETA - Gesellschaft fuer Mehrwertdienste mbH</organization>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ <timezone>+2</timezone>
+ </developer>
+ <developer>
+ <name>Kurt Schrader</name>
+ <id>kschrader</id>
+ <email>[email protected] </email>
+ <organization/>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Jon Scott Stevens</name>
+ <id>jon</id>
+ <email>[email protected] </email>
+ <organization>CollabNet, Inc.</organization>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>James Taylor</name>
+ <id>jtaylor</id>
+ <email>[email protected] </email>
+ <organization/>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Thomas Vandahl</name>
+ <id>tv</id>
+ <email>[email protected] </email>
+ <organization/>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ <timezone>+1</timezone>
+ </developer>
+ <developer>
+ <name>Georg Kallidis</name>
+ <id>gk</id>
+ <email>[email protected] </email>
+ <organization/>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ <timezone>+1</timezone>
+ </developer>
+ </developers>
+
+ <contributors>
+ <contributor>
+ <name>Patrick Carl</name>
+ <email>[email protected] </email>
+ </contributor>
+ <contributor>
+ <name>Roger A. Caron</name>
+ <email>[email protected] </email>
+ </contributor>
+ <contributor>
+ <name>Martin Goulet</name>
+ <email>[email protected] </email>
+ </contributor>
+ <contributor>
+ <name>M. Sean Gilligan</name>
+ <email>[email protected] </email>
+ </contributor>
+ <contributor>
+ <name>James Hillyerd</name>
+ <email>[email protected] </email>
+ </contributor>
+ <contributor>
+ <name>Thierry Lach</name>
+ <email>[email protected] </email>
+ </contributor>
+ <contributor>
+ <name>Johnny Macchione</name>
+ <email>[email protected] </email>
+ </contributor>
+ <contributor>
+ <name>Markus M. May</name>
+ <email>[email protected] </email>
+ </contributor>
+ <contributor>
+ <name>Raphael Pieroni</name>
+ <email>rafale_at_codehaus.org</email>
+ </contributor>
+ <contributor>
+ <name>Jonathan Purvis</name>
+ <email>[email protected] </email>
+ </contributor>
+ <contributor>
+ <name>Thoralf Rickert</name>
+ <email>[email protected] </email>
+ </contributor>
+ <contributor>
+ <name>J. Russell Smyth</name>
+ <email>[email protected] </email>
+ </contributor>
+ <contributor>
+ <name>Tarlika Elisabeth Schmitz</name>
+ <email>[email protected] </email>
+ </contributor>
+ <contributor>
+ <name>Hilco Wijbenga</name>
+ <email>[email protected] </email>
+ </contributor>
+ <contributor>
+ <name>Christoph Zenger</name>
+ <email>[email protected] </email>
+ </contributor>
+ </contributors>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/db/torque/torque4/trunk</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/torque/torque4/trunk</developerConnection>
+ <url>http://svn.apache.org/viewvc/db/torque/torque4/trunk</url>
+ </scm>
+
+ <dependencyManagement>
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-jcl</artifactId>
+ <version>${log4j2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ <version>${log4j2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${log4j2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-1.2-api</artifactId>
+ <version>${log4j2.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-configuration2</artifactId>
+ <version>2.7</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.9.4</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <version>1.4</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-dbcp2</artifactId>
+ <version>2.7.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-jcs-core</artifactId>
+ <version>2.2.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.10</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.7</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>3.4.0</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.avalon.framework</groupId>
+ <artifactId>avalon-framework-api</artifactId>
+ <version>4.3.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.avalon.framework</groupId>
+ <artifactId>avalon-framework-impl</artifactId>
+ <version>4.3.1</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <version>${junit.jupiter.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.junit.platform</groupId>
+ <artifactId>junit-platform-launcher</artifactId>
+ <version>${junit.launcher.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.13</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.fulcrum</groupId>
+ <artifactId>fulcrum-yaafi</artifactId>
+ <version>1.0.8</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <build>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <executions>
- <execution>
- <id>site-for-package</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>site</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <version>2.10</version>
+ <configuration>
+ <workspace>..</workspace>
+ <downloadSources>true</downloadSources>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>velocity.log</exclude>
+ <exclude>.checkstyle</exclude>
+ <exclude>checkstyle-cache.ccf</exclude>
+ <exclude>**/derby.log</exclude>
+ <exclude>**/LICENSE-EDL.txt</exclude>
+ <exclude>DEPENDENCIES</exclude>
+ <!-- special excludes for torque-test because this is not a module
+ in the normal build process -->
+ <exclude>torque-test/src/main/generated-java/**/*</exclude>
+ <!-- hsqldb-jenkins -->
+ <exclude>torque-test/torque-test/**</exclude>
+ <exclude>torque-test/README.md</exclude>
+ <exclude>**/target/**</exclude>
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.project</exclude>
+ <exclude>**/.settings/**</exclude>
+ <exclude>**/torque.usersettings.properties</exclude>
+ </excludes>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>verify</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ <version>2.7</version>
+ <configuration>
+ <formats>
+ <format>html</format>
+ <format>xml</format>
+ </formats>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <configuration>
+ <linkXref>true</linkXref>
+ <targetJdk>${maven.compiler.source}</targetJdk>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <configuration>
+ <excludeFilterFile>${basedir}/src/main/plugin-config/findbugs-exclude.xml</excludeFilterFile>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>3.0.0-M5</version>
+ <configuration>
+ <!--default setting is forkCount=1/reuseForks=true -->
+ <reuseForks>false</reuseForks>
+ <forkCount>1</forkCount>
+ <systemPropertyVariables>
+ <derby.stream.error.file>target/derby.log</derby.stream.error.file>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+ <!-- hint: mvn verify -Ddependency.check.skip=false -->
+ <plugin>
+ <groupId>org.owasp</groupId>
+ <artifactId>dependency-check-maven</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <skip>${dependency.check.skip}</skip>
+ <!-- include in sub modules if needed -->
+ <!-- suppressionFiles>
+ <suppressionFile>${project.basedir}/suppression-owasp-fp.xml</suppressionFile>
+ </suppressionFiles-->
+ </configuration>
+ </plugin>
</plugins>
- </build>
- <modules>
- <module>torque-test</module>
- </modules>
- </profile>
- <profile>
- <id>test</id>
- <modules>
- <module>torque-test</module>
- </modules>
- </profile>
- <profile>
- <id>java8</id>
- <activation>
- <jdk>[1.8,)</jdk>
- </activation>
- <properties>
- <doclint>none</doclint><!-- since javadoc v.3 this is required instead of -Xdoclint:none -->
- </properties>
- </profile>
- <profile>
- <id>owasp</id>
- <properties>
- <dependency.check.skip>false</dependency.check.skip>
- </properties>
- </profile>
- <profile>
- <id>java12</id>
- <activation>
- <jdk>[12,)</jdk>
- </activation>
- <properties>
- <java.version>12</java.version>
- <!--torque.compiler.fork>true</torque.compiler.fork>
- <torque.compiler.compilerVersion>1.12</torque.compiler.compilerVersion>
- <torque.compiler.release>8</torque.compiler.release-->
- </properties>
- </profile>
- </profiles>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <version>3.13.0</version>
+ <configuration>
+ <linkXref>true</linkXref>
+ <targetJdk>${maven.compiler.source}</targetJdk>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ <version>3.0.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>3.0.5</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.15</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <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-M5</version>
+ </plugin>
+ <plugin>
+ <groupId>org.owasp</groupId>
+ <artifactId>dependency-check-maven</artifactId>
+ <version>5.3.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>3.8.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.8.1</version>
+ <configuration>
+ <source>${maven.compiler.source}</source>
+ <target>${maven.compiler.target}</target>
+ <encoding>${project.build.sourceEncoding}</encoding>
+ <fork>${torque.compiler.fork}</fork>
+ <compilerVersion>${torque.compiler.compilerVersion}</compilerVersion>
+ <executable>${torque.compiler.javac}</executable>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>3.2.0</version>
+ <configuration>
+ <additionalparam>-Xdoclint:none</additionalparam>
+ <source>1.8</source>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>taglist-maven-plugin</artifactId>
+ <version>2.4</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jdepend-maven-plugin</artifactId>
+ <version>2.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>0.13</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <configuration>
+ <minimumTokens>200</minimumTokens>
+ <rulesets>
+ <ruleset>/category/java/bestpractices.xml</ruleset>
+ <ruleset>/category/java/codestyle.xml</ruleset>
+ <ruleset>/category/java/errorprone.xml</ruleset>
+ <ruleset>/category/java/multithreading.xml</ruleset>
+ <ruleset>/category/java/performance.xml</ruleset>
+ <ruleset>/category/java/design.xml</ruleset>
+ <!-- comment default rule sets: basic, imports, unusedcode -->
+ <!--ruleset>/rulesets/java/basic.xml</ruleset>
+ <ruleset>/rulesets/java/finalizers.xml</ruleset>
+ <ruleset>/rulesets/java/imports.xml</ruleset>
+ <ruleset>/rulesets/java/unusedcode.xml</ruleset-->
+ </rulesets>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>3.0.5</version>
+ <configuration>
+ <threshold>Normal</threshold>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-changes-plugin</artifactId>
+ <version>2.12.1</version>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>changes-report</report>
+ </reports>
+ <configuration>
+ <xmlPath>src/changes/changes.xml</xmlPath>
+ </configuration>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ </plugins>
+ </reporting>
+
+ <properties>
+ <project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
+ <dependency.check.skip>true</dependency.check.skip>
+
+ <junit.jupiter.version>5.6.2</junit.jupiter.version>
+ <junit.launcher.version>1.6.2</junit.launcher.version>
+ <log4j2.version>2.13.3</log4j2.version>
+
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
+
+ <torque.compiler.fork>false</torque.compiler.fork>
+ <torque.compiler.compilerVersion>1.8</torque.compiler.compilerVersion>
+ <torque.compiler.javac>${JAVA_HOME}/bin/javac</torque.compiler.javac>
+
+
+ </properties>
+
+ <profiles>
+ <profile>
+ <id>apache-release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>site-for-package</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>site</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <modules>
+ <module>torque-test</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>test</id>
+ <modules>
+ <module>torque-test</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>java8</id>
+ <activation>
+ <jdk>[1.8,)</jdk>
+ </activation>
+ <properties>
+ <doclint>none</doclint><!-- since javadoc v.3 this is required instead of -Xdoclint:none -->
+ </properties>
+ </profile>
+ <profile>
+ <id>owasp</id>
+ <properties>
+ <dependency.check.skip>false</dependency.check.skip>
+ </properties>
+ </profile>
+ <profile>
+ <id>java12</id>
+ <activation>
+ <jdk>[12,)</jdk>
+ </activation>
+ <properties>
+ <java.version>12</java.version>
+ <!--torque.compiler.fork>true</torque.compiler.fork>
+ <torque.compiler.compilerVersion>1.12</torque.compiler.compilerVersion>
+ <torque.compiler.release>8</torque.compiler.release-->
+ </properties>
+ </profile>
+ </profiles>
</project>
Modified: db/torque/torque4/trunk/torque-runtime/pom.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/pom.xml?rev=1879929&r1=1879928&r2=1879929&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/pom.xml (original)
+++ db/torque/torque4/trunk/torque-runtime/pom.xml Thu Jul 16 07:42:57 2020
@@ -17,160 +17,170 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.apache.torque</groupId>
- <artifactId>torque</artifactId>
- <version>5.0-SNAPSHOT</version>
- <relativePath>..</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>torque-runtime</artifactId>
- <packaging>jar</packaging>
- <name>Torque Runtime</name>
-
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/db/torque/torque4/trunk/torque-runtime</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/torque/torque4/trunk/torque-runtime</developerConnection>
- <url>http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime</url>
- </scm>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-configuration2</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-dbcp2</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-jcs-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.avalon.framework</groupId>
- <artifactId>avalon-framework-api</artifactId>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-1.2-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-jcl</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.fulcrum</groupId>
- <artifactId>fulcrum-testcontainer</artifactId>
- <version>1.0.8</version>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.fulcrum</groupId>
- <artifactId>fulcrum-yaafi</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <!-- forkCount=1/reuseForks=false is necessary for TorqueInstanceTest -->
- <!-- to get a not-initialized TorqueInstance singleton -->
- <forkCount>1</forkCount>
- <reuseForks>false</reuseForks>
- <excludes>
- <exclude>**/BaseTestCase.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
- <configLocation>${basedir}/../src/main/checkstyle/checkstyle.xml</configLocation>
- <headerLocation>${basedir}/../src/main/checkstyle/license-header.txt</headerLocation>
- <suppressionsLocation>${basedir}/../src/main/checkstyle/checkstyle-suppressions.xml</suppressionsLocation>
- <suppressionsFileExpression>checkstyle.suppressions.file</suppressionsFileExpression>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-
- <profiles>
- <profile>
- <id>apache-release</id>
- <build>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.apache.torque</groupId>
+ <artifactId>torque</artifactId>
+ <version>5.0-SNAPSHOT</version>
+ <relativePath>..</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>torque-runtime</artifactId>
+ <packaging>jar</packaging>
+ <name>Torque Runtime</name>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/db/torque/torque4/trunk/torque-runtime</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/torque/torque4/trunk/torque-runtime
+ </developerConnection>
+ <url>http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime</url>
+ </scm>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-configuration2</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-dbcp2</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-jcs-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.avalon.framework</groupId>
+ <artifactId>avalon-framework-api</artifactId>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-1.2-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-jcl</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.fulcrum</groupId>
+ <artifactId>fulcrum-testcontainer</artifactId>
+ <version>1.0.8</version>
+ <exclusions>
+ <exclusion>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>3.1.0</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.fulcrum</groupId>
+ <artifactId>fulcrum-yaafi</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
<plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>../src/main/assembly/bin-with-dependencies.xml</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <!-- forkCount=1/reuseForks=false is necessary for TorqueInstanceTest -->
+ <!-- to get a not-initialized TorqueInstance singleton -->
+ <forkCount>1</forkCount>
+ <reuseForks>false</reuseForks>
+ <excludes>
+ <exclude>**/BaseTestCase.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+ <configLocation>${basedir}/../src/main/checkstyle/checkstyle.xml</configLocation>
+ <headerLocation>${basedir}/../src/main/checkstyle/license-header.txt</headerLocation>
+ <suppressionsLocation>${basedir}/../src/main/checkstyle/checkstyle-suppressions.xml
+ </suppressionsLocation>
+ <suppressionsFileExpression>checkstyle.suppressions.file</suppressionsFileExpression>
+ </configuration>
+ </plugin>
</plugins>
- </build>
- </profile>
- </profiles>
+ </build>
+
+
+ <profiles>
+ <profile>
+ <id>apache-release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>../src/main/assembly/bin-with-dependencies.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/ColumnImpl.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/ColumnImpl.java?rev=1879929&r1=1879928&r2=1879929&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/ColumnImpl.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/ColumnImpl.java Thu Jul 16 07:42:57 2020
@@ -64,7 +64,7 @@ public class ColumnImpl implements Colum
* @throws NullPointerException if columnName or tableName are null.
* @throws IllegalArgumentException if columnName or tableName are blank.
*/
- public ColumnImpl(String tableName, String columnName)
+ public ColumnImpl(final String tableName, final String columnName)
{
if (columnName == null)
{
@@ -93,7 +93,7 @@ public class ColumnImpl implements Colum
* @throws NullPointerException if columnName or tableName are null.
* @throws IllegalArgumentException if columnName or tableName are blank.
*/
- public ColumnImpl(String schemaName, String tableName, String columnName)
+ public ColumnImpl(final String schemaName, final String tableName, final String columnName)
{
if (columnName == null)
{
@@ -129,10 +129,10 @@ public class ColumnImpl implements Colum
* @throws IllegalArgumentException if tableName or sqlExpression are blank.
*/
public ColumnImpl(
- String schemaName,
- String tableName,
- String columnName,
- String sqlExpression)
+ final String schemaName,
+ final String tableName,
+ final String columnName,
+ final String sqlExpression)
{
setColumnName(columnName);
setTableName(tableName);
@@ -157,7 +157,7 @@ public class ColumnImpl implements Colum
setSqlExpression(sqlExpression);
// Find Table.Column
- int dotIndex = sqlExpression.lastIndexOf(DOT);
+ final int dotIndex = sqlExpression.lastIndexOf(DOT);
if (dotIndex == -1)
{
if (StringUtils.contains(sqlExpression, "*"))
@@ -175,8 +175,8 @@ public class ColumnImpl implements Colum
setColumnName(sqlExpression);
return;
}
- String pre = sqlExpression.substring(0, dotIndex);
- String post = sqlExpression.substring(
+ final String pre = sqlExpression.substring(0, dotIndex);
+ final String post = sqlExpression.substring(
dotIndex + 1,
sqlExpression.length());
if (StringUtils.isBlank(pre))
Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueInstance.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueInstance.java?rev=1879929&r1=1879928&r2=1879929&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueInstance.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueInstance.java Thu Jul 16 07:42:57 2020
@@ -189,8 +189,8 @@ public class TorqueInstance
&& databaseInfoForKeyDefault.getDataSourceFactory() == null)
{
log.debug("Adding the DatasourceFactory and DatabaseAdapter "
- + "from database {} onto database {}",
- defaultDBName, DEFAULT_NAME);
+ + "from database {} onto database {}", () ->
+ defaultDBName, () -> DEFAULT_NAME);
databaseInfoForKeyDefault.setDataSourceFactory(
defaultDatabase.getDataSourceFactory());
databaseInfoForKeyDefault.setAdapter(
Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/BasePeerImpl.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/BasePeerImpl.java?rev=1879929&r1=1879928&r2=1879929&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/BasePeerImpl.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/BasePeerImpl.java Thu Jul 16 07:42:57 2020
@@ -626,7 +626,7 @@ public class BasePeerImpl<T> implements
if (idMethod == IDMethod.ID_BROKER)
{
log.debug("pk does not exist in column map and id method is {}, "
- + "SQL will fail if column has no default value",
+ + "SQL will fail if column has no default value", () ->
idMethod);
// try SQL, maybe database has a default value set
}
Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/LargeSelect.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/LargeSelect.java?rev=1879929&r1=1879928&r2=1879929&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/LargeSelect.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/LargeSelect.java Thu Jul 16 07:42:57 2020
@@ -435,7 +435,7 @@ public class LargeSelect<T> implements R
{
log.debug("getResults(): Sleeping until "
+ "start+size-1 ({}) > currentlyFilledTo ({}) && !queryCompleted (!{})",
- start + size - 1, currentlyFilledTo, queryCompleted);
+ () -> { return start + size - 1; } , () -> currentlyFilledTo, () -> queryCompleted);
while (((start + size - 1) > currentlyFilledTo) && !queryCompleted)
{
try
@@ -455,7 +455,7 @@ public class LargeSelect<T> implements R
{
log.debug("getResults(): Paging backwards as start "
+ "({}) < blockBegin ({}) && start >= 0",
- start, blockBegin);
+ () -> start, () -> blockBegin);
stopQuery();
if (memoryLimit >= 2 * size)
{
@@ -501,7 +501,7 @@ public class LargeSelect<T> implements R
log.debug("getResults(): Retrieving records from results elements "
+ "start-blockBegin ({}) through fromIndex + "
+ "Math.min(size, results.size() - fromIndex) ({})",
- fromIndex, toIndex);
+ () -> fromIndex, () -> toIndex);
List<T> returnResults;
Modified: db/torque/torque4/trunk/torque-templates/pom.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/pom.xml?rev=1879929&r1=1879928&r2=1879929&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/pom.xml (original)
+++ db/torque/torque4/trunk/torque-templates/pom.xml Thu Jul 16 07:42:57 2020
@@ -17,128 +17,131 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.apache.torque</groupId>
- <artifactId>torque</artifactId>
- <version>5.0-SNAPSHOT</version>
- <relativePath>..</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>torque-templates</artifactId>
- <packaging>jar</packaging>
- <name>Torque Templates</name>
-
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/db/torque/torque4/trunk/torque-templates</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/torque/torque4/trunk/torque-templates</developerConnection>
- <url>http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates</url>
- </scm>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.torque</groupId>
- <artifactId>torque-generator</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.torque</groupId>
- <artifactId>torque-runtime</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </dependency>
-
- <!-- Test dependencies -->
- <dependency>
- <groupId>org.xmlunit</groupId>
- <artifactId>xmlunit-core</artifactId>
- <version>2.6.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>10.14.2.0</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter</artifactId>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemProperties>
- <property>
- <name>derby.stream.error.file</name>
- <value>target/derby.log</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
- <configLocation>${basedir}/../src/main/checkstyle/checkstyle.xml</configLocation>
- <headerLocation>${basedir}/../src/main/checkstyle/license-header.txt</headerLocation>
- <suppressionsLocation>${basedir}/../src/main/checkstyle/checkstyle-suppressions.xml</suppressionsLocation>
- <suppressionsFileExpression>checkstyle.suppressions.file</suppressionsFileExpression>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.owasp</groupId>
- <artifactId>dependency-check-maven</artifactId>
- <configuration>
- <suppressionFiles>
- <suppressionFile>${project.parent.basedir}/suppression-owasp-fp.xml</suppressionFile>
- </suppressionFiles>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-
- <profiles>
- <profile>
- <id>apache-release</id>
- <build>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.apache.torque</groupId>
+ <artifactId>torque</artifactId>
+ <version>5.0-SNAPSHOT</version>
+ <relativePath>..</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>torque-templates</artifactId>
+ <packaging>jar</packaging>
+ <name>Torque Templates</name>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/db/torque/torque4/trunk/torque-templates</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/torque/torque4/trunk/torque-templates
+ </developerConnection>
+ <url>http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates</url>
+ </scm>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.torque</groupId>
+ <artifactId>torque-generator</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.torque</groupId>
+ <artifactId>torque-runtime</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </dependency>
+
+ <!-- Test dependencies -->
+ <dependency>
+ <groupId>org.xmlunit</groupId>
+ <artifactId>xmlunit-core</artifactId>
+ <version>2.6.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>10.14.2.0</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+ <build>
<plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>../src/main/assembly/bin-with-dependencies.xml</descriptor>
- </descriptors>
- <appendAssemblyId>false</appendAssemblyId>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemProperties>
+ <property>
+ <name>derby.stream.error.file</name>
+ <value>target/derby.log</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+ <configLocation>${basedir}/../src/main/checkstyle/checkstyle.xml</configLocation>
+ <headerLocation>${basedir}/../src/main/checkstyle/license-header.txt</headerLocation>
+ <suppressionsLocation>${basedir}/../src/main/checkstyle/checkstyle-suppressions.xml
+ </suppressionsLocation>
+ <suppressionsFileExpression>checkstyle.suppressions.file</suppressionsFileExpression>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.owasp</groupId>
+ <artifactId>dependency-check-maven</artifactId>
+ <configuration>
+ <suppressionFiles>
+ <suppressionFile>${project.parent.basedir}/suppression-owasp-fp.xml</suppressionFile>
+ </suppressionFiles>
+ </configuration>
+ </plugin>
</plugins>
- </build>
- </profile>
- </profiles>
+ </build>
+
+
+ <profiles>
+ <profile>
+ <id>apache-release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>../src/main/assembly/bin-with-dependencies.xml</descriptor>
+ </descriptors>
+ <appendAssemblyId>false</appendAssemblyId>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: db/torque/torque4/trunk/torque-test/README.md
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/README.md?rev=1879929&r1=1879928&r2=1879929&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/README.md (original)
+++ db/torque/torque4/trunk/torque-test/README.md Thu Jul 16 07:42:57 2020
@@ -40,7 +40,9 @@ src/test/profile/<database>/
Each database profile is mapped to a Maven profile, but additional maven profiles exist:
-- derbyEmbedded-jenkins: derby profile with default settings. Can only be run from parent project with `mvn -Ptest,derbyEmbedded-jenkins install` because database url is adjusted to this start location
+- derbyEmbedded-jenkins: derby profile with default settings.
+Can only be run from parent project with `mvn -Ptest,derbyEmbedded-jenkins install`
+because database url is adjusted to this start location
- hsqldb-jenkins: see above.
@@ -87,26 +89,40 @@ or instead of mysql replace with postgre
#### Resolving Issues
+- Maven environment
+
+Maven 3.3.9 might need to be upgrade to newest version (testet version 3.6.3).
+
+- Docker environment
+
A successfull connection will result in a message like this
- org.testcontainers.dockerclient.DockerClientProviderStrategy - Found Docker environment with Docker for Windows
+ org.testcontainers.dockerclient.DockerClientProviderStrategy - Found Docker environment with Docker for Windows \
(via TCP port ...)
or
- org.testcontainers.dockerclient.DockerClientProviderStrategy - Found Docker environment with Environment variables,
- system properties and defaults.
+ org.testcontainers.dockerclient.DockerClientProviderStrategy - Found Docker environment with Environment variables, \
+ system properties and defaults. \
Resolved dockerHost=unix:///var/run/docker.sock
If you get
- No <dockerHost> given, no DOCKER_HOST environment variable,
- no read/writable '/var/run/docker.sock' or '//./pipe/docker_engine'
+ No <dockerHost> given, no DOCKER_HOST environment variable, \
+ no read/writable '/var/run/docker.sock' or '//./pipe/docker_engine' \
and no external provider like Docker machine configured
-Docker Desktop (Windows) or docker is not running. If the error still shows up after starting, you may configure and check your system. Provide in **docker-java.properties** DOCKER_HOST or other environment variables.
+Docker Desktop (Windows) or docker is not running. If the error still shows up after starting, you may configure and check your system.
+Provide in **docker-java.properties** DOCKER_HOST or other environment variables.
Find a templates in *src/test<database>/docker-resources/db*.
+If you upgraded a database image, you might get
+
+ {"message":"Conflict. The container name \"/mysql-1\" is already in use by ...
+
+That is the default container is connected to the old image. An option is ti delete the docker container (check with docker ps --all)
+
+ docker rm mysql-1
##### Docker image (Profile docker-textcontainer)
@@ -118,7 +134,8 @@ in folder `src/test/profile/<profile>/do
__Docker-maven-plugin and Docker Testcontainers needs appropriate environment settings__:
-* **Docker-Maven-Plugin** automatically checks the OS system and which URL to use to communicate with the docker daemon. Testcontainers expects [settings][1] in [docker-java.properties][2].
+* **Docker-Maven-Plugin** automatically checks the OS system and which URL to use to communicate with the docker daemon.
+Testcontainers expects [settings][1] in [docker-java.properties][2].
Find the file docker-java.properties in: `src/test/profile/mysql/docker-resources`.
@@ -127,7 +144,8 @@ Find the file docker-java.properties in:
Set it appropriately in `docker-java.properties`. (e.g. activate the daemon without TLS in Windows 10 in Docker Desktop or set it later by using an appropriate (custom) [Docker daemon][3]
in the default folders by creating a `daemon.json` file. You may want to upgrade to wsl2 (native linux kernel), find more information here: [WSL][4].
-* Windows system 7 and below without hyperv may require starting docker using `docker-machine start <id>`, environment check with `docker-machine env <id>` and setting it in shell and testcontainer-settings.
+* Windows system 7 and below without hyperv may require starting docker using `docker-machine start <id>`, environment
+check with `docker-machine env <id>` and setting it in shell and testcontainer-settings.
- Run the tests with profile __docker-testcontainer__ :
@@ -142,7 +160,8 @@ mvn clean test -P mysql,docker-testconta
#### Run test with Docker-Testcontainer
-Change into folder torque-test and check configuration files `testcontainers.properties` and `docker-java.properties` in folder `src/test/profile/postgresql/docker-resources`.
+Change into folder torque-test and check configuration files `testcontainers.properties` and `docker-java.properties`
+in folder `src/test/profile/postgresql/docker-resources`.
Run the tests with: