Merge branch 'master' into lb_update_htsjdk

igvteam · Oct 23, 2023 · c8459f2 · c8459f2
2 parents 5c1da11 + 11b0971
commit c8459f2
Show file tree

Hide file tree

Showing 12 changed files with 4 additions and 1,957 deletions.
diff --git a/build.gradle b/build.gradle
@@ -38,6 +38,7 @@ buildscript {
 
 repositories {
     mavenCentral()
+    mavenLocal()
 }
 
 java {
@@ -112,7 +113,7 @@ dependencies {
             [group: 'org.apache.commons', name: 'commons-lang3', version: '3.9'],
             [group: 'com.github.samtools', name: 'htsjdk', version: '4.0.2'],
             [group: 'org.swinglabs', name: 'swing-layout', version: '1.0.3'],
-            //[group: 'org.bidib.com.jidesoft', name: 'jide-common', version: '3.7.3'],  // no longer in Maven Central
+            [group: 'com.formdev', name: 'jide-oss', version: '3.7.12'],
             [group: 'com.google.guava', name: 'guava', version: '27.0.1-jre'],
             [group: 'org.apache.xmlgraphics', name: 'batik-dom', version: '1.11'],
             [group: 'org.apache.xmlgraphics', name: 'batik-svggen', version: '1.11'],

diff --git a/lib/jide-common-3.7.3.jar b/lib/jide-common-3.7.3.jar
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
@@ -20,7 +20,6 @@
     requires java.xml;
     requires jdk.xml.dom;
     requires swing.layout;
-    requires jide.common;
     requires org.apache.commons.io;
     requires org.apache.commons.lang3;
     requires batik.codec;

diff --git a/src/main/java/org/broad/igv/feature/genome/ColorSpaceSequence.java b/src/main/java/org/broad/igv/feature/genome/ColorSpaceSequence.java
diff --git a/src/main/java/org/broad/igv/feature/genome/GenomeBuilderDialog.java b/src/main/java/org/broad/igv/feature/genome/GenomeBuilderDialog.java