From 1fdd36c0779e660bbc61c247a158a0795a9cf2c7 Mon Sep 17 00:00:00 2001
From: parautenbach <parautenbach@gmail.com>
Date: Sun, 13 Sep 2015 21:27:20 +0200
Subject: [PATCH] * Bug: HipChat API changed (#59). * Bug: Faulty 0.9.1 release
 that included EMMA instrumented code (#56, #57, #58).

---
 .classpath                                               | 2 +-
 CHANGELOG                                                | 7 +++++++
 README.md                                                | 9 +++++++++
 build.xml                                                | 2 +-
 src/com/whatsthatlight/teamcity/hipchat/HipChatRoom.java | 5 +++++
 teamcity-plugin.xml                                      | 2 +-
 6 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/.classpath b/.classpath
index 229ed3f..2ed491e 100644
--- a/.classpath
+++ b/.classpath
@@ -100,7 +100,7 @@
 	<classpathentry kind="var" path="TEAMCITY_HOME/webapps/ROOT/WEB-INF/lib/packtag-3.8.jar"/>
 	<classpathentry kind="var" path="TEAMCITY_HOME/webapps/ROOT/WEB-INF/lib/patches-impl.jar"/>
 	<classpathentry kind="var" path="TEAMCITY_HOME/webapps/ROOT/WEB-INF/lib/processesTerminator.jar"/>
-	<classpathentry kind="var" path="TEAMCITY_HOME/webapps/ROOT/WEB-INF/lib/quartz-1.6.0.jar"/>
+	<classpathentry kind="var" path="TEAMCITY_HOME/webapps/ROOT/WEB-INF/lib/quartz-1.6.1.jar"/>
 	<classpathentry kind="var" path="TEAMCITY_HOME/webapps/ROOT/WEB-INF/lib/remote-api-impl.jar"/>
 	<classpathentry kind="var" path="TEAMCITY_HOME/webapps/ROOT/WEB-INF/lib/resources_en.jar"/>
 	<classpathentry kind="var" path="TEAMCITY_HOME/webapps/ROOT/WEB-INF/lib/runtime-util.jar"/>
diff --git a/CHANGELOG b/CHANGELOG
index e834943..25f24c4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,11 @@
+Version 0.9.2
+* Bug: HipChat API changed (#59).
+* Bug: Faulty 0.9.1 release that included EMMA instrumented code (#56, #57, #58).
+
 Version 0.9.1
+*WARNING: This release was pulled because of a faulty archive that included EMMA instrumented code. If this version is your only option,
+take the EMMA JAR file from the matching release's tag and put it on the classpath.*
+
 * Bug: Update by Atlassian of the HipChat API broke the retrieval of emoticons (#53).
 
 Version 0.9.0
diff --git a/README.md b/README.md
index cfae782..d3aa63c 100644
--- a/README.md
+++ b/README.md
@@ -13,6 +13,8 @@ directory (as explained by [Jetbrains](http://www.jetbrains.com/teamcity/plugins
 [Visit](http://www.whatsthatlight.com/index.php/projects/teamcity-hipchat-plugin/) my website for more detailled instructions and information.
 
 Compatibility:
+* Release v0.9.2 was tested against TeamCity 9.1.1.
+* Release v0.9.1 was tested against TeamCity 9.0.2, but was pulled because of a faulty archive that included EMMA instrumented code.
 * Release v0.9.0 was tested against TeamCity 9.0.2.
 * Releases v0.8.0 and above was tested against TeamCity 8.1.5.
 * Releases v0.4.4 to v0.7.2 was tested against TeamCity 8.1.1.
@@ -53,7 +55,14 @@ For debugging, add the snippets in [`teamcity-server-log4j.xml`](https://github.
 
 # Change log
 
+## Version 0.9.2
+* Bug: HipChat API changed (#59).
+* Bug: Faulty 0.9.1 release that included EMMA instrumented code (#56, #57, #58).
+
 ## Version 0.9.1
+*WARNING: This release was pulled because of a faulty archive that included EMMA instrumented code. If this version is your only option,
+take the EMMA JAR file from the matching release's tag and put it on the classpath.*
+
 * Bug: Update by Atlassian of the HipChat API broke the retrieval of emoticons (#53).
 
 ## Version 0.9.0
diff --git a/build.xml b/build.xml
index c3bdf86..ad58ebf 100644
--- a/build.xml
+++ b/build.xml
@@ -12,7 +12,7 @@
 	<property name="reports" location="reports"/>
 	<property name="main-class" value="HipChatNotifier"/>
 	<!-- Default to 0.0.0.0 if no version specified -->
-	<condition property="version" value="${env.BUILD_NUMBER}" else="0.9.0">
+	<condition property="version" value="${env.BUILD_NUMBER}" else="0.9.2">
 		<and>
 			<isset property="env.BUILD_NUMBER"/>
 			<not>
diff --git a/src/com/whatsthatlight/teamcity/hipchat/HipChatRoom.java b/src/com/whatsthatlight/teamcity/hipchat/HipChatRoom.java
index 770581c..bfc7f93 100644
--- a/src/com/whatsthatlight/teamcity/hipchat/HipChatRoom.java
+++ b/src/com/whatsthatlight/teamcity/hipchat/HipChatRoom.java
@@ -17,7 +17,9 @@
 package com.whatsthatlight.teamcity.hipchat;
 
 import org.codehaus.jackson.annotate.JsonProperty;
+import org.codehaus.jackson.annotate.JsonIgnoreProperties;
 
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class HipChatRoom {
 	
 	@JsonProperty("id")
@@ -29,6 +31,9 @@ public class HipChatRoom {
 	@JsonProperty("name")
 	public String name;
 	
+	@JsonProperty("version")
+	public String version;
+	
 	public HipChatRoom() {
 		// Intentionally left empty
 	}
diff --git a/teamcity-plugin.xml b/teamcity-plugin.xml
index 98f0616..c32d27c 100644
--- a/teamcity-plugin.xml
+++ b/teamcity-plugin.xml
@@ -5,7 +5,7 @@
     <name>HipChat Notifier</name>
     <display-name>HipChat Notifier</display-name>
     <!-- <description>Some description goes here</description> -->
-    <version>0.9.0</version>
+    <version>0.9.2</version>
     <vendor>
       <name>What's That Light?</name>
       <url>http://www.whatsthatlight.com/</url>