Author: gk Date: Tue Jan 7 10:44:50 2020 New Revision: 1872429 URL: http://svn.apache.org/viewvc?rev=1872429&view=rev Log: - removed log4j2 configuration from runtime - exclude duplicate slf4j-api
Removed: db/torque/torque4/trunk/torque-generator/src/main/resources/org/apache/torque/generator/log4j2.xml Modified: db/torque/torque4/trunk/torque-generator/pom.xml Modified: db/torque/torque4/trunk/torque-generator/pom.xml URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/pom.xml?rev=1872429&r1=1872428&r2=1872429&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/pom.xml (original) +++ db/torque/torque4/trunk/torque-generator/pom.xml Tue Jan 7 10:44:50 2020 @@ -48,6 +48,11 @@ <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> @@ -177,10 +182,10 @@ </dependency> <dependency> - <groupId>org.xmlunit</groupId> - <artifactId>xmlunit-core</artifactId> - <version>2.6.2</version> - <scope>test</scope> + <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> @@ -196,14 +201,15 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.derby</groupId> - <artifactId>derby</artifactId> - <version>10.14.2.0</version> - <scope>test</scope> + <groupId>org.apache.derby</groupId> + <artifactId>derby</artifactId> + <version>10.14.2.0</version> + <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.fulcrum</groupId> - <artifactId>fulcrum-testcontainer</artifactId> + <groupId>org.apache.fulcrum</groupId> + <artifactId>fulcrum-testcontainer</artifactId> + <scope>test</scope> </dependency> </dependencies> --------------------------------------------------------------------- To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org For additional commands, e-mail: torque-dev-h...@db.apache.org