You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cs...@apache.org on 2022/03/03 21:59:11 UTC
[activemq] 01/04: AMQ-8520: Re-enable all modules to compile and build by default
This is an automated email from the ASF dual-hosted git repository.
cshannon pushed a commit to branch activemq-5.17.x
in repository https://gitbox.apache.org/repos/asf/activemq.git
commit efe3f5b7d4aefc715e0228452c23d1603b3e2c48
Author: Christopher L. Shannon (cshannon) <ch...@gmail.com>
AuthorDate: Tue Mar 1 12:10:52 2022 -0500
AMQ-8520: Re-enable all modules to compile and build by default
Updates the modules part of the previous full.test profile to always
build but skip running tests by default.
Also fixed miss dependency updates including log4j and jetty
(cherry picked from commit f240cb58067636e1b32d17f8748c8028019da262)
---
activemq-itests-spring31/pom.xml | 21 +++++++++++
activemq-karaf-itest/pom.xml | 32 +++++++++++++++-
activemq-osgi/pom.xml | 10 ++---
.../activemq-perf-maven-plugin/pom.xml | 5 ---
activemq-unit-tests/pom.xml | 43 +++++++++++++++++-----
pom.xml | 12 ++----
6 files changed, 93 insertions(+), 30 deletions(-)
diff --git a/activemq-itests-spring31/pom.xml b/activemq-itests-spring31/pom.xml
index ca814b3..bae3ebe 100644
--- a/activemq-itests-spring31/pom.xml
+++ b/activemq-itests-spring31/pom.xml
@@ -83,4 +83,25 @@
<scope>test</scope>
</dependency>
</dependencies>
+
+ <profiles>
+ <profile>
+ <!-- Default - no tests -->
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skipTests>true</skipTests>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/activemq-karaf-itest/pom.xml b/activemq-karaf-itest/pom.xml
index a596858..06424fe 100644
--- a/activemq-karaf-itest/pom.xml
+++ b/activemq-karaf-itest/pom.xml
@@ -133,8 +133,18 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
@@ -216,6 +226,24 @@
<profiles>
<profile>
+ <!-- Default - no tests -->
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skipTests>true</skipTests>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
<id>ci-build-profile</id>
<activation>
<property>
diff --git a/activemq-osgi/pom.xml b/activemq-osgi/pom.xml
index 9507cc0..2554745 100644
--- a/activemq-osgi/pom.xml
+++ b/activemq-osgi/pom.xml
@@ -499,15 +499,15 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j-version}</version>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <version>${log4j-version}</version>
<classifier>sources</classifier>
<optional>true</optional>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
<version>${log4j-version}</version>
<classifier>sources</classifier>
<optional>true</optional>
diff --git a/activemq-tooling/activemq-perf-maven-plugin/pom.xml b/activemq-tooling/activemq-perf-maven-plugin/pom.xml
index 398bf15..8b94cde 100644
--- a/activemq-tooling/activemq-perf-maven-plugin/pom.xml
+++ b/activemq-tooling/activemq-perf-maven-plugin/pom.xml
@@ -76,10 +76,5 @@
<artifactId>slf4j-simple</artifactId>
<version>${slf4j-version}</version>
</dependency>
- <!-- dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </dependency -->
-
</dependencies>
</project>
diff --git a/activemq-unit-tests/pom.xml b/activemq-unit-tests/pom.xml
index 11e175b..dfb9711 100644
--- a/activemq-unit-tests/pom.xml
+++ b/activemq-unit-tests/pom.xml
@@ -184,13 +184,18 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -260,9 +265,8 @@
</dependency>
<dependency>
<!-- using it for Jetty's JNDI context to work /w Joram tests. -->
- <groupId>org.eclipse.jetty.aggregate</groupId>
- <artifactId>jetty-all</artifactId>
- <classifier>uber</classifier>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-jndi</artifactId>
<scope>test</scope>
</dependency>
@@ -507,6 +511,24 @@
</build>
<profiles>
<profile>
+ <!-- Default - no tests -->
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skipTests>true</skipTests>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
<id>activemq.tests-all</id>
<activation>
<property>
@@ -595,9 +617,9 @@
<profile>
<id>activemq.exclude-broken-tests</id>
<activation>
- <activeByDefault>true</activeByDefault>
<property>
<name>activemq.tests</name>
+ <value>excludeBroken</value>
</property>
</activation>
<build>
@@ -653,7 +675,10 @@
<profile>
<id>activemq.tests-quick</id>
<activation>
- <activeByDefault>true</activeByDefault>
+ <property>
+ <name>activemq.tests</name>
+ <value>quick</value>
+ </property>
</activation>
<build>
<plugins>
diff --git a/pom.xml b/pom.xml
index 85d9758..5966407 100644
--- a/pom.xml
+++ b/pom.xml
@@ -212,6 +212,7 @@
<module>activemq-amqp</module>
<module>activemq-kahadb-store</module>
<module>activemq-jdbc-store</module>
+ <module>activemq-unit-tests</module>
<module>activemq-all</module>
<module>activemq-console</module>
<module>activemq-jaas</module>
@@ -232,6 +233,8 @@
<module>activemq-blueprint</module>
<module>activemq-web-demo</module>
<module>activemq-web-console</module>
+ <module>activemq-karaf-itest</module>
+ <module>activemq-itests-spring31</module>
<module>assembly</module>
<module>activemq-log4j-appender</module>
<module>activemq-http</module>
@@ -1516,15 +1519,6 @@
<profiles>
- <profile>
- <id>full.test</id>
- <modules>
- <module>activemq-unit-tests</module>
- <module>activemq-karaf-itest</module>
- <module>activemq-itests-spring31</module>
- </modules>
- </profile>
-
<!-- If you enable this profile, the console message will have a timestamp -->
<profile>
<id>consolets</id>