Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[4.x]: Change provided and optional to just optional - iteration 2 (#6495) #6650

Merged
merged 4 commits into from
May 5, 2023
Merged

[4.x]: Change provided and optional to just optional - iteration 2 (#6495) #6650

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5704efc
[4.x]: Change provided and optional to just optional - iteration 2 (#…
Captain1653 Apr 19, 2023
4884ae0
[4.x]: Change provided and optional to just optional - iteration 3 (#…
Captain1653 Apr 21, 2023
363f81e
[4.x]: Change provided and optional to just optional - iteration 4 (#…
Captain1653 Apr 21, 2023
2830996
Merge branch 'main' into 6495-provided-vs-optional-2 - resolve conflicts
Captain1653 May 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion builder/tests/builder/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
Expand Down
1 change: 0 additions & 1 deletion common/configurable/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
<dependency>
<groupId>io.helidon.config</groupId>
<artifactId>helidon-config-metadata</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
Expand Down
2 changes: 0 additions & 2 deletions common/http/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,11 @@
<dependency>
<groupId>io.helidon.config</groupId>
<artifactId>helidon-config-metadata</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>io.helidon.config</groupId>
<artifactId>helidon-config-metadata-processor</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
Expand Down
2 changes: 0 additions & 2 deletions common/key-util/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,11 @@
<dependency>
<groupId>io.helidon.config</groupId>
<artifactId>helidon-config-metadata</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>io.helidon.config</groupId>
<artifactId>helidon-config-metadata-processor</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
Expand Down
1 change: 0 additions & 1 deletion common/testing/junit5/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
<groupId>io.helidon.config</groupId>
<artifactId>helidon-config-metadata-processor</artifactId>
<optional>true</optional>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
Expand Down
2 changes: 0 additions & 2 deletions config/config-mp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,11 @@
<dependency>
<groupId>io.helidon.config</groupId>
<artifactId>helidon-config-metadata</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>io.helidon.config</groupId>
<artifactId>helidon-config-metadata-processor</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
Expand Down
1 change: 0 additions & 1 deletion config/config/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@
<dependency>
<groupId>io.helidon.common.features</groupId>
<artifactId>helidon-common-features-api</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
Expand Down
2 changes: 0 additions & 2 deletions config/encryption/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@
<dependency>
<groupId>io.helidon.common.features</groupId>
<artifactId>helidon-common-features-api</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
Expand All @@ -63,7 +62,6 @@
-->
<groupId>io.helidon.config</groupId>
<artifactId>helidon-config-mp</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
Expand Down
1 change: 0 additions & 1 deletion config/etcd/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@
This is needed for the Generated annotation in grpc sources -->
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
Expand Down
1 change: 0 additions & 1 deletion config/git/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@
<dependency>
<groupId>io.helidon.common.features</groupId>
<artifactId>helidon-common-features-api</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
Expand Down
1 change: 0 additions & 1 deletion config/hocon/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@
<dependency>
<groupId>io.helidon.common.features</groupId>
<artifactId>helidon-common-features-api</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
Expand Down
1 change: 0 additions & 1 deletion config/object-mapping/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
<dependency>
<groupId>io.helidon.common.features</groupId>
<artifactId>helidon-common-features-api</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
Expand Down
1 change: 0 additions & 1 deletion config/yaml/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@
<dependency>
<groupId>io.helidon.common.features</groupId>
<artifactId>helidon-common-features-api</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
Expand Down
2 changes: 0 additions & 2 deletions cors/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,11 @@
<dependency>
<groupId>io.helidon.config</groupId>
<artifactId>helidon-config-metadata</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>io.helidon.config</groupId>
<artifactId>helidon-config-metadata-processor</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
Expand Down
1 change: 0 additions & 1 deletion examples/grpc/client-standalone/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@
-->
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
</dependencies>
Expand Down
4 changes: 0 additions & 4 deletions grpc/client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
<dependency>
<groupId>io.helidon.common.features</groupId>
<artifactId>helidon-common-features-api</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
Expand Down Expand Up @@ -95,19 +94,16 @@
-->
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>io.helidon.config</groupId>
<artifactId>helidon-config-metadata</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>io.helidon.config</groupId>
<artifactId>helidon-config-metadata-processor</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
</dependencies>
Expand Down
2 changes: 0 additions & 2 deletions grpc/core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,13 +149,11 @@
<dependency>
<groupId>io.helidon.config</groupId>
<artifactId>helidon-config-metadata</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>io.helidon.config</groupId>
<artifactId>helidon-config-metadata-processor</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
</dependencies>
Expand Down
2 changes: 0 additions & 2 deletions grpc/metrics/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@
<dependency>
<groupId>io.helidon.common.features</groupId>
<artifactId>helidon-common-features-api</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
Expand Down Expand Up @@ -95,7 +94,6 @@
-->
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
</dependencies>
Expand Down
3 changes: 0 additions & 3 deletions grpc/server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,19 +142,16 @@
-->
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>io.helidon.config</groupId>
<artifactId>helidon-config-metadata</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>io.helidon.config</groupId>
<artifactId>helidon-config-metadata-processor</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
</dependencies>
Expand Down
3 changes: 0 additions & 3 deletions health/health-checks/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,20 +49,17 @@
<!-- only needed for compilation, not required in runtime -->
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>io.helidon.common.features</groupId>
<artifactId>helidon-common-features-api</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
<!-- only needed for compilation, not required in runtime -->
<groupId>org.eclipse.microprofile.config</groupId>
<artifactId>microprofile-config-api</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>

Expand Down
1 change: 0 additions & 1 deletion integrations/cdi/eclipselink-cdi/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
<dependency>
<groupId>io.helidon.common.features</groupId>
<artifactId>helidon-common-features-api</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>

Expand Down
1 change: 0 additions & 1 deletion integrations/cdi/hibernate-cdi/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@
<dependency>
<groupId>io.helidon.common.features</groupId>
<artifactId>helidon-common-features-api</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
</dependencies>
Expand Down
1 change: 0 additions & 1 deletion integrations/cdi/jpa-cdi/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,6 @@
<dependency>
<groupId>io.helidon.common.features</groupId>
<artifactId>helidon-common-features-api</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
</dependencies>
Expand Down
1 change: 0 additions & 1 deletion integrations/cdi/jta-cdi/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@
<dependency>
<groupId>io.helidon.common.features</groupId>
<artifactId>helidon-common-features-api</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
</dependencies>
Expand Down
1 change: 0 additions & 1 deletion integrations/micrometer/cdi/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@
<dependency>
<groupId>io.helidon.common.features</groupId>
<artifactId>helidon-common-features-api</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
Expand Down
3 changes: 0 additions & 3 deletions integrations/micrometer/micrometer/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@
<dependency>
<groupId>io.helidon.common.features</groupId>
<artifactId>helidon-common-features-api</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
Expand Down Expand Up @@ -96,13 +95,11 @@
<dependency>
<groupId>io.helidon.config</groupId>
<artifactId>helidon-config-metadata</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>io.helidon.config</groupId>
<artifactId>helidon-config-metadata-processor</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
Expand Down
1 change: 0 additions & 1 deletion integrations/micronaut/data/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@
<dependency>
<groupId>io.helidon.common.features</groupId>
<artifactId>helidon-common-features-api</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
Expand Down
1 change: 0 additions & 1 deletion integrations/microstream/cdi/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
<dependency>
<groupId>io.helidon.common.features</groupId>
<artifactId>helidon-common-features-api</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
Expand Down
1 change: 0 additions & 1 deletion integrations/microstream/core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@
<dependency>
<groupId>io.helidon.common.features</groupId>
<artifactId>helidon-common-features-api</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
Expand Down
2 changes: 0 additions & 2 deletions integrations/neo4j/health/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
<dependency>
<groupId>io.helidon.common.features</groupId>
<artifactId>helidon-common-features-api</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
Expand All @@ -59,7 +58,6 @@
<!-- only needed for compilation, not required in runtime -->
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
</dependencies>
Expand Down
2 changes: 0 additions & 2 deletions integrations/neo4j/metrics/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,12 @@
<dependency>
<groupId>io.helidon.common.features</groupId>
<artifactId>helidon-common-features-api</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
<!-- only needed for compilation, not required in runtime -->
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
</dependencies>
Expand Down
3 changes: 0 additions & 3 deletions integrations/neo4j/neo4j/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,20 +46,17 @@
<dependency>
<groupId>io.helidon.common.features</groupId>
<artifactId>helidon-common-features-api</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
<!-- only needed for compilation, not required in runtime -->
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>io.helidon.config</groupId>
<artifactId>helidon-config-mp</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
</dependencies>
Expand Down
Loading