[med-svn] [Git][med-team/igv][master] 2 commits: add log4j to log4j2 bridge

[Olivier Sallou]

Olivier Sallou pushed to branch master at Debian Med / igv


Commits:
afc64c64 by Olivier Sallou at 2018-10-15T13:04:51Z
add log4j to log4j2 bridge

- - - - -
9b46e631 by Olivier Sallou at 2018-10-15T13:08:05Z
add log4j to log4j2 bridge

- - - - -


1 changed file:

- debian/patches/fix_gradle.patch


Changes:

=====================================
debian/patches/fix_gradle.patch
=====================================
@@ -34,7 +34,7 @@ Forwarded: no
  sourceSets {
      main {
          java {
-@@ -45,6 +54,19 @@
+@@ -45,6 +54,20 @@
  dependencies {
      // Use the newer JIDE lib for Java 9 builds
      compile fileTree(dir: 'lib', include: '*.jar', exclude: 'jide-oss-3.5.5.jar') + fileTree(dir: 'lib_java9', include: '*.jar')
@@ -49,6 +49,7 @@ Forwarded: no
 +    compile "org.jfree:jfreechart:debian"
 +    compile "org.apache.logging.log4j:log4j:debian"
 +    compile "org.apache.logging.log4j:log4j-api:debian"
++    compile "org.apache.logging.log4j:log4j-1.2-api:debian"
 +    compile "org.apache.logging.log4j:log4j-core:debian"
 +    compile "org.swinglabs:swing-layout:debian"
      testCompile fileTree(dir: 'test/lib', include: '*.jar')
@@ -72,7 +73,7 @@ Forwarded: no
      requires htsjdk;
      requires java.datatransfer;
      requires java.desktop;
-@@ -107,15 +107,14 @@
+@@ -107,15 +107,15 @@
      requires java.sql;
      requires java.xml;
      requires java.xml.bind;
@@ -88,8 +89,8 @@ Forwarded: no
 +    requires javafx.swingEmpty;
      requires jdk.xml.dom;
 -    requires jfreechart;
--    requires log4j;
 +    requires jfreechart.debian;
+     requires log4j;
      requires org.apache.logging.log4j;
      requires org.apache.logging.log4j.core;
 -    requires swing.layout;



View it on GitLab: https://salsa.debian.org/med-team/igv/compare/dce682f881aca91f8737bc9675f970dfd02a5cca...9b46e631cc0b6f5732987c6979f1f90cc46c8fc4

-- 
View it on GitLab: https://salsa.debian.org/med-team/igv/compare/dce682f881aca91f8737bc9675f970dfd02a5cca...9b46e631cc0b6f5732987c6979f1f90cc46c8fc4
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20181015/ecb2ec93/attachment-0001.html>