Proper deployment for agent jar
diff --git a/jacoco-maven-plugin/pom.xml b/jacoco-maven-plugin/pom.xml
index ba94dbe..22ed0c0 100644
--- a/jacoco-maven-plugin/pom.xml
+++ b/jacoco-maven-plugin/pom.xml
@@ -49,8 +49,8 @@
<dependency>
<groupId>org.jacoco</groupId>
- <artifactId>org.jacoco.agent.rt</artifactId>
- <classifier>all</classifier>
+ <artifactId>org.jacoco.agent</artifactId>
+ <classifier>runtime</classifier>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/jacoco-maven-plugin/src/main/java/org/jacoco/maven/AgentMojo.java b/jacoco-maven-plugin/src/main/java/org/jacoco/maven/AgentMojo.java
index aa3d414..fa232e4 100644
--- a/jacoco-maven-plugin/src/main/java/org/jacoco/maven/AgentMojo.java
+++ b/jacoco-maven-plugin/src/main/java/org/jacoco/maven/AgentMojo.java
@@ -40,7 +40,7 @@
/**
* Name of the JaCoCo Agent artifact.
*/
- private static final String AGENT_ARTIFACT_NAME = "org.jacoco:org.jacoco.agent.rt";
+ private static final String AGENT_ARTIFACT_NAME = "org.jacoco:org.jacoco.agent";
/**
* Name of the property used in maven-osgi-test-plugin.
diff --git a/org.jacoco.agent.rt/pom.xml b/org.jacoco.agent.rt/pom.xml
index 4e0ccc9..f76a9e6 100644
--- a/org.jacoco.agent.rt/pom.xml
+++ b/org.jacoco.agent.rt/pom.xml
@@ -26,6 +26,8 @@
<properties>
<jarsigner.skip>true</jarsigner.skip>
+ <maven.deploy.skip>true</maven.deploy.skip>
+ <maven.javadoc.skip>true</maven.javadoc.skip>
</properties>
<dependencies>
diff --git a/org.jacoco.agent/pom.xml b/org.jacoco.agent/pom.xml
index c9fe1ba..4060915 100644
--- a/org.jacoco.agent/pom.xml
+++ b/org.jacoco.agent/pom.xml
@@ -56,6 +56,29 @@
</execution>
</executions>
</plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-artifacts</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <file>${project.build.directory}/classes/jacocoagent.jar</file>
+ <type>jar</type>
+ <classifier>runtime</classifier>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
diff --git a/org.jacoco.build/pom.xml b/org.jacoco.build/pom.xml
index 2634113..a27c8bc 100644
--- a/org.jacoco.build/pom.xml
+++ b/org.jacoco.build/pom.xml
@@ -374,6 +374,11 @@
<artifactId>animal-sniffer-maven-plugin</artifactId>
<version>1.6</version>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.5</version>
+ </plugin>
<!-- Third-party plugins -->
<plugin>
<groupId>org.codehaus.groovy.maven</groupId>
diff --git a/org.jacoco.doc/assembly.xml b/org.jacoco.doc/assembly.xml
index 3408411..3f9bab0 100644
--- a/org.jacoco.doc/assembly.xml
+++ b/org.jacoco.doc/assembly.xml
@@ -57,7 +57,7 @@
<outputFileNameMapping>jacocoagent.jar</outputFileNameMapping>
<useProjectArtifact>false</useProjectArtifact>
<includes>
- <include>*:*.agent.rt:*:all</include>
+ <include>*:*.agent:*:runtime</include>
</includes>
</dependencySet>
<dependencySet>
diff --git a/org.jacoco.doc/pom.xml b/org.jacoco.doc/pom.xml
index ba78eb5..2886a7f 100644
--- a/org.jacoco.doc/pom.xml
+++ b/org.jacoco.doc/pom.xml
@@ -48,6 +48,12 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>org.jacoco.agent</artifactId>
+ <version>${project.version}</version>
+ <classifier>runtime</classifier>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>org.jacoco.ant</artifactId>
</dependency>
<dependency>
@@ -56,12 +62,6 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>org.jacoco.agent.rt</artifactId>
- <version>${project.version}</version>
- <classifier>all</classifier>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>org.jacoco.examples</artifactId>
<version>${project.version}</version>
<type>zip</type>