Merge branch 'develop'

korpling · Jun 24, 2015 · 81bcf34 · 81bcf34
2 parents b7fa54a + ff75e96
commit 81bcf34
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -5,6 +5,11 @@
 *	artifactId:		pepper												          *
 *													                              *
 ***********************************************************************************
+Version 2.1.1
+=============
+* this is a bugfix version containing fixes for the plugin mechanism and the logging, which caused LinkageExceptions becuase of a bug in the current logback implementation 
+
+
 Version 2.1.0
 =============
 * a detailed log can be found on github under: https://github.com/korpling/pepper/issues?utf8=%E2%9C%93&q=is%3Aclosed+milestone%3A%22Pepper+2.1+release%22+

diff --git a/pom.xml b/pom.xml
@@ -64,7 +64,7 @@
 		<serviceComponentsTarget>${basedir}/target/classes/OSGI-INF/service-component</serviceComponentsTarget>
 
 		<!-- versions of dependencies -->
-		<salt.version>2.1.1-SNAPSHOT</salt.version>
+		<salt.version>2.1.1</salt.version>
 		<commons-lang3.version>3.3.2</commons-lang3.version>
 		<slf4j.version>1.7.5</slf4j.version>
 		<junit.version>4.11</junit.version>