Skip to content

Commit 5131067

Browse files
aloubyanskyaloubyansky
authored
Merge pull request quarkusio#45053 from phillip-kruger/dev-only-deps
Introduce Dev only module for relevant extensions
2 parents 119f8eb + dbf8e8b commit 5131067

File tree

219 files changed

+1108
-300
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

219 files changed

+1108
-300
lines changed

‎bom/application/pom.xml‎

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -587,6 +587,11 @@
587587
<artifactId>quarkus-arc</artifactId>
588588
<version>${project.version}</version>
589589
</dependency>
590+
<dependency>
591+
<groupId>io.quarkus</groupId>
592+
<artifactId>quarkus-arc-dev</artifactId>
593+
<version>${project.version}</version>
594+
</dependency>
590595
<dependency>
591596
<groupId>io.quarkus</groupId>
592597
<artifactId>quarkus-arc-deployment</artifactId>
@@ -789,6 +794,11 @@
789794
<artifactId>quarkus-datasource</artifactId>
790795
<version>${project.version}</version>
791796
</dependency>
797+
<dependency>
798+
<groupId>io.quarkus</groupId>
799+
<artifactId>quarkus-datasource-dev</artifactId>
800+
<version>${project.version}</version>
801+
</dependency>
792802
<dependency>
793803
<groupId>io.quarkus</groupId>
794804
<artifactId>quarkus-datasource-deployment</artifactId>
@@ -944,6 +954,11 @@
944954
<artifactId>quarkus-oidc</artifactId>
945955
<version>${project.version}</version>
946956
</dependency>
957+
<dependency>
958+
<groupId>io.quarkus</groupId>
959+
<artifactId>quarkus-oidc-dev</artifactId>
960+
<version>${project.version}</version>
961+
</dependency>
947962
<dependency>
948963
<groupId>io.quarkus</groupId>
949964
<artifactId>quarkus-test-oidc-server</artifactId>
@@ -1129,6 +1144,11 @@
11291144
<artifactId>quarkus-flyway</artifactId>
11301145
<version>${project.version}</version>
11311146
</dependency>
1147+
<dependency>
1148+
<groupId>io.quarkus</groupId>
1149+
<artifactId>quarkus-flyway-dev</artifactId>
1150+
<version>${project.version}</version>
1151+
</dependency>
11321152
<dependency>
11331153
<groupId>io.quarkus</groupId>
11341154
<artifactId>quarkus-flyway-deployment</artifactId>
@@ -1204,6 +1224,11 @@
12041224
<artifactId>quarkus-liquibase</artifactId>
12051225
<version>${project.version}</version>
12061226
</dependency>
1227+
<dependency>
1228+
<groupId>io.quarkus</groupId>
1229+
<artifactId>quarkus-liquibase-dev</artifactId>
1230+
<version>${project.version}</version>
1231+
</dependency>
12071232
<dependency>
12081233
<groupId>io.quarkus</groupId>
12091234
<artifactId>quarkus-liquibase-deployment</artifactId>
@@ -1474,6 +1499,11 @@
14741499
<artifactId>quarkus-infinispan-client</artifactId>
14751500
<version>${project.version}</version>
14761501
</dependency>
1502+
<dependency>
1503+
<groupId>io.quarkus</groupId>
1504+
<artifactId>quarkus-infinispan-client-dev</artifactId>
1505+
<version>${project.version}</version>
1506+
</dependency>
14771507
<dependency>
14781508
<groupId>io.quarkus</groupId>
14791509
<artifactId>quarkus-infinispan-client-deployment</artifactId>
@@ -1579,6 +1609,11 @@
15791609
<artifactId>quarkus-kafka-client</artifactId>
15801610
<version>${project.version}</version>
15811611
</dependency>
1612+
<dependency>
1613+
<groupId>io.quarkus</groupId>
1614+
<artifactId>quarkus-kafka-client-dev</artifactId>
1615+
<version>${project.version}</version>
1616+
</dependency>
15821617
<dependency>
15831618
<groupId>io.quarkus</groupId>
15841619
<artifactId>quarkus-kafka-client-deployment</artifactId>
@@ -1589,6 +1624,11 @@
15891624
<artifactId>quarkus-kafka-streams</artifactId>
15901625
<version>${project.version}</version>
15911626
</dependency>
1627+
<dependency>
1628+
<groupId>io.quarkus</groupId>
1629+
<artifactId>quarkus-kafka-streams-dev</artifactId>
1630+
<version>${project.version}</version>
1631+
</dependency>
15921632
<dependency>
15931633
<groupId>io.quarkus</groupId>
15941634
<artifactId>quarkus-kafka-streams-deployment</artifactId>
@@ -1759,6 +1799,11 @@
17591799
<artifactId>quarkus-messaging</artifactId>
17601800
<version>${project.version}</version>
17611801
</dependency>
1802+
<dependency>
1803+
<groupId>io.quarkus</groupId>
1804+
<artifactId>quarkus-messaging-dev</artifactId>
1805+
<version>${project.version}</version>
1806+
</dependency>
17621807
<dependency>
17631808
<groupId>io.quarkus</groupId>
17641809
<artifactId>quarkus-messaging-kotlin</artifactId>
@@ -1814,6 +1859,11 @@
18141859
<artifactId>quarkus-messaging-rabbitmq</artifactId>
18151860
<version>${project.version}</version>
18161861
</dependency>
1862+
<dependency>
1863+
<groupId>io.quarkus</groupId>
1864+
<artifactId>quarkus-messaging-rabbitmq-dev</artifactId>
1865+
<version>${project.version}</version>
1866+
</dependency>
18171867
<dependency>
18181868
<groupId>io.quarkus</groupId>
18191869
<artifactId>quarkus-messaging-rabbitmq-deployment</artifactId>
@@ -2066,6 +2116,11 @@
20662116
<artifactId>quarkus-smallrye-fault-tolerance</artifactId>
20672117
<version>${project.version}</version>
20682118
</dependency>
2119+
<dependency>
2120+
<groupId>io.quarkus</groupId>
2121+
<artifactId>quarkus-smallrye-fault-tolerance-dev</artifactId>
2122+
<version>${project.version}</version>
2123+
</dependency>
20692124
<dependency>
20702125
<groupId>io.quarkus</groupId>
20712126
<artifactId>quarkus-smallrye-fault-tolerance-deployment</artifactId>
@@ -2121,6 +2176,11 @@
21212176
<artifactId>quarkus-vertx-http</artifactId>
21222177
<version>${project.version}</version>
21232178
</dependency>
2179+
<dependency>
2180+
<groupId>io.quarkus</groupId>
2181+
<artifactId>quarkus-vertx-http-dev</artifactId>
2182+
<version>${project.version}</version>
2183+
</dependency>
21242184
<dependency>
21252185
<groupId>io.quarkus</groupId>
21262186
<artifactId>quarkus-vertx-http-dev-console-spi</artifactId>
@@ -2268,6 +2328,11 @@
22682328
</exclusion>
22692329
</exclusions>
22702330
</dependency>
2331+
<dependency>
2332+
<groupId>io.quarkus</groupId>
2333+
<artifactId>quarkus-grpc-dev</artifactId>
2334+
<version>${project.version}</version>
2335+
</dependency>
22712336
<dependency>
22722337
<groupId>io.quarkus</groupId>
22732338
<artifactId>quarkus-grpc-xds</artifactId>
@@ -2349,6 +2414,11 @@
23492414
<artifactId>quarkus-websockets-next</artifactId>
23502415
<version>${project.version}</version>
23512416
</dependency>
2417+
<dependency>
2418+
<groupId>io.quarkus</groupId>
2419+
<artifactId>quarkus-websockets-next-dev</artifactId>
2420+
<version>${project.version}</version>
2421+
</dependency>
23522422
<dependency>
23532423
<groupId>io.quarkus</groupId>
23542424
<artifactId>quarkus-websockets-next-deployment</artifactId>
@@ -2394,6 +2464,11 @@
23942464
<artifactId>quarkus-scheduler</artifactId>
23952465
<version>${project.version}</version>
23962466
</dependency>
2467+
<dependency>
2468+
<groupId>io.quarkus</groupId>
2469+
<artifactId>quarkus-scheduler-dev</artifactId>
2470+
<version>${project.version}</version>
2471+
</dependency>
23972472
<dependency>
23982473
<groupId>io.quarkus</groupId>
23992474
<artifactId>quarkus-scheduler-deployment</artifactId>
@@ -2674,6 +2749,11 @@
26742749
<artifactId>quarkus-rest</artifactId>
26752750
<version>${project.version}</version>
26762751
</dependency>
2752+
<dependency>
2753+
<groupId>io.quarkus</groupId>
2754+
<artifactId>quarkus-rest-dev</artifactId>
2755+
<version>${project.version}</version>
2756+
</dependency>
26772757
<dependency>
26782758
<groupId>io.quarkus</groupId>
26792759
<artifactId>quarkus-rest-kotlin</artifactId>
@@ -2949,6 +3029,11 @@
29493029
<artifactId>quarkus-container-image</artifactId>
29503030
<version>${project.version}</version>
29513031
</dependency>
3032+
<dependency>
3033+
<groupId>io.quarkus</groupId>
3034+
<artifactId>quarkus-container-image-dev</artifactId>
3035+
<version>${project.version}</version>
3036+
</dependency>
29523037
<dependency>
29533038
<groupId>io.quarkus</groupId>
29543039
<artifactId>quarkus-container-image-spi</artifactId>
@@ -3179,6 +3264,11 @@
31793264
<artifactId>quarkus-cache</artifactId>
31803265
<version>${project.version}</version>
31813266
</dependency>
3267+
<dependency>
3268+
<groupId>io.quarkus</groupId>
3269+
<artifactId>quarkus-cache-dev</artifactId>
3270+
<version>${project.version}</version>
3271+
</dependency>
31823272
<dependency>
31833273
<groupId>io.quarkus</groupId>
31843274
<artifactId>quarkus-cache-deployment</artifactId>

