aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--org.jacoco.agent.rt/pom.xml3
-rw-r--r--org.jacoco.agent.test/META-INF/MANIFEST.MF9
-rw-r--r--org.jacoco.agent/META-INF/MANIFEST.MF8
-rw-r--r--org.jacoco.agent/pom.xml22
-rw-r--r--org.jacoco.ant.test/META-INF/MANIFEST.MF9
-rw-r--r--org.jacoco.ant/META-INF/MANIFEST.MF20
-rw-r--r--org.jacoco.ant/pom.xml35
-rw-r--r--org.jacoco.build/pom.xml86
-rw-r--r--org.jacoco.core.test/META-INF/MANIFEST.MF11
-rw-r--r--org.jacoco.core/META-INF/MANIFEST.MF17
-rw-r--r--org.jacoco.core/pom.xml24
-rw-r--r--org.jacoco.doc/META-INF/MANIFEST.MF6
-rw-r--r--org.jacoco.doc/docroot/doc/changes.html7
-rw-r--r--org.jacoco.examples.test/META-INF/MANIFEST.MF12
-rw-r--r--org.jacoco.examples/META-INF/MANIFEST.MF15
-rw-r--r--org.jacoco.report.test/META-INF/MANIFEST.MF11
-rw-r--r--org.jacoco.report/META-INF/MANIFEST.MF17
-rw-r--r--org.jacoco.report/pom.xml26
18 files changed, 144 insertions, 194 deletions
diff --git a/org.jacoco.agent.rt/pom.xml b/org.jacoco.agent.rt/pom.xml
index bacff959..76f9822a 100644
--- a/org.jacoco.agent.rt/pom.xml
+++ b/org.jacoco.agent.rt/pom.xml
@@ -72,6 +72,9 @@
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<manifestEntries>
<Premain-Class>${jacoco.runtime.package.name}.PreMain</Premain-Class>
+ <Implementation-Title>${project.description}</Implementation-Title>
+ <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
+ <Implementation-Version>${project.version}</Implementation-Version>
</manifestEntries>
</transformer>
</transformers>
diff --git a/org.jacoco.agent.test/META-INF/MANIFEST.MF b/org.jacoco.agent.test/META-INF/MANIFEST.MF
deleted file mode 100644
index a7c4e645..00000000
--- a/org.jacoco.agent.test/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,9 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: JaCoCo Agent Tests
-Bundle-SymbolicName: org.jacoco.agent.test
-Bundle-Version: 0.7.9.qualifier
-Fragment-Host: org.jacoco.agent
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Vendor: Mountainminds GmbH & Co. KG
-Import-Package: org.junit;version="[4.8.0,5.0.0)"
diff --git a/org.jacoco.agent/META-INF/MANIFEST.MF b/org.jacoco.agent/META-INF/MANIFEST.MF
deleted file mode 100644
index 7936912c..00000000
--- a/org.jacoco.agent/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: JaCoCo Agent
-Bundle-SymbolicName: org.jacoco.agent
-Bundle-Version: 0.7.9.qualifier
-Bundle-Vendor: Mountainminds GmbH & Co. KG
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.jacoco.agent;version="0.7.9"
diff --git a/org.jacoco.agent/pom.xml b/org.jacoco.agent/pom.xml
index 0d485eb3..3693918b 100644
--- a/org.jacoco.agent/pom.xml
+++ b/org.jacoco.agent/pom.xml
@@ -78,6 +78,28 @@
</execution>
</executions>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
diff --git a/org.jacoco.ant.test/META-INF/MANIFEST.MF b/org.jacoco.ant.test/META-INF/MANIFEST.MF
deleted file mode 100644
index 7555fc09..00000000
--- a/org.jacoco.ant.test/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,9 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: JaCoCo Ant Tasks Tests
-Bundle-SymbolicName: org.jacoco.ant.test
-Bundle-Version: 0.7.9.qualifier
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Vendor: Mountainminds GmbH & Co. KG and Contributors
-Fragment-Host: org.jacoco.ant
-Import-Package: org.junit;version="[4.8.0,5.0.0)"
diff --git a/org.jacoco.ant/META-INF/MANIFEST.MF b/org.jacoco.ant/META-INF/MANIFEST.MF
deleted file mode 100644
index 4788a4ce..00000000
--- a/org.jacoco.ant/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,20 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: JaCoCo Ant Tasks
-Bundle-SymbolicName: org.jacoco.ant
-Bundle-Version: 0.7.9.qualifier
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Vendor: Mountainminds GmbH & Co. KG and Contributors
-Require-Bundle: org.apache.ant;bundle-version="[1.7.0,2.0.0)"
-Import-Package: org.jacoco.agent;bundle-version="[0.7.9,0.7.10)",
- org.jacoco.core.analysis;bundle-version="[0.7.9,0.7.10)",
- org.jacoco.core.data;bundle-version="[0.7.9,0.7.10)",
- org.jacoco.core.instr;bundle-version="[0.7.9,0.7.10)",
- org.jacoco.core.runtime;bundle-version="[0.7.9,0.7.10)",
- org.jacoco.core.tools;bundle-version="[0.7.9,0.7.10)",
- org.jacoco.report;bundle-version="[0.7.9,0.7.10)",
- org.jacoco.report.check;bundle-version="[0.7.9,0.7.10)",
- org.jacoco.report.csv;bundle-version="[0.7.9,0.7.10)",
- org.jacoco.report.html;bundle-version="[0.7.9,0.7.10)",
- org.jacoco.report.xml;bundle-version="[0.7.9,0.7.10)",
- org.objectweb.asm;version="[5.2.0,5.3.0)"
diff --git a/org.jacoco.ant/pom.xml b/org.jacoco.ant/pom.xml
index 16e6cf71..14d0f8e6 100644
--- a/org.jacoco.ant/pom.xml
+++ b/org.jacoco.ant/pom.xml
@@ -67,6 +67,41 @@
<shadedPattern>org.jacoco.asm</shadedPattern>
</relocation>
</relocations>
+ <transformers>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+ <manifestEntries>
+ <Implementation-Title>${project.description}</Implementation-Title>
+ <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
+ <Implementation-Version>${project.version}</Implementation-Version>
+ </manifestEntries>
+ </transformer>
+ </transformers>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <executions>
+ <execution>
+ <!--
+ None of resource tranformers from maven-shade-plugin
+ (including combination of DontIncludeResourceTransformer and ManifestResourceTransformer)
+ does not allow us to leave only desired entries and remove others from META-INF/MANIFEST.MF
+ So we use goal "bundle" instead of "manifest".
+ This introduces some redundant operations, but their cost is negligible.
+ -->
+ <phase>package</phase>
+ <goals>
+ <goal>bundle</goal>
+ </goals>
+ <configuration>
+ <excludeDependencies>true</excludeDependencies>
+ <instructions>
+ <Require-Bundle>org.apache.ant;bundle-version="[1.7.0,2.0.0)"</Require-Bundle>
+ </instructions>
</configuration>
</execution>
</executions>
diff --git a/org.jacoco.build/pom.xml b/org.jacoco.build/pom.xml
index af1015db..a75f1635 100644
--- a/org.jacoco.build/pom.xml
+++ b/org.jacoco.build/pom.xml
@@ -400,6 +400,12 @@
<artifactId>gmaven-plugin</artifactId>
<version>1.0</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <!-- newer versions require Java 7 -->
+ <version>2.5.4</version>
+ </plugin>
</plugins>
</pluginManagement>
@@ -443,15 +449,6 @@
</excludes>
</filter>
</filters>
- <transformers>
- <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
- <manifestEntries>
- <Implementation-Title>${project.description}</Implementation-Title>
- <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
- <Implementation-Version>${project.version}</Implementation-Version>
- </manifestEntries>
- </transformer>
- </transformers>
</configuration>
</plugin>
@@ -598,6 +595,28 @@
</execution>
</executions>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Bundle-Version>${qualified.bundle.version}</Bundle-Version>
+ <Bundle-Name>${project.description}</Bundle-Name>
+ <Export-Package>
+ !about.html,
+ *.internal*;x-internal:=true;version="${version;===;${Bundle-Version}}",
+ *;version="${version;===;${Bundle-Version}}"
+ </Export-Package>
+ <Import-Package>
+ org.jacoco.*;version="${range;[===,==+);${Bundle-Version}}",
+ org.objectweb.asm.*;version="${range;[===,=+);${asm.version}}"
+ </Import-Package>
+ <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
+ <Eclipse-SourceReferences>scm:git:git://github.com/jacoco/jacoco.git;path="${project.artifactId}";commitId=${buildNumber}</Eclipse-SourceReferences>
+ </instructions>
+ </configuration>
+ </plugin>
</plugins>
</build>
@@ -721,55 +740,6 @@
</profile>
<profile>
- <id>manifest</id>
- <activation>
- <file>
- <exists>META-INF/MANIFEST.MF</exists>
- </file>
- </activation>
- <properties>
- <bundle-manifest>${project.build.directory}/META-INF/MANIFEST.MF</bundle-manifest>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>translate-qualifier</id>
- <phase>generate-resources</phase>
- <configuration>
- <target>
- <copy file="META-INF/MANIFEST.MF" tofile="${bundle-manifest}" overwrite="true"/>
- <replace file="${bundle-manifest}">
- <replacefilter token=".qualifier" value=".${buildQualifier}"/>
- </replace>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestFile>${bundle-manifest}</manifestFile>
- <manifestEntries>
- <Eclipse-SourceReferences>scm:git:git://github.com/jacoco/jacoco.git;path="${project.artifactId}";commitId=${buildNumber}</Eclipse-SourceReferences>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <profile>
<id>sources</id>
<activation>
<file>
diff --git a/org.jacoco.core.test/META-INF/MANIFEST.MF b/org.jacoco.core.test/META-INF/MANIFEST.MF
deleted file mode 100644
index fb8caeb0..00000000
--- a/org.jacoco.core.test/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: JaCoCo Core Tests
-Bundle-SymbolicName: org.jacoco.core.test
-Bundle-Version: 0.7.9.qualifier
-Bundle-Vendor: Mountainminds GmbH & Co. KG
-Fragment-Host: org.jacoco.core
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Import-Package: org.junit;version="[4.8.0,5.0.0)",
- org.junit.rules;version="[4.8.0,5.0.0)",
- org.objectweb.asm.util;version="[5.2.0,5.3.0)"
diff --git a/org.jacoco.core/META-INF/MANIFEST.MF b/org.jacoco.core/META-INF/MANIFEST.MF
deleted file mode 100644
index 75cf20be..00000000
--- a/org.jacoco.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,17 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: JaCoCo Core
-Bundle-SymbolicName: org.jacoco.core
-Bundle-Version: 0.7.9.qualifier
-Bundle-Vendor: Mountainminds GmbH & Co. KG
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.jacoco.core;version="0.7.9",
- org.jacoco.core.analysis;version="0.7.9",
- org.jacoco.core.data;version="0.7.9",
- org.jacoco.core.instr;version="0.7.9",
- org.jacoco.core.internal.analysis;version="0.7.9";x-internal=true,
- org.jacoco.core.runtime;version="0.7.9",
- org.jacoco.core.tools;version="0.7.9"
-Import-Package: org.objectweb.asm;version="[5.2.0,5.3.0)",
- org.objectweb.asm.tree;version="[5.2.0,5.3.0)",
- org.objectweb.asm.commons;version="[5.2.0,5.3.0)"
diff --git a/org.jacoco.core/pom.xml b/org.jacoco.core/pom.xml
index 3114d5cb..96565ce8 100644
--- a/org.jacoco.core/pom.xml
+++ b/org.jacoco.core/pom.xml
@@ -33,5 +33,29 @@
<build>
<sourceDirectory>src</sourceDirectory>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
</project>
diff --git a/org.jacoco.doc/META-INF/MANIFEST.MF b/org.jacoco.doc/META-INF/MANIFEST.MF
deleted file mode 100644
index 9b3abb2a..00000000
--- a/org.jacoco.doc/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,6 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: JaCoCo Documentation
-Bundle-SymbolicName: org.jacoco.doc
-Bundle-Version: 0.7.9.qualifier
-Bundle-Vendor: Mountainminds GmbH & Co. KG
diff --git a/org.jacoco.doc/docroot/doc/changes.html b/org.jacoco.doc/docroot/doc/changes.html
index 92d39345..628dacbe 100644
--- a/org.jacoco.doc/docroot/doc/changes.html
+++ b/org.jacoco.doc/docroot/doc/changes.html
@@ -41,6 +41,13 @@
<h3>Non-functional Changes</h3>
<ul>
<li>JaCoCo now depends on ASM 5.2.</li>
+ <li>OSGi metadata now generated automatically and additionally include
+ <code>uses</code> directives, <code>Require-Capability</code> attribute,
+ and export of all internal packages with <code>x-internal:=true</code> directive
+ (GitHub <a href="https://github.com/jacoco/jacoco/issues/211">#211</a>).</li>
+ <li>Removed OSGi attributes that were mistakenly added in version 0.6.1 into
+ <code>jacocoant.jar</code> that contains all dependencies
+ (GitHub <a href="https://github.com/jacoco/jacoco/issues/211">#211</a>).</li>
</ul>
<h2>Release 0.7.8 (2016/12/09)</h2>
diff --git a/org.jacoco.examples.test/META-INF/MANIFEST.MF b/org.jacoco.examples.test/META-INF/MANIFEST.MF
deleted file mode 100644
index 8db599aa..00000000
--- a/org.jacoco.examples.test/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,12 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: JaCoCo Examples Tests
-Bundle-SymbolicName: org.jacoco.examples.test
-Bundle-Version: 0.7.9.qualifier
-Bundle-Vendor: Mountainminds GmbH & Co. KG
-Fragment-Host: org.jacoco.examples
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Import-Package: org.junit;version="[4.8.0,5.0.0)",
- org.junit.matchers;version="[4.8.0,5.0.0)",
- org.junit.rules;version="[4.8.0,5.0.0)"
-Require-Bundle: org.hamcrest.core;bundle-version="[1.1.0,2.0.0)"
diff --git a/org.jacoco.examples/META-INF/MANIFEST.MF b/org.jacoco.examples/META-INF/MANIFEST.MF
deleted file mode 100644
index c1d19d13..00000000
--- a/org.jacoco.examples/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,15 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: JaCoCo API Usage Examples
-Bundle-SymbolicName: org.jacoco.examples
-Bundle-Version: 0.7.9.qualifier
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Vendor: Mountainminds GmbH & Co. KG
-Import-Package: org.jacoco.core.analysis;bundle-version="[0.7.9,0.7.10)",
- org.jacoco.core.data;bundle-version="[0.7.9,0.7.10)",
- org.jacoco.core.instr;bundle-version="[0.7.9,0.7.10)",
- org.jacoco.core.runtime;bundle-version="[0.7.9,0.7.10)",
- org.jacoco.core.tools;bundle-version="[0.7.9,0.7.10)",
- org.jacoco.report;bundle-version="[0.7.9,0.7.10)",
- org.jacoco.report.html;bundle-version="[0.7.9,0.7.10)",
- org.objectweb.asm;version="[5.2.0,5.3.0)"
diff --git a/org.jacoco.report.test/META-INF/MANIFEST.MF b/org.jacoco.report.test/META-INF/MANIFEST.MF
deleted file mode 100644
index 8960c356..00000000
--- a/org.jacoco.report.test/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: JaCoCo Report Tests
-Bundle-SymbolicName: org.jacoco.report.test
-Bundle-Version: 0.7.9.qualifier
-Fragment-Host: org.jacoco.report
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Vendor: Mountainminds GmbH & Co. KG
-Import-Package: org.jacoco.core.internal.analysis;bundle-version="[0.7.9,0.7.10)",
- org.junit;version="[4.8.0,5.0.0)",
- org.junit.rules;version="[4.8.0,5.0.0)"
diff --git a/org.jacoco.report/META-INF/MANIFEST.MF b/org.jacoco.report/META-INF/MANIFEST.MF
deleted file mode 100644
index 2a5357bb..00000000
--- a/org.jacoco.report/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,17 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: JaCoCo Report
-Bundle-SymbolicName: org.jacoco.report
-Bundle-Version: 0.7.9.qualifier
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Vendor: Mountainminds GmbH & Co. KG
-Export-Package: org.jacoco.report;version="0.7.9",
- org.jacoco.report.check;version="0.7.9",
- org.jacoco.report.csv;version="0.7.9",
- org.jacoco.report.html;version="0.7.9",
- org.jacoco.report.xml;version="0.7.9"
-Import-Package: org.jacoco.core;bundle-version="[0.7.9,0.7.10)",
- org.jacoco.core.analysis;bundle-version="[0.7.9,0.7.10)",
- org.jacoco.core.data;bundle-version="[0.7.9,0.7.10)",
- org.jacoco.core.runtime;bundle-version="[0.7.9,0.7.10)",
- org.objectweb.asm;version="[5.2.0,5.3.0)"
diff --git a/org.jacoco.report/pom.xml b/org.jacoco.report/pom.xml
index a3a0acd7..37cb4796 100644
--- a/org.jacoco.report/pom.xml
+++ b/org.jacoco.report/pom.xml
@@ -22,7 +22,7 @@
<artifactId>org.jacoco.report</artifactId>
<name>JaCoCo :: Report</name>
- <description>JaCoCo Reporting</description>
+ <description>JaCoCo Report</description>
<dependencies>
<dependency>
@@ -37,5 +37,29 @@
<build>
<sourceDirectory>src</sourceDirectory>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
</project>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-17 19:40:09 +0000