diff options
| author | Colin Cross <ccross@android.com> | 2018-01-03 20:12:07 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-01-03 20:12:07 +0000 |
| commit | 206294a6e5b7ea53651b910c848c9b2e6d80c0cd (patch) | |
| tree | b78a7f4fad7b2d1b2989bf54e02694287dd4c35f /org.jacoco.build/pom.xml | |
| parent | d617066fb6048ef15f47f58a241fa8399845e831 (diff) | |
| parent | 8e7552aae7305cabda37656801b891f4ff435bf5 (diff) | |
| download | jacoco-206294a6e5b7ea53651b910c848c9b2e6d80c0cd.tar.gz | |
Revert "Merge remote-tracking branch 'aosp/upstream-pull-525' into master" am: 37043f9e86
am: 8e7552aae7
Change-Id: I2fcdfd5240ed833c7910b2e4810a9d24b2aa8772
Diffstat (limited to 'org.jacoco.build/pom.xml')
| -rw-r--r-- | org.jacoco.build/pom.xml | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/org.jacoco.build/pom.xml b/org.jacoco.build/pom.xml index 17e18437..e746d6ac 100644 --- a/org.jacoco.build/pom.xml +++ b/org.jacoco.build/pom.xml @@ -94,12 +94,12 @@ <module>../org.jacoco.agent.rt</module> <module>../org.jacoco.agent</module> <module>../org.jacoco.ant</module> - <module>../org.jacoco.cli</module> - <module>../org.jacoco.examples</module> + <module>../jacoco-maven-plugin</module> <module>../org.jacoco.tests</module> + <module>../org.jacoco.examples</module> <module>../org.jacoco.doc</module> <module>../jacoco</module> </modules> @@ -143,7 +143,6 @@ <!-- Dependencies versions --> <asm.version>5.2</asm.version> <ant.version>1.7.1</ant.version> - <args4j.version>2.0.28</args4j.version> <junit.version>4.8.2</junit.version> <!-- ================== --> @@ -199,11 +198,6 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>org.jacoco.cli</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> <artifactId>org.jacoco.examples</artifactId> <version>${project.version}</version> </dependency> @@ -229,11 +223,6 @@ <version>1.2</version> </dependency> <dependency> - <groupId>args4j</groupId> - <artifactId>args4j</artifactId> - <version>${args4j.version}</version> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>${junit.version}</version> @@ -405,12 +394,6 @@ <artifactId>xml-maven-plugin</artifactId> <version>1.0</version> </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <!-- latest version which runs with Java 5 --> - <version>1.5.0</version> - </plugin> <!-- Third-party plugins --> <plugin> <groupId>org.codehaus.groovy.maven</groupId> |