This is an automated email from the ASF dual-hosted git repository.
robbie pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-protonj2.git
commit 1fedf3dde025a10515634b11822e40b8bd3f7f75
Author: Robbie Gemmell <robbie.gemm...@gmail.com>
AuthorDate: Wed Apr 28 14:29:37 2021 +0100
gate off the JMH perf tests module from main build, require it be enabled
or built directly
---
pom.xml | 16 ++++++++++++++-
protonj2-performance-tests/README.md | 2 --
protonj2-performance-tests/pom.xml | 38 +++++++++++++++++++++++++++++++++++-
3 files changed, 52 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index b6256c8..e2499e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,7 +83,6 @@
<modules>
<module>protonj2</module>
- <module>protonj2-performance-tests</module>
<module>protonj2-test-driver</module>
<module>protonj2-client</module>
<module>protonj2-client-examples</module>
@@ -333,6 +332,8 @@
<configuration>
<autoVersionSubmodules>true</autoVersionSubmodules>
<tagNameFormat>@{project.version}</tagNameFormat>
+ <arguments>-Papache-release -Dperform-release-checks=true
${arguments}</arguments>
+ <pushChanges>true</pushChanges>
</configuration>
</plugin>
<plugin>
@@ -374,6 +375,19 @@
</plugin>
</plugins>
</build>
+ <!-- Enable the optional performance-tests module too, so that it gets
+ the version updated by the maven-release-plugin during release.
+ The module is configured not to deploy anything. -->
+ <modules>
+ <module>protonj2-performance-tests</module>
+ </modules>
+ </profile>
+
+ <profile>
+ <id>performance-jmh</id>
+ <modules>
+ <module>protonj2-performance-tests</module>
+ </modules>
</profile>
<profile>
diff --git a/protonj2-performance-tests/README.md
b/protonj2-performance-tests/README.md
index bbb122a..a0d2c97 100644
--- a/protonj2-performance-tests/README.md
+++ b/protonj2-performance-tests/README.md
@@ -10,8 +10,6 @@ within the overall build by using the 'performance-jmh' maven
profile.
Building the benchmarks
-------
-TODO - Currently just part of the build with deploy disabled.
-
The benchmarks are maven built and involve some code generation for the JMH
part. As such it is required that you
rebuild upon changing the code. As the codebase is small it is recommended
that you do this from the project
root folder to avoid missing any changes from other modules.
diff --git a/protonj2-performance-tests/pom.xml
b/protonj2-performance-tests/pom.xml
index 0a12d70..f704c2c 100644
--- a/protonj2-performance-tests/pom.xml
+++ b/protonj2-performance-tests/pom.xml
@@ -24,7 +24,7 @@
</parent>
<artifactId>protonj2-performance-tests</artifactId>
- <name>Qpid ProtonJ2 JMH performance tests</name>
+ <name>Qpid ProtonJ2 JMH Performance Tests</name>
<description>JMH Tests for the ProtonJ2 library</description>
<packaging>jar</packaging>
@@ -85,4 +85,40 @@
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>perform-release-checks</id>
+ <activation>
+ <property>
+ <name>perform-release-checks</name>
+ <value>true</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>enforce-release-version</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireReleaseVersion>
+ <message>Module still has a SNAPSHOT version! Ensure
release is prepared using "mvn release:prepare -Papache-release"
+ </message>
+ </requireReleaseVersion>
+ </rules>
+ <fail>true</fail>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
