Modified: db/torque/torque4/trunk/torque-generator/pom.xml URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/pom.xml?rev=1880632&r1=1880631&r2=1880632&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/pom.xml (original) +++ db/torque/torque4/trunk/torque-generator/pom.xml Thu Aug 6 08:39:53 2020 @@ -1,308 +1,308 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - 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.1-SNAPSHOT</version> - <relativePath>..</relativePath> - </parent> - - <modelVersion>4.0.0</modelVersion> - - <artifactId>torque-generator</artifactId> - <packaging>jar</packaging> - <name>Torque Generator</name> - - <scm> - <connection>scm:svn:http://svn.apache.org/repos/asf/db/torque/torque4/tags/torque-5.0</connection> - <developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/torque/torque4/tags/torque-5.0</developerConnection> - <url>http://svn.apache.org/viewvc/db/torque/torque4/tags/torque-5.0</url> - </scm> - - <dependencies> - <!-- used in org.apache.torque.generator.merge.ThreeWayMerger --> - <dependency> - <groupId>org.eclipse.jgit</groupId> - <artifactId>org.eclipse.jgit</artifactId> - <version>5.1.1.201809181055-r</version> - <exclusions> - <exclusion> - <groupId>com.jcraft</groupId> - <artifactId>jsch</artifactId> - </exclusion> - <!-- already included in newer version in velocity --> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-1.2-api</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - </dependency> - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - </dependency> - <dependency> - <groupId>commons-jxpath</groupId> - <artifactId>commons-jxpath</artifactId> - <version>1.3</version> - </dependency> - <dependency> - <groupId>org.apache.velocity</groupId> - <artifactId>velocity-engine-core</artifactId> - <version>2.0</version> - </dependency> - <!-- 2.5.6: https://nvd.nist.gov/vuln/detail/CVE-2016-6497 Groovy LDAP API - upgrading to at least 2.4.8 due to CVE-2015-3253 and http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-6814 --> - <dependency> - <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-all</artifactId> - <version>3.0.4</version> - <type>pom</type> - <exclusions> - <exclusion> - <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-testng</artifactId> - </exclusion> - <!-- we do not use groovy sql, excluding all which is not needed --> - <exclusion> - <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-sql</artifactId> - </exclusion> - <exclusion> - <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-ant</artifactId> - </exclusion> - <exclusion> - <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-json</artifactId> - </exclusion> - <exclusion> - <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-jmx</artifactId> - </exclusion> - <exclusion> - <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-datetime</artifactId> - </exclusion> - <exclusion> - <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-xml</artifactId> - </exclusion> - <exclusion> - <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-docgenerator</artifactId> - </exclusion> - <exclusion> - <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-test</artifactId> - </exclusion> - <exclusion> - <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-nio</artifactId> - </exclusion> - <exclusion> - <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-macro</artifactId> - </exclusion> - <exclusion> - <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-swing</artifactId> - </exclusion> - <exclusion> - <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-jsr223</artifactId> - </exclusion> - <exclusion> - <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-console</artifactId> - </exclusion> - <exclusion> - <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-servlet</artifactId> - </exclusion> - <exclusion> - <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-groovysh</artifactId> - </exclusion> - <exclusion> - <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-groovydoc</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <!-- - We do not depend on any xerces features. However, the standard - xml parser packaged in java is sometimes buggy (e.g.1.6.0_20 on windows) - so better explicitly use a working parser - --> - <!-- upgrading to 2.12. due to https://nvd.nist.gov/vuln/detail/CVE-2012-0881 --> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - <version>2.12.0</version> - <!-- removed exclusion due to java.lang.NoClassDefFoundError: org/w3c/dom/Element --> - <!--exclusions> - <exclusion> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - </exclusion> - </exclusions--> - </dependency> - - <dependency> - <groupId>org.xmlunit</groupId> - <artifactId>xmlunit-core</artifactId> - <version>2.6.2</version> - <scope>test</scope> - </dependency> - <!-- this is needed for velocity 2.0, it contains slf4j-api --> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j-impl</artifactId> - <version>${log4j2.version}</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <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> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <excludes> - <exclude>BaseTest.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> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <phase>process-test-resources</phase> - <configuration> - <target> - <!-- prepare the PropertyToJavaJarGenerationTest --> - <mkdir dir="${basedir}/target/test/propertyToJavaJar/src/main/torque-gen/src" /> - <copy todir="${basedir}/target/test/propertyToJavaJar/src/main/torque-gen/src"> - <fileset dir="${basedir}/src/test/propertyToJava/src/main/torque-gen/src" /> - </copy> - <jar basedir="${basedir}/src/test/propertyToJava/src/main/torque-gen" destfile="${basedir}/target/test/propertyToJavaJar/src/main/torque-gen/propertyToJava.jar" /> - </target> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </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> - <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> +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + 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-generator</artifactId> + <packaging>jar</packaging> + <name>Torque Generator</name> + + <scm> + <connection>scm:svn:http://svn.apache.org/repos/asf/db/torque/torque4/trunk/torque-generator</connection> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/torque/torque4/trunk/torque-generator</developerConnection> + <url>http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator</url> + </scm> + + <dependencies> + <!-- used in org.apache.torque.generator.merge.ThreeWayMerger --> + <dependency> + <groupId>org.eclipse.jgit</groupId> + <artifactId>org.eclipse.jgit</artifactId> + <version>5.1.1.201809181055-r</version> + <exclusions> + <exclusion> + <groupId>com.jcraft</groupId> + <artifactId>jsch</artifactId> + </exclusion> + <!-- already included in newer version in velocity --> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-1.2-api</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + <dependency> + <groupId>commons-jxpath</groupId> + <artifactId>commons-jxpath</artifactId> + <version>1.3</version> + </dependency> + <dependency> + <groupId>org.apache.velocity</groupId> + <artifactId>velocity-engine-core</artifactId> + <version>2.0</version> + </dependency> + <!-- 2.5.6: https://nvd.nist.gov/vuln/detail/CVE-2016-6497 Groovy LDAP API + upgrading to at least 2.4.8 due to CVE-2015-3253 and http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-6814 --> + <dependency> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-all</artifactId> + <version>3.0.4</version> + <type>pom</type> + <exclusions> + <exclusion> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-testng</artifactId> + </exclusion> + <!-- we do not use groovy sql, excluding all which is not needed --> + <exclusion> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-sql</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-ant</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-json</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-jmx</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-datetime</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-xml</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-docgenerator</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-test</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-nio</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-macro</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-swing</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-jsr223</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-console</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-servlet</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-groovysh</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-groovydoc</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <!-- + We do not depend on any xerces features. However, the standard + xml parser packaged in java is sometimes buggy (e.g.1.6.0_20 on windows) + so better explicitly use a working parser + --> + <!-- upgrading to 2.12. due to https://nvd.nist.gov/vuln/detail/CVE-2012-0881 --> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + <version>2.12.0</version> + <!-- removed exclusion due to java.lang.NoClassDefFoundError: org/w3c/dom/Element --> + <!--exclusions> + <exclusion> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </exclusion> + </exclusions--> + </dependency> + + <dependency> + <groupId>org.xmlunit</groupId> + <artifactId>xmlunit-core</artifactId> + <version>2.6.2</version> + <scope>test</scope> + </dependency> + <!-- this is needed for velocity 2.0, it contains slf4j-api --> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + <version>${log4j2.version}</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <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> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <excludes> + <exclude>BaseTest.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> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <phase>process-test-resources</phase> + <configuration> + <target> + <!-- prepare the PropertyToJavaJarGenerationTest --> + <mkdir dir="${basedir}/target/test/propertyToJavaJar/src/main/torque-gen/src" /> + <copy todir="${basedir}/target/test/propertyToJavaJar/src/main/torque-gen/src"> + <fileset dir="${basedir}/src/test/propertyToJava/src/main/torque-gen/src" /> + </copy> + <jar basedir="${basedir}/src/test/propertyToJava/src/main/torque-gen" destfile="${basedir}/target/test/propertyToJavaJar/src/main/torque-gen/propertyToJava.jar" /> + </target> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </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> + <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-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-maven-plugin/pom.xml?rev=1880632&r1=1880631&r2=1880632&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-maven-plugin/pom.xml (original) +++ db/torque/torque4/trunk/torque-maven-plugin/pom.xml Thu Aug 6 08:39:53 2020 @@ -1,140 +1,140 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - 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.1-SNAPSHOT</version> - <relativePath>..</relativePath> - </parent> - - <modelVersion>4.0.0</modelVersion> - - <artifactId>torque-maven-plugin</artifactId> - <packaging>maven-plugin</packaging> - <name>Torque Generator Maven 2 Plugin</name> - - <scm> - <connection>scm:svn:http://svn.apache.org/repos/asf/db/torque/torque4/tags/torque-5.0</connection> - <developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/torque/torque4/tags/torque-5.0</developerConnection> - <url>http://svn.apache.org/viewvc/db/torque/torque4/tags/torque-5.0</url> - </scm> - - <dependencies> - <dependency> - <groupId>org.apache.torque</groupId> - <artifactId>torque-generator</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-core</artifactId> - <version>${maven.api.version}</version> - <exclusions> - <exclusion> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - </exclusion> - </exclusions> - </dependency> - <!-- exclude from maven-core and add updated transitive dep guava from 20, due to https://nvd.nist.gov/vuln/detail/CVE-2018-10237 --> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - <version>27.1-jre</version> - </dependency> - <dependency> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-annotations</artifactId> - <version>3.6.0</version> - <!-- annotations are not used at runtime because @Retention(value=CLASS), they are needed only to build the plugin --> - <optional>true</optional> - <exclusions> - <exclusion> - <groupId>*</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <!-- - We do not depend on any xerces features. However, the standard - xml parser packaged in java is sometimes buggy (e.g.1.6.0_20 on windows) - so better explicitly use a working parser - --> - <!-- upgrading to 2.12. due to https://nvd.nist.gov/vuln/detail/CVE-2012-0881 --> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - <version>2.12.0</version> - </dependency> - - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j-impl</artifactId> - <version>2.13.0</version> - </dependency> - - </dependencies> - - <build> - <plugins> - <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> - - <reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-plugin-plugin</artifactId> - <version>3.5.2</version> - </plugin> - </plugins> - </reporting> - - <properties> - <maven.api.version>3.5.4</maven.api.version> - </properties> - -</project> +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + 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-maven-plugin</artifactId> + <packaging>maven-plugin</packaging> + <name>Torque Generator Maven 2 Plugin</name> + + <scm> + <connection>scm:svn:http://svn.apache.org/repos/asf/db/torque/torque4/trunk/torque-maven-plugin</connection> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/torque/torque4/trunk/torque-maven-plugin</developerConnection> + <url>http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-maven-plugin</url> + </scm> + + <dependencies> + <dependency> + <groupId>org.apache.torque</groupId> + <artifactId>torque-generator</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-core</artifactId> + <version>${maven.api.version}</version> + <exclusions> + <exclusion> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </exclusion> + </exclusions> + </dependency> + <!-- exclude from maven-core and add updated transitive dep guava from 20, due to https://nvd.nist.gov/vuln/detail/CVE-2018-10237 --> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>27.1-jre</version> + </dependency> + <dependency> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-annotations</artifactId> + <version>3.6.0</version> + <!-- annotations are not used at runtime because @Retention(value=CLASS), they are needed only to build the plugin --> + <optional>true</optional> + <exclusions> + <exclusion> + <groupId>*</groupId> + <artifactId>*</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <!-- + We do not depend on any xerces features. However, the standard + xml parser packaged in java is sometimes buggy (e.g.1.6.0_20 on windows) + so better explicitly use a working parser + --> + <!-- upgrading to 2.12. due to https://nvd.nist.gov/vuln/detail/CVE-2012-0881 --> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + <version>2.12.0</version> + </dependency> + + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + <version>2.13.0</version> + </dependency> + + </dependencies> + + <build> + <plugins> + <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> + + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-plugin-plugin</artifactId> + <version>3.5.2</version> + </plugin> + </plugins> + </reporting> + + <properties> + <maven.api.version>3.5.4</maven.api.version> + </properties> + +</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=1880632&r1=1880631&r2=1880632&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-runtime/pom.xml (original) +++ db/torque/torque4/trunk/torque-runtime/pom.xml Thu Aug 6 08:39:53 2020 @@ -1,190 +1,191 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - 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.1-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/tags/torque-5.0</connection> - <developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/torque/torque4/tags/torque-5.0 - </developerConnection> - <url>http://svn.apache.org/viewvc/db/torque/torque4/tags/torque-5.0</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.apache.logging.log4j</groupId> - <artifactId>log4j-core</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> - <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> - <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> +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + 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.apache.logging.log4j</groupId> + <artifactId>log4j-core</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> + <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> + <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-site/pom.xml URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-site/pom.xml?rev=1880632&r1=1880631&r2=1880632&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-site/pom.xml (original) +++ db/torque/torque4/trunk/torque-site/pom.xml Thu Aug 6 08:39:53 2020 @@ -1,313 +1,313 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - 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.1-SNAPSHOT</version> - <relativePath>..</relativePath> - </parent> - - <modelVersion>4.0.0</modelVersion> - - <artifactId>torque-site</artifactId> - <packaging>pom</packaging> - <name>Torque Site</name> - <!-- prevent the site plugin from converting absolute links to relative ones --> - <url>http://dummy.apache.org</url> - - <properties> - <project.reporting.outputDirectory>${project.build.directory}/site</project.reporting.outputDirectory> - </properties> - - <scm> - <connection>scm:svn:http://svn.apache.org/repos/asf/db/torque/torque4/tags/torque-5.0</connection> - <developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/torque/torque4/tags/torque-5.0</developerConnection> - <url>http://svn.apache.org/viewvc/db/torque/torque4/tags/torque-5.0</url> - </scm> - - <distributionManagement> - <site> - <id>apache.website</id> - <name>Apache DB Torque Site</name> - <!-- endpoint have to exist --> - <url>scm:svn:https://svn.apache.org/repos/infra/websites/production/db/content/torque/torque-5.0</url> - </site> - </distributionManagement> - - <reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-changes-plugin</artifactId> - <reportSets> - <reportSet> - <reports> - <report>jira-report</report> - </reports> - </reportSet> - <reportSet> - <reports> - <report>changes-report</report> - </reports> - <configuration> - <xmlPath>src/changes/old-changes.xml</xmlPath> - </configuration> - </reportSet> - </reportSets> - <configuration> - <fixVersionIds>12312102,12323291,12324114</fixVersionIds> - <columnNames>Type,Key,Summary,Assignee,Status,Resolution,Fix Version</columnNames> - <statusIds>Resolved,Closed</statusIds> - <sortColumnNames>Created DESC,Fix Version DESC</sortColumnNames> - <maxEntries>300</maxEntries> - <useJql>true</useJql> - </configuration> - </plugin> - </plugins> - </reporting> - - <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-site-plugin</artifactId> - <configuration> - <skipDeploy>true</skipDeploy> - </configuration> - </plugin> - </plugins> - </pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>process-other-sites</id> - <phase>pre-site</phase> - <configuration> - <target> - <ant antfile="src/ant/build.xml" target="process-other-sites" /> - </target> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - <execution> - <id>merge-content</id> - <phase>post-site</phase> - <configuration> - <target> - <ant antfile="src/ant/build.xml" target="merge-content" /> - </target> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>xml-maven-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>transform</goal> - </goals> - <phase>site</phase> - </execution> - </executions> - <configuration> - <transformationSets> - <transformationSet> - <dir>target/runtime-site</dir> - <stylesheet>src/site/xslt/body-content.xsl</stylesheet> - <outputDir>target/runtime-site-content</outputDir> - </transformationSet> - <transformationSet> - <dir>target/generator-site</dir> - <stylesheet>src/site/xslt/body-content.xsl</stylesheet> - <outputDir>target/generator-site-content</outputDir> - </transformationSet> - <transformationSet> - <dir>target/templates-site</dir> - <stylesheet>src/site/xslt/body-content.xsl</stylesheet> - <outputDir>target/templates-site-content</outputDir> - </transformationSet> - <transformationSet> - <dir>target/maven-plugin-site</dir> - <stylesheet>src/site/xslt/body-content.xsl</stylesheet> - <outputDir>target/maven-plugin-site-content</outputDir> - </transformationSet> - <transformationSet> - <dir>target/ant-tasks-site</dir> - <stylesheet>src/site/xslt/body-content.xsl</stylesheet> - <outputDir>target/ant-tasks-site-content</outputDir> - </transformationSet> - </transformationSets> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-scm-publish-plugin</artifactId> - <executions> - <execution> - <id>scm-publish</id> - <phase>site-deploy</phase> - <goals> - <goal>publish-scm</goal> - </goals> - <configuration> - <checkoutDirectory>${scmPubCheckoutDirectory}</checkoutDirectory> - <tryUpdate>true</tryUpdate> - <content>${project.build.directory}/site</content> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - - <extensions> - <extension> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-ssh-external</artifactId> - <version>2.2</version> - </extension> - </extensions> - </build> - - <profiles> - <profile> - <id>apache-release</id> - <properties> - <torque.test.profileDirectory>derbyEmbedded</torque.test.profileDirectory> - <torque.test.idmethod>native</torque.test.idmethod> - <torque.test.driver.artifactId>derby</torque.test.driver.artifactId> - <torque.test.driver.groupId>org.apache.derby</torque.test.driver.groupId> - <!--torque.test.driver.version>10.8.2.2</torque.test.driver.version--> - <torque.driver>org.apache.derby.jdbc.EmbeddedDriver</torque.driver> - <torque.targetDatabase>derby</torque.targetDatabase> - <torque.database.url>jdbc:derby:torque-test/target/bookstore;create=true</torque.database.url> - <torque.database.user /> - <torque.database.password /> - <torque.database.shutdown.url>jdbc:derby:torque-test/target/bookstore;shutdown=true</torque.database.shutdown.url> - <torque.database.shutdown.skip>false</torque.database.shutdown.skip> - </properties> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>xml-maven-plugin</artifactId> - <executions> - <execution> - <id>transform-other-sites-for-package</id> - <goals> - <goal>transform</goal> - </goals> - <phase>prepare-package</phase> - <configuration> - <transformationSets> - <transformationSet> - <dir>target/runtime-site</dir> - <stylesheet>src/site/xslt/body-content.xsl</stylesheet> - <outputDir>target/runtime-site-content</outputDir> - </transformationSet> - <transformationSet> - <dir>target/generator-site</dir> - <stylesheet>src/site/xslt/body-content.xsl</stylesheet> - <outputDir>target/generator-site-content</outputDir> - </transformationSet> - <transformationSet> - <dir>target/templates-site</dir> - <stylesheet>src/site/xslt/body-content.xsl</stylesheet> - <outputDir>target/templates-site-content</outputDir> - </transformationSet> - <transformationSet> - <dir>target/maven-plugin-site</dir> - <stylesheet>src/site/xslt/body-content.xsl</stylesheet> - <outputDir>target/maven-plugin-site-content</outputDir> - </transformationSet> - <transformationSet> - <dir>target/ant-tasks-site</dir> - <stylesheet>src/site/xslt/body-content.xsl</stylesheet> - <outputDir>target/ant-tasks-site-content</outputDir> - </transformationSet> - </transformationSets> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>process-other-sites-for-package</id> - <phase>prepare-package</phase> - <configuration> - <target> - <ant antfile="src/ant/build.xml" target="process-other-sites" /> - </target> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - <execution> - <id>merge-content-for-package</id> - <phase>package</phase> - <configuration> - <target> - <ant antfile="src/ant/build.xml" target="merge-content" /> - </target> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <descriptors> - <descriptor>../src/main/assembly/site.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> +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + 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-site</artifactId> + <packaging>pom</packaging> + <name>Torque Site</name> + <!-- prevent the site plugin from converting absolute links to relative ones --> + <url>http://dummy.apache.org</url> + + <properties> + <project.reporting.outputDirectory>${project.build.directory}/site</project.reporting.outputDirectory> + </properties> + + <scm> + <connection>scm:svn:http://svn.apache.org/repos/asf/db/torque/torque4/trunk/torque-site</connection> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/torque/torque4/trunk/torque-site</developerConnection> + <url>http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-site</url> + </scm> + + <distributionManagement> + <site> + <id>apache.website</id> + <name>Apache DB Torque Site</name> + <!-- endpoint have to exist --> + <url>scm:svn:https://svn.apache.org/repos/infra/websites/production/db/content/torque/torque-5.0</url> + </site> + </distributionManagement> + + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-changes-plugin</artifactId> + <reportSets> + <reportSet> + <reports> + <report>jira-report</report> + </reports> + </reportSet> + <reportSet> + <reports> + <report>changes-report</report> + </reports> + <configuration> + <xmlPath>src/changes/old-changes.xml</xmlPath> + </configuration> + </reportSet> + </reportSets> + <configuration> + <fixVersionIds>12312102,12323291,12324114</fixVersionIds> + <columnNames>Type,Key,Summary,Assignee,Status,Resolution,Fix Version</columnNames> + <statusIds>Resolved,Closed</statusIds> + <sortColumnNames>Created DESC,Fix Version DESC</sortColumnNames> + <maxEntries>300</maxEntries> + <useJql>true</useJql> + </configuration> + </plugin> + </plugins> + </reporting> + + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-site-plugin</artifactId> + <configuration> + <skipDeploy>true</skipDeploy> + </configuration> + </plugin> + </plugins> + </pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>process-other-sites</id> + <phase>pre-site</phase> + <configuration> + <target> + <ant antfile="src/ant/build.xml" target="process-other-sites" /> + </target> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + <execution> + <id>merge-content</id> + <phase>post-site</phase> + <configuration> + <target> + <ant antfile="src/ant/build.xml" target="merge-content" /> + </target> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>xml-maven-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>transform</goal> + </goals> + <phase>site</phase> + </execution> + </executions> + <configuration> + <transformationSets> + <transformationSet> + <dir>target/runtime-site</dir> + <stylesheet>src/site/xslt/body-content.xsl</stylesheet> + <outputDir>target/runtime-site-content</outputDir> + </transformationSet> + <transformationSet> + <dir>target/generator-site</dir> + <stylesheet>src/site/xslt/body-content.xsl</stylesheet> + <outputDir>target/generator-site-content</outputDir> + </transformationSet> + <transformationSet> + <dir>target/templates-site</dir> + <stylesheet>src/site/xslt/body-content.xsl</stylesheet> + <outputDir>target/templates-site-content</outputDir> + </transformationSet> + <transformationSet> + <dir>target/maven-plugin-site</dir> + <stylesheet>src/site/xslt/body-content.xsl</stylesheet> + <outputDir>target/maven-plugin-site-content</outputDir> + </transformationSet> + <transformationSet> + <dir>target/ant-tasks-site</dir> + <stylesheet>src/site/xslt/body-content.xsl</stylesheet> + <outputDir>target/ant-tasks-site-content</outputDir> + </transformationSet> + </transformationSets> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-scm-publish-plugin</artifactId> + <executions> + <execution> + <id>scm-publish</id> + <phase>site-deploy</phase> + <goals> + <goal>publish-scm</goal> + </goals> + <configuration> + <checkoutDirectory>${scmPubCheckoutDirectory}</checkoutDirectory> + <tryUpdate>true</tryUpdate> + <content>${project.build.directory}/site</content> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + + <extensions> + <extension> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-ssh-external</artifactId> + <version>2.2</version> + </extension> + </extensions> + </build> + + <profiles> + <profile> + <id>apache-release</id> + <properties> + <torque.test.profileDirectory>derbyEmbedded</torque.test.profileDirectory> + <torque.test.idmethod>native</torque.test.idmethod> + <torque.test.driver.artifactId>derby</torque.test.driver.artifactId> + <torque.test.driver.groupId>org.apache.derby</torque.test.driver.groupId> + <!--torque.test.driver.version>10.8.2.2</torque.test.driver.version--> + <torque.driver>org.apache.derby.jdbc.EmbeddedDriver</torque.driver> + <torque.targetDatabase>derby</torque.targetDatabase> + <torque.database.url>jdbc:derby:torque-test/target/bookstore;create=true</torque.database.url> + <torque.database.user /> + <torque.database.password /> + <torque.database.shutdown.url>jdbc:derby:torque-test/target/bookstore;shutdown=true</torque.database.shutdown.url> + <torque.database.shutdown.skip>false</torque.database.shutdown.skip> + </properties> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>xml-maven-plugin</artifactId> + <executions> + <execution> + <id>transform-other-sites-for-package</id> + <goals> + <goal>transform</goal> + </goals> + <phase>prepare-package</phase> + <configuration> + <transformationSets> + <transformationSet> + <dir>target/runtime-site</dir> + <stylesheet>src/site/xslt/body-content.xsl</stylesheet> + <outputDir>target/runtime-site-content</outputDir> + </transformationSet> + <transformationSet> + <dir>target/generator-site</dir> + <stylesheet>src/site/xslt/body-content.xsl</stylesheet> + <outputDir>target/generator-site-content</outputDir> + </transformationSet> + <transformationSet> + <dir>target/templates-site</dir> + <stylesheet>src/site/xslt/body-content.xsl</stylesheet> + <outputDir>target/templates-site-content</outputDir> + </transformationSet> + <transformationSet> + <dir>target/maven-plugin-site</dir> + <stylesheet>src/site/xslt/body-content.xsl</stylesheet> + <outputDir>target/maven-plugin-site-content</outputDir> + </transformationSet> + <transformationSet> + <dir>target/ant-tasks-site</dir> + <stylesheet>src/site/xslt/body-content.xsl</stylesheet> + <outputDir>target/ant-tasks-site-content</outputDir> + </transformationSet> + </transformationSets> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>process-other-sites-for-package</id> + <phase>prepare-package</phase> + <configuration> + <target> + <ant antfile="src/ant/build.xml" target="process-other-sites" /> + </target> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + <execution> + <id>merge-content-for-package</id> + <phase>package</phase> + <configuration> + <target> + <ant antfile="src/ant/build.xml" target="merge-content" /> + </target> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <descriptors> + <descriptor>../src/main/assembly/site.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-templates/pom.xml URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/pom.xml?rev=1880632&r1=1880631&r2=1880632&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/pom.xml (original) +++ db/torque/torque4/trunk/torque-templates/pom.xml Thu Aug 6 08:39:53 2020 @@ -1,146 +1,147 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - 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.1-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/tags/torque-5.0</connection> - <developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/torque/torque4/tags/torque-5.0 - </developerConnection> - <url>http://svn.apache.org/viewvc/db/torque/torque4/tags/torque-5.0</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> - <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> +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + 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> + <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> --------------------------------------------------------------------- To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org For additional commands, e-mail: torque-dev-h...@db.apache.org