From 2e06a5ceea55e0a8a431a919bc0f6ee3f1348d46 Mon Sep 17 00:00:00 2001
From: Net Wolf UK <netwolfuk@gmail.com>
Date: Sun, 5 Apr 2020 22:45:41 +1200
Subject: [PATCH] Remove plugin hot-reloading as it not compatible with TC2018
 and below

Versions of TeamCity up to and including 2018.1.5 failed to laod the
plugin correctly if the ` allow-runtime-reload="true"` option was
enabled in the `teamcity-plugin.xml` file.

The `teamcity-plugin.xml` is validated against an XML schema, so older
versions of TeamCity fail to validate and load the configuration.

Fixes issue #154
---
 pom.xml                                       |  2 +-
 .../teamcity-plugin.xml                       | 52 +++++++++----------
 .../teamcity-plugin.xml                       | 42 +++++++--------
 3 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/pom.xml b/pom.xml
index e1ae6df1..a3c4fa3b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<groupId>netwolfuk.teamcity.plugins.tcwebhooks</groupId>
 	<artifactId>tcwebhooks</artifactId>
 	<properties>
-    	<majorVersion>1.2.0-alpha.4</majorVersion>
+    	<majorVersion>1.2.0-alpha.5</majorVersion>
     	<buildNumber>snapshot</buildNumber>
     	<gitHash>${GIT_HASH}</gitHash>
     	<gitBranch>${GIT_BRANCH}</gitBranch>    	
diff --git a/tcwebhooks-rest-api/src/main/teamcity-plugin-resources/teamcity-plugin.xml b/tcwebhooks-rest-api/src/main/teamcity-plugin-resources/teamcity-plugin.xml
index d90c0e6f..5c312811 100644
--- a/tcwebhooks-rest-api/src/main/teamcity-plugin-resources/teamcity-plugin.xml
+++ b/tcwebhooks-rest-api/src/main/teamcity-plugin-resources/teamcity-plugin.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<teamcity-plugin xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                 xsi:noNamespaceSchemaLocation="urn:shemas-jetbrains-com:teamcity-plugin-v1-xml">
-  <info>
-    <name>tcWebHooks-rest-api</name>
-    <display-name>Web Hooks REST API (tcWebHooks)</display-name>
-    <version>${majorVersion}</version>
-    <description>REST API for configuring tcWebhooks plugin.
-           This plugin adds support for configuring the tcWebHook Templates feature, with plans to support configuring Webhooks in future.
-        
-    	   - Branch: ${gitBranch}
-    	   - Revision: ${gitHash}
-    	   - Build: ${buildNumber}    	   
-    </description>
-    <download-url>https://github.com/tcplugins/tcWebHooks/releases</download-url>
-    <vendor>
-      <name>Net Wolf</name>
-      <url>http://netwolfuk.wordpress.com/teamcity-plugins/</url>
-    </vendor>
-  </info>
-  <deployment use-separate-classloader="true" allow-runtime-reload="true"/>
-  <dependencies>
-    <plugin name="tcWebHooks"/>
-    <plugin name="rest-api"/>
-  </dependencies>
-</teamcity-plugin>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<teamcity-plugin xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                 xsi:noNamespaceSchemaLocation="urn:shemas-jetbrains-com:teamcity-plugin-v1-xml">
+  <info>
+    <name>tcWebHooks-rest-api</name>
+    <display-name>Web Hooks REST API (tcWebHooks)</display-name>
+    <version>${majorVersion}</version>
+    <description>REST API for configuring tcWebhooks plugin.
+           This plugin adds support for configuring the tcWebHook Templates feature, with plans to support configuring Webhooks in future.
+        
+    	   - Branch: ${gitBranch}
+    	   - Revision: ${gitHash}
+    	   - Build: ${buildNumber}    	   
+    </description>
+    <download-url>https://github.com/tcplugins/tcWebHooks/releases</download-url>
+    <vendor>
+      <name>Net Wolf</name>
+      <url>http://netwolfuk.wordpress.com/teamcity-plugins/</url>
+    </vendor>
+  </info>
+  <deployment use-separate-classloader="true"/>
+  <dependencies>
+    <plugin name="tcWebHooks"/>
+    <plugin name="rest-api"/>
+  </dependencies>
+</teamcity-plugin>
diff --git a/tcwebhooks-web-ui/src/main/teamcity-plugin-resources/teamcity-plugin.xml b/tcwebhooks-web-ui/src/main/teamcity-plugin-resources/teamcity-plugin.xml
index f2b8fd5f..6cd01ec9 100644
--- a/tcwebhooks-web-ui/src/main/teamcity-plugin-resources/teamcity-plugin.xml
+++ b/tcwebhooks-web-ui/src/main/teamcity-plugin-resources/teamcity-plugin.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<teamcity-plugin xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                 xsi:noNamespaceSchemaLocation="urn:shemas-jetbrains-com:teamcity-plugin-v1-xml">
-  <info>
-    <name>tcWebHooks</name>
-    <display-name>Web Hooks (tcWebHooks)</display-name>
-    <version>${majorVersion}</version>
-    <description>Trigger webhook POST requests from build events.
-           This plugin adds new tabs to the Project and Build pages for viewing and configuring WebHook events.
-        
-    	   - Branch: ${gitBranch}
-    	   - Revision: ${gitHash}
-    	   - Build: ${buildNumber}
-    </description>
-    <download-url>https://github.com/tcplugins/tcWebHooks/releases</download-url>
-    <vendor>
-      <name>Net Wolf</name>
-      <url>http://netwolfuk.wordpress.com/teamcity-plugins/</url>
-    </vendor>
-  </info>
-  <deployment use-separate-classloader="true" allow-runtime-reload="true"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<teamcity-plugin xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                 xsi:noNamespaceSchemaLocation="urn:shemas-jetbrains-com:teamcity-plugin-v1-xml">
+  <info>
+    <name>tcWebHooks</name>
+    <display-name>Web Hooks (tcWebHooks)</display-name>
+    <version>${majorVersion}</version>
+    <description>Trigger webhook POST requests from build events.
+           This plugin adds new tabs to the Project and Build pages for viewing and configuring WebHook events.
+        
+    	   - Branch: ${gitBranch}
+    	   - Revision: ${gitHash}
+    	   - Build: ${buildNumber}
+    </description>
+    <download-url>https://github.com/tcplugins/tcWebHooks/releases</download-url>
+    <vendor>
+      <name>Net Wolf</name>
+      <url>http://netwolfuk.wordpress.com/teamcity-plugins/</url>
+    </vendor>
+  </info>
+  <deployment use-separate-classloader="true" />
 </teamcity-plugin>
\ No newline at end of file