Skip to content

Commit 7937c35

Browse files
micronaut tests shouldn't run during the build
1 parent c5a44e3 commit 7937c35

File tree

4 files changed

+18
-16
lines changed

4 files changed

+18
-16
lines changed

config/config-mp/pom.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,11 @@
8383
<artifactId>helidon-codegen-apt</artifactId>
8484
<version>${helidon.version}</version>
8585
</path>
86+
<path>
87+
<groupId>io.helidon.service</groupId>
88+
<artifactId>helidon-service-codegen</artifactId>
89+
<version>${helidon.version}</version>
90+
</path>
8691
<path>
8792
<groupId>io.helidon.config.metadata</groupId>
8893
<artifactId>helidon-config-metadata-codegen</artifactId>
@@ -96,6 +101,11 @@
96101
<artifactId>helidon-codegen-apt</artifactId>
97102
<version>${helidon.version}</version>
98103
</dependency>
104+
<dependency>
105+
<groupId>io.helidon.service</groupId>
106+
<artifactId>helidon-service-codegen</artifactId>
107+
<version>${helidon.version}</version>
108+
</dependency>
99109
<dependency>
100110
<groupId>io.helidon.config.metadata</groupId>
101111
<artifactId>helidon-config-metadata-codegen</artifactId>

config/config-mp/src/main/java/io/helidon/config/mp/MpConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public static io.helidon.config.Config toHelidonConfig(Config mpConfig) {
5252

5353
if (mpConfig instanceof MpConfigImpl) {
5454

55-
// If the mpConfig is based on an SE config (such as when we use meta configuration)pom.xml
55+
// If the mpConfig is based on an SE config (such as when we use meta configuration)
5656
// we must reuse that se config instance
5757
Iterator<ConfigSource> configSources = mpConfig.getConfigSources().iterator();
5858
ConfigSource first = configSources.hasNext() ? configSources.next() : null;

integrations/micronaut/data/pom.xml

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -222,17 +222,9 @@
222222
<activation>
223223
<jdk>!21</jdk>
224224
</activation>
225-
<build>
226-
<plugins>
227-
<plugin>
228-
<groupId>org.apache.maven.plugins</groupId>
229-
<artifactId>maven-surefire-plugin</artifactId>
230-
<configuration>
231-
<skipTests>true</skipTests>
232-
</configuration>
233-
</plugin>
234-
</plugins>
235-
</build>
225+
<properties>
226+
<skipTests>true</skipTests>
227+
</properties>
236228
</profile>
237229
</profiles>
238230
</project>

integrations/micronaut/data/src/test/java/io/helidon/integrations/micronaut/cdi/data/MicronautDataCdiExtensionTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
import io.helidon.integrations.micronaut.cdi.data.app.DbPetRepository;
2424
import io.helidon.integrations.micronaut.cdi.data.app.Owner;
2525
import io.helidon.integrations.micronaut.cdi.data.app.Pet;
26-
import io.helidon.microprofile.testing.junit5.AddBean;
27-
import io.helidon.microprofile.testing.junit5.Configuration;
26+
import io.helidon.microprofile.testing.AddBean;
27+
import io.helidon.microprofile.testing.Configuration;
2828
import io.helidon.microprofile.testing.junit5.HelidonTest;
2929

3030
import jakarta.enterprise.context.ApplicationScoped;
@@ -58,7 +58,7 @@ void testPet() {
5858
Optional<Pet> dinoOptional = petRepository.findByName("Dino");
5959
assertThat(dinoOptional, is(optionalPresent()));
6060

61-
Pet pet = dinoOptional.get();
61+
Pet pet = dinoOptional.orElseThrow();
6262
assertThat(pet.getName(), is("Dino"));
6363
Owner owner = pet.getOwner();
6464
assertThat(owner.getName(), is("Fred"));
@@ -70,7 +70,7 @@ void testOwner() {
7070
Optional<Owner> maybeBarney = ownerRepository.findByName("Barney");
7171
assertThat(maybeBarney, is(optionalPresent()));
7272

73-
Owner barney = maybeBarney.get();
73+
Owner barney = maybeBarney.orElseThrow();
7474
assertThat(barney.getName(), is("Barney"));
7575
assertThat(barney.getAge(), is(40));
7676
}

0 commit comments

Comments
 (0)