From 7cba7a6609f1e32be1785f375799982f54c93888 Mon Sep 17 00:00:00 2001 From: Rubenlagu Date: Tue, 12 Apr 2016 20:20:00 +0200 Subject: [PATCH] 1. Update dependencies --- ...github_rubenlagus_TelegramBots_v2_0_1.xml} | 8 ++-- ...__com_sun_jersey_jersey_bundle_1_19_1.xml} | 8 ++-- ...en__com_sun_jersey_jersey_core_1_19_1.xml} | 8 ++-- ..._com_sun_jersey_jersey_grizzly2_1_19_1.xml | 13 +++++ ...jersey_jersey_grizzly2_servlet_1_19_1.xml} | 8 ++-- ...__com_sun_jersey_jersey_server_1_19_1.xml} | 8 ++-- ...en__com_sun_jersey_jersey_servlet_1_19.xml | 13 ----- ..._com_sun_jersey_jersey_servlet_1_19_1.xml} | 8 ++-- ...pache_httpcomponents_httpclient_4_5_2.xml} | 8 ++-- ..._apache_httpcomponents_httpcore_4_4_4.xml} | 8 ++-- ..._apache_httpcomponents_httpmime_4_5_2.xml} | 8 ++-- ...rnal_aopalliance_repackaged_2_4_0_b34.xml} | 8 ++-- ...h_hk2_external_javax_inject_2_4_0_b34.xml} | 8 ++-- ...__org_glassfish_hk2_hk2_api_2_4_0_b34.xml} | 8 ++-- ...g_glassfish_hk2_hk2_locator_2_4_0_b34.xml} | 8 ++-- ...org_glassfish_hk2_hk2_utils_2_4_0_b34.xml} | 8 ++-- ...undles_repackaged_jersey_guava_2_22_2.xml} | 8 ++-- ...jersey_container_grizzly2_http_2_22_2.xml} | 8 ++-- ...fish_jersey_core_jersey_client_2_22_2.xml} | 8 ++-- ...fish_jersey_core_jersey_common_2_22_2.xml} | 8 ++-- ...fish_jersey_core_jersey_server_2_22_2.xml} | 8 ++-- ...ey_ext_jersey_entity_filtering_2_22_2.xml} | 8 ++-- ...jersey_media_jersey_media_jaxb_2_22_2.xml} | 8 ++-- ...edia_jersey_media_json_jackson_2_22_2.xml} | 8 ++-- .../Maven__org_json_json_20151123.xml | 13 ----- .../Maven__org_json_json_20160212.xml | 13 +++++ BotAPi.iml | 48 +++++++++---------- pom.xml | 17 ++++--- 28 files changed, 148 insertions(+), 145 deletions(-) rename .idea/libraries/{Maven__com_github_rubenlagus_TelegramBots_v2_0.xml => Maven__com_github_rubenlagus_TelegramBots_v2_0_1.xml} (56%) rename .idea/libraries/{Maven__com_sun_jersey_jersey_bundle_1_19.xml => Maven__com_sun_jersey_jersey_bundle_1_19_1.xml} (59%) rename .idea/libraries/{Maven__com_sun_jersey_jersey_server_1_19.xml => Maven__com_sun_jersey_jersey_core_1_19_1.xml} (60%) create mode 100644 .idea/libraries/Maven__com_sun_jersey_jersey_grizzly2_1_19_1.xml rename .idea/libraries/{Maven__com_sun_jersey_jersey_grizzly2_servlet_1_19.xml => Maven__com_sun_jersey_jersey_grizzly2_servlet_1_19_1.xml} (62%) rename .idea/libraries/{Maven__com_sun_jersey_jersey_core_1_19.xml => Maven__com_sun_jersey_jersey_server_1_19_1.xml} (59%) delete mode 100644 .idea/libraries/Maven__com_sun_jersey_jersey_servlet_1_19.xml rename .idea/libraries/{Maven__com_sun_jersey_jersey_grizzly2_1_19.xml => Maven__com_sun_jersey_jersey_servlet_1_19_1.xml} (58%) rename .idea/libraries/{Maven__org_apache_httpcomponents_httpclient_4_5_1.xml => Maven__org_apache_httpcomponents_httpclient_4_5_2.xml} (68%) rename .idea/libraries/{Maven__org_apache_httpcomponents_httpcore_4_4_3.xml => Maven__org_apache_httpcomponents_httpcore_4_4_4.xml} (59%) rename .idea/libraries/{Maven__org_apache_httpcomponents_httpmime_4_5_1.xml => Maven__org_apache_httpcomponents_httpmime_4_5_2.xml} (59%) rename .idea/libraries/{Maven__org_glassfish_hk2_external_aopalliance_repackaged_2_4_0_b31.xml => Maven__org_glassfish_hk2_external_aopalliance_repackaged_2_4_0_b34.xml} (56%) rename .idea/libraries/{Maven__org_glassfish_hk2_external_javax_inject_2_4_0_b31.xml => Maven__org_glassfish_hk2_external_javax_inject_2_4_0_b34.xml} (65%) rename .idea/libraries/{Maven__org_glassfish_hk2_hk2_api_2_4_0_b31.xml => Maven__org_glassfish_hk2_hk2_api_2_4_0_b34.xml} (60%) rename .idea/libraries/{Maven__org_glassfish_hk2_hk2_locator_2_4_0_b31.xml => Maven__org_glassfish_hk2_hk2_locator_2_4_0_b34.xml} (57%) rename .idea/libraries/{Maven__org_glassfish_hk2_hk2_utils_2_4_0_b31.xml => Maven__org_glassfish_hk2_hk2_utils_2_4_0_b34.xml} (58%) rename .idea/libraries/{Maven__org_glassfish_jersey_bundles_repackaged_jersey_guava_2_22_1.xml => Maven__org_glassfish_jersey_bundles_repackaged_jersey_guava_2_22_2.xml} (64%) rename .idea/libraries/{Maven__org_glassfish_jersey_containers_jersey_container_grizzly2_http_2_22_1.xml => Maven__org_glassfish_jersey_containers_jersey_container_grizzly2_http_2_22_2.xml} (52%) rename .idea/libraries/{Maven__org_glassfish_jersey_core_jersey_client_2_22_1.xml => Maven__org_glassfish_jersey_core_jersey_client_2_22_2.xml} (65%) rename .idea/libraries/{Maven__org_glassfish_jersey_core_jersey_common_2_22_1.xml => Maven__org_glassfish_jersey_core_jersey_common_2_22_2.xml} (65%) rename .idea/libraries/{Maven__org_glassfish_jersey_core_jersey_server_2_22_1.xml => Maven__org_glassfish_jersey_core_jersey_server_2_22_2.xml} (65%) rename .idea/libraries/{Maven__org_glassfish_jersey_ext_jersey_entity_filtering_2_22_1.xml => Maven__org_glassfish_jersey_ext_jersey_entity_filtering_2_22_2.xml} (66%) rename .idea/libraries/{Maven__org_glassfish_jersey_media_jersey_media_jaxb_2_22_1.xml => Maven__org_glassfish_jersey_media_jersey_media_jaxb_2_22_2.xml} (65%) rename .idea/libraries/{Maven__org_glassfish_jersey_media_jersey_media_json_jackson_2_22_1.xml => Maven__org_glassfish_jersey_media_jersey_media_json_jackson_2_22_2.xml} (56%) delete mode 100644 .idea/libraries/Maven__org_json_json_20151123.xml create mode 100644 .idea/libraries/Maven__org_json_json_20160212.xml diff --git a/.idea/libraries/Maven__com_github_rubenlagus_TelegramBots_v2_0.xml b/.idea/libraries/Maven__com_github_rubenlagus_TelegramBots_v2_0_1.xml similarity index 56% rename from .idea/libraries/Maven__com_github_rubenlagus_TelegramBots_v2_0.xml rename to .idea/libraries/Maven__com_github_rubenlagus_TelegramBots_v2_0_1.xml index 0e1725b..d693438 100644 --- a/.idea/libraries/Maven__com_github_rubenlagus_TelegramBots_v2_0.xml +++ b/.idea/libraries/Maven__com_github_rubenlagus_TelegramBots_v2_0_1.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_sun_jersey_jersey_bundle_1_19.xml b/.idea/libraries/Maven__com_sun_jersey_jersey_bundle_1_19_1.xml similarity index 59% rename from .idea/libraries/Maven__com_sun_jersey_jersey_bundle_1_19.xml rename to .idea/libraries/Maven__com_sun_jersey_jersey_bundle_1_19_1.xml index 015dbda..4d626a6 100644 --- a/.idea/libraries/Maven__com_sun_jersey_jersey_bundle_1_19.xml +++ b/.idea/libraries/Maven__com_sun_jersey_jersey_bundle_1_19_1.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_sun_jersey_jersey_server_1_19.xml b/.idea/libraries/Maven__com_sun_jersey_jersey_core_1_19_1.xml similarity index 60% rename from .idea/libraries/Maven__com_sun_jersey_jersey_server_1_19.xml rename to .idea/libraries/Maven__com_sun_jersey_jersey_core_1_19_1.xml index 47f74e7..91d65b2 100644 --- a/.idea/libraries/Maven__com_sun_jersey_jersey_server_1_19.xml +++ b/.idea/libraries/Maven__com_sun_jersey_jersey_core_1_19_1.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_sun_jersey_jersey_grizzly2_1_19_1.xml b/.idea/libraries/Maven__com_sun_jersey_jersey_grizzly2_1_19_1.xml new file mode 100644 index 0000000..ec38da5 --- /dev/null +++ b/.idea/libraries/Maven__com_sun_jersey_jersey_grizzly2_1_19_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_sun_jersey_jersey_grizzly2_servlet_1_19.xml b/.idea/libraries/Maven__com_sun_jersey_jersey_grizzly2_servlet_1_19_1.xml similarity index 62% rename from .idea/libraries/Maven__com_sun_jersey_jersey_grizzly2_servlet_1_19.xml rename to .idea/libraries/Maven__com_sun_jersey_jersey_grizzly2_servlet_1_19_1.xml index 2f3fb72..e61c7cb 100644 --- a/.idea/libraries/Maven__com_sun_jersey_jersey_grizzly2_servlet_1_19.xml +++ b/.idea/libraries/Maven__com_sun_jersey_jersey_grizzly2_servlet_1_19_1.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_sun_jersey_jersey_core_1_19.xml b/.idea/libraries/Maven__com_sun_jersey_jersey_server_1_19_1.xml similarity index 59% rename from .idea/libraries/Maven__com_sun_jersey_jersey_core_1_19.xml rename to .idea/libraries/Maven__com_sun_jersey_jersey_server_1_19_1.xml index 3ac29b2..b4ad3de 100644 --- a/.idea/libraries/Maven__com_sun_jersey_jersey_core_1_19.xml +++ b/.idea/libraries/Maven__com_sun_jersey_jersey_server_1_19_1.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_sun_jersey_jersey_servlet_1_19.xml b/.idea/libraries/Maven__com_sun_jersey_jersey_servlet_1_19.xml deleted file mode 100644 index 882f842..0000000 --- a/.idea/libraries/Maven__com_sun_jersey_jersey_servlet_1_19.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_sun_jersey_jersey_grizzly2_1_19.xml b/.idea/libraries/Maven__com_sun_jersey_jersey_servlet_1_19_1.xml similarity index 58% rename from .idea/libraries/Maven__com_sun_jersey_jersey_grizzly2_1_19.xml rename to .idea/libraries/Maven__com_sun_jersey_jersey_servlet_1_19_1.xml index 8734ae4..943df5a 100644 --- a/.idea/libraries/Maven__com_sun_jersey_jersey_grizzly2_1_19.xml +++ b/.idea/libraries/Maven__com_sun_jersey_jersey_servlet_1_19_1.xml @@ -1,13 +1,13 @@ - + - + - + - + \ 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 68% 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 958a9fa..fdb7ead 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 @@ - + - + - + - + \ 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 59% 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 a9f8d49..3a5aa19 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 @@ - + - + - + - + \ 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 59% 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 793e63d..4b2025a 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 @@ - + - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_glassfish_hk2_external_aopalliance_repackaged_2_4_0_b31.xml b/.idea/libraries/Maven__org_glassfish_hk2_external_aopalliance_repackaged_2_4_0_b34.xml similarity index 56% rename from .idea/libraries/Maven__org_glassfish_hk2_external_aopalliance_repackaged_2_4_0_b31.xml rename to .idea/libraries/Maven__org_glassfish_hk2_external_aopalliance_repackaged_2_4_0_b34.xml index 874c890..1908e81 100644 --- a/.idea/libraries/Maven__org_glassfish_hk2_external_aopalliance_repackaged_2_4_0_b31.xml +++ b/.idea/libraries/Maven__org_glassfish_hk2_external_aopalliance_repackaged_2_4_0_b34.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_glassfish_hk2_external_javax_inject_2_4_0_b31.xml b/.idea/libraries/Maven__org_glassfish_hk2_external_javax_inject_2_4_0_b34.xml similarity index 65% rename from .idea/libraries/Maven__org_glassfish_hk2_external_javax_inject_2_4_0_b31.xml rename to .idea/libraries/Maven__org_glassfish_hk2_external_javax_inject_2_4_0_b34.xml index 87ed334..8ef6daa 100644 --- a/.idea/libraries/Maven__org_glassfish_hk2_external_javax_inject_2_4_0_b31.xml +++ b/.idea/libraries/Maven__org_glassfish_hk2_external_javax_inject_2_4_0_b34.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_glassfish_hk2_hk2_api_2_4_0_b31.xml b/.idea/libraries/Maven__org_glassfish_hk2_hk2_api_2_4_0_b34.xml similarity index 60% rename from .idea/libraries/Maven__org_glassfish_hk2_hk2_api_2_4_0_b31.xml rename to .idea/libraries/Maven__org_glassfish_hk2_hk2_api_2_4_0_b34.xml index 14746f4..97dd43f 100644 --- a/.idea/libraries/Maven__org_glassfish_hk2_hk2_api_2_4_0_b31.xml +++ b/.idea/libraries/Maven__org_glassfish_hk2_hk2_api_2_4_0_b34.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_glassfish_hk2_hk2_locator_2_4_0_b31.xml b/.idea/libraries/Maven__org_glassfish_hk2_hk2_locator_2_4_0_b34.xml similarity index 57% rename from .idea/libraries/Maven__org_glassfish_hk2_hk2_locator_2_4_0_b31.xml rename to .idea/libraries/Maven__org_glassfish_hk2_hk2_locator_2_4_0_b34.xml index e57e76f..e15594e 100644 --- a/.idea/libraries/Maven__org_glassfish_hk2_hk2_locator_2_4_0_b31.xml +++ b/.idea/libraries/Maven__org_glassfish_hk2_hk2_locator_2_4_0_b34.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_glassfish_hk2_hk2_utils_2_4_0_b31.xml b/.idea/libraries/Maven__org_glassfish_hk2_hk2_utils_2_4_0_b34.xml similarity index 58% rename from .idea/libraries/Maven__org_glassfish_hk2_hk2_utils_2_4_0_b31.xml rename to .idea/libraries/Maven__org_glassfish_hk2_hk2_utils_2_4_0_b34.xml index e99f973..00ca710 100644 --- a/.idea/libraries/Maven__org_glassfish_hk2_hk2_utils_2_4_0_b31.xml +++ b/.idea/libraries/Maven__org_glassfish_hk2_hk2_utils_2_4_0_b34.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_glassfish_jersey_bundles_repackaged_jersey_guava_2_22_1.xml b/.idea/libraries/Maven__org_glassfish_jersey_bundles_repackaged_jersey_guava_2_22_2.xml similarity index 64% rename from .idea/libraries/Maven__org_glassfish_jersey_bundles_repackaged_jersey_guava_2_22_1.xml rename to .idea/libraries/Maven__org_glassfish_jersey_bundles_repackaged_jersey_guava_2_22_2.xml index 3836fa4..4a0aac2 100644 --- a/.idea/libraries/Maven__org_glassfish_jersey_bundles_repackaged_jersey_guava_2_22_1.xml +++ b/.idea/libraries/Maven__org_glassfish_jersey_bundles_repackaged_jersey_guava_2_22_2.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_glassfish_jersey_containers_jersey_container_grizzly2_http_2_22_1.xml b/.idea/libraries/Maven__org_glassfish_jersey_containers_jersey_container_grizzly2_http_2_22_2.xml similarity index 52% rename from .idea/libraries/Maven__org_glassfish_jersey_containers_jersey_container_grizzly2_http_2_22_1.xml rename to .idea/libraries/Maven__org_glassfish_jersey_containers_jersey_container_grizzly2_http_2_22_2.xml index cd470f3..8dea8ef 100644 --- a/.idea/libraries/Maven__org_glassfish_jersey_containers_jersey_container_grizzly2_http_2_22_1.xml +++ b/.idea/libraries/Maven__org_glassfish_jersey_containers_jersey_container_grizzly2_http_2_22_2.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_glassfish_jersey_core_jersey_client_2_22_1.xml b/.idea/libraries/Maven__org_glassfish_jersey_core_jersey_client_2_22_2.xml similarity index 65% rename from .idea/libraries/Maven__org_glassfish_jersey_core_jersey_client_2_22_1.xml rename to .idea/libraries/Maven__org_glassfish_jersey_core_jersey_client_2_22_2.xml index d9aea91..37260b9 100644 --- a/.idea/libraries/Maven__org_glassfish_jersey_core_jersey_client_2_22_1.xml +++ b/.idea/libraries/Maven__org_glassfish_jersey_core_jersey_client_2_22_2.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_glassfish_jersey_core_jersey_common_2_22_1.xml b/.idea/libraries/Maven__org_glassfish_jersey_core_jersey_common_2_22_2.xml similarity index 65% rename from .idea/libraries/Maven__org_glassfish_jersey_core_jersey_common_2_22_1.xml rename to .idea/libraries/Maven__org_glassfish_jersey_core_jersey_common_2_22_2.xml index beb58fe..5ada064 100644 --- a/.idea/libraries/Maven__org_glassfish_jersey_core_jersey_common_2_22_1.xml +++ b/.idea/libraries/Maven__org_glassfish_jersey_core_jersey_common_2_22_2.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_glassfish_jersey_core_jersey_server_2_22_1.xml b/.idea/libraries/Maven__org_glassfish_jersey_core_jersey_server_2_22_2.xml similarity index 65% rename from .idea/libraries/Maven__org_glassfish_jersey_core_jersey_server_2_22_1.xml rename to .idea/libraries/Maven__org_glassfish_jersey_core_jersey_server_2_22_2.xml index c069857..04a4246 100644 --- a/.idea/libraries/Maven__org_glassfish_jersey_core_jersey_server_2_22_1.xml +++ b/.idea/libraries/Maven__org_glassfish_jersey_core_jersey_server_2_22_2.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_glassfish_jersey_ext_jersey_entity_filtering_2_22_1.xml b/.idea/libraries/Maven__org_glassfish_jersey_ext_jersey_entity_filtering_2_22_2.xml similarity index 66% rename from .idea/libraries/Maven__org_glassfish_jersey_ext_jersey_entity_filtering_2_22_1.xml rename to .idea/libraries/Maven__org_glassfish_jersey_ext_jersey_entity_filtering_2_22_2.xml index 3d6acfa..3024084 100644 --- a/.idea/libraries/Maven__org_glassfish_jersey_ext_jersey_entity_filtering_2_22_1.xml +++ b/.idea/libraries/Maven__org_glassfish_jersey_ext_jersey_entity_filtering_2_22_2.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_glassfish_jersey_media_jersey_media_jaxb_2_22_1.xml b/.idea/libraries/Maven__org_glassfish_jersey_media_jersey_media_jaxb_2_22_2.xml similarity index 65% rename from .idea/libraries/Maven__org_glassfish_jersey_media_jersey_media_jaxb_2_22_1.xml rename to .idea/libraries/Maven__org_glassfish_jersey_media_jersey_media_jaxb_2_22_2.xml index e3cc3ce..8c59a6a 100644 --- a/.idea/libraries/Maven__org_glassfish_jersey_media_jersey_media_jaxb_2_22_1.xml +++ b/.idea/libraries/Maven__org_glassfish_jersey_media_jersey_media_jaxb_2_22_2.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_glassfish_jersey_media_jersey_media_json_jackson_2_22_1.xml b/.idea/libraries/Maven__org_glassfish_jersey_media_jersey_media_json_jackson_2_22_2.xml similarity index 56% rename from .idea/libraries/Maven__org_glassfish_jersey_media_jersey_media_json_jackson_2_22_1.xml rename to .idea/libraries/Maven__org_glassfish_jersey_media_jersey_media_json_jackson_2_22_2.xml index 17b61a1..3e399f2 100644 --- a/.idea/libraries/Maven__org_glassfish_jersey_media_jersey_media_json_jackson_2_22_1.xml +++ b/.idea/libraries/Maven__org_glassfish_jersey_media_jersey_media_json_jackson_2_22_2.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_json_json_20151123.xml b/.idea/libraries/Maven__org_json_json_20151123.xml deleted file mode 100644 index 324279d..0000000 --- a/.idea/libraries/Maven__org_json_json_20151123.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_json_json_20160212.xml b/.idea/libraries/Maven__org_json_json_20160212.xml new file mode 100644 index 0000000..44a278c --- /dev/null +++ b/.idea/libraries/Maven__org_json_json_20160212.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/BotAPi.iml b/BotAPi.iml index cf87285..00e0570 100644 --- a/BotAPi.iml +++ b/BotAPi.iml @@ -11,50 +11,50 @@ - - - + + + - + - - - - - + + + + + - - - + + + - - + + - + - + - - - + + + - - + + - - + + - + diff --git a/pom.xml b/pom.xml index 4171ced..0ee3e44 100644 --- a/pom.xml +++ b/pom.xml @@ -24,9 +24,12 @@ UTF-8 UTF-8 - 2.22.1 - 4.5.1 - v2.0 + 2.22.2 + 1.19.1 + 4.5.2 + v2.0.1 + 20160212 + 5.1.38 @@ -59,17 +62,17 @@ com.sun.jersey jersey-bundle - 1.19 + ${jerseyengine.version} com.sun.jersey jersey-grizzly2-servlet - 1.19 + ${jerseyengine.version} org.json json - 20151123 + ${json.version} commons-io @@ -89,7 +92,7 @@ mysql mysql-connector-java - 5.1.38 + ${mysql.version} org.jsoup