Skip to content

Commit f7ff863

Browse files
authored
Fix #891 Migrate Micronaut version to 3.2 (#903)
1 parent 3356f0b commit f7ff863

File tree

4 files changed

+22
-8
lines changed

4 files changed

+22
-8
lines changed

bolt-micronaut/pom.xml

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,12 @@
1010
</parent>
1111

1212
<properties>
13-
<!-- TODO: upgrade to v3 -->
14-
<micronaut.version>2.5.12</micronaut.version>
15-
<micronaut-test-junit5.version>2.3.7</micronaut-test-junit5.version>
13+
<micronaut.version>3.2.2</micronaut.version>
14+
<micronaut-test-junit5.version>3.0.5</micronaut-test-junit5.version>
15+
<micronaut-rxjava3.version>2.1.1</micronaut-rxjava3.version>
16+
<!-- Note that upgrading this library breaks other dependency resolution -->
1617
<mockito-all.version>1.10.19</mockito-all.version>
18+
<jakarta.inject.version>2.0.1</jakarta.inject.version>
1719
</properties>
1820

1921
<artifactId>bolt-micronaut</artifactId>
@@ -42,6 +44,12 @@
4244
<version>${project.version}</version>
4345
</dependency>
4446

47+
<!-- https://mvnrepository.com/artifact/jakarta.inject/jakarta.inject-api -->
48+
<dependency>
49+
<groupId>jakarta.inject</groupId>
50+
<artifactId>jakarta.inject-api</artifactId>
51+
<version>${jakarta.inject.version}</version>
52+
</dependency>
4553
<dependency>
4654
<groupId>io.micronaut</groupId>
4755
<artifactId>micronaut-http-server-netty</artifactId>
@@ -54,6 +62,12 @@
5462
<version>${micronaut.version}</version>
5563
<scope>test</scope>
5664
</dependency>
65+
<dependency>
66+
<groupId>io.micronaut.rxjava3</groupId>
67+
<artifactId>micronaut-rxjava3-http-client</artifactId>
68+
<version>${micronaut-rxjava3.version}</version>
69+
<scope>test</scope>
70+
</dependency>
5771
<dependency>
5872
<groupId>io.micronaut.test</groupId>
5973
<artifactId>micronaut-test-junit5</artifactId>

bolt-micronaut/src/main/java/com/slack/api/bolt/micronaut/SlackAppMicronautAdapter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
import io.micronaut.http.HttpStatus;
1111
import io.micronaut.http.MutableHttpResponse;
1212
import io.micronaut.http.server.netty.NettyHttpResponseFactory;
13+
import jakarta.inject.Singleton;
1314
import lombok.extern.slf4j.Slf4j;
1415

15-
import javax.inject.Singleton;
1616
import java.net.InetSocketAddress;
1717
import java.util.Collections;
1818
import java.util.List;

bolt-micronaut/src/test/java/example/app/AppFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import com.slack.api.bolt.App;
77
import com.slack.api.bolt.AppConfig;
88
import io.micronaut.context.annotation.Factory;
9+
import jakarta.inject.Singleton;
910

10-
import javax.inject.Singleton;
1111
import java.io.BufferedReader;
1212
import java.io.IOException;
1313
import java.io.InputStream;

bolt-micronaut/src/test/java/test_locally/app/CommandsTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111
import io.micronaut.http.HttpRequest;
1212
import io.micronaut.http.HttpResponse;
1313
import io.micronaut.http.MutableHttpRequest;
14-
import io.micronaut.http.client.RxHttpClient;
1514
import io.micronaut.http.client.annotation.Client;
1615
import io.micronaut.http.client.exceptions.HttpClientResponseException;
16+
import io.micronaut.rxjava3.http.client.Rx3HttpClient;
1717
import io.micronaut.test.annotation.MockBean;
1818
import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
19+
import jakarta.inject.Inject;
1920
import org.junit.jupiter.api.Assertions;
2021
import org.junit.jupiter.api.Test;
2122

22-
import javax.inject.Inject;
2323
import java.io.IOException;
2424

2525
import static org.mockito.Mockito.*;
@@ -43,7 +43,7 @@ public class CommandsTest {
4343

4444
@Inject
4545
@Client("/")
46-
RxHttpClient client;
46+
Rx3HttpClient client;
4747

4848
String signingSecret = "test";
4949
String botToken = "xoxb-dummy";

0 commit comments

Comments
 (0)