Skip to content

Commit 73f12a3

Browse files
lolodomololodomo
committed
Merge branch 'main' into fileformat_create_parse_api
2 parents 96af722 + cc340bd commit 73f12a3

308 files changed

Lines changed: 5495 additions & 1354 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/ci-build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
fail-fast: false
2020
matrix:
2121
java: [ '21' ]
22-
maven: [ '3.9.9' ]
22+
maven: [ '3.9.10' ]
2323
os: [ 'ubuntu-24.04' ]
2424
name: Build (Java ${{ matrix.java }}, ${{ matrix.os }})
2525
runs-on: ${{ matrix.os }}

‎.mvn/README‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
required by Maven 4 to detect root dir; adding root=true to pom is not compatible with Maven 3

‎.vscode/settings.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"java.compile.nullAnalysis.mode": "automatic"
3+
}

‎bom/compile-model/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.openhab.core.bom</groupId>
99
<artifactId>org.openhab.core.reactor.bom</artifactId>
10-
<version>5.0.0-SNAPSHOT</version>
10+
<version>5.1.0-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>org.openhab.core.bom.compile-model</artifactId>

‎bom/compile/pom.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.openhab.core.bom</groupId>
99
<artifactId>org.openhab.core.reactor.bom</artifactId>
10-
<version>5.0.0-SNAPSHOT</version>
10+
<version>5.1.0-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>org.openhab.core.bom.compile</artifactId>
@@ -69,7 +69,6 @@
6969
<groupId>org.eclipse.jdt</groupId>
7070
<artifactId>org.eclipse.jdt.annotation</artifactId>
7171
<version>2.2.600</version>
72-
<!--<scope>compile</scope> -->
7372
</dependency>
7473

7574
<!-- Annotation API -->
@@ -361,7 +360,7 @@
361360
<dependency>
362361
<groupId>de.focus-shift</groupId>
363362
<artifactId>jollyday-jackson</artifactId>
364-
<version>1.5.0</version>
363+
<version>1.5.4</version>
365364
<scope>compile</scope>
366365
</dependency>
367366

‎bom/openhab-core-index/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.openhab.core.bom</groupId>
99
<artifactId>org.openhab.core.reactor.bom</artifactId>
10-
<version>5.0.0-SNAPSHOT</version>
10+
<version>5.1.0-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>org.openhab.core.bom.openhab-core-index</artifactId>

‎bom/openhab-core/pom.xml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.openhab.core.bom</groupId>
99
<artifactId>org.openhab.core.reactor.bom</artifactId>
10-
<version>5.0.0-SNAPSHOT</version>
10+
<version>5.1.0-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>org.openhab.core.bom.openhab-core</artifactId>
@@ -412,6 +412,12 @@
412412
<version>${project.version}</version>
413413
<scope>compile</scope>
414414
</dependency>
415+
<dependency>
416+
<groupId>org.openhab.core.bundles</groupId>
417+
<artifactId>org.openhab.core.automation.module.script.providersupport</artifactId>
418+
<version>${project.version}</version>
419+
<scope>compile</scope>
420+
</dependency>
415421
<dependency>
416422
<groupId>org.openhab.core.bundles</groupId>
417423
<artifactId>org.openhab.core.automation.module.script.rulesupport</artifactId>

‎bom/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.openhab.core</groupId>
99
<artifactId>org.openhab.core.reactor</artifactId>
10-
<version>5.0.0-SNAPSHOT</version>
10+
<version>5.1.0-SNAPSHOT</version>
1111
</parent>
1212

1313
<groupId>org.openhab.core.bom</groupId>

‎bom/runtime-index/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.openhab.core.bom</groupId>
99
<artifactId>org.openhab.core.reactor.bom</artifactId>
10-
<version>5.0.0-SNAPSHOT</version>
10+
<version>5.1.0-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>org.openhab.core.bom.runtime-index</artifactId>

‎bom/runtime/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.openhab.core.bom</groupId>
99
<artifactId>org.openhab.core.reactor.bom</artifactId>
10-
<version>5.0.0-SNAPSHOT</version>
10+
<version>5.1.0-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>org.openhab.core.bom.runtime</artifactId>
@@ -958,7 +958,7 @@
958958
<dependency>
959959
<groupId>de.focus-shift</groupId>
960960
<artifactId>jollyday-jackson</artifactId>
961-
<version>1.5.0</version>
961+
<version>1.5.4</version>
962962
<scope>compile</scope>
963963
</dependency>
964964

0 commit comments

Comments
 (0)