diff options
| author | Alexander Marsalek <amarsalek@iaik.tugraz.at> | 2015-03-17 08:31:52 +0100 |
|---|---|---|
| committer | Alexander Marsalek <amarsalek@iaik.tugraz.at> | 2015-03-17 08:31:52 +0100 |
| commit | 0fed62d7df1d29190b7a88233ab77abcbb3349d6 (patch) | |
| tree | a46d8a1d8c0c4a270398ed1c1c9a1e23c26624dc /common/pom.xml | |
| parent | 6b6c98ae7af48c15e86b189e0db9e39bc1d14edb (diff) | |
| parent | c0613b08431899c6d97affc570a237b81dfcda80 (diff) | |
| download | moa-id-spss-0fed62d7df1d29190b7a88233ab77abcbb3349d6.tar.gz moa-id-spss-0fed62d7df1d29190b7a88233ab77abcbb3349d6.tar.bz2 moa-id-spss-0fed62d7df1d29190b7a88233ab77abcbb3349d6.zip | |
Merge branch 'merge' into 2.2.x-STORK-Snapshot
Diffstat (limited to 'common/pom.xml')
| -rw-r--r-- | common/pom.xml | 27 |
1 files changed, 6 insertions, 21 deletions
diff --git a/common/pom.xml b/common/pom.xml index e702c5e66..72cf702bc 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -74,11 +74,6 @@ <artifactId>slf4j-api</artifactId> <version>1.7.10</version> </dependency> -<!-- <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <version>1.7.6</version> - </dependency> --> <dependency> <groupId>org.slf4j</groupId> <artifactId>jcl-over-slf4j</artifactId> @@ -86,28 +81,18 @@ </dependency> <dependency> <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> + <artifactId>jul-to-slf4j</artifactId> <version>1.7.10</version> </dependency> -<!-- <dependency> - <groupId>org.slf4j</groupId> - <artifactId>log4j-over-slf4j</artifactId> - <version>1.7.6</version> - </dependency> --> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>1.7.10</version> + </dependency> <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>1.7.10</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>jul-to-slf4j</artifactId> - <version>1.7.10</version> - </dependency> </dependencies> <build> |