Skip to content

Commit 3d80f55

Browse files
New FIFO_SDK, spring boot and java version
1 parent 53eea6a commit 3d80f55

File tree

4 files changed

+20
-18
lines changed

4 files changed

+20
-18
lines changed

.github/workflows/manual_release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ jobs:
77
build:
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/checkout@v2
10+
- uses: actions/checkout@v4
1111

1212
- name: Create tag by maven-release plugin
13-
uses: qcastel/[email protected].2
13+
uses: qcastel/[email protected].41
1414
with:
1515
release-branch-name: "master"
1616
git-release-bot-name: "auto"

.github/workflows/on_commit.yml renamed to .github/workflows/on_push.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@ jobs:
88
runs-on: ubuntu-latest
99

1010
steps:
11-
- uses: actions/checkout@v2
12-
- name: Set up JDK 1.8
13-
uses: actions/setup-java@v1
11+
- uses: actions/checkout@v4
12+
- name: Set up JDK
13+
uses: actions/setup-java@v2
1414
with:
15-
java-version: 1.8
15+
distribution: 'zulu'
16+
java-version: '21'
1617
- name: Build with Maven
1718
run: mvn clean test --file pom.xml

pom.xml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.springframework.boot</groupId>
66
<artifactId>spring-boot-starter-parent</artifactId>
7-
<version>2.7.0</version>
7+
<version>3.2.3</version>
88
<relativePath /> <!-- lookup parent from repository -->
99
</parent>
1010
<groupId>com.orange.lo.sample.lo2iot</groupId>
@@ -14,7 +14,7 @@
1414
<description>Connector between live object and azure IoT Hub</description>
1515

1616
<properties>
17-
<java.version>1.8</java.version>
17+
<java.version>21</java.version>
1818
</properties>
1919

2020
<repositories>
@@ -28,7 +28,7 @@
2828
<dependency>
2929
<groupId>com.github.DatavenueLiveObjects</groupId>
3030
<artifactId>FIFO_SDK_LiveObjects</artifactId>
31-
<version>v1.16</version>
31+
<version>v2.0.1</version>
3232
</dependency>
3333
<dependency>
3434
<groupId>org.springframework.boot</groupId>
@@ -41,7 +41,7 @@
4141
<dependency>
4242
<groupId>com.microsoft.azure.sdk.iot</groupId>
4343
<artifactId>iot-service-client</artifactId>
44-
<version>2.1.6</version>
44+
<version>2.1.7</version>
4545
</dependency>
4646
<dependency>
4747
<groupId>org.springframework.boot</groupId>
@@ -51,17 +51,17 @@
5151
<dependency>
5252
<groupId>com.microsoft.azure.sdk.iot</groupId>
5353
<artifactId>iot-device-client</artifactId>
54-
<version>2.4.0</version>
54+
<version>2.4.1</version>
5555
</dependency>
5656
<dependency>
5757
<groupId>com.microsoft.azure</groupId>
5858
<artifactId>applicationinsights-spring-boot-starter</artifactId>
59-
<version>2.5.1</version>
59+
<version>2.6.4</version>
6060
</dependency>
6161
<dependency>
6262
<groupId>com.microsoft.azure</groupId>
6363
<artifactId>azure-spring-boot-metrics-starter</artifactId>
64-
<version>2.2.1</version>
64+
<version>2.3.5</version>
6565
</dependency>
6666
<dependency>
6767
<groupId>org.springframework.integration</groupId>
@@ -70,12 +70,12 @@
7070
<dependency>
7171
<groupId>org.apache.maven</groupId>
7272
<artifactId>maven-model</artifactId>
73-
<version>3.8.5</version>
73+
<version>3.9.6</version>
7474
</dependency>
7575
<dependency>
7676
<groupId>org.apache.commons</groupId>
7777
<artifactId>commons-text</artifactId>
78-
<version>1.10.0</version>
78+
<version>1.11.0</version>
7979
</dependency>
8080
<dependency>
8181
<groupId>net.jodah</groupId>
@@ -90,13 +90,13 @@
9090
<dependency>
9191
<groupId>com.tngtech.archunit</groupId>
9292
<artifactId>archunit</artifactId>
93-
<version>0.23.1</version>
93+
<version>1.2.1</version>
9494
<scope>test</scope>
9595
</dependency>
9696
<dependency>
9797
<groupId>com.tngtech.archunit</groupId>
9898
<artifactId>archunit-junit5</artifactId>
99-
<version>0.23.1</version>
99+
<version>1.2.1</version>
100100
<scope>test</scope>
101101
</dependency>
102102
</dependencies>

src/main/java/com/orange/lo/sample/lo2iothub/ApplicationConfig.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public TaskScheduler taskScheduler() {
7373
}
7474

7575
@Bean
76-
public void init() {
76+
public Object init() {
7777
RetryPolicy<Void> commandRetryPolicy = restCommandRetryPolicy();
7878
TaskScheduler taskScheduler = taskScheduler();
7979
RetryPolicy<List<Group>> groupRetryPolicy = restGroupRetryPolicy();
@@ -144,6 +144,7 @@ public void init() {
144144
}
145145
});
146146
});
147+
return new Object();
147148
}
148149

149150
private IoTDeviceProvider createIotDeviceProvider(AzureIotHubProperties azureIotHubProperties) {

0 commit comments

Comments
 (0)