Bump version to 2.0.11

Includes the pull request from torax242. Makes random sleep in PickGreeting configurable.
SAP · Mar 14, 2017 · abe194a · abe194a
1 parent c31d1f0
commit abe194a
Showing 11 changed files with 27 additions and 21 deletions.
diff --git a/README.md b/README.md
@@ -26,11 +26,11 @@ All in all, you should do the following:
 * pick your favorite logging implementation, and
 * adjust your logging configuration accordingly.
 
-Say, you want to make use of the *servlet filter* feature, then you need to add the following dependency to your POM with property `cf-logging-version` referring to the latest version (currently `2.0.10`):
+Say, you want to make use of the *servlet filter* feature, then you need to add the following dependency to your POM with property `cf-logging-version` referring to the latest version (currently `2.0.11`):
 
 ```xml
 <properties>
-	<cf-logging-version>2.0.10</cf-logging-version>
+	<cf-logging-version>2.0.11</cf-logging-version>
 </properties>
 ```
 

diff --git a/cf-java-logging-support-core/pom.xml b/cf-java-logging-support-core/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>com.sap.hcp.cf.logging</groupId>
     <artifactId>cf-java-logging-support-parent</artifactId>
-    <version>2.0.10</version>
+    <version>2.0.11</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <profiles>

diff --git a/cf-java-logging-support-jersey/pom.xml b/cf-java-logging-support-jersey/pom.xml
@@ -9,7 +9,7 @@
   	<relativePath>../pom.xml</relativePath>
   	<groupId>com.sap.hcp.cf.logging</groupId>
   	<artifactId>cf-java-logging-support-parent</artifactId>
-  	<version>2.0.10</version>
+  	<version>2.0.11</version>
   </parent>
 
   <name>cf-java-logging-support-jersey</name>

diff --git a/cf-java-logging-support-log4j2/pom.xml b/cf-java-logging-support-log4j2/pom.xml
@@ -11,7 +11,7 @@
 		<relativePath>../pom.xml</relativePath>
 		<groupId>com.sap.hcp.cf.logging</groupId>
 		<artifactId>cf-java-logging-support-parent</artifactId>
-		<version>2.0.10</version>
+		<version>2.0.11</version>
 	</parent>
 
 	<properties>

diff --git a/cf-java-logging-support-logback/pom.xml b/cf-java-logging-support-logback/pom.xml
@@ -10,7 +10,7 @@
   	<relativePath>../pom.xml</relativePath>
   	<groupId>com.sap.hcp.cf.logging</groupId>
   	<artifactId>cf-java-logging-support-parent</artifactId>
-  	<version>2.0.10</version>
+  	<version>2.0.11</version>
   </parent>
 
   <properties>

diff --git a/cf-java-logging-support-servlet/pom.xml b/cf-java-logging-support-servlet/pom.xml
@@ -9,7 +9,7 @@
   <parent>
   	<groupId>com.sap.hcp.cf.logging</groupId>
   	<artifactId>cf-java-logging-support-parent</artifactId>
-  	<version>2.0.10</version>
+  	<version>2.0.11</version>
   	<relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>com.sap.hcp.cf.logging</groupId>
   <artifactId>cf-java-logging-support-parent</artifactId>
-  <version>2.0.10</version>
+  <version>2.0.11</version>
   <packaging>pom</packaging>
 
   <name>Cloud Foundry Java logging support components</name>

diff --git a/sample/README.md b/sample/README.md
@@ -6,6 +6,8 @@ A simple CF sample application that we cloned from [cloudfoundry-sticky-session]
 
 Currently configured to use `log4j2` as the logging implementation.
 
+It uses a environment variable `RANDOM_SLEEP` which, when set to `true` will introduce a artificial delay (up to 1 sec). 
+
 ## Running it locally
 
 You can use the following Maven target to run the application locally 

diff --git a/sample/manifest.yml b/sample/manifest.yml
@@ -7,4 +7,6 @@ applications:
   host: logging-sample-app
   instances: 1
   memory: 256M
-  path: target/logging-sample-app-2.0.10.war
+  path: target/logging-sample-app-2.0.11.war
+  env:
+    RANDOM_SLEEP: true
diff --git a/sample/pom.xml b/sample/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.sap.hcp.cf.logging</groupId>
 		<artifactId>cf-java-logging-support-parent</artifactId>
-		<version>2.0.10</version>
+		<version>2.0.11</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
@@ -18,7 +18,7 @@
 		<slf4j.version>1.7.12</slf4j.version>
 		<jersey.version>2.22.2</jersey.version>
 		<javax.ws.version>2.0.1</javax.ws.version>
-		<cf-logging.version>2.0.10</cf-logging.version>
+		<cf-logging.version>2.0.11</cf-logging.version>
 	</properties>
 	<dependencies>
 		<dependency>

diff --git a/sample/src/main/java/com/sap/hcp/cf/sample/PickGreeting.java b/sample/src/main/java/com/sap/hcp/cf/sample/PickGreeting.java
@@ -1,13 +1,14 @@
- package com.sap.hcp.cf.sample;
+package com.sap.hcp.cf.sample;
 
-  import java.util.Random;
+import java.util.Random;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class PickGreeting {
 	private static Random random = new Random();
-
+	private static boolean DO_SLEEP = Boolean.getBoolean("RANDOM_SLEEP");
+
 	private static final String[] GREETINGS = new String[] {
 		"Hello Stranger",
 		"Bonjour!",
@@ -16,15 +17,16 @@ public class PickGreeting {
 		"What a beautiful day!",
 		"\u0c90 \u0ca0"
 	};
-	
+
 	private static final Logger LOGGER = LoggerFactory.getLogger(PickGreeting.class);
-	
+
 	public static String pick() {
-		try {
-			Thread.sleep(random.nextInt(1000));
-		}
-		catch (Exception ex) {
-			LOGGER.error("Thread.sleep() failed", ex); 
+		if (DO_SLEEP) {
+			try {
+				Thread.sleep(random.nextInt(1000));
+			} catch (Exception ex) {
+				LOGGER.error("Thread.sleep() failed", ex);
+			}
 		}
 		String greeting = GREETINGS[random.nextInt(GREETINGS.length)];
 		LOGGER.info("Picked greeting : {}", greeting);