dependencies scope cleanup, bridged logging to SLF
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/29c640e8 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/29c640e8 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/29c640e8 Branch: refs/heads/master Commit: 29c640e8c027373a77cebb068fbf8414104de116 Parents: c0c1c5a Author: Andrus Adamchik <and...@objectstyle.com> Authored: Sun Dec 11 20:02:00 2016 +0300 Committer: Andrus Adamchik <and...@objectstyle.com> Committed: Sun Dec 11 20:03:20 2016 +0300 ---------------------------------------------------------------------- cayenne-joda/pom.xml | 18 +++++++- cayenne-tools/pom.xml | 111 +++++++++++++++++++++++++-------------------- 2 files changed, 80 insertions(+), 49 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/29c640e8/cayenne-joda/pom.xml ---------------------------------------------------------------------- diff --git a/cayenne-joda/pom.xml b/cayenne-joda/pom.xml index 009ea2d..3f2fbe8 100644 --- a/cayenne-joda/pom.xml +++ b/cayenne-joda/pom.xml @@ -45,11 +45,12 @@ <groupId>org.apache.cayenne</groupId> <artifactId>cayenne-server</artifactId> <version>${project.version}</version> + <scope>compile</scope> </dependency> - <dependency> <groupId>joda-time</groupId> <artifactId>joda-time</artifactId> + <scope>compile</scope> </dependency> <!-- Test dependencies --> @@ -74,6 +75,21 @@ <artifactId>hsqldb</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <scope>test</scope> + </dependency> </dependencies> <build> <plugins> http://git-wip-us.apache.org/repos/asf/cayenne/blob/29c640e8/cayenne-tools/pom.xml ---------------------------------------------------------------------- diff --git a/cayenne-tools/pom.xml b/cayenne-tools/pom.xml index eb9a6e7..fb48cb3 100644 --- a/cayenne-tools/pom.xml +++ b/cayenne-tools/pom.xml @@ -31,88 +31,103 @@ <packaging>jar</packaging> <name>cayenne-tools: Cayenne Tools</name> <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - <dependency> - <groupId>org.apache.cayenne</groupId> - <artifactId>cayenne-server</artifactId> - <version>${project.version}</version> - <scope>test</scope> - <type>test-jar</type> - </dependency> - <dependency> - <groupId>org.apache.cayenne</groupId> - <artifactId>cayenne-dbsync</artifactId> - <version>${project.version}</version> - <scope>test</scope> - <type>test-jar</type> - </dependency> - - <dependency> - <groupId>org.apache.cayenne.build-tools</groupId> - <artifactId>cayenne-test-utilities</artifactId> - <version>${project.version}</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant</artifactId> - </dependency> + <!-- Compile Dependencies --> <dependency> <groupId>org.apache.ant</groupId> - <artifactId>ant-testutil</artifactId> - <version>1.9.4</version> - <scope>test</scope> + <artifactId>ant</artifactId> + <scope>compile</scope> </dependency> - <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> + <scope>compile</scope> </dependency> - <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> + <scope>compile</scope> </dependency> - <dependency> <groupId>org.apache.velocity</groupId> <artifactId>velocity</artifactId> - </dependency> - + <scope>compile</scope> + </dependency> <dependency> <groupId>org.apache.cayenne</groupId> <artifactId>cayenne-server</artifactId> <version>${project.version}</version> + <scope>compile</scope> </dependency> - <dependency> <groupId>org.apache.cayenne</groupId> <artifactId>cayenne-project</artifactId> <version>${project.version}</version> + <scope>compile</scope> </dependency> - <dependency> <groupId>org.apache.cayenne</groupId> <artifactId>cayenne-dbsync</artifactId> <version>${project.version}</version> <scope>compile</scope> </dependency> - <dependency> <groupId>foundrylogic.vpp</groupId> <artifactId>vpp</artifactId> + <scope>compile</scope> </dependency> + <!-- Test Dependencies --> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.cayenne</groupId> + <artifactId>cayenne-server</artifactId> + <version>${project.version}</version> + <scope>test</scope> + <type>test-jar</type> + </dependency> + <dependency> + <groupId>org.apache.cayenne</groupId> + <artifactId>cayenne-dbsync</artifactId> + <version>${project.version}</version> + <scope>test</scope> + <type>test-jar</type> + </dependency> + <dependency> + <groupId>org.apache.cayenne.build-tools</groupId> + <artifactId>cayenne-test-utilities</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-all</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant-testutil</artifactId> + <version>1.9.4</version> + <scope>test</scope> + </dependency> <dependency> <groupId>org.apache.derby</groupId> <artifactId>derby</artifactId> @@ -128,7 +143,7 @@ <build> <plugins> - <!-- This ensures LICESNE and NOTICE inclusion in all jars --> + <!-- This ensures LICENSE and NOTICE inclusion in all jars --> <plugin> <artifactId>maven-remote-resources-plugin</artifactId> <executions>
