Repository: incubator-juneau Updated Branches: refs/heads/master e3ce935a6 -> 3e52ccd64
Clean up dependencies in poms by adding a dependenciesManagement element to the root pom. Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/3e52ccd6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/3e52ccd6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/3e52ccd6 Branch: refs/heads/master Commit: 3e52ccd6449727a83a1a2a08bf3c89610129f62a Parents: e3ce935 Author: jamesbognar <jamesbog...@gmail.com> Authored: Mon Sep 19 16:02:48 2016 -0400 Committer: jamesbognar <jamesbog...@gmail.com> Committed: Mon Sep 19 16:02:48 2016 -0400 ---------------------------------------------------------------------- juneau-client/pom.xml | 11 ---- juneau-core/pom.xml | 37 +++++++++++-- juneau-microservice/pom.xml | 12 ----- juneau-samples/pom.xml | 10 ++-- juneau-server-test/pom.xml | 5 -- juneau-server/pom.xml | 3 -- pom.xml | 111 +++++++++++++++++++++++++++++++++++---- 7 files changed, 140 insertions(+), 49 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/3e52ccd6/juneau-client/pom.xml ---------------------------------------------------------------------- diff --git a/juneau-client/pom.xml b/juneau-client/pom.xml index 89cf518..2572974 100644 --- a/juneau-client/pom.xml +++ b/juneau-client/pom.xml @@ -36,17 +36,6 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> - <version>4.5</version> - </dependency> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpcore</artifactId> - <version>4.4.1</version> - </dependency> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpmime</artifactId> - <version>4.5</version> </dependency> </dependencies> </project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/3e52ccd6/juneau-core/pom.xml ---------------------------------------------------------------------- diff --git a/juneau-core/pom.xml b/juneau-core/pom.xml index b2c0b85..b4faa77 100644 --- a/juneau-core/pom.xml +++ b/juneau-core/pom.xml @@ -31,13 +31,44 @@ <dependency> <groupId>org.apache.jena</groupId> <artifactId>jena-core</artifactId> - <version>2.7.1</version> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.11</version> - <scope>test</scope> </dependency> </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.19.1</version> + <configuration> + <includes> + <include>**/*Test.class</include> + </includes> + </configuration> + </plugin> + <plugin> + <groupId>org.jacoco</groupId> + <artifactId>jacoco-maven-plugin</artifactId> + <version>0.7.2.201409121644</version> + <executions> + <execution> + <id>default-prepare-agent</id> + <goals> + <goal>prepare-agent</goal> + </goals> + </execution> + <execution> + <id>default-report</id> + <phase>prepare-package</phase> + <goals> + <goal>report</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/3e52ccd6/juneau-microservice/pom.xml ---------------------------------------------------------------------- diff --git a/juneau-microservice/pom.xml b/juneau-microservice/pom.xml index 9a26e10..f2c0427 100644 --- a/juneau-microservice/pom.xml +++ b/juneau-microservice/pom.xml @@ -41,22 +41,10 @@ <dependency> <groupId>org.eclipse.jetty.aggregate</groupId> <artifactId>jetty-all-server</artifactId> - <version>8.1.0.v20120127</version> - </dependency> - <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - <version>1.9</version> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>1.2</version> </dependency> <dependency> <groupId>commons-fileupload</groupId> <artifactId>commons-fileupload</artifactId> - <version>1.3.1</version> </dependency> </dependencies> </project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/3e52ccd6/juneau-samples/pom.xml ---------------------------------------------------------------------- diff --git a/juneau-samples/pom.xml b/juneau-samples/pom.xml index 8a0c34f..8d94240 100644 --- a/juneau-samples/pom.xml +++ b/juneau-samples/pom.xml @@ -37,19 +37,19 @@ </dependency> <dependency> <groupId>org.apache.jena</groupId> - <artifactId>jena-iri</artifactId> - <version>0.9.2</version> + <artifactId>jena-core</artifactId> </dependency> <dependency> <groupId>org.apache.derby</groupId> <artifactId>derby</artifactId> - <version>10.10.2.0</version> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpmime</artifactId> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.11</version> - <scope>test</scope> </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/3e52ccd6/juneau-server-test/pom.xml ---------------------------------------------------------------------- diff --git a/juneau-server-test/pom.xml b/juneau-server-test/pom.xml index 56d09dd..1413f43 100644 --- a/juneau-server-test/pom.xml +++ b/juneau-server-test/pom.xml @@ -37,19 +37,14 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.10</version> - <scope>test</scope> </dependency> <dependency> <groupId>javax.ws.rs</groupId> <artifactId>jsr311-api</artifactId> - <version>1.1.1</version> </dependency> <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> - <version>3.0.1</version> - <scope>provided</scope> </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/3e52ccd6/juneau-server/pom.xml ---------------------------------------------------------------------- diff --git a/juneau-server/pom.xml b/juneau-server/pom.xml index 6e46786..3f94ac7 100644 --- a/juneau-server/pom.xml +++ b/juneau-server/pom.xml @@ -36,13 +36,10 @@ <dependency> <groupId>javax.ws.rs</groupId> <artifactId>jsr311-api</artifactId> - <version>1.1.1</version> </dependency> <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> - <version>3.0.1</version> - <scope>provided</scope> </dependency> </dependencies> </project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/3e52ccd6/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 4100bbf..3fabcc6 100644 --- a/pom.xml +++ b/pom.xml @@ -32,6 +32,57 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <encoding>UTF-8</encoding> </properties> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.apache.jena</groupId> + <artifactId>jena-core</artifactId> + <version>2.7.1</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.11</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>javax.ws.rs</groupId> + <artifactId>jsr311-api</artifactId> + <version>1.1.1</version> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + <version>3.0.1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + <version>4.5</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty.aggregate</groupId> + <artifactId>jetty-all-server</artifactId> + <version>8.1.0.v20120127</version> + </dependency> + <dependency> + <groupId>commons-fileupload</groupId> + <artifactId>commons-fileupload</artifactId> + <version>1.3.1</version> + </dependency> + <dependency> + <groupId>org.apache.derby</groupId> + <artifactId>derby</artifactId> + <version>10.10.2.0</version> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpmime</artifactId> + <version>4.5</version> + </dependency> + </dependencies> + </dependencyManagement> <modules> <module>juneau-core</module> @@ -65,16 +116,6 @@ </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.19.1</version> - <configuration> - <includes> - <include>**/*Test.class</include> - </includes> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> <version>2.10.4</version> <configuration> @@ -145,9 +186,50 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.jacoco</groupId> + <artifactId>jacoco-maven-plugin</artifactId> + <version>0.7.2.201409121644</version> + <executions> + <execution> + <id>default-prepare-agent</id> + <goals> + <goal>prepare-agent</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </pluginManagement> </build> + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.10.4</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jxr-plugin</artifactId> + <version>2.5</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-report-plugin</artifactId> + <version>2.18</version> + <configuration> + <aggregate>true</aggregate> + </configuration> + </plugin> + <plugin> + <groupId>org.jacoco</groupId> + <artifactId>jacoco-maven-plugin</artifactId> + <version>0.7.2.201409121644</version> + </plugin> + </plugins> + </reporting> + <url>http://juneau.incubator.apache.org</url> <organization> <name>Apache</name> @@ -159,4 +241,13 @@ <issueManagement> <url>https://issues.apache.org/jira/browse/JUNEAU</url> </issueManagement> + <mailingLists> + <mailingList> + <name>Apache Juneau Developers</name> + <post>d...@juneau.incubator.apache.org</post> + <subscribe>list-subscr...@juneau.apache.org</subscribe> + <unsubscribe>list-unsubscr...@juneau.apache.org</unsubscribe> + <archive>https://lists.apache.org/list.html?d...@juneau.apache.org</archive> + </mailingList> + </mailingLists> </project> \ No newline at end of file
