AIRAVATA-2363 Removing slf4j bindings except logback
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/9578e5c3 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/9578e5c3 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/9578e5c3 Branch: refs/heads/develop Commit: 9578e5c3d32d01eb1c455c248275696a6856f430 Parents: ab6d02d Author: Marcus Christie <[email protected]> Authored: Tue Apr 11 11:31:51 2017 -0400 Committer: Marcus Christie <[email protected]> Committed: Tue Apr 11 17:17:25 2017 -0400 ---------------------------------------------------------------------- airavata-api/airavata-api-server/pom.xml | 5 ----- airavata-api/airavata-api-stubs/pom.xml | 5 ----- airavata-api/airavata-data-models/pom.xml | 5 ----- airavata-api/airavata-model-utils/pom.xml | 5 ----- modules/cloud/cloud-provisioning/pom.xml | 5 ----- modules/cluster-monitoring/pom.xml | 4 ---- modules/commons/pom.xml | 4 ---- .../credential-store-service/pom.xml | 4 ---- .../credential-store-stubs/pom.xml | 5 ----- modules/distribution/pom.xml | 17 +++++++++++++++++ modules/gfac/gfac-client/pom.xml | 5 ----- modules/gfac/gfac-service/pom.xml | 5 ----- modules/orchestrator/orchestrator-client/pom.xml | 5 ----- modules/orchestrator/orchestrator-core/pom.xml | 5 ----- modules/orchestrator/orchestrator-service/pom.xml | 5 ----- modules/registry/registry-server/pom.xml | 7 ------- modules/security/pom.xml | 4 ---- modules/server/pom.xml | 4 ---- .../sharing-registry-server/pom.xml | 6 ++++++ 19 files changed, 23 insertions(+), 82 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/9578e5c3/airavata-api/airavata-api-server/pom.xml ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-api-server/pom.xml b/airavata-api/airavata-api-server/pom.xml index 213a638..0d9ea97 100644 --- a/airavata-api/airavata-api-server/pom.xml +++ b/airavata-api/airavata-api-server/pom.xml @@ -99,11 +99,6 @@ <version>${thrift.version}</version> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>${org.slf4j.version}</version> - </dependency> - <dependency> <groupId>org.apache.curator</groupId> <artifactId>curator-framework</artifactId> <version>${curator.version}</version> http://git-wip-us.apache.org/repos/asf/airavata/blob/9578e5c3/airavata-api/airavata-api-stubs/pom.xml ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-api-stubs/pom.xml b/airavata-api/airavata-api-stubs/pom.xml index dc1714a..79d8bb1 100644 --- a/airavata-api/airavata-api-stubs/pom.xml +++ b/airavata-api/airavata-api-stubs/pom.xml @@ -52,11 +52,6 @@ <artifactId>libthrift</artifactId> <version>${thrift.version}</version> </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>${org.slf4j.version}</version> - </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/airavata/blob/9578e5c3/airavata-api/airavata-data-models/pom.xml ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/pom.xml b/airavata-api/airavata-data-models/pom.xml index 26bde47..d03ef52 100644 --- a/airavata-api/airavata-data-models/pom.xml +++ b/airavata-api/airavata-data-models/pom.xml @@ -43,11 +43,6 @@ <artifactId>libthrift</artifactId> <version>${thrift.version}</version> </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>${org.slf4j.version}</version> - </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/airavata/blob/9578e5c3/airavata-api/airavata-model-utils/pom.xml ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-model-utils/pom.xml b/airavata-api/airavata-model-utils/pom.xml index a36ae6e..4e877c1 100644 --- a/airavata-api/airavata-model-utils/pom.xml +++ b/airavata-api/airavata-model-utils/pom.xml @@ -43,11 +43,6 @@ <artifactId>airavata-data-models</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>${org.slf4j.version}</version> - </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/airavata/blob/9578e5c3/modules/cloud/cloud-provisioning/pom.xml ---------------------------------------------------------------------- diff --git a/modules/cloud/cloud-provisioning/pom.xml b/modules/cloud/cloud-provisioning/pom.xml index 7981a10..673e617 100644 --- a/modules/cloud/cloud-provisioning/pom.xml +++ b/modules/cloud/cloud-provisioning/pom.xml @@ -51,11 +51,6 @@ <artifactId>slf4j-api</artifactId> <version>1.7.21</version> </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <version>1.7.21</version> - </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/airavata/blob/9578e5c3/modules/cluster-monitoring/pom.xml ---------------------------------------------------------------------- diff --git a/modules/cluster-monitoring/pom.xml b/modules/cluster-monitoring/pom.xml index 2797b04..a83d38d 100644 --- a/modules/cluster-monitoring/pom.xml +++ b/modules/cluster-monitoring/pom.xml @@ -78,10 +78,6 @@ <artifactId>jcl-over-slf4j</artifactId> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/airavata/blob/9578e5c3/modules/commons/pom.xml ---------------------------------------------------------------------- diff --git a/modules/commons/pom.xml b/modules/commons/pom.xml index 54ca4c7..b00c9ee 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -114,10 +114,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </dependency> - <dependency> <groupId>org.apache.curator</groupId> <artifactId>curator-framework</artifactId> <version>${curator.version}</version> http://git-wip-us.apache.org/repos/asf/airavata/blob/9578e5c3/modules/credential-store/credential-store-service/pom.xml ---------------------------------------------------------------------- diff --git a/modules/credential-store/credential-store-service/pom.xml b/modules/credential-store/credential-store-service/pom.xml index 48602b2..b7e7b2c 100644 --- a/modules/credential-store/credential-store-service/pom.xml +++ b/modules/credential-store/credential-store-service/pom.xml @@ -78,10 +78,6 @@ <!--<version>5.1.34</version>--> <!--</dependency>--> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>4.7</version> http://git-wip-us.apache.org/repos/asf/airavata/blob/9578e5c3/modules/credential-store/credential-store-stubs/pom.xml ---------------------------------------------------------------------- diff --git a/modules/credential-store/credential-store-stubs/pom.xml b/modules/credential-store/credential-store-stubs/pom.xml index 67308f2..6ce97b9 100644 --- a/modules/credential-store/credential-store-stubs/pom.xml +++ b/modules/credential-store/credential-store-stubs/pom.xml @@ -43,11 +43,6 @@ <version>${thrift.version}</version> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>${org.slf4j.version}</version> - </dependency> - <dependency> <groupId>org.apache.airavata</groupId> <artifactId>airavata-commons</artifactId> <version>${project.version}</version> http://git-wip-us.apache.org/repos/asf/airavata/blob/9578e5c3/modules/distribution/pom.xml ---------------------------------------------------------------------- diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index d89bbfc..24d8e88 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -455,6 +455,16 @@ <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper</artifactId> <version>3.4.0</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>commons-cli</groupId> @@ -477,6 +487,7 @@ <artifactId>kafka-clients</artifactId> <version>${kafka-clients.version}</version> </dependency> + <!-- Use logback as the runtime binding for SLF4J --> <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> @@ -508,6 +519,12 @@ <groupId>org.apache.airavata</groupId> <artifactId>airavata-client-samples</artifactId> <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + </exclusions> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/airavata/blob/9578e5c3/modules/gfac/gfac-client/pom.xml ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-client/pom.xml b/modules/gfac/gfac-client/pom.xml index c605a3e..9f98fbd 100644 --- a/modules/gfac/gfac-client/pom.xml +++ b/modules/gfac/gfac-client/pom.xml @@ -42,11 +42,6 @@ <artifactId>libthrift</artifactId> <version>${thrift.version}</version> </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>${org.slf4j.version}</version> - </dependency> <dependency> <groupId>org.apache.airavata</groupId> <artifactId>airavata-data-models</artifactId> http://git-wip-us.apache.org/repos/asf/airavata/blob/9578e5c3/modules/gfac/gfac-service/pom.xml ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-service/pom.xml b/modules/gfac/gfac-service/pom.xml index b879f90..67d0836 100644 --- a/modules/gfac/gfac-service/pom.xml +++ b/modules/gfac/gfac-service/pom.xml @@ -42,11 +42,6 @@ <artifactId>libthrift</artifactId> <version>${thrift.version}</version> </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>${org.slf4j.version}</version> - </dependency> <!--<dependency>--> <!--<groupId>org.apache.airavata</groupId>--> <!--<artifactId>airavata-client-api</artifactId>--> http://git-wip-us.apache.org/repos/asf/airavata/blob/9578e5c3/modules/orchestrator/orchestrator-client/pom.xml ---------------------------------------------------------------------- diff --git a/modules/orchestrator/orchestrator-client/pom.xml b/modules/orchestrator/orchestrator-client/pom.xml index 78abd60..9f7154a 100644 --- a/modules/orchestrator/orchestrator-client/pom.xml +++ b/modules/orchestrator/orchestrator-client/pom.xml @@ -42,11 +42,6 @@ <artifactId>libthrift</artifactId> <version>${thrift.version}</version> </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>${org.slf4j.version}</version> - </dependency> <dependency> <groupId>org.apache.airavata</groupId> <artifactId>airavata-data-models</artifactId> http://git-wip-us.apache.org/repos/asf/airavata/blob/9578e5c3/modules/orchestrator/orchestrator-core/pom.xml ---------------------------------------------------------------------- diff --git a/modules/orchestrator/orchestrator-core/pom.xml b/modules/orchestrator/orchestrator-core/pom.xml index cc4d213..791d27d 100644 --- a/modules/orchestrator/orchestrator-core/pom.xml +++ b/modules/orchestrator/orchestrator-core/pom.xml @@ -37,11 +37,6 @@ <dependencies> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>1.7.5</version> - </dependency> - <dependency> <groupId>org.apache.airavata</groupId> <artifactId>airavata-registry-cpi</artifactId> <version>${project.version}</version> http://git-wip-us.apache.org/repos/asf/airavata/blob/9578e5c3/modules/orchestrator/orchestrator-service/pom.xml ---------------------------------------------------------------------- diff --git a/modules/orchestrator/orchestrator-service/pom.xml b/modules/orchestrator/orchestrator-service/pom.xml index dfcb33f..1f0cac3 100644 --- a/modules/orchestrator/orchestrator-service/pom.xml +++ b/modules/orchestrator/orchestrator-service/pom.xml @@ -48,11 +48,6 @@ <version>${thrift.version}</version> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>${org.slf4j.version}</version> - </dependency> - <dependency> <groupId>org.apache.airavata</groupId> <artifactId>airavata-orchestrator-core</artifactId> <version>${project.version}</version> http://git-wip-us.apache.org/repos/asf/airavata/blob/9578e5c3/modules/registry/registry-server/pom.xml ---------------------------------------------------------------------- diff --git a/modules/registry/registry-server/pom.xml b/modules/registry/registry-server/pom.xml index 4d3555a..39e0cf7 100644 --- a/modules/registry/registry-server/pom.xml +++ b/modules/registry/registry-server/pom.xml @@ -37,13 +37,6 @@ <module>registry-api-service</module> <module>registry-api-stubs</module> </modules> - <dependencies> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>${org.slf4j.version}</version> - </dependency> - </dependencies> </project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata/blob/9578e5c3/modules/security/pom.xml ---------------------------------------------------------------------- diff --git a/modules/security/pom.xml b/modules/security/pom.xml index d0c4d05..92ed231 100644 --- a/modules/security/pom.xml +++ b/modules/security/pom.xml @@ -44,10 +44,6 @@ <artifactId>slf4j-api</artifactId> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - </dependency> - <dependency> <groupId>org.apache.shiro</groupId> <artifactId>shiro-core</artifactId> <version>1.2.1</version> http://git-wip-us.apache.org/repos/asf/airavata/blob/9578e5c3/modules/server/pom.xml ---------------------------------------------------------------------- diff --git a/modules/server/pom.xml b/modules/server/pom.xml index 0602148..0bedd4b 100644 --- a/modules/server/pom.xml +++ b/modules/server/pom.xml @@ -38,10 +38,6 @@ <artifactId>slf4j-api</artifactId> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>4.7</version> http://git-wip-us.apache.org/repos/asf/airavata/blob/9578e5c3/modules/sharing-registry/sharing-registry-server/pom.xml ---------------------------------------------------------------------- diff --git a/modules/sharing-registry/sharing-registry-server/pom.xml b/modules/sharing-registry/sharing-registry-server/pom.xml index 69aa3f0..e6e0f39 100644 --- a/modules/sharing-registry/sharing-registry-server/pom.xml +++ b/modules/sharing-registry/sharing-registry-server/pom.xml @@ -61,6 +61,12 @@ <groupId>net.sf.dozer</groupId> <artifactId>dozer</artifactId> <version>5.4.0</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.openjpa</groupId>
