You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jg...@apache.org on 2018/12/31 21:12:43 UTC
[1/3] tomee git commit: Add jacoco plugin to openejb-container
Repository: tomee
Updated Branches:
refs/heads/master ec3555af8 -> 3b2d562f8
Add jacoco plugin to openejb-container
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/4c236d8c
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/4c236d8c
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/4c236d8c
Branch: refs/heads/master
Commit: 4c236d8ce29ac57f0b71227c94af81cb40e8fe9a
Parents: 17674f3
Author: Jonathan Gallimore <jo...@jrg.me.uk>
Authored: Mon Dec 31 14:09:12 2018 +0000
Committer: Jonathan Gallimore <jo...@jrg.me.uk>
Committed: Mon Dec 31 14:09:12 2018 +0000
----------------------------------------------------------------------
container/openejb-core/pom.xml | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/4c236d8c/container/openejb-core/pom.xml
----------------------------------------------------------------------
diff --git a/container/openejb-core/pom.xml b/container/openejb-core/pom.xml
index 88f5700..55da9dc 100644
--- a/container/openejb-core/pom.xml
+++ b/container/openejb-core/pom.xml
@@ -323,6 +323,7 @@
<forkCount>1</forkCount>
<testNGArtifactName>none:none</testNGArtifactName>
<argLine>
+ @{argLine}
-javaagent:${project.basedir}/target/openejb-javaagent-${project.version}.jar
-Dopenejb.classloader.forced-skip=org.apache.openejb.jee.,org.apache.openejb.api.
-Dopenejb.classloader.forced-load=org.apache.openejb
@@ -367,6 +368,26 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <version>0.8.2</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ </execution>
+ <!-- attached to Maven test phase -->
+ <execution>
+ <id>report</id>
+ <phase>test</phase>
+ <goals>
+ <goal>report</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
[3/3] tomee git commit: Merge branch 'jacoco-config'
Posted by jg...@apache.org.
Merge branch 'jacoco-config'
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/3b2d562f
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/3b2d562f
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/3b2d562f
Branch: refs/heads/master
Commit: 3b2d562f87e14923996e422da70a6f9b383beac5
Parents: ec3555a c41b1da
Author: Jonathan Gallimore <jo...@jrg.me.uk>
Authored: Mon Dec 31 21:12:28 2018 +0000
Committer: Jonathan Gallimore <jo...@jrg.me.uk>
Committed: Mon Dec 31 21:12:28 2018 +0000
----------------------------------------------------------------------
container/openejb-core/pom.xml | 16 ++++++++++++++++
pom.xml | 20 ++++++++++++++++++++
2 files changed, 36 insertions(+)
----------------------------------------------------------------------
[2/3] tomee git commit: Introduce -Pcoverage profile
Posted by jg...@apache.org.
Introduce -Pcoverage profile
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/c41b1da4
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/c41b1da4
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/c41b1da4
Branch: refs/heads/master
Commit: c41b1da4b39093b87900c850f60d649fa80f952f
Parents: 4c236d8
Author: Jonathan Gallimore <jo...@jrg.me.uk>
Authored: Mon Dec 31 14:43:27 2018 +0000
Committer: Jonathan Gallimore <jo...@jrg.me.uk>
Committed: Mon Dec 31 14:43:27 2018 +0000
----------------------------------------------------------------------
container/openejb-core/pom.xml | 37 ++++++++++++++++---------------------
pom.xml | 20 ++++++++++++++++++++
2 files changed, 36 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/c41b1da4/container/openejb-core/pom.xml
----------------------------------------------------------------------
diff --git a/container/openejb-core/pom.xml b/container/openejb-core/pom.xml
index 55da9dc..dd08eba 100644
--- a/container/openejb-core/pom.xml
+++ b/container/openejb-core/pom.xml
@@ -227,6 +227,7 @@
org.apache.openejb*;version=${openejb.osgi.export.version},
org.apache.openejb;version=${openejb.osgi.export.version}
</openejb.osgi.export>
+ <jacocoArgLine></jacocoArgLine>
</properties>
<build>
@@ -323,7 +324,7 @@
<forkCount>1</forkCount>
<testNGArtifactName>none:none</testNGArtifactName>
<argLine>
- @{argLine}
+ ${jacocoArgLine}
-javaagent:${project.basedir}/target/openejb-javaagent-${project.version}.jar
-Dopenejb.classloader.forced-skip=org.apache.openejb.jee.,org.apache.openejb.api.
-Dopenejb.classloader.forced-load=org.apache.openejb
@@ -368,26 +369,6 @@
</executions>
</plugin>
<plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <version>0.8.2</version>
- <executions>
- <execution>
- <goals>
- <goal>prepare-agent</goal>
- </goals>
- </execution>
- <!-- attached to Maven test phase -->
- <execution>
- <id>report</id>
- <phase>test</phase>
- <goals>
- <goal>report</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
@@ -758,6 +739,20 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>coverage</id>
+ <properties>
+ <jacocoArgLine>@{argLine}</jacocoArgLine>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
http://git-wip-us.apache.org/repos/asf/tomee/blob/c41b1da4/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0ae30ac..640b30b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -379,6 +379,26 @@
<artifactId>dependency-check-maven</artifactId>
<version>4.0.0</version>
</plugin>
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <version>0.8.2</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ </execution>
+ <!-- attached to Maven test phase -->
+ <execution>
+ <id>report</id>
+ <phase>test</phase>
+ <goals>
+ <goal>report</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</pluginManagement>