Move jena-cmds dependency to the server module. Tidy POMs.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/9c25a304 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/9c25a304 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/9c25a304 Branch: refs/heads/master Commit: 9c25a304d4057acf1741e922a89af73a6205070a Parents: 2f80d36 Author: Andy Seaborne <[email protected]> Authored: Sun Feb 21 13:31:36 2016 +0000 Committer: Andy Seaborne <[email protected]> Committed: Sun Feb 21 13:33:29 2016 +0000 ---------------------------------------------------------------------- jena-fuseki2/jena-fuseki-core/pom.xml | 113 +++++++++++++-------------- jena-fuseki2/jena-fuseki-server/pom.xml | 10 +++ 2 files changed, 63 insertions(+), 60 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/9c25a304/jena-fuseki2/jena-fuseki-core/pom.xml ---------------------------------------------------------------------- diff --git a/jena-fuseki2/jena-fuseki-core/pom.xml b/jena-fuseki2/jena-fuseki-core/pom.xml index d4e39ee..522980a 100644 --- a/jena-fuseki2/jena-fuseki-core/pom.xml +++ b/jena-fuseki2/jena-fuseki-core/pom.xml @@ -27,10 +27,6 @@ <name>Apache Jena - Fuseki Server Engine</name> <artifactId>jena-fuseki-core</artifactId> - - <!-- We make the JAR file so that the shade plugin includes it. - The war:war goal is added to the package phase. - --> <packaging>jar</packaging> <repositories> @@ -53,28 +49,45 @@ <type>pom</type> </dependency> - <dependency> - <groupId>org.apache.jena</groupId> - <artifactId>jena-cmds</artifactId> - <version>3.1.0-SNAPSHOT</version> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + <exclusions> + <!-- Replace with slf4j adapter --> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> - <groupId>org.apache.jena</groupId> - <artifactId>jena-arq</artifactId> - <version>3.1.0-SNAPSHOT</version> - <classifier>tests</classifier> - <scope>test</scope> + <groupId>commons-fileupload</groupId> + <artifactId>commons-fileupload</artifactId> </dependency> <dependency> - <groupId>org.apache.jena</groupId> - <artifactId>jena-base</artifactId> - <version>3.1.0-SNAPSHOT</version> - <classifier>tests</classifier> - <scope>test</scope> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-webapp</artifactId> + <version>${ver.jetty}</version> </dependency> + <!-- + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-runner</artifactId> + <version>${ver.jetty}</version> + </dependency> + --> + + <!-- Jetty's useful servlets, inc compression --> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlets</artifactId> + <version>${ver.jetty}</version> + </dependency> + + <!-- Text and spatial --> <dependency> <groupId>org.apache.jena</groupId> <artifactId>jena-text</artifactId> @@ -96,6 +109,7 @@ <version>3.1.0-SNAPSHOT</version> </dependency> + <!-- Apache Shiro --> <dependency> <groupId>org.apache.shiro</groupId> <artifactId>shiro-core</artifactId> @@ -108,66 +122,45 @@ <version>${ver.shiro}</version> </dependency> + <!-- Logging : Needed because the Fuseki command line manages logging --> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - <exclusions> - <!-- Replace with slf4j adapter --> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>commons-fileupload</groupId> - <artifactId>commons-fileupload</artifactId> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> </dependency> <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-webapp</artifactId> - <version>${ver.jetty}</version> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> </dependency> - <!-- <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-runner</artifactId> - <version>${ver.jetty}</version> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> </dependency> - --> - <!-- Development and standalone jar (if built) --> - <!-- Jetty's useful servlets, inc compression --> + <!-- Testing --> <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-servlets</artifactId> - <version>${ver.jetty}</version> + <groupId>org.apache.jena</groupId> + <artifactId>jena-arq</artifactId> + <version>3.1.0-SNAPSHOT</version> + <classifier>tests</classifier> + <scope>test</scope> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> + <groupId>org.apache.jena</groupId> + <artifactId>jena-base</artifactId> + <version>3.1.0-SNAPSHOT</version> + <classifier>tests</classifier> + <scope>test</scope> </dependency> - <!-- Needed because the Fuseki command line manages logging --> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/jena/blob/9c25a304/jena-fuseki2/jena-fuseki-server/pom.xml ---------------------------------------------------------------------- diff --git a/jena-fuseki2/jena-fuseki-server/pom.xml b/jena-fuseki2/jena-fuseki-server/pom.xml index e6b498e..2e650a3 100644 --- a/jena-fuseki2/jena-fuseki-server/pom.xml +++ b/jena-fuseki2/jena-fuseki-server/pom.xml @@ -51,6 +51,16 @@ <version>${project.version}</version> </dependency> + <!-- Include commands in the server jar so + "java -cp server-jar jena...." works + Convencie in deployments. + --> + <dependency> + <groupId>org.apache.jena</groupId> + <artifactId>jena-cmds</artifactId> + <version>3.1.0-SNAPSHOT</version> + </dependency> + </dependencies> <build>
