You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2017/08/02 16:52:05 UTC
[3/4] activemq-artemis git commit: ARTEMIS-1265 Fixing jacoco profile
for IDE integration
ARTEMIS-1265 Fixing jacoco profile for IDE integration
Idea and Eclipse integration was broken because of the surefire plugin options
(cherry picked from commit 14fe149fa5c8a0e7851e4dd52ddf6361adf98bf0)
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/d96957ea
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/d96957ea
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/d96957ea
Branch: refs/heads/1.x
Commit: d96957ea70ce31db84234e2945b07444a3e0bd90
Parents: 17d4ec4
Author: Clebert Suconic <cl...@apache.org>
Authored: Mon Jul 24 15:10:13 2017 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Aug 2 12:51:57 2017 -0400
----------------------------------------------------------------------
pom.xml | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d96957ea/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b101839..6698f16 100644
--- a/pom.xml
+++ b/pom.xml
@@ -150,14 +150,10 @@
-->
- <!-- Property set by Jacoco plugin -->
- <jacoco.agent></jacoco.agent>
-
<activemq-surefire-argline>-Djava.util.logging.manager=org.jboss.logmanager.LogManager
-Dlogging.configuration="file:${activemq.basedir}/tests/config/logging.properties"
-Djava.library.path="${activemq.basedir}/artemis-native/bin" -Djgroups.bind_addr=localhost -Dorg.apache.activemq.artemis.api.core.UDPBroadcastEndpointFactory.localBindAddress=localhost
-Djava.net.preferIPv4Stack=true
- @{jacoco.agent} -Djacoco.agent=@{jacoco.agent}
</activemq-surefire-argline>
<activemq.basedir>${project.basedir}</activemq.basedir>
<skipLicenseCheck>true</skipLicenseCheck>
@@ -974,6 +970,18 @@
<artifactId>org.jacoco.core</artifactId>
</dependency>
</dependencies>
+ <properties>
+
+ <!-- Property set by Jacoco plugin -->
+ <jacoco.agent></jacoco.agent>
+
+ <activemq-surefire-argline>-Djava.util.logging.manager=org.jboss.logmanager.LogManager
+ -Dlogging.configuration="file:${activemq.basedir}/tests/config/logging.properties"
+ -Djava.library.path="${activemq.basedir}/artemis-native/bin" -Djgroups.bind_addr=localhost -Dorg.apache.activemq.artemis.api.core.UDPBroadcastEndpointFactory.localBindAddress=localhost
+ -Djava.net.preferIPv4Stack=true -Dbasedir=${basedir}
+ @{jacoco.agent} -Djacoco.agent=@{jacoco.agent}
+ </activemq-surefire-argline>
+ </properties>
<build>
<plugins>
<plugin>
@@ -1085,7 +1093,6 @@
<fileset dir="${activemq.basedir}/artemis-server/target/classes"/>
<fileset dir="${activemq.basedir}/artemis-server-osgi/target/classes"/>
<fileset dir="${activemq.basedir}/artemis-service-extensions/target"/>
- <fileset dir="${activemq.basedir}/artemis-tools/target/classes"/>
<fileset dir="${activemq.basedir}/artemis-web/target/classes"/>
</classfiles>
<sourcefiles encoding="UTF-8">
@@ -1106,7 +1113,6 @@
<fileset dir="${activemq.basedir}/artemis-server/src/main/java"/>
<fileset dir="${activemq.basedir}/artemis-server-osgi/src/main/java"/>
<fileset dir="${activemq.basedir}/artemis-service-extensions/src/main/java"/>
- <fileset dir="${activemq.basedir}/artemis-tools/src/main/java"/>
<fileset dir="${activemq.basedir}/artemis-web/src/main/java"/>
</sourcefiles>
</structure>