[med-svn] [Git][med-team/igv][master] Correcting the name of the junit module in build.gradle
Pierre Gruet
gitlab at salsa.debian.org
Tue Nov 10 17:07:30 GMT 2020
Pierre Gruet pushed to branch master at Debian Med / igv
Commits:
f66e78b6 by Pierre Gruet at 2020-11-10T17:39:02+01:00
Correcting the name of the junit module in build.gradle
- - - - -
2 changed files:
- debian/changelog
- debian/patches/gradle_dependencies.patch
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+igv (2.6.3+dfsg-2) UNRELEASED; urgency=medium
+
+ * Correcting the module name of junit in build.gradle
+ Closes: #974076
+
+ -- Pierre Gruet <pgtdebian at free.fr> Tue, 01 Sep 2020 22:14:41 +0200
+
igv (2.6.3+dfsg-1) unstable; urgency=medium
[ Andreas Tille ]
=====================================
debian/patches/gradle_dependencies.patch
=====================================
@@ -1,10 +1,8 @@
Description: Adapting gradle build files to Debian environment
Paths of Debian libraries are indicated.
- We put the junit4 module (as we use the Debian one) everywhere instead of
- junit.
Author: Pierre Gruet <pgtdebian at free.fr>
Forwarded: not-needed
-Last-Update: 2020-08-31
+Last-Update: 2020-11-10
--- a/build_java11.gradle
+++ b/build_java11.gradle
@@ -33,28 +31,6 @@ Last-Update: 2020-08-31
}
task wrapper(type: Wrapper) {
-@@ -107,7 +124,7 @@
- doFirst {
- options.compilerArgs = [
- '--module-path', classpath.asPath,
-- '--add-modules', 'junit',
-+ '--add-modules', 'junit4',
- '--add-modules', 'fest.swing',
- '--patch-module', "$moduleName=" + files(sourceSets.test.java.srcDirs).asPath,
- ]
-@@ -121,10 +138,10 @@
- jvmArgs = [
- '-Dcom.sun.xml.bind.v2.bytecode.ClassTailor.noOptimize',
- '--module-path', classpath.asPath,
-- '--add-modules', 'junit',
-+ '--add-modules', 'junit4',
- '--add-modules', 'fest.swing',
- '--add-modules', 'ALL-MODULE-PATH',
-- '--add-reads', "$moduleName=junit",
-+ '--add-reads', "$moduleName=junit4",
- '--add-reads', "$moduleName=fest.swing",
- '@scripts/java11/test_suite.args',
- '--patch-module', "$moduleName=" + files(sourceSets.test.java.outputDir, sourceSets.main.output.resourcesDir).asPath,
@@ -307,4 +324,4 @@
if (!makensisCommand.equals("") && !signcodeCommand.equals("")) {
@@ -76,157 +52,3 @@ Last-Update: 2020-08-31
requires htsjdk;
requires java.datatransfer;
requires java.desktop;
---- a/scripts/java11/test_suite.args
-+++ b/scripts/java11/test_suite.args
-@@ -1,77 +1,77 @@
- # Arguments to support running the test suite on Java 9 and 10
- # Need to expose internals to junit for testing.
-
----add-exports org.igv/org.broad.igv.annotations=junit
----add-exports org.igv/org.broad.igv.batch=junit
----add-exports org.igv/org.broad.igv.bbfile=junit
----add-exports org.igv/org.broad.igv.bigwig=junit
----add-exports org.igv/org.broad.igv.charts=junit
----add-exports org.igv/org.broad.igv.cli_plugin.ui=junit
----add-exports org.igv/org.broad.igv.data=junit
----add-exports org.igv/org.broad.igv.data.cufflinks=junit
----add-exports org.igv/org.broad.igv.data.expression=junit
----add-exports org.igv/org.broad.igv.data.seg=junit
----add-exports org.igv/org.broad.igv.event=junit
----add-exports org.igv/org.broad.igv.exceptions=junit
----add-exports org.igv/org.broad.igv.feature=junit
----add-exports org.igv/org.broad.igv.feature.basepair=junit
----add-exports org.igv/org.broad.igv.feature.bionano=junit
----add-exports org.igv/org.broad.igv.feature.dranger=junit
----add-exports org.igv/org.broad.igv.feature.dsi=junit
----add-exports org.igv/org.broad.igv.feature.genome=junit
----add-exports org.igv/org.broad.igv.feature.genome.fasta=junit
----add-exports org.igv/org.broad.igv.feature.tribble=junit
----add-exports org.igv/org.broad.igv.feature.tribble.reader=junit
----add-exports org.igv/org.broad.igv.google=junit
----add-exports org.igv/org.broad.igv.gs=junit
----add-exports org.igv/org.broad.igv.gs.dm=junit
----add-exports org.igv/org.broad.igv.gs.atm=junit
----add-exports org.igv/org.broad.igv.goby=junit
----add-exports org.igv/org.broad.igv.gwas=junit
----add-exports org.igv/org.broad.igv.lists=junit
----add-exports org.igv/org.broad.igv.maf=junit
----add-exports org.igv/org.broad.igv.methyl=junit
----add-exports org.igv/org.broad.igv.peaks=junit
----add-exports org.igv/org.broad.igv.prefs=junit
----add-exports org.igv/org.broad.igv.repeats=junit
----add-exports org.igv/org.broad.igv.renderer=junit
----add-exports org.igv/org.broad.igv.sam=junit
----add-exports org.igv/org.broad.igv.sam.cram=junit
----add-exports org.igv/org.broad.igv.sam.lite=junit
----add-exports org.igv/org.broad.igv.sam.reader=junit
----add-exports org.igv/org.broad.igv.session=junit
----add-exports org.igv/org.broad.igv.tdf=junit
----add-exports org.igv/org.broad.igv.tools.converters=junit
----add-exports org.igv/org.broad.igv.tools.motiffinder=junit
----add-exports org.igv/org.broad.igv.tools.parsers=junit
----add-exports org.igv/org.broad.igv.tools.sort=junit
----add-exports org.igv/org.broad.igv.tools.ui=junit
----add-exports org.igv/org.broad.igv.track=junit
----add-exports org.igv/org.broad.igv.ui.action=junit
----add-exports org.igv/org.broad.igv.ui.color=junit
----add-exports org.igv/org.broad.igv.ui.commandbar=junit
----add-exports org.igv/org.broad.igv.ui.dnd=junit
----add-exports org.igv/org.broad.igv.ui.filefilters=junit
----add-exports org.igv/org.broad.igv.ui.legend=junit
----add-exports org.igv/org.broad.igv.ui.panel=junit
----add-exports org.igv/org.broad.igv.ui.svg=junit
----add-exports org.igv/org.broad.igv.ui.util=junit
----add-exports org.igv/org.broad.igv.ui.util.download=junit
----add-exports org.igv/org.broad.igv.util=junit
----add-exports org.igv/org.broad.igv.util.blat=junit
----add-exports org.igv/org.broad.igv.util.collections=junit
----add-exports org.igv/org.broad.igv.util.converters=junit
----add-exports org.igv/org.broad.igv.util.extview=junit
----add-exports org.igv/org.broad.igv.util.encode=junit
----add-exports org.igv/org.broad.igv.util.ftp=junit
----add-exports org.igv/org.broad.igv.util.index=junit
----add-exports org.igv/org.broad.igv.util.stream=junit
----add-exports org.igv/org.broad.igv.util.stats=junit
----add-exports org.igv/org.broad.igv.variant=junit
----add-exports org.igv/org.broad.igv.variant.New=junit
----add-exports org.igv/org.broad.igv.variant.util=junit
----add-exports org.igv/org.broad.igv.variant.vcf=junit
----add-exports org.igv/biz.source_code.base64Coder=junit
----add-exports org.igv/org.broad.igv.preprocess=junit
----add-exports org.igv/org.broad.tribble=junit
----add-exports org.igv/util=junit
-+--add-exports org.igv/org.broad.igv.annotations=junit4
-+--add-exports org.igv/org.broad.igv.batch=junit4
-+--add-exports org.igv/org.broad.igv.bbfile=junit4
-+--add-exports org.igv/org.broad.igv.bigwig=junit4
-+--add-exports org.igv/org.broad.igv.charts=junit4
-+--add-exports org.igv/org.broad.igv.cli_plugin.ui=junit4
-+--add-exports org.igv/org.broad.igv.data=junit4
-+--add-exports org.igv/org.broad.igv.data.cufflinks=junit4
-+--add-exports org.igv/org.broad.igv.data.expression=junit4
-+--add-exports org.igv/org.broad.igv.data.seg=junit4
-+--add-exports org.igv/org.broad.igv.event=junit4
-+--add-exports org.igv/org.broad.igv.exceptions=junit4
-+--add-exports org.igv/org.broad.igv.feature=junit4
-+--add-exports org.igv/org.broad.igv.feature.basepair=junit4
-+--add-exports org.igv/org.broad.igv.feature.bionano=junit4
-+--add-exports org.igv/org.broad.igv.feature.dranger=junit4
-+--add-exports org.igv/org.broad.igv.feature.dsi=junit4
-+--add-exports org.igv/org.broad.igv.feature.genome=junit4
-+--add-exports org.igv/org.broad.igv.feature.genome.fasta=junit4
-+--add-exports org.igv/org.broad.igv.feature.tribble=junit4
-+--add-exports org.igv/org.broad.igv.feature.tribble.reader=junit4
-+--add-exports org.igv/org.broad.igv.google=junit4
-+--add-exports org.igv/org.broad.igv.gs=junit4
-+--add-exports org.igv/org.broad.igv.gs.dm=junit4
-+--add-exports org.igv/org.broad.igv.gs.atm=junit4
-+--add-exports org.igv/org.broad.igv.goby=junit4
-+--add-exports org.igv/org.broad.igv.gwas=junit4
-+--add-exports org.igv/org.broad.igv.lists=junit4
-+--add-exports org.igv/org.broad.igv.maf=junit4
-+--add-exports org.igv/org.broad.igv.methyl=junit4
-+--add-exports org.igv/org.broad.igv.peaks=junit4
-+--add-exports org.igv/org.broad.igv.prefs=junit4
-+--add-exports org.igv/org.broad.igv.repeats=junit4
-+--add-exports org.igv/org.broad.igv.renderer=junit4
-+--add-exports org.igv/org.broad.igv.sam=junit4
-+--add-exports org.igv/org.broad.igv.sam.cram=junit4
-+--add-exports org.igv/org.broad.igv.sam.lite=junit4
-+--add-exports org.igv/org.broad.igv.sam.reader=junit4
-+--add-exports org.igv/org.broad.igv.session=junit4
-+--add-exports org.igv/org.broad.igv.tdf=junit4
-+--add-exports org.igv/org.broad.igv.tools.converters=junit4
-+--add-exports org.igv/org.broad.igv.tools.motiffinder=junit4
-+--add-exports org.igv/org.broad.igv.tools.parsers=junit4
-+--add-exports org.igv/org.broad.igv.tools.sort=junit4
-+--add-exports org.igv/org.broad.igv.tools.ui=junit4
-+--add-exports org.igv/org.broad.igv.track=junit4
-+--add-exports org.igv/org.broad.igv.ui.action=junit4
-+--add-exports org.igv/org.broad.igv.ui.color=junit4
-+--add-exports org.igv/org.broad.igv.ui.commandbar=junit4
-+--add-exports org.igv/org.broad.igv.ui.dnd=junit4
-+--add-exports org.igv/org.broad.igv.ui.filefilters=junit4
-+--add-exports org.igv/org.broad.igv.ui.legend=junit4
-+--add-exports org.igv/org.broad.igv.ui.panel=junit4
-+--add-exports org.igv/org.broad.igv.ui.svg=junit4
-+--add-exports org.igv/org.broad.igv.ui.util=junit4
-+--add-exports org.igv/org.broad.igv.ui.util.download=junit4
-+--add-exports org.igv/org.broad.igv.util=junit4
-+--add-exports org.igv/org.broad.igv.util.blat=junit4
-+--add-exports org.igv/org.broad.igv.util.collections=junit4
-+--add-exports org.igv/org.broad.igv.util.converters=junit4
-+--add-exports org.igv/org.broad.igv.util.extview=junit4
-+--add-exports org.igv/org.broad.igv.util.encode=junit4
-+--add-exports org.igv/org.broad.igv.util.ftp=junit4
-+--add-exports org.igv/org.broad.igv.util.index=junit4
-+--add-exports org.igv/org.broad.igv.util.stream=junit4
-+--add-exports org.igv/org.broad.igv.util.stats=junit4
-+--add-exports org.igv/org.broad.igv.variant=junit4
-+--add-exports org.igv/org.broad.igv.variant.New=junit4
-+--add-exports org.igv/org.broad.igv.variant.util=junit4
-+--add-exports org.igv/org.broad.igv.variant.vcf=junit4
-+--add-exports org.igv/biz.source_code.base64Coder=junit4
-+--add-exports org.igv/org.broad.igv.preprocess=junit4
-+--add-exports org.igv/org.broad.tribble=junit4
-+--add-exports org.igv/util=junit4
View it on GitLab: https://salsa.debian.org/med-team/igv/-/commit/f66e78b6ebc2504d65178c01541cbaf17482a223
--
View it on GitLab: https://salsa.debian.org/med-team/igv/-/commit/f66e78b6ebc2504d65178c01541cbaf17482a223
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/20201110/1e292d3a/attachment-0001.html>
More information about the debian-med-commit
mailing list