diff --git a/.github/workflows/check-links.yml b/.github/workflows/check-links.yml index a0a1a37..8627b21 100644 --- a/.github/workflows/check-links.yml +++ b/.github/workflows/check-links.yml @@ -26,7 +26,7 @@ jobs: fetch-depth: 0 - name: Restore lychee cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: .lycheecache key: cache-lychee-${{ github.sha }} @@ -34,7 +34,7 @@ jobs: - name: Check links id: lychee - uses: lycheeverse/lychee-action@v1.8.0 + uses: lycheeverse/lychee-action@v1.10.0 with: fail: true args: --max-concurrency 1 --cache --no-progress --exclude-all-private './**/*.md' diff --git a/.github/workflows/heylogs.yml b/.github/workflows/heylogs.yml new file mode 100644 index 0000000..31a97af --- /dev/null +++ b/.github/workflows/heylogs.yml @@ -0,0 +1,33 @@ +name: Heylogs + +on: [ push ] + +jobs: + badge-job: + if: startsWith(github.repository, 'jdemetra/') && startsWith(github.ref, 'refs/heads/develop') + runs-on: ubuntu-latest + steps: + - name: Checkout source code + uses: actions/checkout@v4 + + - name: Setup Java + uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: 21 + cache: 'maven' + + - name: Scan changelog + run: mvn -B -ntp -U com.github.nbbrd.heylogs:heylogs-maven-plugin::scan -Dheylogs.output.file=scan.json -Dheylogs.format.id=json + + - name: Create badges endpoint json + run: | + mkdir heylogs + jq '{schemaVersion: 1, label: "unreleased changes", message: "#\(.[0].summary.unreleasedChanges)", color: "E05735", logoColor: "white", namedLogo: "keepachangelog"}' scan.json > heylogs/unreleased-changes.json + + - name: Deploy badges endpoint json + uses: peaceiris/actions-gh-pages@v4 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + publish_branch: badges + publish_dir: ./heylogs diff --git a/.github/workflows/java-ea-maven.yml b/.github/workflows/java-ea-maven.yml index 53906f4..a690e85 100644 --- a/.github/workflows/java-ea-maven.yml +++ b/.github/workflows/java-ea-maven.yml @@ -12,7 +12,7 @@ jobs: fail-fast: false matrix: java: [ 21 ] - os: [ ubuntu-latest ] + os: [ ubuntu-latest, macos-latest ] name: JDK${{ matrix.java }} on ${{ matrix.os }} runs-on: ${{ matrix.os }} @@ -34,4 +34,4 @@ jobs: - name: Build and (headless) test with Maven uses: smithki/xvfb-action@v1.1.2 with: - run: mvn -U -B -ntp package + run: mvn -U -B -ntp verify diff --git a/.github/workflows/java-maven.yml b/.github/workflows/java-maven.yml index 2480829..c0286e7 100644 --- a/.github/workflows/java-maven.yml +++ b/.github/workflows/java-maven.yml @@ -8,8 +8,8 @@ jobs: strategy: fail-fast: false matrix: - java: [ 17 ] - os: [ ubuntu-latest, macOS-latest, windows-latest ] + java: [ 21 ] + os: [ ubuntu-latest, macos-13, windows-latest ] name: JDK${{ matrix.java }} on ${{ matrix.os }} runs-on: ${{ matrix.os }} @@ -34,7 +34,7 @@ jobs: - name: Build and (headless) test with Maven uses: smithki/xvfb-action@v1.1.2 with: - run: mvn -U -B -ntp package + run: mvn -U -B -ntp verify auto-merge-job: needs: build-and-test-job @@ -58,7 +58,7 @@ jobs: if: startsWith(github.repository, 'jdemetra/') && startsWith(github.ref, 'refs/heads/develop') strategy: matrix: - java: [ 17 ] + java: [ 21 ] os: [ ubuntu-latest ] name: Snapshot on develop @@ -96,7 +96,7 @@ jobs: - name: Upload JReleaser output if: always() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: assets-snapshot-log path: | @@ -108,7 +108,7 @@ jobs: if: startsWith(github.repository, 'jdemetra/') && startsWith(github.ref, 'refs/tags/v') strategy: matrix: - java: [ 17 ] + java: [ 21 ] os: [ ubuntu-latest ] name: Release on tag @@ -148,7 +148,7 @@ jobs: - name: Upload JReleaser output if: always() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: assets-release-log path: | diff --git a/CHANGELOG.md b/CHANGELOG.md index 639bc9d..e87a748 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,4 +7,18 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] -[Unreleased]: https://github.com/jdemetra/jd3-benchmarking/compare/3beebc91b34f5933677d8d0e45522e7b02190b5a...HEAD +## [1.1.1] - 2024-07-12 + +## [1.1.0] - 2023-12-12 + +## [1.0.0] - 2023-12-12 + +[Unreleased]: https://github.com/jdemetra/jdplus-benchmarking/compare/v1.1.1...HEAD +[1.1.1]: https://github.com/jdemetra/jdplus-benchmarking/compare/v1.1.0...v1.1.1 +[1.1.0]: https://github.com/jdemetra/jdplus-benchmarking/compare/v1.0.0...v1.1.0 +[1.0.0]: https://github.com/jdemetra/jdplus-benchmarking/releases/tag/v1.0.0 + +[STAT]: https://img.shields.io/badge/-STAT-068C09 +[OTHER]: https://img.shields.io/badge/-OTHER-e4e669 +[IO]: https://img.shields.io/badge/-IO-F813F7 +[UI]: https://img.shields.io/badge/-UI-5319E7 diff --git a/README.md b/README.md index a2a1f09..6a02aab 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,4 @@ # JDemetra+ v3 - benchmarking extensions - \ No newline at end of file + +[![Download](https://img.shields.io/github/release/jdemetra/jdplus-benchmarking.svg)](https://github.com/jdemetra/jdplus-benchmarking/releases/latest) +[![Changes](https://img.shields.io/endpoint?url=https%3A%2F%2Fraw.githubusercontent.com%2Fjdemetra%2Fjdplus-benchmarking%2Fbadges%2Funreleased-changes.json)](https://github.com/jdemetra/jdplus-benchmarking/blob/develop/CHANGELOG.md) diff --git a/jdplus-benchmarking-base/jdplus-benchmarking-base-parent/jdplus-benchmarking-base-api/pom.xml b/jdplus-benchmarking-base/jdplus-benchmarking-base-parent/jdplus-benchmarking-base-api/pom.xml index c83f8af..ce4a4f5 100644 --- a/jdplus-benchmarking-base/jdplus-benchmarking-base-parent/jdplus-benchmarking-base-api/pom.xml +++ b/jdplus-benchmarking-base/jdplus-benchmarking-base-parent/jdplus-benchmarking-base-api/pom.xml @@ -5,7 +5,7 @@ eu.europa.ec.joinup.sat jdplus-benchmarking-base-parent - 1.1.0 + 1.2.0 jdplus-benchmarking-base-api diff --git a/jdplus-benchmarking-base/jdplus-benchmarking-base-parent/jdplus-benchmarking-base-core/pom.xml b/jdplus-benchmarking-base/jdplus-benchmarking-base-parent/jdplus-benchmarking-base-core/pom.xml index 8331029..b4bed1b 100644 --- a/jdplus-benchmarking-base/jdplus-benchmarking-base-parent/jdplus-benchmarking-base-core/pom.xml +++ b/jdplus-benchmarking-base/jdplus-benchmarking-base-parent/jdplus-benchmarking-base-core/pom.xml @@ -5,7 +5,7 @@ eu.europa.ec.joinup.sat jdplus-benchmarking-base-parent - 1.1.0 + 1.2.0 jdplus-benchmarking-base-core diff --git a/jdplus-benchmarking-base/jdplus-benchmarking-base-parent/jdplus-benchmarking-base-core/src/main/java/jdplus/benchmarking/base/core/benchmarking/extractors/TemporalDisaggregationExtractor.java b/jdplus-benchmarking-base/jdplus-benchmarking-base-parent/jdplus-benchmarking-base-core/src/main/java/jdplus/benchmarking/base/core/benchmarking/extractors/TemporalDisaggregationExtractor.java index 0113c66..02b9093 100644 --- a/jdplus-benchmarking-base/jdplus-benchmarking-base-parent/jdplus-benchmarking-base-core/src/main/java/jdplus/benchmarking/base/core/benchmarking/extractors/TemporalDisaggregationExtractor.java +++ b/jdplus-benchmarking-base/jdplus-benchmarking-base-parent/jdplus-benchmarking-base-core/src/main/java/jdplus/benchmarking/base/core/benchmarking/extractors/TemporalDisaggregationExtractor.java @@ -37,22 +37,22 @@ public class TemporalDisaggregationExtractor extends InformationMapping { public TemporalDisaggregationExtractor() { - set(TemporalDisaggregationDictionaries.DISAGG, TsData.class, + set(TemporalDisaggregationDictionaries.DISAGG, TsData.class, source -> source.getDisaggregatedSeries()); - set(TemporalDisaggregationDictionaries.EDISAGG, TsData.class, + set(TemporalDisaggregationDictionaries.EDISAGG, TsData.class, source -> source.getStdevDisaggregatedSeries()); - set(TemporalDisaggregationDictionaries.LDISAGG, TsData.class, + set(TemporalDisaggregationDictionaries.LDISAGG, TsData.class, source -> source.getDisaggregatedSeries() .fn(source.getStdevDisaggregatedSeries(), (a, b) -> a - 2 * b)); - set(TemporalDisaggregationDictionaries.UDISAGG, TsData.class, + set(TemporalDisaggregationDictionaries.UDISAGG, TsData.class, source -> source.getDisaggregatedSeries().fn(source.getStdevDisaggregatedSeries(), (a, b) -> a + 2 * b)); - set(TemporalDisaggregationDictionaries.REGEFFECT, TsData.class, + set(TemporalDisaggregationDictionaries.REGEFFECT, TsData.class, source -> source.getRegressionEffects()); - set(TemporalDisaggregationDictionaries.SMOOTHINGEFFECT, TsData.class, + set(TemporalDisaggregationDictionaries.SMOOTHINGEFFECT, TsData.class, source -> TsData.subtract(source.getDisaggregatedSeries(), source.getRegressionEffects())); - set(TemporalDisaggregationDictionaries.COEFF, double[].class, + set(TemporalDisaggregationDictionaries.COEFF, double[].class, source -> source.getCoefficients().toArray()); - set(TemporalDisaggregationDictionaries.COVAR, Matrix.class, + set(TemporalDisaggregationDictionaries.COVAR, Matrix.class, source -> source.getCoefficientsCovariance()); set(TemporalDisaggregationDictionaries.REGNAMES, String[].class, source -> { Variable[] vars = source.getIndicators(); @@ -78,7 +78,8 @@ public TemporalDisaggregationExtractor() { return Double.NaN; } Matrix H = source.getMaximum().getHessian(); - return (H == null || H.isEmpty()) ? Double.NaN : Math.sqrt(1 / source.getMaximum().getHessian().get(0, 0)); + int n = source.getLikelihood().degreesOfFreedom() - 1; + return (H == null || H.isEmpty()) ? Double.NaN : Math.sqrt(-1 / (n * H.get(0, 0))); }); set(TemporalDisaggregationDictionaries.SPART, Double.class, source -> { TsData re = source.getRegressionEffects(); diff --git a/jdplus-benchmarking-base/jdplus-benchmarking-base-parent/jdplus-benchmarking-base-core/src/test/java/jdplus/benchmarking/base/core/benchmarking/multivariate/MultivariateCholetteTest.java b/jdplus-benchmarking-base/jdplus-benchmarking-base-parent/jdplus-benchmarking-base-core/src/test/java/jdplus/benchmarking/base/core/benchmarking/multivariate/MultivariateCholetteTest.java index d9fd148..6c9506c 100644 --- a/jdplus-benchmarking-base/jdplus-benchmarking-base-parent/jdplus-benchmarking-base-core/src/test/java/jdplus/benchmarking/base/core/benchmarking/multivariate/MultivariateCholetteTest.java +++ b/jdplus-benchmarking-base/jdplus-benchmarking-base-parent/jdplus-benchmarking-base-core/src/test/java/jdplus/benchmarking/base/core/benchmarking/multivariate/MultivariateCholetteTest.java @@ -27,6 +27,8 @@ import java.util.HashMap; import java.util.Map; import java.util.Random; +import jdplus.toolkit.base.api.data.AggregationType; +import jdplus.toolkit.base.api.timeseries.TsUnit; import static org.junit.jupiter.api.Assertions.assertTrue; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -67,7 +69,7 @@ public void testTable() { TemporalConstraint c4 = TemporalConstraint.parse("S22=sum(s22)"); MultivariateCholetteSpec.Builder builder = MultivariateCholetteSpec.builder() - .lambda(1) + .lambda(0.9) .rho(1) .contemporaneousConstraint(c1) .contemporaneousConstraint(c2) @@ -106,8 +108,8 @@ public void testTable() { assertTrue(distance(s2_, TsData.add(rslt2.get("s21"), rslt2.get("s22"))) < 1e-9); } - @Test - @Disabled +// @Test +// @Disabled public void testOldTable() { TsMultiBenchmarking bench = new TsMultiBenchmarking(); ec.tstoolkit.timeseries.simplets.TsData s11 = oldRandomM(120, 0); @@ -126,7 +128,7 @@ public void testOldTable() { ec.tstoolkit.timeseries.simplets.TsData s2_ = oldRandomM(120, 6); bench.addInput("s2_", s2_); - bench.setLambda(0.5); + bench.setLambda(0.9); bench.setRho(1); ec.benchmarking.simplets.TsMultiBenchmarking.ContemporaneousConstraintDescriptor c1 = ec.benchmarking.simplets.TsMultiBenchmarking.ContemporaneousConstraintDescriptor.parse("s_1=s11+s21"); bench.addContemporaneousConstraint(c1); @@ -183,4 +185,107 @@ private ec.tstoolkit.timeseries.simplets.TsData oldRandomY(int len, int seed) { return new ec.tstoolkit.timeseries.simplets.TsData(ec.tstoolkit.timeseries.simplets.TsFrequency.Yearly, 1980, 0, data, false); } +// The following test works... + @Test + public void testTableFictiveData() { + + Map input = new HashMap<>(); + + double[] s1 = {7,7.2,8.1,7.5,8.5,7.8,8.1,8.4}; + input.put("s1", TsData.ofInternal(TsPeriod.quarterly(2021, 1), s1)); + + double[] s2 = {18,19.5,19.0,19.7,18.5,19.0,20.3,20.0}; + input.put("s2", TsData.ofInternal(TsPeriod.quarterly(2021, 1), s2)); + + double[] s3 = {1.5,1.8,2,2.5,2.0,1.5,1.7,2.0}; + input.put("s3", TsData.ofInternal(TsPeriod.quarterly(2021, 1), s3)); + + double[] a = {27.1,29.8,29.9,31.2,29.3,27.9,30.9,31.7}; + input.put("a", TsData.ofInternal(TsPeriod.quarterly(2021, 1), a)); + + double[] y1 = {30.0,30.5}; + input.put("y1", TsData.ofInternal(TsPeriod.yearly(2021), y1)); + + double[] y2 = {80.0,81.2}; + input.put("y2", TsData.ofInternal(TsPeriod.yearly(2021), y2)); + + double[] y3 = {8.0,8.1}; + input.put("y3", TsData.ofInternal(TsPeriod.yearly(2021), y3)); + + ContemporaneousConstraint c1 = ContemporaneousConstraint.parse("a=s1+s2+s3"); + + TemporalConstraint c2 = TemporalConstraint.parse("y1=sum(s1)"); + TemporalConstraint c3 = TemporalConstraint.parse("y2=sum(s2)"); + TemporalConstraint c4 = TemporalConstraint.parse("y3=sum(s3)"); + + MultivariateCholetteSpec spec = MultivariateCholetteSpec.builder() + .lambda(.5) + .rho(1) + .contemporaneousConstraint(c1) + .temporalConstraint(c2) + .temporalConstraint(c3) + .temporalConstraint(c4) + .build(); + + Map rslt = MultivariateCholette.benchmark(input, spec); + } + + // The following test does not work... (the only difference is that I added 2 more decimals to the second figure of s1) + // Note that if I change the decimal, it works again... + @Test + public void testTableFictiveData2() { + + Map input = new HashMap<>(); + + double[] s1 = {7,7.228,8.1,7.5,8.5,7.8,8.1,8.4}; + TsData S1=TsData.ofInternal(TsPeriod.quarterly(2021, 1), s1); + input.put("s1", S1); + + double[] s2 = {18,19.5,19.0,19.7,18.5,19.0,20.3,20.0}; + TsData S2=TsData.ofInternal(TsPeriod.quarterly(2021, 1), s2); + input.put("s2", S2); + + double[] s3 = {1.5,1.8,2,2.5,2.0,1.5,1.7,2.0}; + TsData S3=TsData.ofInternal(TsPeriod.quarterly(2021, 1), s3); + input.put("s3", S3); + + double[] a = {27.1,29.8,29.9,31.2,29.3,27.9,30.9,31.7}; + TsData A=TsData.ofInternal(TsPeriod.quarterly(2021, 1), a); + input.put("a", A); + + double[] y1 = {30.0,30.5}; + TsData Y1=TsData.ofInternal(TsPeriod.yearly(2021), y1); + input.put("y1", Y1); + + double[] y2 = {80.0,81.2}; + TsData Y2=TsData.ofInternal(TsPeriod.yearly(2021), y2); + input.put("y2", Y2); + + double[] y3 = {8.0,8.1}; + TsData Y3=TsData.ofInternal(TsPeriod.yearly(2021), y3); + input.put("y3", Y3); + + ContemporaneousConstraint c1 = ContemporaneousConstraint.parse("a=s1+s2+s3"); + + TemporalConstraint c2 = TemporalConstraint.parse("y1=sum(s1)"); + TemporalConstraint c3 = TemporalConstraint.parse("y2=sum(s2)"); + TemporalConstraint c4 = TemporalConstraint.parse("y3=sum(s3)"); + + MultivariateCholetteSpec spec = MultivariateCholetteSpec.builder() + .lambda(0.5) + .rho(1) + .contemporaneousConstraint(c1) + .temporalConstraint(c2) + .temporalConstraint(c3) + .temporalConstraint(c4) + .build(); + + Map rslt = MultivariateCholette.benchmark(input, spec); + assertTrue(distance(A, TsData.add(rslt.get("s1"), rslt.get("s2"), rslt.get("s3"))) < 1e-9); + assertTrue(distance(Y1, rslt.get("s1").aggregate(TsUnit.YEAR, AggregationType.Sum, true))< 1e-9); + assertTrue(distance(Y2, rslt.get("s2").aggregate(TsUnit.YEAR, AggregationType.Sum, true))< 1e-9); + assertTrue(distance(Y3, rslt.get("s3").aggregate(TsUnit.YEAR, AggregationType.Sum, true))< 1e-9); + } + + } diff --git a/jdplus-benchmarking-base/jdplus-benchmarking-base-parent/jdplus-benchmarking-base-core/src/test/java/jdplus/benchmarking/base/core/univariate/TemporalDisaggregationProcessorTest.java b/jdplus-benchmarking-base/jdplus-benchmarking-base-parent/jdplus-benchmarking-base-core/src/test/java/jdplus/benchmarking/base/core/univariate/TemporalDisaggregationProcessorTest.java index 6e8d0cf..fe6c2f6 100644 --- a/jdplus-benchmarking-base/jdplus-benchmarking-base-parent/jdplus-benchmarking-base-core/src/test/java/jdplus/benchmarking/base/core/univariate/TemporalDisaggregationProcessorTest.java +++ b/jdplus-benchmarking-base/jdplus-benchmarking-base-parent/jdplus-benchmarking-base-core/src/test/java/jdplus/benchmarking/base/core/univariate/TemporalDisaggregationProcessorTest.java @@ -13,6 +13,7 @@ import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; import jdplus.benchmarking.base.api.univariate.TemporalDisaggregationSpec; +import jdplus.toolkit.base.api.data.DoubleSeq; import jdplus.toolkit.base.api.data.Parameter; /** @@ -73,6 +74,7 @@ public void testChowLin() { System.out.println(rslt2.getDisaggregatedSeries().getValues()); // System.out.println(rslt2.getStdevDisaggregatedSeries().getValues()); System.out.println(rslt2.getCoefficients()); + System.out.println(rslt1.getMaximum().getHessian()); // System.out.println(rslt2.getConcentratedLikelihood().e()); // System.out.println(rslt2.getConcentratedLikelihood().logLikelihood()); } diff --git a/jdplus-benchmarking-base/jdplus-benchmarking-base-parent/jdplus-benchmarking-base-information/pom.xml b/jdplus-benchmarking-base/jdplus-benchmarking-base-parent/jdplus-benchmarking-base-information/pom.xml index 103fc62..b157d6a 100644 --- a/jdplus-benchmarking-base/jdplus-benchmarking-base-parent/jdplus-benchmarking-base-information/pom.xml +++ b/jdplus-benchmarking-base/jdplus-benchmarking-base-parent/jdplus-benchmarking-base-information/pom.xml @@ -5,7 +5,7 @@ eu.europa.ec.joinup.sat jdplus-benchmarking-base-parent - 1.1.0 + 1.2.0 jdplus-benchmarking-base-information diff --git a/jdplus-benchmarking-base/jdplus-benchmarking-base-parent/jdplus-benchmarking-base-protobuf/pom.xml b/jdplus-benchmarking-base/jdplus-benchmarking-base-parent/jdplus-benchmarking-base-protobuf/pom.xml index b74d723..4c5da56 100644 --- a/jdplus-benchmarking-base/jdplus-benchmarking-base-parent/jdplus-benchmarking-base-protobuf/pom.xml +++ b/jdplus-benchmarking-base/jdplus-benchmarking-base-parent/jdplus-benchmarking-base-protobuf/pom.xml @@ -5,7 +5,7 @@ eu.europa.ec.joinup.sat jdplus-benchmarking-base-parent - 1.1.0 + 1.2.0 jdplus-benchmarking-base-protobuf diff --git a/jdplus-benchmarking-base/jdplus-benchmarking-base-parent/jdplus-benchmarking-base-r/pom.xml b/jdplus-benchmarking-base/jdplus-benchmarking-base-parent/jdplus-benchmarking-base-r/pom.xml index cf86444..d5622cd 100644 --- a/jdplus-benchmarking-base/jdplus-benchmarking-base-parent/jdplus-benchmarking-base-r/pom.xml +++ b/jdplus-benchmarking-base/jdplus-benchmarking-base-parent/jdplus-benchmarking-base-r/pom.xml @@ -5,7 +5,7 @@ eu.europa.ec.joinup.sat jdplus-benchmarking-base-parent - 1.1.0 + 1.2.0 jdplus-benchmarking-base-r diff --git a/jdplus-benchmarking-base/jdplus-benchmarking-base-parent/jdplus-benchmarking-base-workspace/pom.xml b/jdplus-benchmarking-base/jdplus-benchmarking-base-parent/jdplus-benchmarking-base-workspace/pom.xml index f01831c..90ccfb4 100644 --- a/jdplus-benchmarking-base/jdplus-benchmarking-base-parent/jdplus-benchmarking-base-workspace/pom.xml +++ b/jdplus-benchmarking-base/jdplus-benchmarking-base-parent/jdplus-benchmarking-base-workspace/pom.xml @@ -5,7 +5,7 @@ eu.europa.ec.joinup.sat jdplus-benchmarking-base-parent - 1.1.0 + 1.2.0 jdplus-benchmarking-base-workspace diff --git a/jdplus-benchmarking-base/jdplus-benchmarking-base-parent/pom.xml b/jdplus-benchmarking-base/jdplus-benchmarking-base-parent/pom.xml index b6a4ccf..f6ba6d1 100644 --- a/jdplus-benchmarking-base/jdplus-benchmarking-base-parent/pom.xml +++ b/jdplus-benchmarking-base/jdplus-benchmarking-base-parent/pom.xml @@ -5,7 +5,7 @@ eu.europa.ec.joinup.sat jdplus-benchmarking-base - 1.1.0 + 1.2.0 jdplus-benchmarking-base-parent diff --git a/jdplus-benchmarking-base/pom.xml b/jdplus-benchmarking-base/pom.xml index b3c022e..e261ce3 100644 --- a/jdplus-benchmarking-base/pom.xml +++ b/jdplus-benchmarking-base/pom.xml @@ -6,7 +6,7 @@ eu.europa.ec.joinup.sat jdplus-benchmarking - 1.1.0 + 1.2.0 jdplus-benchmarking-base diff --git a/jdplus-benchmarking-cli/pom.xml b/jdplus-benchmarking-cli/pom.xml index 5f80cde..869f01a 100644 --- a/jdplus-benchmarking-cli/pom.xml +++ b/jdplus-benchmarking-cli/pom.xml @@ -6,7 +6,7 @@ eu.europa.ec.joinup.sat jdplus-benchmarking - 1.1.0 + 1.2.0 jdplus-benchmarking-cli diff --git a/jdplus-benchmarking-desktop/jdplus-benchmarking-desktop-plugin/pom.xml b/jdplus-benchmarking-desktop/jdplus-benchmarking-desktop-plugin/pom.xml index 86c8df7..7f34d83 100644 --- a/jdplus-benchmarking-desktop/jdplus-benchmarking-desktop-plugin/pom.xml +++ b/jdplus-benchmarking-desktop/jdplus-benchmarking-desktop-plugin/pom.xml @@ -5,7 +5,7 @@ eu.europa.ec.joinup.sat jdplus-benchmarking-desktop - 1.1.0 + 1.2.0 jdplus-benchmarking-desktop-plugin diff --git a/jdplus-benchmarking-desktop/pom.xml b/jdplus-benchmarking-desktop/pom.xml index dc9fa95..b1287fc 100644 --- a/jdplus-benchmarking-desktop/pom.xml +++ b/jdplus-benchmarking-desktop/pom.xml @@ -6,7 +6,7 @@ eu.europa.ec.joinup.sat jdplus-benchmarking - 1.1.0 + 1.2.0 jdplus-benchmarking-desktop @@ -16,7 +16,7 @@ - RELEASE200 + RELEASE220 @@ -30,7 +30,7 @@ org.apache.netbeans.utilities nbm-maven-plugin - 14.0 + 14.1 diff --git a/pom.xml b/pom.xml index 46a08c2..ec62f77 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ eu.europa.ec.joinup.sat jdplus-benchmarking - 1.1.0 + 1.2.0 pom ${project.artifactId} @@ -38,6 +38,7 @@ UTF-8 + 2024-07-12T09:06:05Z 17 17 17 @@ -47,18 +48,18 @@ ${project.artifactId} - 1.18.30 - 1.7.0 - 1.5.0 - 3.41.0 + 1.18.34 + 1.9.0 + 1.5.1 + 3.45.0 - 5.10.1 - 3.24.2 + 5.10.3 + 3.26.3 2.2.4 - 3.2.1 + 3.2.4 3.21.12 @@ -123,27 +124,27 @@ org.apache.maven.plugins maven-clean-plugin - 3.3.2 + 3.4.0 org.apache.maven.plugins maven-compiler-plugin - 3.11.0 + 3.13.0 org.apache.maven.plugins maven-deploy-plugin - 3.1.1 + 3.1.2 org.apache.maven.plugins maven-install-plugin - 3.1.1 + 3.1.2 org.apache.maven.plugins maven-jar-plugin - 3.3.0 + 3.4.2 org.apache.maven.plugins @@ -158,12 +159,12 @@ org.apache.maven.plugins maven-surefire-plugin - 3.2.2 + 3.3.1 org.apache.maven.surefire surefire-junit-platform - 3.2.2 + 3.3.1 @@ -171,27 +172,27 @@ org.apache.maven.plugins maven-dependency-plugin - 3.6.1 + 3.7.1 org.apache.maven.plugins maven-enforcer-plugin - 3.4.1 + 3.5.0 org.gaul modernizer-maven-plugin - 2.7.0 + 2.9.0 de.thetaphi forbiddenapis - 3.6 + 3.7 com.github.nbbrd.heylogs heylogs-maven-plugin - 0.7.2 + 0.8.1 org.xolstice.maven.plugins @@ -201,27 +202,32 @@ com.amashchenko.maven.plugin gitflow-maven-plugin - 1.20.0 + 1.21.0 org.apache.maven.plugins maven-source-plugin - 3.3.0 + 3.3.1 org.apache.maven.plugins maven-javadoc-plugin - 3.6.3 + 3.7.0 org.simplify4u.plugins sign-maven-plugin - 1.0.1 + 1.1.0 org.sonatype.plugins nexus-staging-maven-plugin - 1.6.13 + 1.7.0 + + + org.jreleaser + jreleaser-maven-plugin + 1.13.1 @@ -315,12 +321,12 @@ org.codehaus.mojo extra-enforcer-rules - 1.7.0 + 1.8.0 org.kordamp.maven pomchecker-enforcer-rules - 1.10.0 + 1.11.0