Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 f240cb5806)
This commit is contained in:
Christopher L. Shannon (cshannon) 2022-03-01 12:10:52 -05:00
parent d4222af9d1
commit efe3f5b7d4
6 changed files with 93 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
activemq-itests-spring31/pom.xml
View File

@ -83,4 +83,25 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </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> </project>

32
activemq-karaf-itest/pom.xml
View File

@ -133,8 +133,18 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.apache.logging.log4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <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> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
@ -215,6 +225,24 @@
</build> </build>
<profiles> <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> <profile>
<id>ci-build-profile</id> <id>ci-build-profile</id>
<activation> <activation>

10
activemq-osgi/pom.xml
View File

@ -499,15 +499,15 @@
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.apache.logging.log4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>log4j-slf4j-impl</artifactId>
<version>${slf4j-version}</version> <version>${log4j-version}</version>
<classifier>sources</classifier> <classifier>sources</classifier>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId> <artifactId>log4j-core</artifactId>
<version>${log4j-version}</version> <version>${log4j-version}</version>
<classifier>sources</classifier> <classifier>sources</classifier>
<optional>true</optional> <optional>true</optional>

5
activemq-tooling/activemq-perf-maven-plugin/pom.xml
View File

@ -76,10 +76,5 @@
<artifactId>slf4j-simple</artifactId> <artifactId>slf4j-simple</artifactId>
<version>${slf4j-version}</version> <version>${slf4j-version}</version>
</dependency> </dependency>
<!-- dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</dependency -->
</dependencies> </dependencies>
</project> </project>

43
activemq-unit-tests/pom.xml
View File

@ -184,13 +184,18 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.apache.logging.log4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>log4j-api</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId> <artifactId>log4j-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -260,9 +265,8 @@
</dependency> </dependency>
<dependency> <dependency>
<!-- using it for Jetty's JNDI context to work /w Joram tests. --> <!-- using it for Jetty's JNDI context to work /w Joram tests. -->
<groupId>org.eclipse.jetty.aggregate</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-all</artifactId> <artifactId>jetty-jndi</artifactId>
<classifier>uber</classifier>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
@ -506,6 +510,24 @@
</plugins> </plugins>
</build> </build>
<profiles> <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> <profile>
<id>activemq.tests-all</id> <id>activemq.tests-all</id>
<activation> <activation>
@ -595,9 +617,9 @@
<profile> <profile>
<id>activemq.exclude-broken-tests</id> <id>activemq.exclude-broken-tests</id>
<activation> <activation>
<activeByDefault>true</activeByDefault>
<property> <property>
<name>activemq.tests</name> <name>activemq.tests</name>
<value>excludeBroken</value>
</property> </property>
</activation> </activation>
<build> <build>
@ -653,7 +675,10 @@
<profile> <profile>
<id>activemq.tests-quick</id> <id>activemq.tests-quick</id>
<activation> <activation>
<activeByDefault>true</activeByDefault> <property>
<name>activemq.tests</name>
<value>quick</value>
</property>
</activation> </activation>
<build> <build>
<plugins> <plugins>

12
pom.xml
View File

@ -212,6 +212,7 @@
<module>activemq-amqp</module> <module>activemq-amqp</module>
<module>activemq-kahadb-store</module> <module>activemq-kahadb-store</module>
<module>activemq-jdbc-store</module> <module>activemq-jdbc-store</module>
<module>activemq-unit-tests</module>
<module>activemq-all</module> <module>activemq-all</module>
<module>activemq-console</module> <module>activemq-console</module>
<module>activemq-jaas</module> <module>activemq-jaas</module>
@ -232,6 +233,8 @@
<module>activemq-blueprint</module> <module>activemq-blueprint</module>
<module>activemq-web-demo</module> <module>activemq-web-demo</module>
<module>activemq-web-console</module> <module>activemq-web-console</module>
<module>activemq-karaf-itest</module>
<module>activemq-itests-spring31</module>
<module>assembly</module> <module>assembly</module>
<module>activemq-log4j-appender</module> <module>activemq-log4j-appender</module>
<module>activemq-http</module> <module>activemq-http</module>
@ -1516,15 +1519,6 @@
<profiles> <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 --> <!-- If you enable this profile, the console message will have a timestamp -->
<profile> <profile>
<id>consolets</id> <id>consolets</id>