From 29aa2f58f7be36a2d474a66362e3f0520a9c3c74 Mon Sep 17 00:00:00 2001
From: Rubenlagus <rberlopez@gmail.com>
Date: Sat, 2 Apr 2016 18:11:45 +0200
Subject: [PATCH] Merge

---
 .idea/compiler.xml                                        | 8 --------
 ...Maven__org_apache_httpcomponents_httpclient_4_5_2.xml} | 8 ++++----
 ...> Maven__org_apache_httpcomponents_httpcore_4_4_4.xml} | 8 ++++----
 ...> Maven__org_apache_httpcomponents_httpmime_4_5_2.xml} | 8 ++++----
 .idea/misc.xml                                            | 3 ---
 TelegramBots.iml                                          | 8 ++++----
 6 files changed, 16 insertions(+), 27 deletions(-)
 rename .idea/libraries/{Maven__org_apache_httpcomponents_httpclient_4_5_1.xml => Maven__org_apache_httpcomponents_httpclient_4_5_2.xml} (70%)
 rename .idea/libraries/{Maven__org_apache_httpcomponents_httpcore_4_4_3.xml => Maven__org_apache_httpcomponents_httpcore_4_4_4.xml} (61%)
 rename .idea/libraries/{Maven__org_apache_httpcomponents_httpmime_4_5_1.xml => Maven__org_apache_httpcomponents_httpmime_4_5_2.xml} (61%)

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 89d6b111..434b83aa 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -24,17 +24,9 @@
         <processorPath useClasspath="true" />
         <module name="BotAPi" />
       </profile>
-      <profile default="false" name="Annotation profile for TelegramBots" enabled="true">
-        <sourceOutputDir name="target/generated-sources/annotations" />
-        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
-        <outputRelativeToContentRoot value="true" />
-        <processorPath useClasspath="true" />
-        <module name="TelegramBots" />
-      </profile>
     </annotationProcessing>
     <bytecodeTargetLevel target="1.8">
       <module name="BotAPi" target="1.8" />
-      <module name="TelegramBots" target="1.8" />
     </bytecodeTargetLevel>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_1.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_2.xml
similarity index 70%
rename from .idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_1.xml
rename to .idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_2.xml
index 958a9faf..fdb7eada 100644
--- a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_1.xml
+++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_2.xml
@@ -1,13 +1,13 @@
 <component name="libraryTable">
-  <library name="Maven: org.apache.httpcomponents:httpclient:4.5.1">
+  <library name="Maven: org.apache.httpcomponents:httpclient:4.5.2">
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.1/httpclient-4.5.1.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.2/httpclient-4.5.2.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.1/httpclient-4.5.1-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.2/httpclient-4.5.2-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.1/httpclient-4.5.1-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.2/httpclient-4.5.2-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_3.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_4.xml
similarity index 61%
rename from .idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_3.xml
rename to .idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_4.xml
index a9f8d494..3a5aa19c 100644
--- a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_3.xml
+++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_4.xml
@@ -1,13 +1,13 @@
 <component name="libraryTable">
-  <library name="Maven: org.apache.httpcomponents:httpcore:4.4.3">
+  <library name="Maven: org.apache.httpcomponents:httpcore:4.4.4">
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpcore/4.4.3/httpcore-4.4.3.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpcore/4.4.4/httpcore-4.4.4.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpcore/4.4.3/httpcore-4.4.3-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpcore/4.4.4/httpcore-4.4.4-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpcore/4.4.3/httpcore-4.4.3-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpcore/4.4.4/httpcore-4.4.4-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpmime_4_5_1.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpmime_4_5_2.xml
similarity index 61%
rename from .idea/libraries/Maven__org_apache_httpcomponents_httpmime_4_5_1.xml
rename to .idea/libraries/Maven__org_apache_httpcomponents_httpmime_4_5_2.xml
index 793e63d6..4b2025af 100644
--- a/.idea/libraries/Maven__org_apache_httpcomponents_httpmime_4_5_1.xml
+++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpmime_4_5_2.xml
@@ -1,13 +1,13 @@
 <component name="libraryTable">
-  <library name="Maven: org.apache.httpcomponents:httpmime:4.5.1">
+  <library name="Maven: org.apache.httpcomponents:httpmime:4.5.2">
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpmime/4.5.1/httpmime-4.5.1.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpmime/4.5.2/httpmime-4.5.2.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpmime/4.5.1/httpmime-4.5.1-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpmime/4.5.2/httpmime-4.5.2-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpmime/4.5.1/httpmime-4.5.1-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpmime/4.5.2/httpmime-4.5.2-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index f46d96ae..3bb9901e 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -50,9 +50,6 @@
     <option vars="true" />
     <option white="true" />
   </component>
-  <component name="JnetxGlobalBuildDir">
-    <option name="globalBuildDir" value="$PROJECT_DIR$/../TelegramBots\build" />
-  </component>
   <component name="JsBowerSettings">
     <exe-path>/usr/local/bin/bower</exe-path>
     <config-path />
diff --git a/TelegramBots.iml b/TelegramBots.iml
index 292848d5..f0d376fb 100644
--- a/TelegramBots.iml
+++ b/TelegramBots.iml
@@ -9,7 +9,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="jdk" jdkName="1.8.0_45" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Maven: org.glassfish.jersey.containers:jersey-container-grizzly2-http:2.22.1" level="project" />
     <orderEntry type="library" name="Maven: org.glassfish.hk2.external:javax.inject:2.4.0-b31" level="project" />
@@ -48,10 +48,10 @@
     <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:3.0.1" level="project" />
     <orderEntry type="library" name="Maven: com.sun.jersey:jersey-servlet:1.19" level="project" />
     <orderEntry type="library" name="Maven: org.json:json:20151123" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.4" level="project" />
     <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
     <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.9" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.2" level="project" />
   </component>
 </module>
\ No newline at end of file