diff options
| author | Evgeny Mandrikov <mandrikov@gmail.com> | 2012-12-26 19:31:55 +0100 |
|---|---|---|
| committer | Evgeny Mandrikov <mandrikov@gmail.com> | 2012-12-26 19:31:55 +0100 |
| commit | b3fd3717f2a4c2095fba98106843992e4fbd4d84 (patch) | |
| tree | 695a96cb2bfbc6be75e8f9d35f4cc2f29f171a31 /org.jacoco.ant | |
| parent | ad8749dace1130caf442704d302e178dd29089b7 (diff) | |
| parent | 4a77e4024a2d40cfc50a6e4213842cbe0758de14 (diff) | |
| download | jacoco-b3fd3717f2a4c2095fba98106843992e4fbd4d84.tar.gz | |
Merge branch 'master' into topic/offlineinstr
Conflicts:
org.jacoco.ant/META-INF/MANIFEST.MF
Diffstat (limited to 'org.jacoco.ant')
| -rw-r--r-- | org.jacoco.ant/META-INF/MANIFEST.MF | 20 | ||||
| -rw-r--r-- | org.jacoco.ant/pom.xml | 2 |
2 files changed, 11 insertions, 11 deletions
diff --git a/org.jacoco.ant/META-INF/MANIFEST.MF b/org.jacoco.ant/META-INF/MANIFEST.MF index 3ef60cb1..09e27f12 100644 --- a/org.jacoco.ant/META-INF/MANIFEST.MF +++ b/org.jacoco.ant/META-INF/MANIFEST.MF @@ -2,17 +2,17 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2
Bundle-Name: JaCoCo Ant Tasks
Bundle-SymbolicName: org.jacoco.ant
-Bundle-Version: 0.6.1.qualifier
+Bundle-Version: 0.6.2.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.objectweb.asm;version="[4.1.0,4.2.0)",
- org.jacoco.agent;bundle-version="[0.6.1,0.6.2)",
- org.jacoco.core.analysis;bundle-version="[0.6.1,0.6.2)",
- org.jacoco.core.data;bundle-version="[0.6.1,0.6.2)",
- org.jacoco.core.instr;version="[0.6.1,0.6.2)",
- org.jacoco.core.runtime;bundle-version="[0.6.1,0.6.2)",
- org.jacoco.report;bundle-version="[0.6.1,0.6.2)",
- org.jacoco.report.csv;bundle-version="[0.6.1,0.6.2)",
- org.jacoco.report.html;bundle-version="[0.6.1,0.6.2)",
- org.jacoco.report.xml;bundle-version="[0.6.1,0.6.2)"
+ org.jacoco.agent;bundle-version="[0.6.2,0.6.3)",
+ org.jacoco.core.analysis;bundle-version="[0.6.2,0.6.3)",
+ org.jacoco.core.data;bundle-version="[0.6.2,0.6.3)",
+ org.jacoco.core.instr;version="[0.6.2,0.6.3)",
+ org.jacoco.core.runtime;bundle-version="[0.6.2,0.6.3)",
+ org.jacoco.report;bundle-version="[0.6.2,0.6.3)",
+ org.jacoco.report.csv;bundle-version="[0.6.2,0.6.3)",
+ org.jacoco.report.html;bundle-version="[0.6.2,0.6.3)",
+ org.jacoco.report.xml;bundle-version="[0.6.2,0.6.3)"
diff --git a/org.jacoco.ant/pom.xml b/org.jacoco.ant/pom.xml index 642f3aa7..52e3ab6f 100644 --- a/org.jacoco.ant/pom.xml +++ b/org.jacoco.ant/pom.xml @@ -15,7 +15,7 @@ <parent> <groupId>org.jacoco</groupId> <artifactId>org.jacoco.build</artifactId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.2-SNAPSHOT</version> <relativePath>../org.jacoco.build</relativePath> </parent> |