Hjfocs has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/365252 )

Change subject: Workarounds to fix the project build
......................................................................

Workarounds to fix the project build

Blazegraph snapshot dependencies do not seem to be deployed
in the Wikimedia repos, so add the OSS one.
Linked Data Fragments -wmf2 version does not seem to be available
at all, so use -wmf.
The duplicate finder Maven plugin fails the build due to the following 
duplicates
in the 'war' and 'tools' modules respectively:
com.codahale.metrics:metrics-core:3.0.0 VS 
io.dropwizard.metrics:metrics-core:3.1.0
and
war/src/main/resources/logback.xml VS tools/src/main/resources/logback.xml
The codahale dependency is now ignored by the Maven plugin, while the 
logback.xml
resource in the 'tools' module is deleted.

Change-Id: I8f18af22a230472680ce55ae519a3022dfe17195
---
M pom.xml
D tools/src/main/resources/logback.xml
2 files changed, 10 insertions(+), 17 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/rdf 
refs/changes/52/365252/1

diff --git a/pom.xml b/pom.xml
index 7d65391..f0d358c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -430,7 +430,7 @@
       <dependency>
         <groupId>org.linkeddatafragments</groupId>
         <artifactId>ldfserver</artifactId>
-        <version>0.1.1-wmf2</version>
+        <version>0.1.1-wmf</version>
         <classifier>classes</classifier>
         <exclusions>
           <exclusion>
@@ -466,7 +466,7 @@
       <dependency>
         <groupId>org.linkeddatafragments</groupId>
         <artifactId>ldfserver</artifactId>
-        <version>0.1.1-wmf2</version>
+        <version>0.1.1-wmf</version>
         <type>war</type>
       </dependency>
       <dependency>
@@ -627,6 +627,10 @@
     <repository>
       <id>wmf.releases</id>
       <url>http://archiva.wikimedia.org/repository/releases</url>
+    </repository>
+    <repository>
+      <id>ossrh</id>
+      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
     </repository>
   </repositories>
 
@@ -1047,6 +1051,10 @@
               clean, it will come in a second time...
             -->
             <dependency>
+              <groupId>com.codahale.metrics</groupId>
+              <artifactId>metrics-core</artifactId>
+            </dependency>
+            <dependency>
               <groupId>colt</groupId>
               <artifactId>colt</artifactId>
             </dependency>
diff --git a/tools/src/main/resources/logback.xml 
b/tools/src/main/resources/logback.xml
deleted file mode 100644
index 206a188..0000000
--- a/tools/src/main/resources/logback.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - 
%msg%n</pattern>
-            <outputPatternAsHeader>true</outputPatternAsHeader>
-        </encoder>
-    </appender>
-
-    <logger name="org.wikidata.query.rdf" level="info"/>
-
-    <root level="warn">
-        <appender-ref ref="STDOUT"/>
-    </root>
-</configuration>

-- 
To view, visit https://gerrit.wikimedia.org/r/365252
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8f18af22a230472680ce55ae519a3022dfe17195
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/rdf
Gerrit-Branch: master
Gerrit-Owner: Hjfocs <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to