From dbc761ca517e50b013c3fb826c3b81a6d85acdda Mon Sep 17 00:00:00 2001 From: Rubenlagus Date: Sun, 22 May 2016 20:17:52 +0200 Subject: [PATCH] 1. Fix bug --- ...l => Maven__commons_io_commons_io_2_5.xml} | 8 +++---- ...en__mysql_mysql_connector_java_5_1_39.xml} | 8 +++---- ..._bundles_repackaged_jersey_guava_2_23.xml} | 8 +++---- ...s_jersey_container_grizzly2_http_2_23.xml} | 8 +++---- ...ssfish_jersey_core_jersey_client_2_23.xml} | 8 +++---- ...ssfish_jersey_core_jersey_common_2_23.xml} | 8 +++---- ...ssfish_jersey_core_jersey_server_2_23.xml} | 8 +++---- ...rsey_ext_jersey_entity_filtering_2_23.xml} | 8 +++---- ...h_jersey_media_jersey_media_jaxb_2_23.xml} | 8 +++---- ..._media_jersey_media_json_jackson_2_23.xml} | 8 +++---- .../Maven__org_jsoup_jsoup_1_8_3.xml | 13 ----------- .../Maven__org_jsoup_jsoup_1_9_2.xml | 13 +++++++++++ BotAPi.iml | 22 +++++++++---------- pom.xml | 18 --------------- 14 files changed, 64 insertions(+), 82 deletions(-) rename .idea/libraries/{Maven__commons_io_commons_io_2_4.xml => Maven__commons_io_commons_io_2_5.xml} (65%) rename .idea/libraries/{Maven__mysql_mysql_connector_java_5_1_38.xml => Maven__mysql_mysql_connector_java_5_1_39.xml} (57%) rename .idea/libraries/{Maven__org_glassfish_jersey_bundles_repackaged_jersey_guava_2_22_2.xml => Maven__org_glassfish_jersey_bundles_repackaged_jersey_guava_2_23.xml} (60%) rename .idea/libraries/{Maven__org_glassfish_jersey_containers_jersey_container_grizzly2_http_2_22_2.xml => Maven__org_glassfish_jersey_containers_jersey_container_grizzly2_http_2_23.xml} (52%) rename .idea/libraries/{Maven__org_glassfish_jersey_core_jersey_client_2_22_2.xml => Maven__org_glassfish_jersey_core_jersey_client_2_23.xml} (65%) rename .idea/libraries/{Maven__org_glassfish_jersey_core_jersey_common_2_22_2.xml => Maven__org_glassfish_jersey_core_jersey_common_2_23.xml} (65%) rename .idea/libraries/{Maven__org_glassfish_jersey_core_jersey_server_2_22_2.xml => Maven__org_glassfish_jersey_core_jersey_server_2_23.xml} (65%) rename .idea/libraries/{Maven__org_glassfish_jersey_ext_jersey_entity_filtering_2_22_2.xml => Maven__org_glassfish_jersey_ext_jersey_entity_filtering_2_23.xml} (58%) rename .idea/libraries/{Maven__org_glassfish_jersey_media_jersey_media_jaxb_2_22_2.xml => Maven__org_glassfish_jersey_media_jersey_media_jaxb_2_23.xml} (62%) rename .idea/libraries/{Maven__org_glassfish_jersey_media_jersey_media_json_jackson_2_22_2.xml => Maven__org_glassfish_jersey_media_jersey_media_json_jackson_2_23.xml} (56%) delete mode 100644 .idea/libraries/Maven__org_jsoup_jsoup_1_8_3.xml create mode 100644 .idea/libraries/Maven__org_jsoup_jsoup_1_9_2.xml diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_5.xml similarity index 65% rename from .idea/libraries/Maven__commons_io_commons_io_2_4.xml rename to .idea/libraries/Maven__commons_io_commons_io_2_5.xml index bc2aad0..67c2ad2 100644 --- a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml +++ b/.idea/libraries/Maven__commons_io_commons_io_2_5.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_38.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_39.xml similarity index 57% rename from .idea/libraries/Maven__mysql_mysql_connector_java_5_1_38.xml rename to .idea/libraries/Maven__mysql_mysql_connector_java_5_1_39.xml index c648589..18e6ec9 100644 --- a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_38.xml +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_39.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_2.xml b/.idea/libraries/Maven__org_glassfish_jersey_bundles_repackaged_jersey_guava_2_23.xml similarity index 60% rename from .idea/libraries/Maven__org_glassfish_jersey_bundles_repackaged_jersey_guava_2_22_2.xml rename to .idea/libraries/Maven__org_glassfish_jersey_bundles_repackaged_jersey_guava_2_23.xml index 4a0aac2..0922457 100644 --- a/.idea/libraries/Maven__org_glassfish_jersey_bundles_repackaged_jersey_guava_2_22_2.xml +++ b/.idea/libraries/Maven__org_glassfish_jersey_bundles_repackaged_jersey_guava_2_23.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_2.xml b/.idea/libraries/Maven__org_glassfish_jersey_containers_jersey_container_grizzly2_http_2_23.xml similarity index 52% rename from .idea/libraries/Maven__org_glassfish_jersey_containers_jersey_container_grizzly2_http_2_22_2.xml rename to .idea/libraries/Maven__org_glassfish_jersey_containers_jersey_container_grizzly2_http_2_23.xml index 8dea8ef..628f5f8 100644 --- a/.idea/libraries/Maven__org_glassfish_jersey_containers_jersey_container_grizzly2_http_2_22_2.xml +++ b/.idea/libraries/Maven__org_glassfish_jersey_containers_jersey_container_grizzly2_http_2_23.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_2.xml b/.idea/libraries/Maven__org_glassfish_jersey_core_jersey_client_2_23.xml similarity index 65% rename from .idea/libraries/Maven__org_glassfish_jersey_core_jersey_client_2_22_2.xml rename to .idea/libraries/Maven__org_glassfish_jersey_core_jersey_client_2_23.xml index 37260b9..92d3902 100644 --- a/.idea/libraries/Maven__org_glassfish_jersey_core_jersey_client_2_22_2.xml +++ b/.idea/libraries/Maven__org_glassfish_jersey_core_jersey_client_2_23.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_2.xml b/.idea/libraries/Maven__org_glassfish_jersey_core_jersey_common_2_23.xml similarity index 65% rename from .idea/libraries/Maven__org_glassfish_jersey_core_jersey_common_2_22_2.xml rename to .idea/libraries/Maven__org_glassfish_jersey_core_jersey_common_2_23.xml index 5ada064..2801393 100644 --- a/.idea/libraries/Maven__org_glassfish_jersey_core_jersey_common_2_22_2.xml +++ b/.idea/libraries/Maven__org_glassfish_jersey_core_jersey_common_2_23.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_2.xml b/.idea/libraries/Maven__org_glassfish_jersey_core_jersey_server_2_23.xml similarity index 65% rename from .idea/libraries/Maven__org_glassfish_jersey_core_jersey_server_2_22_2.xml rename to .idea/libraries/Maven__org_glassfish_jersey_core_jersey_server_2_23.xml index 04a4246..0d9ef50 100644 --- a/.idea/libraries/Maven__org_glassfish_jersey_core_jersey_server_2_22_2.xml +++ b/.idea/libraries/Maven__org_glassfish_jersey_core_jersey_server_2_23.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_2.xml b/.idea/libraries/Maven__org_glassfish_jersey_ext_jersey_entity_filtering_2_23.xml similarity index 58% rename from .idea/libraries/Maven__org_glassfish_jersey_ext_jersey_entity_filtering_2_22_2.xml rename to .idea/libraries/Maven__org_glassfish_jersey_ext_jersey_entity_filtering_2_23.xml index 3024084..b5a8f8c 100644 --- a/.idea/libraries/Maven__org_glassfish_jersey_ext_jersey_entity_filtering_2_22_2.xml +++ b/.idea/libraries/Maven__org_glassfish_jersey_ext_jersey_entity_filtering_2_23.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_2.xml b/.idea/libraries/Maven__org_glassfish_jersey_media_jersey_media_jaxb_2_23.xml similarity index 62% rename from .idea/libraries/Maven__org_glassfish_jersey_media_jersey_media_jaxb_2_22_2.xml rename to .idea/libraries/Maven__org_glassfish_jersey_media_jersey_media_jaxb_2_23.xml index 8c59a6a..ca88973 100644 --- a/.idea/libraries/Maven__org_glassfish_jersey_media_jersey_media_jaxb_2_22_2.xml +++ b/.idea/libraries/Maven__org_glassfish_jersey_media_jersey_media_jaxb_2_23.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_2.xml b/.idea/libraries/Maven__org_glassfish_jersey_media_jersey_media_json_jackson_2_23.xml similarity index 56% rename from .idea/libraries/Maven__org_glassfish_jersey_media_jersey_media_json_jackson_2_22_2.xml rename to .idea/libraries/Maven__org_glassfish_jersey_media_jersey_media_json_jackson_2_23.xml index 3e399f2..cfdf082 100644 --- a/.idea/libraries/Maven__org_glassfish_jersey_media_jersey_media_json_jackson_2_22_2.xml +++ b/.idea/libraries/Maven__org_glassfish_jersey_media_jersey_media_json_jackson_2_23.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jsoup_jsoup_1_8_3.xml b/.idea/libraries/Maven__org_jsoup_jsoup_1_8_3.xml deleted file mode 100644 index de00ad0..0000000 --- a/.idea/libraries/Maven__org_jsoup_jsoup_1_8_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jsoup_jsoup_1_9_2.xml b/.idea/libraries/Maven__org_jsoup_jsoup_1_9_2.xml new file mode 100644 index 0000000..f38a2fc --- /dev/null +++ b/.idea/libraries/Maven__org_jsoup_jsoup_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/BotAPi.iml b/BotAPi.iml index 448ca73..a9b350a 100644 --- a/BotAPi.iml +++ b/BotAPi.iml @@ -12,27 +12,27 @@ - + - + - + - - - + + + - - + + @@ -49,13 +49,13 @@ - + - - + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 3e004bc..f9ccb4e 100644 --- a/pom.xml +++ b/pom.xml @@ -28,32 +28,14 @@ v2.3.3.1 20160212 5.1.39 - 2.23 - 1.19.1 - - - - org.glassfish.jersey - jersey-bom - ${jersey.version} - pom - import - - - - com.github.rubenlagus TelegramBots ${telegrambots.version} - - org.glassfish.jersey.containers - jersey-container-grizzly2-http - org.json json