Skip to content

Commit

Permalink
fix the build
Browse files Browse the repository at this point in the history
  • Loading branch information
@ChaimaaeROUAI
ChaimaaeROUAI committed May 9, 2024
1 parent 3fc629d commit d8e5b8b
Show file tree
Hide file tree
Showing 11 changed files with 166 additions and 203 deletions.
4 changes: 2 additions & 2 deletions src/carts/.mvn/wrapper/maven-wrapper.properties
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
30 changes: 10 additions & 20 deletions src/carts/app/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<parent>
<groupId>micronaut.mushop.carts</groupId>
<artifactId>carts-parent</artifactId>
<!-- <version>${revision}</version> -->
<version>0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand All @@ -31,26 +30,11 @@
<artifactId>micronaut-micrometer-registry-prometheus</artifactId>
<scope>compile</scope>
</dependency>
<!-- <dependency>
<groupId>io.micronaut.data</groupId>
<artifactId>micronaut-data-mongodb</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.mongodb</groupId>
<artifactId>mongodb-driver-sync</artifactId>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>io.micronaut.testresources</groupId>
<artifactId>micronaut-test-resources-client</artifactId>
<scope>provided</scope>
</dependency> -->
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>micronaut.mushop.carts</groupId>
<artifactId>carts-tck</artifactId>
Expand All @@ -69,7 +53,13 @@
<nativeImageBuildArg>-H:AdditionalSecurityProviders=com.sun.security.sasl.Provider</nativeImageBuildArg>
<buildArg>-H:-UseServiceLoaderFeature</buildArg>
</nativeImageBuildArgs>
</configuration>
<testResourcesDependencies>
<dependency>
<groupId>io.micronaut.testresources</groupId>
<artifactId>micronaut-test-resources-mongodb</artifactId>
</dependency>
</testResourcesDependencies>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down
5 changes: 1 addition & 4 deletions src/carts/app/src/main/resources/application-app.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,4 @@ endpoints:
prometheus:
enabled: true
sensitive: false
details-visible: ANONYMOUS

mongodb:
uri: mongodb://${MONGO_USER:root}:${MONGO_PASS}@${MONGO_HOST:localhost}:${MONGO_PORT:27017}/?authSource=admin
details-visible: ANONYMOUS
55 changes: 52 additions & 3 deletions src/carts/aws/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,11 @@
<artifactId>carts-lib</artifactId>
<version>${project.version}</version>
</dependency>

<!-- <dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<scope>runtime</scope>
</dependency> -->
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>sts</artifactId>
Expand Down Expand Up @@ -60,7 +64,7 @@
</dependency>
</dependencies>

<build>
<!-- <build>
<plugins>
<plugin>
<groupId>io.micronaut.maven</groupId>
Expand All @@ -69,8 +73,54 @@
<nativeImageBuildArgs>
<nativeImageBuildArg>-H:AdditionalSecurityProviders=com.sun.security.sasl.Provider</nativeImageBuildArg>
</nativeImageBuildArgs>
<testResourcesDependencies>
<dependency>
<groupId>io.micronaut.testresources</groupId>
<artifactId>micronaut-test-resources-mongodb</artifactId>
</dependency>
</testResourcesDependencies>
</configuration>
</plugin>
<plugin>
<groupId>com.google.cloud.tools</groupId>
<artifactId>jib-maven-plugin</artifactId>
<configuration>
<to>
<image>phx.ocir.io/oraclelabs/micronaut-showcase/mushop/${project.artifactId}-${docker.image.suffix}:${project.version}</image>
</to>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build> -->
<build>
<plugins>
<plugin>
<groupId>io.micronaut.maven</groupId>
<artifactId>micronaut-maven-plugin</artifactId>
<configuration>
<nativeImageBuildArgs>
<nativeImageBuildArg>-H:AdditionalSecurityProviders=com.sun.security.sasl.Provider</nativeImageBuildArg>
<buildArg>-H:-UseServiceLoaderFeature</buildArg>
</nativeImageBuildArgs>
<testResourcesDependencies>
<dependency>
<groupId>io.micronaut.testresources</groupId>
<artifactId>micronaut-test-resources-mongodb</artifactId>
</dependency>
</testResourcesDependencies>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
</plugin>
<plugin>
<groupId>com.google.cloud.tools</groupId>
<artifactId>jib-maven-plugin</artifactId>
Expand All @@ -82,5 +132,4 @@
</plugin>
</plugins>
</build>

