Author: gk
Date: Mon Jan 18 09:58:12 2021
New Revision: 1885642
URL: http://svn.apache.org/viewvc?rev=1885642&view=rev
Log:
- update dependencies due to owasp security failures
- update site ant tutorial
- add missing junit-jupiter dep in maven-plugin + ant
- update docker mysql to 8.0.22 and postgresql to 13.1 in test
Modified:
db/torque/trunk/pom.xml
db/torque/trunk/torque-ant-tasks/pom.xml
db/torque/trunk/torque-generator/pom.xml
db/torque/trunk/torque-maven-plugin/pom.xml
db/torque/trunk/torque-site/src/site/xdoc/documentation/tutorial/orm/step1-ant.xml
db/torque/trunk/torque-test/pom.xml
db/torque/trunk/torque-test/src/test/profile/mysql/docker-resources/db/Dockerfile
db/torque/trunk/torque-test/src/test/profile/postgresql/docker-resources/db/Dockerfile
Modified: db/torque/trunk/pom.xml
URL: http://svn.apache.org/viewvc/db/torque/trunk/pom.xml?rev=1885642&r1=1885641&r2=1885642&view=diff
==============================================================================
--- db/torque/trunk/pom.xml (original)
+++ db/torque/trunk/pom.xml Mon Jan 18 09:58:12 2021
@@ -726,7 +726,7 @@
<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>
+ <log4j2.version>2.14.0</log4j2.version>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
Modified: db/torque/trunk/torque-ant-tasks/pom.xml
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-ant-tasks/pom.xml?rev=1885642&r1=1885641&r2=1885642&view=diff
==============================================================================
--- db/torque/trunk/torque-ant-tasks/pom.xml (original)
+++ db/torque/trunk/torque-ant-tasks/pom.xml Mon Jan 18 09:58:12 2021
@@ -53,7 +53,7 @@
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.10.8</version>
+ <version>1.10.9</version>
<scope>provided</scope>
<exclusions>
<exclusion>
@@ -84,6 +84,11 @@
<version>2.6.2</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
Modified: db/torque/trunk/torque-generator/pom.xml
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/pom.xml?rev=1885642&r1=1885641&r2=1885642&view=diff
==============================================================================
--- db/torque/trunk/torque-generator/pom.xml (original)
+++ db/torque/trunk/torque-generator/pom.xml Mon Jan 18 09:58:12 2021
@@ -98,7 +98,7 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
- <version>3.0.4</version>
+ <version>3.0.7</version>
<type>pom</type>
<exclusions>
<exclusion>
Modified: db/torque/trunk/torque-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-maven-plugin/pom.xml?rev=1885642&r1=1885641&r2=1885642&view=diff
==============================================================================
--- db/torque/trunk/torque-maven-plugin/pom.xml (original)
+++ db/torque/trunk/torque-maven-plugin/pom.xml Mon Jan 18 09:58:12 2021
@@ -58,7 +58,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>27.1-jre</version>
+ <version>30.1-jre</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
@@ -96,6 +96,12 @@
<artifactId>log4j-slf4j-impl</artifactId>
<version>2.13.0</version>
</dependency>
+
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
Modified: db/torque/trunk/torque-site/src/site/xdoc/documentation/tutorial/orm/step1-ant.xml
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-site/src/site/xdoc/documentation/tutorial/orm/step1-ant.xml?rev=1885642&r1=1885641&r2=1885642&view=diff
==============================================================================
--- db/torque/trunk/torque-site/src/site/xdoc/documentation/tutorial/orm/step1-ant.xml (original)
+++ db/torque/trunk/torque-site/src/site/xdoc/documentation/tutorial/orm/step1-ant.xml Mon Jan 18 09:58:12 2021
@@ -68,7 +68,7 @@
<property file="${torque.contextProperties}"/>
<path id="ant-classpath">
- <fileset dir="lib/ant">
+ <fileset dir="libs">
<include name="*.jar"/>
</fileset>
</path>
@@ -207,33 +207,37 @@
</p>
<ul>
<li>
- Create the directory lib/ant in your project.
+ Create the directory <strong>libs</strong> in your project.
</li>
<li>
Download the binary distribution of torque-templates.
- Put all libraries from its lib directory
- plus the torque-templates-${version}.jar from its root directory
- in the lib/ant directory of your project.
+ Put the torque-templates-${version}.jar from its root directory
+ in the libs directory of your project.
</li>
<li>
Download the binary distribution of torque-ant-tasks.
Put the torque-ant-tasks-${version}.jar from its root directory
- in the lib/ant directory of your project.
+ in the libs directory of your project.
</li>
<li>
Download the binary distribution of torque-generator-tasks.
- Put the torque-generator-tasks-${version}.jar from its root directory
- in the lib/ant directory of your project.
- Copy the generator dependencies in direcotry lib from the source repo to lib/ant directory by running this command
+ Put the torque-generator-tasks-${version}.jar from its root directory to the directory of your project containing your dependency libraries ("libs" in this example).
+ </li>
+ <li>
+ Download the <a href="http://www.apache.org/dyn/closer.cgi/db/torque/torque-5.0/">sources</a> and run from the source repo's sub folder
+ <code>cd torque-5.0/torque-generator</code> the following command, which copies all dependencies if Torque Generator to libs.
<code>mvn clean dependency:copy-dependencies -DincludeScope=runtime -DoutputDirectory=libs -DexcludeScope=test</code>)
</li>
<li>To configure Logging (Log4j2) set e.g.
- <code>set ANT_OPTS=-Dlog4j.configurationFile=lib/ant/log4j2.xml</code>
+ <code>set ANT_OPTS=-Dlog4j.configurationFile=libs/log4j2.xml</code>
</li>
<li>
Download the appropriate mysql driver jar, e.g. from
<a href="http://repo1.maven.org/maven2/mysql/mysql-connector-java/">here</a>
- and add the jar to the lib/ant directory of your project.
+ and add the jar to the libs directory of your project.
+ </li>
+ <li>Add any <a href="http://www.apache.org/dyn/closer.cgi/turbine/fulcrum/">Fulcrum dependencies</a>
+ (fulcrum-security-api and fulcrum-security-torque, if you are using <a href="https://turbine.apache.org/">Turbine</a> and references of peer interfaces in the schema.
</li>
</ul>
Modified: db/torque/trunk/torque-test/pom.xml
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-test/pom.xml?rev=1885642&r1=1885641&r2=1885642&view=diff
==============================================================================
--- db/torque/trunk/torque-test/pom.xml (original)
+++ db/torque/trunk/torque-test/pom.xml Mon Jan 18 09:58:12 2021
@@ -53,11 +53,11 @@
<torque.test.derby.version>10.14.2.0</torque.test.derby.version>
<torque.test.hsqldb.version>2.5.1</torque.test.hsqldb.version><!-- 2.5.1 as of june 2020 -->
<torque.test.mssql.version>1.2.7</torque.test.mssql.version>
- <torque.test.mysql.version>8.0.21</torque.test.mysql.version><!-- 5.1.48 -->
+ <torque.test.mysql.version>8.0.22</torque.test.mysql.version><!-- 5.1.48 -->
<torque.test.log4j2.version>2.13.3</torque.test.log4j2.version>
<torque.test.oracle.version>10.2.0.3.0</torque.test.oracle.version>
<torque.test.postgres.jdbc.version>42.2.14</torque.test.postgres.jdbc.version><!-- 9.1-901.jdbc4, -->
- <torque.test.postgres.version>12.3</torque.test.postgres.version>
+ <torque.test.postgres.version>13.1</torque.test.postgres.version>
<torque.test.testcontainer.version>1.14.3</torque.test.testcontainer.version>
<!-- -->
<torque.test.idmethod>native</torque.test.idmethod>
@@ -123,7 +123,7 @@
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
- <version>1.0.8</version>
+ <version>1.0.9</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
Modified: db/torque/trunk/torque-test/src/test/profile/mysql/docker-resources/db/Dockerfile
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-test/src/test/profile/mysql/docker-resources/db/Dockerfile?rev=1885642&r1=1885641&r2=1885642&view=diff
==============================================================================
--- db/torque/trunk/torque-test/src/test/profile/mysql/docker-resources/db/Dockerfile (original)
+++ db/torque/trunk/torque-test/src/test/profile/mysql/docker-resources/db/Dockerfile Mon Jan 18 09:58:12 2021
@@ -15,7 +15,7 @@
# limitations under the License.
#
-FROM mysql:8.0.21
+FROM mysql:8.0.22
COPY ./generated-sql-init /generated-sql-init
# dependent sql should be name sorted after id-table-schema.sql
Modified: db/torque/trunk/torque-test/src/test/profile/postgresql/docker-resources/db/Dockerfile
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-test/src/test/profile/postgresql/docker-resources/db/Dockerfile?rev=1885642&r1=1885641&r2=1885642&view=diff
==============================================================================
--- db/torque/trunk/torque-test/src/test/profile/postgresql/docker-resources/db/Dockerfile (original)
+++ db/torque/trunk/torque-test/src/test/profile/postgresql/docker-resources/db/Dockerfile Mon Jan 18 09:58:12 2021
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-FROM postgres:12.1
+FROM postgres:13.1
COPY ./generated-sql-init /tmp-sql
# dependent sql should be name sorted after id-table-schema.sql
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.