Skip to content

Commit 7f1bd9a

Browse files
authored
Merge pull request #2 from sonalika-roy/main
Updating source code
2 parents 2f33721 + 57838ef commit 7f1bd9a

File tree

5 files changed

+17
-44
lines changed

5 files changed

+17
-44
lines changed

docs/02_lab_migrate/0205.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@ You also want to make sure the config-server is deployed first and up and runnin
3636
1. From the Git Bash window, set a `VERSION` environment variable to this version number `3.0.2`.
3737

3838
```bash
39-
VERSION=3.2.5
39+
VERSION=3.0.2
4040
```
4141

4242
1. You will start by building all the microservice of the spring petclinic application. To accomplish this, run `mvn clean package` in the root directory of the application.
4343

4444
```bash
45-
cd ~/workspaces/java-microservices-aca-lab/src
45+
cd /workspaces/java-microservices-aca-lab/src
4646
mvn clean package -DskipTests
4747
```
4848

src/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
<parent>
77
<groupId>org.springframework.boot</groupId>
88
<artifactId>spring-boot-starter-parent</artifactId>
9-
<version>3.2.5</version>
9+
<version>3.0.2</version>
1010
</parent>
1111

1212
<groupId>org.springframework.samples</groupId>
1313
<artifactId>spring-petclinic-microservices</artifactId>
14-
<version>3.2.5</version>
14+
<version>3.0.2</version>
1515
<name>${project.artifactId}</name>
1616
<packaging>pom</packaging>
1717

src/spring-petclinic-customers-service/pom.xml

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
<properties>
1818
<docker.image.exposed.port>8081</docker.image.exposed.port>
1919
<docker.image.dockerfile.dir>${basedir}/../docker</docker.image.dockerfile.dir>
20-
<version.spring.cloud.azure>5.2.0</version.spring.cloud.azure>
2120
</properties>
2221

2322
<dependencies>
@@ -52,20 +51,11 @@
5251
</dependency>
5352

5453
<!-- Third parties -->
55-
5654
<dependency>
57-
<groupId>com.azure.spring</groupId>
58-
<artifactId>spring-cloud-azure-starter-jdbc-mysql</artifactId>
55+
<groupId>com.mysql</groupId>
56+
<artifactId>mysql-connector-j</artifactId>
57+
<scope>runtime</scope>
5958
</dependency>
60-
61-
<dependency>
62-
<groupId>com.azure.spring</groupId>
63-
<artifactId>spring-cloud-azure-dependencies</artifactId>
64-
<version>${version.spring.cloud.azure}</version>
65-
<type>pom</type>
66-
<scope>import</scope>
67-
</dependency>
68-
6959
<dependency>
7060
<groupId>org.hsqldb</groupId>
7161
<artifactId>hsqldb</artifactId>

src/spring-petclinic-vets-service/pom.xml

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
<properties>
1818
<docker.image.exposed.port>8081</docker.image.exposed.port>
1919
<docker.image.dockerfile.dir>${basedir}/../docker</docker.image.dockerfile.dir>
20-
<version.spring.cloud.azure>5.2.0</version.spring.cloud.azure>
2120
</properties>
2221

2322
<dependencies>
@@ -86,19 +85,11 @@
8685
<artifactId>hsqldb</artifactId>
8786
<scope>runtime</scope>
8887
</dependency>
89-
90-
<dependency>
91-
<groupId>com.azure.spring</groupId>
92-
<artifactId>spring-cloud-azure-starter-jdbc-mysql</artifactId>
93-
</dependency>
94-
<dependency>
95-
<groupId>com.azure.spring</groupId>
96-
<artifactId>spring-cloud-azure-dependencies</artifactId>
97-
<version>${version.spring.cloud.azure}</version>
98-
<type>pom</type>
99-
<scope>import</scope>
100-
</dependency>
101-
88+
<dependency>
89+
<groupId>com.mysql</groupId>
90+
<artifactId>mysql-connector-j</artifactId>
91+
<scope>runtime</scope>
92+
</dependency>
10293
<dependency>
10394
<groupId>io.micrometer</groupId>
10495
<artifactId>micrometer-registry-prometheus</artifactId>

src/spring-petclinic-visits-service/pom.xml

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
<properties>
1818
<docker.exposed.port>8081</docker.exposed.port>
1919
<docker.image.dockerfile.dir>${basedir}/../docker</docker.image.dockerfile.dir>
20-
<version.spring.cloud.azure>5.2.0</version.spring.cloud.azure>
2120
</properties>
2221

2322
<dependencies>
@@ -65,18 +64,11 @@
6564
<groupId>org.jolokia</groupId>
6665
<artifactId>jolokia-core</artifactId>
6766
</dependency>
68-
<dependency>
69-
<groupId>com.azure.spring</groupId>
70-
<artifactId>spring-cloud-azure-starter-jdbc-mysql</artifactId>
71-
</dependency>
72-
<dependency>
73-
<groupId>com.azure.spring</groupId>
74-
<artifactId>spring-cloud-azure-dependencies</artifactId>
75-
<version>${version.spring.cloud.azure}</version>
76-
<type>pom</type>
77-
<scope>import</scope>
78-
</dependency>
79-
67+
<dependency>
68+
<groupId>com.mysql</groupId>
69+
<artifactId>mysql-connector-j</artifactId>
70+
<scope>runtime</scope>
71+
</dependency>
8072
<dependency>
8173
<groupId>io.micrometer</groupId>
8274
<artifactId>micrometer-registry-prometheus</artifactId>

0 commit comments

Comments
 (0)