Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
charphi committed Jul 12, 2024
2 parents e0ab30f + 4bbfa6a commit 8973432
Show file tree
Hide file tree
Showing 14 changed files with 158 additions and 17 deletions.
9 changes: 6 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,17 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]

## [1.1.1] - 2024-07-12
## [1.2.1] - 2024-07-12

## [1.2.0] - 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
[Unreleased]: https://github.com/jdemetra/jdplus-benchmarking/compare/v1.2.1...HEAD
[1.2.1]: https://github.com/jdemetra/jdplus-benchmarking/compare/v1.2.0...v1.2.1
[1.2.0]: https://github.com/jdemetra/jdplus-benchmarking/compare/v1.1.0...v1.2.0
[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

Expand Down
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-benchmarking-base-parent</artifactId>
<version>1.2.0</version>
<version>1.2.1</version>
</parent>

<artifactId>jdplus-benchmarking-base-api</artifactId>
Expand Down
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-benchmarking-base-parent</artifactId>
<version>1.2.0</version>
<version>1.2.1</version>
</parent>

<artifactId>jdplus-benchmarking-base-core</artifactId>
Expand Down
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-benchmarking-base-parent</artifactId>
<version>1.2.0</version>
<version>1.2.1</version>
</parent>

<artifactId>jdplus-benchmarking-base-information</artifactId>
Expand Down
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-benchmarking-base-parent</artifactId>
<version>1.2.0</version>
<version>1.2.1</version>
</parent>

<artifactId>jdplus-benchmarking-base-protobuf</artifactId>
Expand Down
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-benchmarking-base-parent</artifactId>
<version>1.2.0</version>
<version>1.2.1</version>
</parent>

<artifactId>jdplus-benchmarking-base-r</artifactId>
Expand Down
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-benchmarking-base-parent</artifactId>
<version>1.2.0</version>
<version>1.2.1</version>
</parent>

<artifactId>jdplus-benchmarking-base-workspace</artifactId>
Expand Down
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-benchmarking-base</artifactId>
<version>1.2.0</version>
<version>1.2.1</version>
</parent>

<artifactId>jdplus-benchmarking-base-parent</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion jdplus-benchmarking-base/pom.xml
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-benchmarking</artifactId>
<version>1.2.0</version>
<version>1.2.1</version>
</parent>

<artifactId>jdplus-benchmarking-base</artifactId>
Expand Down
135 changes: 135 additions & 0 deletions jdplus-benchmarking-bom/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,135 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-benchmarking</artifactId>
<version>1.2.1</version>
</parent>

<artifactId>jdplus-benchmarking-bom</artifactId>
<packaging>pom</packaging>

<name>${project.artifactId}</name>
<description>${project.parent.artifactId} - ${project.artifactId}</description>
<url>${project.parent.url}</url>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jdplus-benchmarking-base</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jdplus-benchmarking-cli</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jdplus-benchmarking-desktop</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<version>1.6.0</version>
<configuration>
<flattenMode>bom</flattenMode>
<outputDirectory>${project.build.directory}</outputDirectory>
</configuration>
<executions>
<execution>
<id>flatten</id>
<phase>process-resources</phase>
<goals>
<goal>flatten</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

<profiles>
<!-- Release binaries on GitHub -->
<!-- Note that all plugins are run on 'install' phase -->
<profile>
<id>full-release</id>
<properties>
<desktop.basedir>${project.build.directory}/../../jdplus-benchmarking-desktop</desktop.basedir>
</properties>
<build>
<plugins>
<!-- Extract changelog -->
<plugin>
<groupId>com.github.nbbrd.heylogs</groupId>
<artifactId>heylogs-maven-plugin</artifactId>
<executions>
<execution>
<id>extract-changelog</id>
<phase>install</phase>
<goals>
<goal>extract</goal>
</goals>
<configuration>
<inputFile>${project.parent.basedir}/CHANGELOG.md</inputFile>
</configuration>
</execution>
</executions>
</plugin>

<!-- Release assets -->
<plugin>
<groupId>org.jreleaser</groupId>
<artifactId>jreleaser-maven-plugin</artifactId>
<executions>
<execution>
<id>release-assets</id>
<phase>install</phase>
<goals>
<goal>full-release</goal>
</goals>
<configuration>
<jreleaser>
<release>
<github>
<skipTag>true</skipTag>
<changelog>
<external>${project.build.directory}/CHANGELOG.md</external>
</changelog>
</github>
</release>
<signing>
<active>ALWAYS</active>
<!-- Fix default value -->
<armored>true</armored>
</signing>
<files>
<artifacts>
<artifact>
<path>
${desktop.basedir}/jdplus-benchmarking-desktop-plugin/target/jdplus-benchmarking-desktop-plugin-${project.version}.nbm
</path>
</artifact>
</artifacts>
</files>
</jreleaser>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
2 changes: 1 addition & 1 deletion jdplus-benchmarking-cli/pom.xml
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-benchmarking</artifactId>
<version>1.2.0</version>
<version>1.2.1</version>
</parent>

<artifactId>jdplus-benchmarking-cli</artifactId>
Expand Down
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-benchmarking-desktop</artifactId>
<version>1.2.0</version>
<version>1.2.1</version>
</parent>

<artifactId>jdplus-benchmarking-desktop-plugin</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion jdplus-benchmarking-desktop/pom.xml
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-benchmarking</artifactId>
<version>1.2.0</version>
<version>1.2.1</version>
</parent>

<artifactId>jdplus-benchmarking-desktop</artifactId>
Expand Down
9 changes: 6 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-benchmarking</artifactId>
<version>1.2.0</version>
<version>1.2.1</version>
<packaging>pom</packaging>

<name>${project.artifactId}</name>
Expand Down Expand Up @@ -38,7 +38,7 @@
<properties>
<!-- Java 17 config -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.outputTimestamp>2024-07-12T09:06:05Z</project.build.outputTimestamp>
<project.build.outputTimestamp>2024-07-12T10:25:54Z</project.build.outputTimestamp>
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.release>17</maven.compiler.release>
Expand Down Expand Up @@ -67,6 +67,7 @@
<module>jdplus-benchmarking-base</module>
<module>jdplus-benchmarking-desktop</module>
<module>jdplus-benchmarking-cli</module>
<module>jdplus-benchmarking-bom</module>
</modules>

<dependencies>
Expand Down Expand Up @@ -351,7 +352,7 @@
<requireProperty>
<property>project.artifactId</property>
<message>Project artifactId must follow JD3 pattern</message>
<regex>^(jdplus)-(\w+)(?:-(base|cli|desktop)(?:-(\w+))?)?$</regex>
<regex>^(jdplus)-(\w+)(?:-(base|cli|desktop|bom)(?:-(\w+))?)?$</regex>
</requireProperty>
<requireReleaseDeps>
<onlyWhenRelease>true</onlyWhenRelease>
Expand Down Expand Up @@ -530,6 +531,7 @@
<serverId>ossrh</serverId>
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
<autoReleaseAfterClose>true</autoReleaseAfterClose>
<stagingProgressTimeoutMinutes>10</stagingProgressTimeoutMinutes>
</configuration>
</plugin>
</plugins>
Expand All @@ -555,6 +557,7 @@
<serverId>ossrh</serverId>
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
<autoReleaseAfterClose>true</autoReleaseAfterClose>
<stagingProgressTimeoutMinutes>10</stagingProgressTimeoutMinutes>
</configuration>
</plugin>
</plugins>
Expand Down

0 comments on commit 8973432

Please sign in to comment.