diff --git a/pom.xml b/pom.xml index e7810979..6d76e3dc 100644 --- a/pom.xml +++ b/pom.xml @@ -65,7 +65,7 @@ 11 - 8 + 11 ${java.version} ${java.version} diff --git a/telegrambots-abilities/pom.xml b/telegrambots-abilities/pom.xml index 210a8d79..38e75777 100644 --- a/telegrambots-abilities/pom.xml +++ b/telegrambots-abilities/pom.xml @@ -71,7 +71,7 @@ 11 - 8 + 11 ${java.version} ${java.version} @@ -249,6 +249,13 @@ ${java.version} ${java.version} UTF-8 + + + org.projectlombok + lombok + ${lombok.version} + + diff --git a/telegrambots-abilities/src/main/java/module-info.java b/telegrambots-abilities/src/main/java/module-info.java new file mode 100644 index 00000000..7fc01b49 --- /dev/null +++ b/telegrambots-abilities/src/main/java/module-info.java @@ -0,0 +1,13 @@ +module telegrambots.abilities { + requires telegrambots; + requires telegrambots.meta; + requires com.google.common; + requires org.slf4j; + requires com.fasterxml.jackson.core; + requires com.fasterxml.jackson.databind; + requires mapdb; + requires org.apache.commons.lang3; + requires annotations; + requires org.apache.commons.io; + requires org.json; +} \ No newline at end of file diff --git a/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/util/AbilityUtils.java b/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/util/AbilityUtils.java index 39f0f210..70e1eb95 100644 --- a/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/util/AbilityUtils.java +++ b/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/util/AbilityUtils.java @@ -13,6 +13,7 @@ import java.util.ResourceBundle; import java.util.StringJoiner; import java.util.function.Consumer; import java.util.function.Predicate; +import org.telegram.telegrambots.meta.api.objects.payments.PreCheckoutQuery; import static java.util.ResourceBundle.Control.FORMAT_PROPERTIES; import static java.util.ResourceBundle.Control.getNoFallbackControl; diff --git a/telegrambots-chat-session-bot/pom.xml b/telegrambots-chat-session-bot/pom.xml index fed03b99..d1ce7a2a 100644 --- a/telegrambots-chat-session-bot/pom.xml +++ b/telegrambots-chat-session-bot/pom.xml @@ -71,7 +71,7 @@ 11 - 8 + 11 ${java.version} ${java.version} @@ -240,6 +240,13 @@ ${java.version} ${java.version} UTF-8 + + + org.projectlombok + lombok + ${lombok.version} + + diff --git a/telegrambots-chat-session-bot/src/main/java/module-info.java b/telegrambots-chat-session-bot/src/main/java/module-info.java new file mode 100644 index 00000000..dd4bbd02 --- /dev/null +++ b/telegrambots-chat-session-bot/src/main/java/module-info.java @@ -0,0 +1,5 @@ +module telegrambots.chat.session.bot { + requires shiro.core; + requires telegrambots; + requires telegrambots.meta; +} \ No newline at end of file diff --git a/telegrambots-extensions/pom.xml b/telegrambots-extensions/pom.xml index 2b908aa9..c5ec8bfc 100644 --- a/telegrambots-extensions/pom.xml +++ b/telegrambots-extensions/pom.xml @@ -65,7 +65,7 @@ 11 - 8 + 11 ${java.version} ${java.version} @@ -224,6 +224,13 @@ ${java.version} ${java.version} UTF-8 + + + org.projectlombok + lombok + ${lombok.version} + + diff --git a/telegrambots-extensions/src/main/java/module-info.java b/telegrambots-extensions/src/main/java/module-info.java new file mode 100644 index 00000000..c56878db --- /dev/null +++ b/telegrambots-extensions/src/main/java/module-info.java @@ -0,0 +1,4 @@ +module telegrambotsextensions { + requires telegrambots.meta; + requires telegrambots; +} \ No newline at end of file diff --git a/telegrambots-meta/pom.xml b/telegrambots-meta/pom.xml index 11460de8..9d07e56e 100644 --- a/telegrambots-meta/pom.xml +++ b/telegrambots-meta/pom.xml @@ -65,7 +65,7 @@ 11 - 8 + 11 ${java.version} ${java.version} @@ -247,6 +247,13 @@ ${java.version} ${java.version} UTF-8 + + + org.projectlombok + lombok + ${lombok.version} + + diff --git a/telegrambots-meta/src/main/java/module-info.java b/telegrambots-meta/src/main/java/module-info.java new file mode 100644 index 00000000..b61291c6 --- /dev/null +++ b/telegrambots-meta/src/main/java/module-info.java @@ -0,0 +1,40 @@ +module telegrambots.meta { + exports org.telegram.telegrambots.meta.api.objects; + exports org.telegram.telegrambots.meta; + exports org.telegram.telegrambots.meta.generics; + exports org.telegram.telegrambots.meta.exceptions; + exports org.telegram.telegrambots.meta.api.methods; + exports org.telegram.telegrambots.meta.api.methods.groupadministration; + exports org.telegram.telegrambots.meta.api.methods.send; + exports org.telegram.telegrambots.meta.api.methods.stickers; + exports org.telegram.telegrambots.meta.api.objects.media; + exports org.telegram.telegrambots.meta.api.methods.updatingmessages; + exports org.telegram.telegrambots.meta.api.methods.commands; + exports org.telegram.telegrambots.meta.api.methods.games; + exports org.telegram.telegrambots.meta.api.methods.polls; + exports org.telegram.telegrambots.meta.bots; + exports org.telegram.telegrambots.meta.updateshandlers; + exports org.telegram.telegrambots.meta.api.methods.updates; + exports org.telegram.telegrambots.meta.api.objects.chatmember; + exports org.telegram.telegrambots.meta.api.objects.replykeyboard; + exports org.telegram.telegrambots.meta.api.objects.payments; + exports org.telegram.telegrambots.meta.api.objects.extra; + exports org.telegram.telegrambots.meta.api.objects.commands; + exports org.telegram.telegrambots.meta.api.objects.games; + exports org.telegram.telegrambots.meta.api.objects.inlinequery; + exports org.telegram.telegrambots.meta.api.objects.passport; + exports org.telegram.telegrambots.meta.api.objects.polls; + exports org.telegram.telegrambots.meta.api.objects.stickers; + exports org.telegram.telegrambots.meta.api.objects.voicechat; + exports org.telegram.telegrambots.meta.api.objects.replykeyboard.buttons; + exports org.telegram.telegrambots.meta.api.interfaces; + exports org.telegram.telegrambots.meta.api.objects.inlinequery.inputmessagecontent; + exports org.telegram.telegrambots.meta.api.objects.inlinequery.result; + requires com.google.common; + requires lombok; + requires com.fasterxml.jackson.annotation; + requires com.fasterxml.jackson.core; + requires com.fasterxml.jackson.databind; + requires org.json; + requires org.slf4j; +} \ No newline at end of file diff --git a/telegrambots-spring-boot-starter/pom.xml b/telegrambots-spring-boot-starter/pom.xml index 89e9b0f0..a3c75952 100644 --- a/telegrambots-spring-boot-starter/pom.xml +++ b/telegrambots-spring-boot-starter/pom.xml @@ -65,7 +65,7 @@ 11 - 8 + 11 ${java.version} ${java.version} @@ -258,6 +258,13 @@ ${java.version} ${java.version} UTF-8 + + + org.projectlombok + lombok + ${lombok.version} + + diff --git a/telegrambots-spring-boot-starter/src/main/java/module-info.java b/telegrambots-spring-boot-starter/src/main/java/module-info.java new file mode 100644 index 00000000..16a49197 --- /dev/null +++ b/telegrambots-spring-boot-starter/src/main/java/module-info.java @@ -0,0 +1,8 @@ +module telegrambots.spring.boot.starter { + requires telegrambots.meta; + requires telegrambots; + requires org.slf4j; + requires spring.beans; + requires spring.boot.autoconfigure; + requires spring.context; +} \ No newline at end of file diff --git a/telegrambots/pom.xml b/telegrambots/pom.xml index 4835dbb3..295283c2 100644 --- a/telegrambots/pom.xml +++ b/telegrambots/pom.xml @@ -65,7 +65,7 @@ 11 - 8 + 11 ${java.version} ${java.version} @@ -340,6 +340,13 @@ ${java.version} ${java.version} UTF-8 + + + org.projectlombok + lombok + ${lombok.version} + + diff --git a/telegrambots/src/main/java/module-info.java b/telegrambots/src/main/java/module-info.java new file mode 100644 index 00000000..ec05b8c0 --- /dev/null +++ b/telegrambots/src/main/java/module-info.java @@ -0,0 +1,26 @@ +module telegrambots { + exports org.telegram.telegrambots.bots; + exports org.telegram.telegrambots.updatesreceivers; + exports org.telegram.telegrambots.util; + requires org.apache.httpcomponents.httpclient; + requires org.apache.httpcomponents.httpcore; + requires telegrambots.meta; + requires com.fasterxml.jackson.core; + requires com.fasterxml.jackson.databind; + requires lombok; + requires org.apache.httpcomponents.httpmime; + requires org.apache.commons.io; + requires org.slf4j; + requires org.json; + requires java.ws.rs; + requires grizzly.http.server; + requires grizzly.framework; + requires jersey.container.grizzly2.http; + requires jersey.media.json.jackson; + requires jersey.server; + requires org.apache.commons.compress; + requires jersey.common; + requires java.annotation; + requires com.google.common; + +} \ No newline at end of file