Skip to content

Commit 08797e6

Browse files
pcasaespcasaes
committed
Move RequestContextCoroutineContext to kotlin module
1 parent 67b784b commit 08797e6

File tree

9 files changed

+77
-161
lines changed

9 files changed

+77
-161
lines changed

‎bom/application/pom.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -613,11 +613,6 @@
613613
<artifactId>quarkus-arc</artifactId>
614614
<version>${project.version}</version>
615615
</dependency>
616-
<dependency>
617-
<groupId>io.quarkus</groupId>
618-
<artifactId>quarkus-arc-kotlin</artifactId>
619-
<version>${project.version}</version>
620-
</dependency>
621616
<dependency>
622617
<groupId>io.quarkus</groupId>
623618
<artifactId>quarkus-arc-dev</artifactId>

‎extensions/arc/deployment/pom.xml

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,6 @@
6666
<scope>test</scope>
6767
</dependency>
6868

69-
<dependency>
70-
<groupId>org.jetbrains.kotlinx</groupId>
71-
<artifactId>kotlinx-coroutines-test</artifactId>
72-
<scope>test</scope>
73-
</dependency>
7469
</dependencies>
7570

7671
<build>
@@ -92,33 +87,6 @@
9287
</execution>
9388
</executions>
9489
</plugin>
95-
<plugin>
96-
<groupId>org.jetbrains.kotlin</groupId>
97-
<artifactId>kotlin-maven-plugin</artifactId>
98-
<version>${kotlin.version}</version>
99-
<executions>
100-
<execution>
101-
<id>compile</id>
102-
<goals>
103-
<goal>compile</goal>
104-
</goals>
105-
</execution>
106-
<execution>
107-
<id>test-compile</id>
108-
<goals>
109-
<goal>test-compile</goal>
110-
</goals>
111-
<configuration>
112-
<sourceDirs>
113-
<source>src/test/kotlin</source>
114-
</sourceDirs>
115-
</configuration>
116-
</execution>
117-
</executions>
118-
<configuration>
119-
<jvmTarget>${maven.compiler.target}</jvmTarget>
120-
</configuration>
121-
</plugin>
12290
</plugins>
12391
</build>
12492
</project>

‎extensions/arc/kotlin/pom.xml

Lines changed: 0 additions & 117 deletions
This file was deleted.

‎extensions/arc/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
<packaging>pom</packaging>
1616
<modules>
1717
<module>deployment</module>
18-
<module>kotlin</module>
1918
<module>runtime</module>
2019
<module>test-supplement</module>
2120
<module>test-supplement-decorator</module>

‎extensions/arc/runtime/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@
2222
<groupId>io.quarkus</groupId>
2323
<artifactId>quarkus-core</artifactId>
2424
</dependency>
25-
<dependency>
26-
<groupId>io.quarkus</groupId>
27-
<artifactId>quarkus-arc-kotlin</artifactId>
28-
</dependency>
2925
<dependency>
3026
<groupId>org.eclipse.microprofile.context-propagation</groupId>
3127
<artifactId>microprofile-context-propagation-api</artifactId>

‎extensions/kotlin/deployment/pom.xml

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,30 @@
3333
<artifactId>quarkus-vertx-kotlin-deployment</artifactId>
3434
<optional>true</optional>
3535
</dependency>
36+
37+
<dependency>
38+
<groupId>io.quarkus</groupId>
39+
<artifactId>quarkus-junit5-internal</artifactId>
40+
<scope>test</scope>
41+
</dependency>
42+
43+
<dependency>
44+
<groupId>io.quarkus</groupId>
45+
<artifactId>quarkus-arc-test-supplement</artifactId>
46+
<scope>test</scope>
47+
</dependency>
48+
49+
<dependency>
50+
<groupId>io.quarkus</groupId>
51+
<artifactId>quarkus-arc-test-supplement-decorator</artifactId>
52+
<scope>test</scope>
53+
</dependency>
54+
55+
<dependency>
56+
<groupId>org.jetbrains.kotlinx</groupId>
57+
<artifactId>kotlinx-coroutines-test</artifactId>
58+
<scope>test</scope>
59+
</dependency>
3660
</dependencies>
3761

3862
<build>
@@ -54,6 +78,33 @@
5478
</execution>
5579
</executions>
5680
</plugin>
81+
<plugin>
82+
<groupId>org.jetbrains.kotlin</groupId>
83+
<artifactId>kotlin-maven-plugin</artifactId>
84+
<version>${kotlin.version}</version>
85+
<executions>
86+
<execution>
87+
<id>compile</id>
88+
<goals>
89+
<goal>compile</goal>
90+
</goals>
91+
</execution>
92+
<execution>
93+
<id>test-compile</id>
94+
<goals>
95+
<goal>test-compile</goal>
96+
</goals>
97+
<configuration>
98+
<sourceDirs>
99+
<source>src/test/kotlin</source>
100+
</sourceDirs>
101+
</configuration>
102+
</execution>
103+
</executions>
104+
<configuration>
105+
<jvmTarget>${maven.compiler.target}</jvmTarget>
106+
</configuration>
107+
</plugin>
57108
</plugins>
58109
</build>
59110

‎extensions/arc/deployment/src/test/kotlin/io/quarkus/arc/kotlin/RequestContextCoroutineContextTest.kt renamed to ‎extensions/kotlin/deployment/src/test/kotlin/io/quarkus/kotlin/arc/RequestContextCoroutineContextTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.quarkus.arc.kotlin
1+
package io.quarkus.kotlin.arc
22

33
import io.quarkus.arc.Arc
44
import io.quarkus.test.QuarkusUnitTest

‎extensions/kotlin/runtime/pom.xml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
<name>Quarkus - Kotlin - Runtime</name>
1515
<description>Write your services in Kotlin</description>
1616
<build>
17+
<sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
18+
<testSourceDirectory>${project.basedir}/src/test/kotlin</testSourceDirectory>
1719
<plugins>
1820
<plugin>
1921
<groupId>io.quarkus</groupId>
@@ -30,6 +32,28 @@
3032
</capabilities>
3133
</configuration>
3234
</plugin>
35+
<plugin>
36+
<groupId>org.jetbrains.kotlin</groupId>
37+
<artifactId>kotlin-maven-plugin</artifactId>
38+
<version>${kotlin.version}</version>
39+
<executions>
40+
<execution>
41+
<id>compile</id>
42+
<goals>
43+
<goal>compile</goal>
44+
</goals>
45+
</execution>
46+
<execution>
47+
<id>test-compile</id>
48+
<goals>
49+
<goal>test-compile</goal>
50+
</goals>
51+
</execution>
52+
</executions>
53+
<configuration>
54+
<jvmTarget>${maven.compiler.target}</jvmTarget>
55+
</configuration>
56+
</plugin>
3357
</plugins>
3458
</build>
3559
<dependencies>

‎extensions/arc/kotlin/src/main/kotlin/io/quarkus/arc/kotlin/RequestContextCoroutineContext.kt renamed to ‎extensions/kotlin/runtime/src/main/kotlin/io/quarkus/kotlin/arc/RequestContextCoroutineContext.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.quarkus.arc.kotlin
1+
package io.quarkus.kotlin.arc
22

33
import io.quarkus.arc.Arc
44
import io.quarkus.arc.InjectableContext

0 commit comments

Comments
 (0)