Gehel has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/349959 )
Change subject: [WIP] deploy blazegraph only once
......................................................................
[WIP] deploy blazegraph only once
It looks like the jetty-maven-plugin will deploy a war that is defined as
dependency. So the configuration can be simplified even further.
Note that there are 2 tests failing with this change, I'm not sure why...
Change-Id: I1b9984c45d2f2d076c7205fe0e3f43bebf31886f
---
M pom.xml
M tools/pom.xml
M war/pom.xml
3 files changed, 4 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/rdf
refs/changes/59/349959/1
diff --git a/pom.xml b/pom.xml
index c0b2004..5d22a08 100644
--- a/pom.xml
+++ b/pom.xml
@@ -702,6 +702,9 @@
<artifactId>jetty-maven-plugin</artifactId>
<version>${jetty.version}</version>
<configuration>
+ <webApp>
+ <contextPath>/bigdata</contextPath>
+ </webApp>
<scanIntervalSeconds>10</scanIntervalSeconds>
<stopKey>stopblazegraphrightnowplzkthx</stopKey>
<stopPort>9898</stopPort>
diff --git a/tools/pom.xml b/tools/pom.xml
index 1c061c9..3cb06f5 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -125,7 +125,7 @@
<groupId>org.wikidata.query.rdf</groupId>
<artifactId>blazegraph-service</artifactId>
<type>war</type>
- <scope>runtime</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -220,13 +220,6 @@
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<configuration>
- <contextHandlers>
- <contextHandler
implementation="org.eclipse.jetty.maven.plugin.JettyWebAppContext">
-
<war>${project.basedir}/../war/target/blazegraph-service-${project.version}.war</war>
- <contextPath>/bigdata</contextPath>
- </contextHandler>
- </contextHandlers>
- <jettyXml></jettyXml>
<systemProperties combine.children="append">
<systemProperty>
<!-- By default Blazegraph's WAR thinks it running in tomcat and
uses funky relative paths. They suggest
diff --git a/war/pom.xml b/war/pom.xml
index 0d91a08..b669fa1 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -89,9 +89,6 @@
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<configuration>
- <webApp>
- <contextPath>/bigdata</contextPath>
- </webApp>
<systemProperties combine.children="append">
<systemProperty>
<!-- By default Blazegraph's WAR thinks it running in tomcat and
uses funky relative paths. They suggest
--
To view, visit https://gerrit.wikimedia.org/r/349959
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1b9984c45d2f2d076c7205fe0e3f43bebf31886f
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/rdf
Gerrit-Branch: master
Gerrit-Owner: Gehel <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
