Skip to content

Commit

Permalink
Merge pull request #80 from oracle-quickstart/cart-to-micronaut-4
Browse files Browse the repository at this point in the history 
Cart to micronaut 4.3.4
  • Loading branch information
@ChaimaaeROUAI
ChaimaaeROUAI authored May 23, 2024
2 parents c5a274b + f9be47a commit 5596d15
Show file tree
Hide file tree
Showing 16 changed files with 918 additions and 852 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
145 changes: 80 additions & 65 deletions src/carts/app/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,65 +1,80 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>micronaut.mushop.carts</groupId>
<artifactId>carts-parent</artifactId>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>carts-app</artifactId>

<packaging>${packaging}</packaging>

<properties>
<packaging>jar</packaging>
<exec.mainClass>mushop.carts.Application</exec.mainClass>
</properties>

<dependencies>
<dependency>
<groupId>micronaut.mushop.carts</groupId>
<artifactId>carts-lib</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>io.micronaut.micrometer</groupId>
<artifactId>micronaut-micrometer-registry-prometheus</artifactId>
<scope>compile</scope>
</dependency>

<dependency>
<groupId>micronaut.mushop.carts</groupId>
<artifactId>carts-tck</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>io.micronaut.build</groupId>
<artifactId>micronaut-maven-plugin</artifactId>
<configuration>
<nativeImageBuildArgs>
<nativeImageBuildArg>-H:AdditionalSecurityProviders=com.sun.security.sasl.Provider</nativeImageBuildArg>
</nativeImageBuildArgs>
</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>
</plugins>
</build>

</project>
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>micronaut.mushop.carts</groupId>
<artifactId>carts-parent</artifactId>
<version>0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>carts-app</artifactId>

<packaging>${packaging}</packaging>

<properties>
<packaging>jar</packaging>
<exec.mainClass>mushop.carts.Application</exec.mainClass>
</properties>

<dependencies>
<dependency>
<groupId>micronaut.mushop.carts</groupId>
<artifactId>carts-lib</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>io.micronaut.micrometer</groupId>
<artifactId>micronaut-micrometer-registry-prometheus</artifactId>
<scope>compile</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>
<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>
<configuration>
<to>
<image>phx.ocir.io/oraclelabs/micronaut-showcase/mushop/${project.artifactId}-${docker.image.suffix}:${project.version}</image>
</to>
</configuration>
</plugin>
</plugins>
</build>

</project>
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
173 changes: 93 additions & 80 deletions src/carts/aws/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,80 +1,93 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>micronaut.mushop.carts</groupId>
<artifactId>carts-parent</artifactId>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>carts-aws</artifactId>

<packaging>${packaging}</packaging>

<properties>
<packaging>jar</packaging>
<exec.mainClass>mushop.carts.AwsApplication</exec.mainClass>
</properties>

<dependencies>
<dependency>
<groupId>micronaut.mushop.carts</groupId>
<artifactId>carts-lib</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>sts</artifactId>
</dependency>

<!-- Configuration discovery -->
<dependency>
<groupId>io.micronaut.aws</groupId>
<artifactId>micronaut-aws-secretsmanager</artifactId>
</dependency>
<dependency>
<groupId>io.micronaut.aws</groupId>
<artifactId>micronaut-aws-parameter-store</artifactId>
</dependency>

<!-- Metrics -->
<dependency>
<groupId>io.micronaut.micrometer</groupId>
<artifactId>micronaut-micrometer-registry-cloudwatch</artifactId>
</dependency>

<dependency>
<groupId>micronaut.mushop.carts</groupId>
<artifactId>carts-tck</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>io.micronaut.build</groupId>
<artifactId>micronaut-maven-plugin</artifactId>
<configuration>
<nativeImageBuildArgs>
<nativeImageBuildArg>-H:AdditionalSecurityProviders=com.sun.security.sasl.Provider</nativeImageBuildArg>
</nativeImageBuildArgs>
</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>
</plugins>
</build>

</project>
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>micronaut.mushop.carts</groupId>
<artifactId>carts-parent</artifactId>
<version>0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>carts-aws</artifactId>

<packaging>${packaging}</packaging>

<properties>
<packaging>jar</packaging>
<exec.mainClass>mushop.carts.AwsApplication</exec.mainClass>
</properties>

<dependencies>
<dependency>
<groupId>micronaut.mushop.carts</groupId>
<artifactId>carts-lib</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>sts</artifactId>
</dependency>

<!-- Configuration discovery -->
<dependency>
<groupId>io.micronaut.aws</groupId>
<artifactId>micronaut-aws-secretsmanager</artifactId>
</dependency>
<dependency>
<groupId>io.micronaut.aws</groupId>
<artifactId>micronaut-aws-parameter-store</artifactId>
</dependency>

<!-- Metrics -->
<dependency>
<groupId>io.micronaut.micrometer</groupId>
<artifactId>micronaut-micrometer-registry-cloudwatch</artifactId>
</dependency>
<dependency>
<groupId>micronaut.mushop.carts</groupId>
<artifactId>carts-tck</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<scope>runtime</scope>
</dependency>
</dependencies>

<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>
<configuration>
<to>
<image>phx.ocir.io/oraclelabs/micronaut-showcase/mushop/${project.artifactId}-${docker.image.suffix}:${project.version}</image>
</to>
</configuration>
</plugin>
</plugins>
</build>
</project>
10 changes: 5 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,5 @@
micronaut:
metrics:
export:
cloudwatch:
enabled: false
micronaut:
metrics:
export:
cloudwatch:
enabled: false
Loading

0 comments on commit 5596d15

Please sign in to comment.