You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ss...@apache.org on 2014/03/18 14:51:05 UTC
[1/2] git commit: upgrade slf4j and logback
Repository: marmotta
Updated Branches:
refs/heads/develop 73d80e0c5 -> 34b70b23e
upgrade slf4j and logback
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/2697461e
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/2697461e
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/2697461e
Branch: refs/heads/develop
Commit: 2697461e6d7ed6560328cd2801599a8897e87334
Parents: 0290056
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Tue Mar 18 14:47:58 2014 +0100
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Tue Mar 18 14:47:58 2014 +0100
----------------------------------------------------------------------
parent/pom.xml | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/2697461e/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index cb10321..8fbe641 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -774,42 +774,42 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.5</version>
+ <version>1.7.6</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-ext</artifactId>
- <version>1.7.5</version>
+ <version>1.7.6</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
- <version>1.7.5</version>
+ <version>1.7.6</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
- <version>1.7.5</version>
+ <version>1.7.6</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
- <version>1.7.5</version>
+ <version>1.7.6</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
- <version>1.7.5</version>
+ <version>1.7.6</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
- <version>1.1.0</version>
+ <version>1.1.1</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>1.1.0</version>
+ <version>1.1.1</version>
</dependency>
<dependency>
<groupId>ch.qos.cal10n</groupId>
[2/2] git commit: Merge remote-tracking branch 'origin/develop' into
develop
Posted by ss...@apache.org.
Merge remote-tracking branch 'origin/develop' into develop
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/34b70b23
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/34b70b23
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/34b70b23
Branch: refs/heads/develop
Commit: 34b70b23ed9ff49198e0e29651e5967246db68f9
Parents: 2697461 73d80e0
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Tue Mar 18 14:51:00 2014 +0100
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Tue Mar 18 14:51:00 2014 +0100
----------------------------------------------------------------------
.../maven/plugins/refpack/RefPackMojo.java | 4 ++--
launchers/marmotta-installer/pom.xml | 7 -------
.../src/main/resources/installer/standalone.xml | 1 -
launchers/marmotta-webapp/assembly.xml | 8 +-------
launchers/marmotta-webapp/pom.xml | 17 ++++++++++-------
parent/pom.xml | 2 ++
6 files changed, 15 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/34b70b23/parent/pom.xml
----------------------------------------------------------------------