You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ro...@apache.org on 2021/10/20 14:56:48 UTC

[activemq-artemis] branch main updated: NO-JIRA: enable optional modules during release, get their version updated and are tagged as such. Refresh release docs.

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/activemq-artemis.git


The following commit(s) were added to refs/heads/main by this push:
     new 6bd7638  NO-JIRA: enable optional modules during release, get their version updated and are tagged as such. Refresh release docs.
6bd7638 is described below

commit 6bd76386f16cf5cd2b943f55a53f1db835881dae
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Wed Oct 20 14:38:56 2021 +0100

    NO-JIRA: enable optional modules during release, get their version updated and are tagged as such. Refresh release docs.
---
 RELEASING.md                                           | 18 ++++++------------
 .../src/main/assembly/source-assembly.xml              |  3 ---
 tests/extra-tests/pom.xml                              | 10 ++++++++++
 tests/pom.xml                                          |  3 +++
 4 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/RELEASING.md b/RELEASING.md
index 902d96a..630a53f 100644
--- a/RELEASING.md
+++ b/RELEASING.md
@@ -79,12 +79,12 @@ When prompted make sure the next is a major release. Example:
 
 ```
 [INFO] Checking dependencies and plugins for snapshots ...
-What is the release version for "ActiveMQ Artemis Parent"? (org.apache.activemq:artemis-pom) 1.4.0: :
-What is SCM release tag or label for "ActiveMQ Artemis Parent"? (org.apache.activemq:artemis-pom) artemis-pom-1.4.0: : 1.4.0
-What is the new development version for "ActiveMQ Artemis Parent"? (org.apache.activemq:artemis-pom) 1.4.1-SNAPSHOT: : 1.5.0-SNAPSHOT
+What is the release version for "ActiveMQ Artemis Parent"? (org.apache.activemq:artemis-pom) 2.19.0: :
+What is SCM release tag or label for "ActiveMQ Artemis Parent"? (org.apache.activemq:artemis-pom) artemis-pom-2.19.0: : 2.19.0
+What is the new development version for "ActiveMQ Artemis Parent"? (org.apache.activemq:artemis-pom) 2.19.1-SNAPSHOT: : 2.20.0-SNAPSHOT
 ```
 
-Otherwise snapshots will be created at 1.4.1 and forgotten. (Unless we ever release 1.4.1 on that example).
+Otherwise snapshots will be created at 2.19.1-SNAPSHOT and forgotten. (Unless we ever release 2.19.1 on that example).
 
 For more information look at the prepare plugin:
 
@@ -98,13 +98,6 @@ git push upstream
 git push upstream <version>
 ```
 
-
-## Extra tests
-
-Note: The Apache Release plugin does not bump the version on the `extraTests` module.  Release manager should manually
-bump the version in the test/extra-tests/pom.xml to the next development version.
-
-
 ## Uploading to nexus
 
 Ensure that your environment is ready to deploy to the ASF Nexus repository as described at
@@ -263,12 +256,13 @@ informing the list about the voting results, e.g.:
 ```
 Results of the Apache ActiveMQ Artemis <version> release vote.
 
-Vote passes with 3 votes, 2 binding and 1 non binding.
+Vote passes with 4 votes, 3 binding and 1 non-binding.
 
 The following votes were received:
 
 Binding:
 +1 John Doe
++1 Jane Doe
 +1 Bill Smith
 
 Non Binding:
diff --git a/artemis-distribution/src/main/assembly/source-assembly.xml b/artemis-distribution/src/main/assembly/source-assembly.xml
index 46805d4..8fa8889 100644
--- a/artemis-distribution/src/main/assembly/source-assembly.xml
+++ b/artemis-distribution/src/main/assembly/source-assembly.xml
@@ -37,9 +37,6 @@
          <directoryMode>0755</directoryMode>
          <fileMode>0644</fileMode>
          <excludes>
-            <exclude>tests/extra-tests/</exclude>
-            <exclude>tests/performance-jmh/</exclude>
-
             <exclude>artemis-distribution/src/main/resources/bin/artemis</exclude>
             <exclude>artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis</exclude>
             <exclude>artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service</exclude>
diff --git a/tests/extra-tests/pom.xml b/tests/extra-tests/pom.xml
index 0914ac0..972d5ca 100644
--- a/tests/extra-tests/pom.xml
+++ b/tests/extra-tests/pom.xml
@@ -302,6 +302,16 @@
                <argLine>${activemq-surefire-argline} -noverify</argLine>
             </configuration>
          </plugin>
+
+         <!-- Don't deploy artifacts for this module. It has non-permissive
+              dependencies and is only optionally used for local testing. -->
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-deploy-plugin</artifactId>
+            <configuration>
+               <skip>true</skip>
+            </configuration>
+         </plugin>
       </plugins>
    </build>
 
diff --git a/tests/pom.xml b/tests/pom.xml
index d65b2ae..925a5dc 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -131,9 +131,12 @@
          <id>release</id>
          <modules>
             <module>activemq5-unit-tests</module>
+            <module>extra-tests</module>
+            <module>performance-jmh</module>
          </modules>
          <properties>
             <skipActiveMQ5Tests>true</skipActiveMQ5Tests>
+            <skipExtraTests>true</skipExtraTests>
          </properties>
       </profile>
    </profiles>