Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@charphi
charphi committed Oct 11, 2023
2 parents 1420043 + 69dca11 commit 7dfff7f
Show file tree
Hide file tree
Showing 69 changed files with 76 additions and 69 deletions.
9 changes: 8 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]

## [3.1.1] - 2023-10-11

### Fixed

- ![UI] Fix startup options that fail with bundled JRE

## [3.1.0] - 2023-10-11

### Changed
Expand Down Expand Up @@ -64,7 +70,8 @@ Install instructions are available at https://github.com/jdemetra/jdplus-main#in
This is the **initial release** of JDemetra+ v3.0.0.
[Java SE 17 or later](https://whichjdk.com/) version is required to run it.

[Unreleased]: https://github.com/jdemetra/jd3-main/compare/v3.1.0...HEAD
[Unreleased]: https://github.com/jdemetra/jd3-main/compare/v3.1.1...HEAD
[3.1.1]: https://github.com/jdemetra/jd3-main/compare/v3.1.0...v3.1.1
[3.1.0]: https://github.com/jdemetra/jd3-main/compare/v3.0.2...v3.1.0
[3.0.2]: https://github.com/jdemetra/jd3-main/compare/v3.0.1...v3.0.2
[3.0.1]: https://github.com/jdemetra/jd3-main/compare/v3.0.0...v3.0.1
Expand Down
2 changes: 1 addition & 1 deletion jdplus-main-base/jdplus-sa-base-parent/jdplus-sa-base-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-sa-base-parent</artifactId>
<version>3.1.0</version>
<version>3.1.1</version>
</parent>

<artifactId>jdplus-sa-base-api</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion jdplus-main-base/jdplus-sa-base-parent/jdplus-sa-base-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-sa-base-parent</artifactId>
<version>3.1.0</version>
<version>3.1.1</version>
</parent>

<artifactId>jdplus-sa-base-core</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion jdplus-main-base/jdplus-sa-base-parent/jdplus-sa-base-csv/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-sa-base-parent</artifactId>
<version>3.1.0</version>
<version>3.1.1</version>
</parent>

<artifactId>jdplus-sa-base-csv</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion jdplus-main-base/jdplus-sa-base-parent/jdplus-sa-base-information/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-sa-base-parent</artifactId>
<version>3.1.0</version>
<version>3.1.1</version>
</parent>

<artifactId>jdplus-sa-base-information</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion jdplus-main-base/jdplus-sa-base-parent/jdplus-sa-base-protobuf/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-sa-base-parent</artifactId>
<version>3.1.0</version>
<version>3.1.1</version>
</parent>

<artifactId>jdplus-sa-base-protobuf</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion jdplus-main-base/jdplus-sa-base-parent/jdplus-sa-base-r/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-sa-base-parent</artifactId>
<version>3.1.0</version>
<version>3.1.1</version>
</parent>

<artifactId>jdplus-sa-base-r</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion jdplus-main-base/jdplus-sa-base-parent/jdplus-sa-base-workspace/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-sa-base-parent</artifactId>
<version>3.1.0</version>
<version>3.1.1</version>
</parent>

<artifactId>jdplus-sa-base-workspace</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion jdplus-main-base/jdplus-sa-base-parent/jdplus-sa-base-xml/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-sa-base-parent</artifactId>
<version>3.1.0</version>
<version>3.1.1</version>
</parent>

<artifactId>jdplus-sa-base-xml</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion jdplus-main-base/jdplus-sa-base-parent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-main-base</artifactId>
<version>3.1.0</version>
<version>3.1.1</version>
</parent>

<artifactId>jdplus-sa-base-parent</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion jdplus-main-base/jdplus-spreadsheet-base-parent/jdplus-spreadsheet-base-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-spreadsheet-base-parent</artifactId>
<version>3.1.0</version>
<version>3.1.1</version>
</parent>

<artifactId>jdplus-spreadsheet-base-api</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion jdplus-main-base/jdplus-spreadsheet-base-parent/jdplus-spreadsheet-base-r/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-spreadsheet-base-parent</artifactId>
<version>3.1.0</version>
<version>3.1.1</version>
</parent>

<artifactId>jdplus-spreadsheet-base-r</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion jdplus-main-base/jdplus-spreadsheet-base-parent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-main-base</artifactId>
<version>3.1.0</version>
<version>3.1.1</version>
</parent>

<artifactId>jdplus-spreadsheet-base-parent</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion jdplus-main-base/jdplus-sql-base-parent/jdplus-sql-base-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-sql-base-parent</artifactId>
<version>3.1.0</version>
<version>3.1.1</version>
</parent>

<artifactId>jdplus-sql-base-api</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion jdplus-main-base/jdplus-sql-base-parent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-main-base</artifactId>
<version>3.1.0</version>
<version>3.1.1</version>
</parent>

<artifactId>jdplus-sql-base-parent</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion jdplus-main-base/jdplus-text-base-parent/jdplus-text-base-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-text-base-parent</artifactId>
<version>3.1.0</version>
<version>3.1.1</version>
</parent>

<artifactId>jdplus-text-base-api</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion jdplus-main-base/jdplus-text-base-parent/jdplus-txt-base-r/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-text-base-parent</artifactId>
<version>3.1.0</version>
<version>3.1.1</version>
</parent>

<artifactId>jdplus-text-base-r</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion jdplus-main-base/jdplus-text-base-parent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-main-base</artifactId>
<version>3.1.0</version>
<version>3.1.1</version>
</parent>

<artifactId>jdplus-text-base-parent</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion jdplus-main-base/jdplus-toolkit-base-parent/jdplus-toolkit-base-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-toolkit-base-parent</artifactId>
<version>3.1.0</version>
<version>3.1.1</version>
</parent>

<artifactId>jdplus-toolkit-base-api</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion jdplus-main-base/jdplus-toolkit-base-parent/jdplus-toolkit-base-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-toolkit-base-parent</artifactId>
<version>3.1.0</version>
<version>3.1.1</version>
</parent>

<artifactId>jdplus-toolkit-base-core</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion jdplus-main-base/jdplus-toolkit-base-parent/jdplus-toolkit-base-information/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-toolkit-base-parent</artifactId>
<version>3.1.0</version>
<version>3.1.1</version>
</parent>

<artifactId>jdplus-toolkit-base-information</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion jdplus-main-base/jdplus-toolkit-base-parent/jdplus-toolkit-base-protobuf/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-toolkit-base-parent</artifactId>
<version>3.1.0</version>
<version>3.1.1</version>
</parent>

<artifactId>jdplus-toolkit-base-protobuf</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion jdplus-main-base/jdplus-toolkit-base-parent/jdplus-toolkit-base-r/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-toolkit-base-parent</artifactId>
<version>3.1.0</version>
<version>3.1.1</version>
</parent>

<artifactId>jdplus-toolkit-base-r</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion jdplus-main-base/jdplus-toolkit-base-parent/jdplus-toolkit-base-tsp/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-toolkit-base-parent</artifactId>
<version>3.1.0</version>
<version>3.1.1</version>
</parent>

<artifactId>jdplus-toolkit-base-tsp</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion jdplus-main-base/jdplus-toolkit-base-parent/jdplus-toolkit-base-tspbridge/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-toolkit-base-parent</artifactId>
<version>3.1.0</version>
<version>3.1.1</version>
</parent>

<artifactId>jdplus-toolkit-base-tspbridge</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion jdplus-main-base/jdplus-toolkit-base-parent/jdplus-toolkit-base-workspace/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-toolkit-base-parent</artifactId>
<version>3.1.0</version>
<version>3.1.1</version>
</parent>

<artifactId>jdplus-toolkit-base-workspace</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion jdplus-main-base/jdplus-toolkit-base-parent/jdplus-toolkit-base-xml/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-toolkit-base-parent</artifactId>
<version>3.1.0</version>
<version>3.1.1</version>
</parent>

<artifactId>jdplus-toolkit-base-xml</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion jdplus-main-base/jdplus-toolkit-base-parent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-main-base</artifactId>
<version>3.1.0</version>
<version>3.1.1</version>
</parent>

<artifactId>jdplus-toolkit-base-parent</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion jdplus-main-base/jdplus-tramoseats-base-parent/jdplus-tramoseats-base-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-tramoseats-base-parent</artifactId>
<version>3.1.0</version>
<version>3.1.1</version>
</parent>

<artifactId>jdplus-tramoseats-base-api</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion jdplus-main-base/jdplus-tramoseats-base-parent/jdplus-tramoseats-base-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-tramoseats-base-parent</artifactId>
<version>3.1.0</version>
<version>3.1.1</version>
</parent>

<artifactId>jdplus-tramoseats-base-core</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion jdplus-main-base/jdplus-tramoseats-base-parent/jdplus-tramoseats-base-information/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-tramoseats-base-parent</artifactId>
<version>3.1.0</version>
<version>3.1.1</version>
</parent>

<artifactId>jdplus-tramoseats-base-information</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion jdplus-main-base/jdplus-tramoseats-base-parent/jdplus-tramoseats-base-protobuf/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-tramoseats-base-parent</artifactId>
<version>3.1.0</version>
<version>3.1.1</version>
</parent>

<artifactId>jdplus-tramoseats-base-protobuf</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion jdplus-main-base/jdplus-tramoseats-base-parent/jdplus-tramoseats-base-r/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-tramoseats-base-parent</artifactId>
<version>3.1.0</version>
<version>3.1.1</version>
</parent>

<artifactId>jdplus-tramoseats-base-r</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion jdplus-main-base/jdplus-tramoseats-base-parent/jdplus-tramoseats-base-workspace/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-tramoseats-base-parent</artifactId>
<version>3.1.0</version>
<version>3.1.1</version>
</parent>

<artifactId>jdplus-tramoseats-base-workspace</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion jdplus-main-base/jdplus-tramoseats-base-parent/jdplus-tramoseats-base-xml/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-tramoseats-base-parent</artifactId>
<version>3.1.0</version>
<version>3.1.1</version>
</parent>

<artifactId>jdplus-tramoseats-base-xml</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion jdplus-main-base/jdplus-tramoseats-base-parent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-main-base</artifactId>
<version>3.1.0</version>
<version>3.1.1</version>
</parent>

<artifactId>jdplus-tramoseats-base-parent</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion jdplus-main-base/jdplus-x13-base-parent/jdplus-x13-base-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-x13-base-parent</artifactId>
<version>3.1.0</version>
<version>3.1.1</version>
</parent>

<artifactId>jdplus-x13-base-api</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion jdplus-main-base/jdplus-x13-base-parent/jdplus-x13-base-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-x13-base-parent</artifactId>
<version>3.1.0</version>
<version>3.1.1</version>
</parent>

<artifactId>jdplus-x13-base-core</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion jdplus-main-base/jdplus-x13-base-parent/jdplus-x13-base-information/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-x13-base-parent</artifactId>
<version>3.1.0</version>
<version>3.1.1</version>
</parent>

<artifactId>jdplus-x13-base-information</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion jdplus-main-base/jdplus-x13-base-parent/jdplus-x13-base-protobuf/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-x13-base-parent</artifactId>
<version>3.1.0</version>
<version>3.1.1</version>
</parent>

<artifactId>jdplus-x13-base-protobuf</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion jdplus-main-base/jdplus-x13-base-parent/jdplus-x13-base-r/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-x13-base-parent</artifactId>
<version>3.1.0</version>
<version>3.1.1</version>
</parent>

<artifactId>jdplus-x13-base-r</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion jdplus-main-base/jdplus-x13-base-parent/jdplus-x13-base-workspace/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-x13-base-parent</artifactId>
<version>3.1.0</version>
<version>3.1.1</version>
</parent>

<artifactId>jdplus-x13-base-workspace</artifactId>
Expand Down
Loading

0 comments on commit 7dfff7f

Please sign in to comment.