</project>
13 changes: 8 additions & 5 deletions src/carts/aws/src/test/resources/application-test.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
micronaut:
metrics:
export:
cloudwatch:
enabled: false
micronaut:
metrics:
export:
cloudwatch:
enabled: false

# mongodb:
# uri: mongodb://${MONGO_USER:root}:${MONGO_PASS}@${MONGO_HOST:localhost}:${MONGO_PORT:27017}/?authSource=admin
44 changes: 17 additions & 27 deletions src/carts/lib/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<parent>
<groupId>micronaut.mushop.carts</groupId>
<artifactId>carts-parent</artifactId>
<!-- <version>${revision}</version> -->
<version>0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand All @@ -23,8 +22,6 @@
<dependency>
<groupId>io.micronaut.validation</groupId>
<artifactId>micronaut-validation</artifactId>
<!-- <version>${micronaut.core.version}</version> -->
<!-- <version>4.3.4</version> -->
<scope>compile</scope>
</dependency>
<dependency>
Expand All @@ -33,16 +30,15 @@
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<scope>runtime</scope>
</dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<scope>runtime</scope>
</dependency>

<dependency>
<groupId>io.micronaut</groupId>
<artifactId>micronaut-http-client</artifactId>
Expand All @@ -53,12 +49,11 @@
<artifactId>micronaut-runtime</artifactId>
<scope>compile</scope>
</dependency>

<dependency>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
<scope>compile</scope>
</dependency>
<!-- Swagger -->
<dependency>
<groupId>io.swagger.core.v3</groupId>
Expand All @@ -77,15 +72,10 @@
<artifactId>micronaut-serde-jackson</artifactId>
<scope>compile</scope>
</dependency>
<!-- <dependency>
<groupId>org.mongodb</groupId>
<artifactId>mongodb-driver-sync</artifactId>
<scope>runtime</scope>
</dependency> -->
<dependency>
<groupId>io.micronaut.mongodb</groupId>
<artifactId>micronaut-mongo-reactive</artifactId>
</dependency>
<groupId>io.micronaut.mongodb</groupId>
<artifactId>micronaut-mongo-reactive</artifactId>
</dependency>
<dependency>
<groupId>io.micronaut.testresources</groupId>
<artifactId>micronaut-test-resources-client</artifactId>
Expand Down Expand Up @@ -124,11 +114,11 @@
<artifactId>micronaut-tracing-core</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>io.micronaut.tracing</groupId>
<artifactId>micronaut-tracing-brave-http</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>io.micronaut.tracing</groupId>
<artifactId>micronaut-tracing-brave-http</artifactId>
<scope>compile</scope>
</dependency>
</dependencies>
<build>
<plugins>
Expand Down
28 changes: 18 additions & 10 deletions src/carts/oci/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<parent>
<groupId>micronaut.mushop.carts</groupId>
<artifactId>carts-parent</artifactId>
<!-- <version>${revision}</version> -->
<version>0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down Expand Up @@ -37,29 +36,39 @@
<artifactId>micronaut-oraclecloud-micrometer</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>micronaut.mushop.carts</groupId>
<artifactId>carts-tck</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<build>
<plugins>
<plugin>
<groupId>io.micronaut.maven</groupId>
<artifactId>micronaut-maven-plugin</artifactId>
<configuration>
<nativeImageBuildArgs>
<nativeImageBuildArg>-H:AdditionalSecurityProviders=com.sun.security.sasl.Provider</nativeImageBuildArg>
<buildArg>-H:-UseServiceLoaderFeature</buildArg>
</nativeImageBuildArgs>
</configuration>
<testResourcesDependencies>
<dependency>
<groupId>io.micronaut.testresources</groupId>
<artifactId>micronaut-test-resources-mongodb</artifactId>
</dependency>
</testResourcesDependencies>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
</plugin>
<plugin>
<groupId>com.google.cloud.tools</groupId>
Expand All @@ -72,5 +81,4 @@
</plugin>
</plugins>
</build>

</project>
Loading

0 comments on commit d8e5b8b

Please sign in to comment.