jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/403310 )
Change subject: Use built GUI for distribution package
......................................................................
Use built GUI for distribution package
Bug: T166246
Change-Id: I77f82b93e13e63e0d4d4a9fa02ceec47c40e5c0e
---
M dist/pom.xml
M dist/src/assembly/dist.xml
M docs/ChangeLog
M gui
M pom.xml
5 files changed, 20 insertions(+), 16 deletions(-)
Approvals:
Smalyshev: Looks good to me, approved
jenkins-bot: Verified
diff --git a/dist/pom.xml b/dist/pom.xml
index bf0ff56..1175b09 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -34,6 +34,10 @@
<artifactId>blazegraph-service</artifactId>
<type>war</type>
</dependency>
+ <dependency>
+ <groupId>org.wikidata.query.rdf</groupId>
+ <artifactId>gui</artifactId>
+ </dependency>
</dependencies>
<build>
diff --git a/dist/src/assembly/dist.xml b/dist/src/assembly/dist.xml
index a694704..d8a70a3 100644
--- a/dist/src/assembly/dist.xml
+++ b/dist/src/assembly/dist.xml
@@ -1,6 +1,6 @@
-<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0";
+<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd";>
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
http://maven.apache.org/xsd/assembly-1.1.2.xsd";>
<id>dist</id>
@@ -32,19 +32,7 @@
<fileSet>
<outputDirectory>gui</outputDirectory>
- <directory>${project.basedir}/../gui</directory>
- <excludes>
- <exclude>Gruntfile.js</exclude>
- <exclude>.git*</exclude>
- <exclude>.js*</exclude>
- <exclude>.settings</exclude>
- <exclude>.project</exclude>
- <exclude>package.json</exclude>
- <exclude>jsduck.json</exclude>
- <exclude>README.md</exclude>
- <exclude>node_modules/**</exclude>
- <exclude>wikibase/tests/**</exclude>
- </excludes>
+ <directory>${project.basedir}/../gui/build</directory>
</fileSet>
</fileSets>
diff --git a/docs/ChangeLog b/docs/ChangeLog
index 352c1f6..6cdb392 100644
--- a/docs/ChangeLog
+++ b/docs/ChangeLog
@@ -2,6 +2,7 @@
-----
Add more URIs used by Wikibase to vocabulary (requires data reload)
Add wikibase:apiOrdinal for MWAPI queries
+Fix GUI build - now service.zip package contains full build of the GUI
0.2.5
-----
diff --git a/gui b/gui
index ea009d7..fbbf879 160000
--- a/gui
+++ b/gui
@@ -1 +1 @@
-Subproject commit ea009d7ba815e5ba4d87ea1dfecaca7ed3ab6b75
+Subproject commit fbbf879d44f76f946751bf489febff52449e3284
diff --git a/pom.xml b/pom.xml
index 7cef193..77f5af9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,6 +41,7 @@
<module>war</module>
<module>tools</module>
<module>dist</module>
+ <module>gui</module>
</modules>
<scm>
@@ -524,6 +525,11 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>org.wikidata.query.rdf</groupId>
+ <artifactId>gui</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
<version>1.4.01</version>
@@ -742,6 +748,11 @@
</executions>
</plugin>
<plugin>
+ <groupId>com.github.eirslett</groupId>
+ <artifactId>frontend-maven-plugin</artifactId>
+ <version>1.6</version>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
--
To view, visit https://gerrit.wikimedia.org/r/403310
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I77f82b93e13e63e0d4d4a9fa02ceec47c40e5c0e
Gerrit-PatchSet: 10
Gerrit-Project: wikidata/query/rdf
Gerrit-Branch: master
Gerrit-Owner: Smalyshev <[email protected]>
Gerrit-Reviewer: Gehel <[email protected]>
Gerrit-Reviewer: Jonas Kress (WMDE) <[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
