jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/349959 )
Change subject: deploy blazegraph only once
......................................................................
deploy blazegraph only once
Copying the blazegraph-service war to the tools module and start
it explicitely. Using a test dependency would mess up the test
classpath (see note below). The runBlazegraph.sh script has moved
to the war module (where it logically belongs) to ensure that it
can run standalone, without requiring the copy-war execution to
be run first.
Note: tests were failing due to the misaligned versions of
sesame. This should be fixed at some point.
Change-Id: I1b9984c45d2f2d076c7205fe0e3f43bebf31886f
---
M pom.xml
M tools/pom.xml
R war/runBlazegraph.sh
3 files changed, 31 insertions(+), 15 deletions(-)
Approvals:
Smalyshev: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pom.xml b/pom.xml
index 3422f0c..fb26db8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,8 +42,8 @@
<module>testTools</module>
<module>common</module>
<module>blazegraph</module>
- <module>tools</module>
<module>war</module>
+ <module>tools</module>
<module>dist</module>
</modules>
diff --git a/tools/pom.xml b/tools/pom.xml
index 3323593..bf0de91 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -131,18 +131,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <!--
- adding a test dependency to blazegraph service to ensure that the
- reactor build order is coherent. There should be a better way to do
- this, via an explicit dependency on the jetty-maven-plugin, but I can't
- find the correct syntax at the moment.
- -->
- <groupId>org.wikidata.query.rdf</groupId>
- <artifactId>blazegraph-service</artifactId>
- <type>war</type>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.wikidata.query.rdf</groupId>
<artifactId>testTools</artifactId>
<scope>test</scope>
@@ -176,6 +164,35 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <!--
+ Copy the blazegraph-service WAR in this module target/war
+ directory, so that we don't have a reference to a path in another
+ module (each module should be independent, except for explicit
+ dependencies).
+ -->
+ <id>copy-war</id>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <phase>process-resources</phase>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.wikidata.query.rdf</groupId>
+ <artifactId>blazegraph-service</artifactId>
+ <type>war</type>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/war</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -222,11 +239,10 @@
<configuration>
<contextHandlers>
<contextHandler
implementation="org.eclipse.jetty.maven.plugin.JettyWebAppContext">
-
<war>${project.basedir}/../war/target/blazegraph-service-${project.version}.war</war>
+
<war>${project.build.directory}/war/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/tools/runBlazegraph.sh b/war/runBlazegraph.sh
similarity index 100%
rename from tools/runBlazegraph.sh
rename to war/runBlazegraph.sh
--
To view, visit https://gerrit.wikimedia.org/r/349959
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1b9984c45d2f2d076c7205fe0e3f43bebf31886f
Gerrit-PatchSet: 5
Gerrit-Project: wikidata/query/rdf
Gerrit-Branch: master
Gerrit-Owner: Gehel <[email protected]>
Gerrit-Reviewer: Gehel <[email protected]>
Gerrit-Reviewer: Smalyshev <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
