Skip to content

Commit

Permalink
Merge branch 'release/3.7.1' into annis3/master
Browse files Browse the repository at this point in the history
  • Loading branch information
@thomaskrause
thomaskrause committed Feb 3, 2023
2 parents 8737d7b + beeea0e commit ade2c91
Show file tree
Hide file tree
Showing 81 changed files with 9,261 additions and 1,147 deletions.
4 changes: 3 additions & 1 deletion .vscode/settings.json
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
{
"java.configuration.updateBuildConfiguration": "automatic"
"java.configuration.updateBuildConfiguration": "automatic",
"java.format.settings.url": "https://raw.githubusercontent.com/hexatomic/hexatomic/develop/releng/ide/eclipse-java-hexatomic-style.xml",
"java.compile.nullAnalysis.mode": "automatic"
}
9 changes: 9 additions & 0 deletions CHANGELOG
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
Version 3.7.1
=============

Changelog is also available on GitHub:
https://github.com/korpling/ANNIS/milestone/64?closed=1

[Fixed Bugs]
#813 Missing join on corpus reference when multiple corpora are selected

Version 3.7.0
=============

Expand Down
64 changes: 0 additions & 64 deletions annis-gui/.factorypath
View file

This file was deleted.

37 changes: 20 additions & 17 deletions annis-gui/THIRD-PARTY/annis-gui_dependencies.txt
View file
Original file line number Diff line number Diff line change
@@ -1,49 +1,51 @@

