[Git][java-team/darcula][master] do not include iconloader jar in darcula jar, add iconloader as dependency in pom.xml

[Felix Natter]

Felix Natter pushed to branch master at Debian Java Maintainers / darcula


Commits:
491864c0 by Felix Natter at 2019-11-07T18:26:02Z
do not include iconloader jar in darcula jar, add iconloader as dependency in pom.xml

- - - - -


2 changed files:

- debian/patches/01_fix_gradle_build.patch
- debian/patches/02_add_pom.patch


Changes:

=====================================
debian/patches/01_fix_gradle_build.patch
=====================================
@@ -17,7 +17,14 @@ Last-Update: 2019-10-09
    }
  }
  
-@@ -35,7 +35,7 @@
+@@ -29,13 +29,13 @@
+ 
+ jar {
+   from {
+-    configurations.library.collect { it.isDirectory() ? it : zipTree(it) }
++  //  configurations.library.collect { it.isDirectory() ? it : zipTree(it) }
+   }
+ }
  
  dependencies {
    library name: 'iconloader'


=====================================
debian/patches/02_add_pom.patch
=====================================
@@ -5,7 +5,7 @@ Last-Update: 2019-10-09
 
 --- /dev/null
 +++ b/pom.xml
-@@ -0,0 +1,22 @@
+@@ -0,0 +1,28 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
 +    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
@@ -21,6 +21,12 @@ Last-Update: 2019-10-09
 +      <scope>compile</scope>
 +    </dependency>
 +    <dependency>
++      <groupId>com.bulenkov</groupId>
++      <artifactId>iconloader</artifactId>
++      <version>0.0+git20170615</version>
++      <scope>compile</scope>
++    </dependency>
++    <dependency>
 +      <groupId>junit</groupId>
 +      <artifactId>junit</artifactId>
 +      <version>4.12</version>



View it on GitLab: https://salsa.debian.org/java-team/darcula/commit/491864c0a6b12c794b08288725b344120fb38f96

-- 
View it on GitLab: https://salsa.debian.org/java-team/darcula/commit/491864c0a6b12c794b08288725b344120fb38f96
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/pkg-java-commits/attachments/20191107/39878b33/attachment.html>