‎extensions/arc/deployment/pom.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@
2929
<groupId>io.quarkus</groupId>
3030
<artifactId>quarkus-arc</artifactId>
3131
</dependency>
32+
<dependency>
33+
<groupId>io.quarkus</groupId>
34+
<artifactId>quarkus-arc-dev</artifactId>
35+
</dependency>
3236
<dependency>
3337
<groupId>io.quarkus.arc</groupId>
3438
<artifactId>arc-processor</artifactId>

‎extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/devui/ArcDevModeApiProcessor.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import io.quarkus.arc.processor.InjectionPointInfo;
2525
import io.quarkus.arc.processor.InterceptorInfo;
2626
import io.quarkus.arc.processor.ObserverInfo;
27-
import io.quarkus.deployment.IsDevelopment;
27+
import io.quarkus.deployment.IsLocalDevelopment;
2828
import io.quarkus.deployment.annotations.BuildProducer;
2929
import io.quarkus.deployment.annotations.BuildStep;
3030
import io.quarkus.dev.console.DevConsoleManager;
@@ -44,7 +44,7 @@ public class ArcDevModeApiProcessor {
4444
*/
4545
private static final int DEPENCENY_GRAPH_NODES_LIMIT = 30;
4646

47-
@BuildStep(onlyIf = IsDevelopment.class)
47+
@BuildStep(onlyIf = IsLocalDevelopment.class)
4848
public void collectBeanInfo(ArcConfig config, ValidationPhaseBuildItem validationPhaseBuildItem,
4949
CompletedApplicationClassPredicateBuildItem predicate,
5050
BuildProducer<ArcBeanInfoBuildItem> arcBeanInfoProducer) {

‎extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/devui/ArcDevUIProcessor.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
import io.quarkus.arc.deployment.BeanDefiningAnnotationBuildItem;
1414
import io.quarkus.arc.deployment.CustomScopeAnnotationsBuildItem;
1515
import io.quarkus.arc.processor.AnnotationsTransformer;
16-
import io.quarkus.arc.runtime.devconsole.InvocationInterceptor;
17-
import io.quarkus.arc.runtime.devconsole.InvocationTree;
18-
import io.quarkus.arc.runtime.devconsole.InvocationsMonitor;
19-
import io.quarkus.arc.runtime.devconsole.Monitored;
20-
import io.quarkus.arc.runtime.devmode.EventsMonitor;
21-
import io.quarkus.arc.runtime.devui.ArcJsonRPCService;
22-
import io.quarkus.deployment.IsDevelopment;
16+
import io.quarkus.arc.runtime.dev.EventsMonitor;
17+
import io.quarkus.arc.runtime.dev.console.InvocationInterceptor;
18+
import io.quarkus.arc.runtime.dev.console.InvocationTree;
19+
import io.quarkus.arc.runtime.dev.console.InvocationsMonitor;
20+
import io.quarkus.arc.runtime.dev.console.Monitored;
21+
import io.quarkus.arc.runtime.dev.ui.ArcJsonRPCService;
22+
import io.quarkus.deployment.IsLocalDevelopment;
2323
import io.quarkus.deployment.annotations.BuildProducer;
2424
import io.quarkus.deployment.annotations.BuildStep;
2525
import io.quarkus.devui.spi.JsonRPCProvidersBuildItem;
@@ -28,7 +28,7 @@
2828

2929
public class ArcDevUIProcessor {
3030

31-
@BuildStep(onlyIf = IsDevelopment.class)
31+
@BuildStep(onlyIf = IsLocalDevelopment.class)
3232
public CardPageBuildItem pages(ArcBeanInfoBuildItem arcBeanInfoBuildItem, ArcConfig config) {
3333
DevBeanInfos beanInfos = arcBeanInfoBuildItem.getBeanInfos();
3434

@@ -102,12 +102,12 @@ public CardPageBuildItem pages(ArcBeanInfoBuildItem arcBeanInfoBuildItem, ArcCon
102102
return pageBuildItem;
103103
}
104104

105-
@BuildStep
105+
@BuildStep(onlyIf = IsLocalDevelopment.class)
106106
JsonRPCProvidersBuildItem createJsonRPCService() {
107107
return new JsonRPCProvidersBuildItem(ArcJsonRPCService.class);
108108
}
109109

110-
@BuildStep(onlyIf = IsDevelopment.class)
110+
@BuildStep(onlyIf = IsLocalDevelopment.class)
111111
void registerMonitoringComponents(ArcConfig config, BuildProducer<AdditionalBeanBuildItem> beans,
112112
BuildProducer<AnnotationsTransformerBuildItem> annotationTransformers,
113113
CustomScopeAnnotationsBuildItem customScopes, List<BeanDefiningAnnotationBuildItem> beanDefiningAnnotations) {

‎extensions/arc/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<module>runtime</module>
1919
<module>test-supplement</module>
2020
<module>test-supplement-decorator</module>
21+
<module>runtime-dev</module>
2122
</modules>
2223

2324
</project>

‎extensions/arc/runtime-dev/pom.xml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<parent>
6+
<artifactId>quarkus-arc-parent</artifactId>
7+
<groupId>io.quarkus</groupId>
8+
<version>999-SNAPSHOT</version>
9+
</parent>
10+
<modelVersion>4.0.0</modelVersion>
11+
12+
<artifactId>quarkus-arc-dev</artifactId>
13+
<name>Quarkus - ArC - Runtime Dev mode</name>
14+
<description>Build time CDI dependency injection - Dev mode only</description>
15+
16+
<dependencies>
17+
<dependency>
18+
<groupId>${project.groupId}</groupId>
19+
<artifactId>quarkus-arc</artifactId>
20+
</dependency>
21+
</dependencies>
22+
23+
</project>

‎extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/devmode/EventInfo.java‎ renamed to ‎extensions/arc/runtime-dev/src/main/java/io/quarkus/arc/runtime/dev/EventInfo.java‎

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

33
import java.util.List;
44

‎extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/devmode/EventsMonitor.java‎ renamed to ‎extensions/arc/runtime-dev/src/main/java/io/quarkus/arc/runtime/dev/EventsMonitor.java‎

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

33
import java.lang.annotation.Annotation;
44
import java.lang.reflect.Type;

‎extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/devmode/InvocationInfo.java‎ renamed to ‎extensions/arc/runtime-dev/src/main/java/io/quarkus/arc/runtime/dev/InvocationInfo.java‎

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

33
import java.util.List;
44

‎extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/devconsole/Invocation.java‎ renamed to ‎extensions/arc/runtime-dev/src/main/java/io/quarkus/arc/runtime/dev/console/Invocation.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.quarkus.arc.runtime.devconsole;
1+
package io.quarkus.arc.runtime.dev.console;
22

33
import java.lang.reflect.Method;
44
import java.time.Instant;

0 commit comments

Comments
 (0)