Lists of 105 third-party dependencies.
Lists of 108 third-party dependencies.
(Apache License Version 2.0) cglib (cglib:cglib-nodep:2.1_3 - http://cglib.sourceforge.net/)
(Eclipse Public License - v 1.0) (GNU Lesser General Public License) Logback Classic Module (ch.qos.logback:logback-classic:1.1.3 - http://logback.qos.ch/logback-classic)
(Eclipse Public License - v 1.0) (GNU Lesser General Public License) Logback Core Module (ch.qos.logback:logback-core:1.1.3 - http://logback.qos.ch/logback-core)
(The Apache License, Version 2.0) Woodstox (com.fasterxml.woodstox:woodstox-core:5.0.3 - https://github.com/FasterXML/woodstox)
(MIT License) oshi-core (com.github.oshi:oshi-core:5.5.0 - https://github.com/oshi/oshi/oshi-core)
(SPDX-License-Identifier: MIT) oshi-core (com.github.oshi:oshi-core:6.1.4 - https://github.com/oshi/oshi/oshi-core)
(Apache 2) JSClipboard Add-on (com.github.vaadin4qbanos:jsclipboard:1.0.12 - https://github.com/vaadin4qbanos/vaadin-jsclipboard-addon.git)
(The Apache Software License, Version 2.0) FindBugs-jsr305 (com.google.code.findbugs:jsr305:1.3.9 - http://findbugs.sourceforge.net/)
(Apache 2.0) Gson (com.google.code.gson:gson:2.8.5 - https://github.com/google/gson/gson)
(The Apache Software License, Version 2.0) Guava: Google Core Libraries for Java (com.google.guava:guava:16.0 - http://code.google.com/p/guava-libraries/guava)
(The Apache Software License, Version 2.0) Guava GWT compatible libs (com.google.guava:guava-gwt:16.0 - http://code.google.com/p/guava-libraries/guava-gwt)
(The MIT License) GAGAWA (com.hp.gagawa:gagawa:1.0.1 - http://code.google.com/p/gagawa/)
(The Apache Software License, Version 2.0) Neo Visionaries Internationalization Package (com.neovisionaries:nv-i18n:1.1 - https://github.com/TakahikoKawasaki/nv-i18n)
(The Apache Software License, Version 2.0) Nimbus JOSE+JWT (com.nimbusds:nimbus-jose-jwt:9.23 - https://bitbucket.org/connect2id/nimbus-jose-jwt)
(CDDL 1.1) (GPL2 w/ CPE) jersey-client (com.sun.jersey:jersey-client:1.19 - https://jersey.java.net/jersey-client/)
(CDDL 1.1) (GPL2 w/ CPE) jersey-core (com.sun.jersey:jersey-core:1.19 - https://jersey.java.net/jersey-core/)
(CDDL 1.1) (GPL2 w/ CPE) Jersey Apache HTTP Client 4.x (com.sun.jersey.contribs:jersey-apache-client4:1.19 - https://jersey.java.net/jersey-contribs/jersey-apache-client4/)
(Apache License Version 2.0) Vaadin License Checker (com.vaadin:license-checker:1.2.0 - http://vaadin.com/license-checker)
(Apache License Version 2.0) vaadin-client-compiled (com.vaadin:vaadin-client-compiled:7.7.30 - https://vaadin.com/)
(Apache License Version 2.0) vaadin-push (com.vaadin:vaadin-push:7.7.30 - https://vaadin.com/)
(Apache License Version 2.0) Vaadin License Checker (com.vaadin:license-checker:1.11.2 - https://github.com/vaadin/license-checker-vaadin10)
(Apache License Version 2.0) Open stuff like URLs, files, executables. Cross-platform (com.vaadin:open:8.4.0.3 - http://vaadin.com/open)
(Vaadin Commercial License) vaadin-client-compiled (com.vaadin:vaadin-client-compiled:7.7.37 - https://vaadin.com/)
(Vaadin Commercial License) vaadin-push (com.vaadin:vaadin-push:7.7.37 - https://vaadin.com/)
(Apache License 2.0) Vaadin Sass Compiler (com.vaadin:vaadin-sass-compiler:0.9.13 - http://vaadin.com/)
(Apache License Version 2.0) vaadin-server (com.vaadin:vaadin-server:7.7.30 - https://vaadin.com/)
(Apache License Version 2.0) vaadin-shared (com.vaadin:vaadin-shared:7.7.30 - https://vaadin.com/)
(Apache License Version 2.0) vaadin-themes (com.vaadin:vaadin-themes:7.7.30 - https://vaadin.com/)
(Apache License 2.0) (CDDL) atmosphere-runtime (com.vaadin.external.atmosphere:atmosphere-runtime:2.2.13.vaadin3 - https://github.com/Atmosphere/atmosphere)
(Vaadin Commercial License) vaadin-server (com.vaadin:vaadin-server:7.7.37 - https://vaadin.com/)
(Vaadin Commercial License) vaadin-shared (com.vaadin:vaadin-shared:7.7.37 - https://vaadin.com/)
(Vaadin Commercial License) vaadin-themes (com.vaadin:vaadin-themes:7.7.37 - https://vaadin.com/)
(Apache License 2.0) (CDDL) atmosphere-runtime (com.vaadin.external.atmosphere:atmosphere-runtime:2.2.13.vaadin4 - https://github.com/Atmosphere/atmosphere)
(W3C Software Copyright Notice and License) Flute (com.vaadin.external.flute:flute:1.3.0.gg2 - http://www.w3.org)
(Apache License Version 2.0) Vaadin Customized GWT Elemental Library (com.vaadin.external.gwt:gwt-elemental:2.8.2.vaadin2 - http://vaadin.com/gwt-elemental)
(The MIT License) vaadin-slf4j-jdk14 (com.vaadin.external.slf4j:vaadin-slf4j-jdk14:1.6.1 - http://www.slf4j.org)
(The Apache Software License, Version 2.0) Apache Commons Codec (commons-codec:commons-codec:1.9 - http://commons.apache.org/proper/commons-codec/)
(Apache License, Version 2.0) Apache Commons Collections (commons-collections:commons-collections:3.2.2 - http://commons.apache.org/collections/)
(The Apache Software License, Version 2.0) Commons IO (commons-io:commons-io:1.3.2 - http://jakarta.apache.org/commons/io/)
(The Apache Software License, Version 2.0) Apache Commons Logging (commons-logging:commons-logging:1.2 - http://commons.apache.org/proper/commons-logging/)
(The Apache Software License, Version 2.0) annis-doc (de.hu-berlin.german.korpling.annis:annis-docs:3.7.0 - http://corpus-tools.org/annis/annis-docs/)
(The Apache Software License, Version 2.0) annis-interfaces (de.hu-berlin.german.korpling.annis:annis-interfaces:3.7.0 - http://corpus-tools.org/annis/annis-interfaces/)
(The Apache Software License, Version 2.0) annis-libgui (de.hu-berlin.german.korpling.annis:annis-libgui:3.7.0 - http://corpus-tools.org/annis/annis-libgui/)
(The Apache Software License, Version 2.0) annis-visualizers (de.hu-berlin.german.korpling.annis:annis-visualizers:3.7.0 - http://maven.apache.org)
(The Apache Software License, Version 2.0) annis-widgets (de.hu-berlin.german.korpling.annis:annis-widgets:3.7.0 - http://corpus-tools.org/annis/annis-widgets/)
(The Apache Software License, Version 2.0) annis-doc (de.hu-berlin.german.korpling.annis:annis-docs:3.7.1 - http://corpus-tools.org/annis/annis-docs/)
(The Apache Software License, Version 2.0) annis-interfaces (de.hu-berlin.german.korpling.annis:annis-interfaces:3.7.1 - http://corpus-tools.org/annis/annis-interfaces/)
(The Apache Software License, Version 2.0) annis-libgui (de.hu-berlin.german.korpling.annis:annis-libgui:3.7.1 - http://corpus-tools.org/annis/annis-libgui/)
(The Apache Software License, Version 2.0) annis-visualizers (de.hu-berlin.german.korpling.annis:annis-visualizers:3.7.1 - http://maven.apache.org)
(The Apache Software License, Version 2.0) annis-widgets (de.hu-berlin.german.korpling.annis:annis-widgets:3.7.1 - http://corpus-tools.org/annis/annis-widgets/)
(Apache License, Version 2.0) The Netty Project (io.netty:netty:3.5.2.Final - http://netty.io/)
(COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0) JavaBeans(TM) Activation Framework (javax.activation:activation:1.1.1 - http://java.sun.com/javase/technologies/desktop/javabeans/jaf/index.jsp)
(CDDL) (GPLv2+CE) JavaMail API (compat) (javax.mail:mail:1.4.5 - http://kenai.com/projects/javamail/mail)
(CDDL + GPLv2 with classpath exception) Java Servlet API (javax.servlet:javax.servlet-api:3.0.1 - http://servlet-spec.java.net)
(CDDL License) jsr311-api (javax.ws.rs:jsr311-api:1.1.1 - https://jsr311.dev.java.net)
(Apache 2) Joda-Time (joda-time:joda-time:2.4 - http://www.joda.org/joda-time/)
(Eclipse Public License 1.0) JUnit (junit:junit:4.12 - http://junit.org)
(ASL, version 2) (LGPL, version 2.1) Java Native Access (net.java.dev.jna:jna:4.1.0 - https://github.com/twall/jna)
(ASL, version 2) (LGPL, version 2.1) Java Native Access Platform (net.java.dev.jna:jna-platform:4.1.0 - https://github.com/twall/jna)
(Apache-2.0) (LGPL-2.1-or-later) Java Native Access (net.java.dev.jna:jna:5.10.0 - https://github.com/java-native-access/jna)
(Apache-2.0) (LGPL-2.1-or-later) Java Native Access Platform (net.java.dev.jna:jna-platform:5.10.0 - https://github.com/java-native-access/jna)
(The Apache Software License, Version 2.0) Ehcache Core (net.sf.ehcache:ehcache-core:2.6.11 - http://ehcache.org)
(The BSD License) jung-api (net.sf.jung:jung-api:2.0.1 - http://jung.sourceforge.net/site/jung-api)
(The BSD License) jung-graph-impl (net.sf.jung:jung-graph-impl:2.0.1 - http://jung.sourceforge.net/site/jung-graph-impl)
Expand Down Expand Up @@ -82,8 +84,9 @@ Lists of 105 third-party dependencies.
(New BSD License) Hamcrest Core (org.hamcrest:hamcrest-core:1.3 - https://github.com/hamcrest/JavaHamcrest/hamcrest-core)
(Similar to Apache License but with the acknowledgment clause removed) JDOM (org.jdom:jdom:1.1.3 - http://www.jdom.org)
(The JSON License) JSON in Java (org.json:json:20140107 - https://github.com/douglascrockford/JSON-java)
(The MIT License) jsoup Java HTML Parser (org.jsoup:jsoup:1.14.3 - https://jsoup.org/)
(The MIT License) jsoup Java HTML Parser (org.jsoup:jsoup:1.15.3 - https://jsoup.org/)
(GNU Lesser General Public License) Java Text Categorizing Library (org.knallgrau.utils:textcat:1.0.1 - http://textcat.sourceforge.net/)
(Apache License, Version 2.0) jcip-annotations (org.lucee:jcip-annotations:1.0.0 - http://maven.lucee.org/jcip-annotations/)
(The Apache Software License, Version 2.0) selenium-api (org.seleniumhq.selenium:selenium-api:2.49.0 - http://selenium.googlecode.com/selenium-api/)
(The Apache Software License, Version 2.0) selenium-chrome-driver (org.seleniumhq.selenium:selenium-chrome-driver:2.49.0 - http://selenium.googlecode.com/selenium-chrome-driver/)
(The Apache Software License, Version 2.0) selenium-edge-driver (org.seleniumhq.selenium:selenium-edge-driver:2.49.0 - http://selenium.googlecode.com/selenium-edge-driver/)
Expand Down
Loading

0 comments on commit ade2c91

Please sign in to comment.