Skip to content

Commit c5efd67

Browse files
labkey-susanhlabkey-susanh
authored
Update dependencies for 21.7 (#2352)
1 parent 2a0325f commit c5efd67

File tree

9 files changed

+107
-68
lines changed

9 files changed

+107
-68
lines changed

‎.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,16 @@ core/resources/views/gen
2222

2323
experiment/resources/web/experiment/gen
2424
experiment/resources/views/gen
25+
experiment/resources/credits/jars.txt
2526

2627
assay/resources/web/assay/gen
2728
assay/resources/views/gen
2829

2930
pipeline/resources/web/pipeline/gen
3031
pipeline/resources/views/gen
3132

33+
internal/resources/credits/jars.txt
34+
3235
# Gradle
3336
core/.gradle
3437
experiment/.gradle

‎api/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ List others = [
8888
"xerces:xercesImpl:${xercesImplVersion}",
8989
"org.imca_cat.pollingwatchservice:pollingwatchservice:${pollingWatchVersion}",
9090
"org.postgresql:postgresql:${postgresqlDriverVersion}",
91-
"org.hamcrest:hamcrest-core:${hamcrestCoreVersion}"
91+
"org.hamcrest:hamcrest-core:${hamcrestVersion}"
9292
]
9393

9494
List javax = [

‎api/resources/credits/jars.txt

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,40 +4,40 @@ annotations-15.0.jar|Compiler annotations|1.0|{link:JetBrains|http://www.jetbrai
44
batik-codec-1.10.jar|Apache Batik Codec|1.10|{link:Apache|http://xmlgraphics.apache.org/batik/}|{link:Apache 2.0|http://www.apache.org/licenses/LICENSE-2.0}|adam|FOP dependency
55
batik-transcoder-1.10.jar|Apache Batik Transcoder|1.10|{link:Apache|http://xmlgraphics.apache.org/batik/}|{link:Apache 2.0|http://www.apache.org/licenses/LICENSE-2.0}|adam|FOP dependency
66
cglib-nodep-2.2.3.jar|Code Generation Library|2.2.3|{link:SourceForge|http://sourceforge.net/projects/cglib/}|{link:Apache 2.0|http://www.apache.org/licenses/LICENSE-2.0}|mbellew|Used by Spring Framework and jMock
7-
commons-beanutils-1.7.0.jar|Commons Beanutils|1.7.0|{link:Apache|http://jakarta.apache.org/commons/beanutils/}|{link:Apache 2.0|http://www.apache.org/licenses/LICENSE-2.0}|mbellew|Reading/writing beans
8-
commons-codec-1.10.jar|Commons Codec|1.10|{link:Apache|http://jakarta.apache.org/commons/codec/}|{link:Apache 2.0|http://www.apache.org/licenses/LICENSE-2.0}|jeckels|Provides implementations of common encoders and decoders such as Base64, Hex, Phonetic and URLs
9-
commons-collections4-4.2.jar|Commons Collections|4.2|{link:Apache|https://commons.apache.org/proper/commons-collections/index.html}|{link:Apache 2.0|http://www.apache.org/licenses/LICENSE-2.0}|adam|Helpful collections
7+
commons-beanutils-1.8.3.jar|Commons Beanutils|1.8.3|{link:Apache|http://jakarta.apache.org/commons/beanutils/}|{link:Apache 2.0|http://www.apache.org/licenses/LICENSE-2.0}|mbellew|Reading/writing beans
8+
commons-codec-1.15.jar|Commons Codec|1.15|{link:Apache|http://jakarta.apache.org/commons/codec/}|{link:Apache 2.0|http://www.apache.org/licenses/LICENSE-2.0}|jeckels|Provides implementations of common encoders and decoders such as Base64, Hex, Phonetic and URLs
9+
commons-collections4-4.4.jar|Commons Collections|4.4|{link:Apache|https://commons.apache.org/proper/commons-collections/index.html}|{link:Apache 2.0|http://www.apache.org/licenses/LICENSE-2.0}|adam|Helpful collections
1010
commons-dbcp-1.4.jar|Commons Database Connection Pool|1.4|{link:Apache|http://commons.apache.org/proper/commons-dbcp/}|{link:Apache 2.0|http://www.apache.org/licenses/LICENSE-2.0}|jeckels|Database connection pooling - Mondrian and TargetedMS dependency
1111
commons-io-2.8.0.jar|Commons I/O|2.8.0|{link:Apache|http://jakarta.apache.org/commons/io/}|{link:Apache 2.0|http://www.apache.org/licenses/LICENSE-2.0}|jeckels|I/O utility classes
1212
commons-lang3-3.12.0.jar|Commons Lang|3.12.0|{link:Apache|http://jakarta.apache.org/commons/lang/}|{link:Apache 2.0|http://www.apache.org/licenses/LICENSE-2.0}|jeckels|Language helpers
1313
commons-logging-1.2.jar|Commons Logging|1.2|{link:Apache|http://jakarta.apache.org/commons/logging/}|{link:Apache 2.0|http://www.apache.org/licenses/LICENSE-2.0}|jeckels|Bridge API to different logging implementations
1414
commons-pool-1.6.jar|Commons Pool|1.6|{link:Apache|http://commons.apache.org/pool/}|{link:Apache 2.0|http://www.apache.org/licenses/LICENSE-2.0}|jeckels|Object pooling - Pipeline & TargetedMS dependency
15-
commons-validator-1.5.0.jar|Commons Validator|1.5.0|{link:Apache|http://jakarta.apache.org/commons/validator/}|{link:Apache 2.0|http://www.apache.org/licenses/LICENSE-2.0}|jeckels|Data validation and error messages
15+
commons-validator-1.7.jar|Commons Validator|1.7|{link:Apache|http://jakarta.apache.org/commons/validator/}|{link:Apache 2.0|http://www.apache.org/licenses/LICENSE-2.0}|jeckels|Data validation and error messages
1616
core-renderer-R8.jar|FlyingSaucer|R8|{link:FlyingSaucer|http://code.google.com/p/flying-saucer/}|{link:LGPL|http://www.gnu.org/copyleft/lesser.html}|kevink|XHTML/CSS rendering library
1717
ehcache-core-2.6.8.jar|Ehcache|2.6.8|{link:Terracotta|http://ehcache.org/documentation/overview.html}|{link:Apache 2.0|http://www.apache.org/licenses/LICENSE-2.0}|adam|Caching library
1818
fop-2.3.jar|Formatting Objects Processor (FOP)|2.3|{link:Apache|http://xmlgraphics.apache.org/fop/}|{link:Apache 2.0|http://www.apache.org/licenses/LICENSE-2.0}|adam|Used to export SVG visualizations to image and PDF formats
19-
guava-24.0-jre.jar|Guava: Google Core Libraries for Java|17.0|{link:guava-libraries|http://code.google.com/p/guava-libraries/}|{link:Apache 2.0|http://www.apache.org/licenses/LICENSE-2.0}|kevink|Collections Library
19+
guava-30.1.1-jre.jar|Guava: Google Core Libraries for Java|30.1.1-jre|{link:guava-libraries|http://code.google.com/p/guava-libraries/}|{link:Apache 2.0|http://www.apache.org/licenses/LICENSE-2.0}|kevink|Collections Library
2020
gwt-servlet-2.8.2.jar|Server Support for Google Web Toolkit|2.8.2|{link:Google|http://code.google.com/webtoolkit/}|{link:Apache 2.0|http://www.apache.org/licenses/LICENSE-2.0}|jeckels|Support for rich web apps
2121
hamcrest-core-1.3.jar|Hamcrest|1.3|{link:Java Hamcrest|http://hamcrest.org/JavaHamcrest/}|{link:New BSD License|http://www.opensource.org/licenses/bsd-license.php}||Library for writing declartive matches for testing
2222
httpclient-4.5.13.jar|Apache HTTP Client|4.5.13|{link:Apache|http://hc.apache.org/httpcomponents-client-ga}|{link:Apache 2.0|http://www.apache.org/licenses/LICENSE-2.0}|adam|HTTP client for requests of remote servers
2323
httpcore-4.4.14.jar|Apache HTTP Core|4.4.14|{link:Apache|http://hc.apache.org/httpcomponents-core-ga/index.html}|{link:Apache 2.0|http://www.apache.org/licenses/LICENSE-2.0}|adam|HTTP core library, HttpClient dependency
24-
httpmime-4.5.3.jar|Apache HTTP Mime|4.5.3|{link:Apache|http://hc.apache.org/httpcomponents-client-ga}|{link:Apache 2.0|http://www.apache.org/licenses/LICENSE-2.0}|adam|HTTP client for requests of remote servers
25-
jackson-annotations-2.9.5.jar|Jackson Annotations Library|2.9.5|{link:Jackson|https://github.com/FasterXML/jackson}|{link:Apache 2.0|http://www.apache.org/licenses/LICENSE-2.0}|klum|JSON de/serialization, reporting API dependency
26-
jackson-core-2.9.5.jar|Jackson Core Library|2.9.5|{link:Jackson|https://github.com/FasterXML/jackson}|{link:Apache 2.0|http://www.apache.org/licenses/LICENSE-2.0}|klum|JSON de/serialization, reporting API dependency
27-
jackson-databind-2.9.5.jar|Jackson Databind Library|2.9.5|{link:Jackson|https://github.com/FasterXML/jackson}|{link:Apache 2.0|http://www.apache.org/licenses/LICENSE-2.0}|klum|JSON de/serialization, reporting API dependency
28-
jackson-datatype-json-org-2.9.5.jar|Jackson support for org.json|2.9.5|{link:Jackson|https://github.com/FasterXML/jackson-datatype-json-org}|{link:Apache 2.0|http://www.apache.org/licenses/LICENSE-2.0}|kevink|Jackson support for org.json data types, to ease migration out of code that uses them
29-
jama-1.0.2.jar|Java Matrix Package|1.0.2|{link:MathWorks & NIST|http://math.nist.gov/javanumerics/jama/}|{link:Public Domain|https://math.nist.gov/javanumerics/jama/#license}|adam|Linear regressions for hydrophobicity
30-
jfreechart-1.0.14.jar|JFreeChart|1.0.14|{link:JFreeChart|http://www.jfree.org/jfreechart/}|{link:LGPL|http://www.gnu.org/copyleft/lesser.html}|mbellew|Charting
24+
httpmime-4.5.13.jar|Apache HTTP Mime|4.5.13|{link:Apache|http://hc.apache.org/httpcomponents-client-ga}|{link:Apache 2.0|http://www.apache.org/licenses/LICENSE-2.0}|adam|HTTP client for requests of remote servers
25+
jackson-annotations-2.12.3.jar|Jackson Annotations Library|2.12.3|{link:Jackson|https://github.com/FasterXML/jackson}|{link:Apache 2.0|http://www.apache.org/licenses/LICENSE-2.0}|klum|JSON de/serialization, reporting API dependency
26+
jackson-core-2.12.3.jar|Jackson Core Library|2.12.3|{link:Jackson|https://github.com/FasterXML/jackson}|{link:Apache 2.0|http://www.apache.org/licenses/LICENSE-2.0}|klum|JSON de/serialization, reporting API dependency
27+
jackson-databind-2.12.3.jar|Jackson Databind Library|2.12.3|{link:Jackson|https://github.com/FasterXML/jackson}|{link:Apache 2.0|http://www.apache.org/licenses/LICENSE-2.0}|klum|JSON de/serialization, reporting API dependency
28+
jackson-datatype-json-org-2.12.3.jar|Jackson support for org.json|2.12.3|{link:Jackson|https://github.com/FasterXML/jackson-datatype-json-org}|{link:Apache 2.0|http://www.apache.org/licenses/LICENSE-2.0}|kevink|Jackson support for org.json data types, to ease migration out of code that uses them
29+
jama-1.0.3.jar|Java Matrix Package|1.0.3|{link:MathWorks & NIST|http://math.nist.gov/javanumerics/jama/}|{link:Public Domain|https://math.nist.gov/javanumerics/jama/#license}|adam|Linear regressions for hydrophobicity
30+
jfreechart-1.0.19.jar|JFreeChart|1.0.19|{link:JFreeChart|http://www.jfree.org/jfreechart/}|{link:LGPL|http://www.gnu.org/copyleft/lesser.html}|mbellew|Charting
3131
jmock-2.6.0.jar|jMock|2.6.0|{link:jMock|http://www.jmock.org/}|{link:jMock Project License|http://www.jmock.org/license.html}|jeckels|jMock mock object testing framework
3232
jmock-legacy-2.6.0.jar|jMock|2.6.0|{link:jMock|http://www.jmock.org/}|{link:jMock Project License|http://www.jmock.org/license.html}|jeckels|jMock mock object testing framework
33-
json-simple-1.1.jar|JSON.simple - A Simple Java toolkit for JSON|Version 1.1|{link:JSON.simple|https://code.google.com/p/json-simple/}|{link:Apache 2.0|http://www.apache.org/licenses/LICENSE-2.0}|klum|JSON parser for remoteapi
33+
json-simple-1.1.1.jar|JSON.simple - A Simple Java toolkit for JSON|1.1.1|{link:JSON.simple|https://code.google.com/p/json-simple/}|{link:Apache 2.0|http://www.apache.org/licenses/LICENSE-2.0}|klum|JSON parser for remoteapi
3434
jtidy-r918.jar|Java Tidy|r918|{link:SourceForge|http://jtidy.sourceforge.net/}|{link:Custom|http://www.labkey.org/download/jtidy-LICENSE.txt}|mbellew|Validating HTML content
35-
junit-4.12.jar|JUnit|4.12|{link:Junit|http://www.junit.org}|{link:CPL 1.0|http://www.opensource.org/licenses/cpl1.0.php}|jeckels|Unit testing
35+
junit-4.13.2.jar|JUnit|4.13.2|{link:Junit|http://www.junit.org}|{link:CPL 1.0|http://www.opensource.org/licenses/cpl1.0.php}|jeckels|Unit testing
3636
jxl-2.6.3.jar|API|2.6.3|{link:jexcelapi|http://www.jexcelapi.org/}|{link:LGPL|http://www.opensource.org/licenses/lgpl-license.php}|jeckels|Java Excel library
3737
kaptcha-2.3.jar|Captcha generator|2.3|{link:kaptcha|http://code.google.com/p/kaptcha/}|{link:Apache 2.0|http://www.apache.org/licenses/LICENSE-2.0}|nicka|User signup forms
38-
log4j-api-2.13.3.jar|Log4j|2.13.3|{link:Apache|https://logging.apache.org/log4j/2.x/}|{link:Apache 2.0|http://www.apache.org/licenses/LICENSE-2.0}|ankurj|Logging
39-
log4j-core-2.13.3.jar|Log4j|2.13.3|{link:Apache|https://logging.apache.org/log4j/2.x/}|{link:Apache 2.0|http://www.apache.org/licenses/LICENSE-2.0}|ankurj|Logging
40-
log4j-1.2-api-2.13.3.jar|Log4j|2.13.3|{link:Apache|https://logging.apache.org/log4j/2.x/}|{link:Apache 2.0|http://www.apache.org/licenses/LICENSE-2.0}|ankurj|Logging
38+
log4j-api-2.14.1.jar|Log4j|2.14.1|{link:Apache|https://logging.apache.org/log4j/2.x/}|{link:Apache 2.0|http://www.apache.org/licenses/LICENSE-2.0}|ankurj|Logging
39+
log4j-core-2.14.1.jar|Log4j|2.14.1|{link:Apache|https://logging.apache.org/log4j/2.x/}|{link:Apache 2.0|http://www.apache.org/licenses/LICENSE-2.0}|ankurj|Logging
40+
log4j-1.2-api-2.14.1.jar|Log4j|2.14.1|{link:Apache|https://logging.apache.org/log4j/2.x/}|{link:Apache 2.0|http://www.apache.org/licenses/LICENSE-2.0}|ankurj|Logging
4141
opencsv-2.3.jar|OpenCSV|2.3|{link:OpenCSV|http://opencsv.sourceforge.net/}|{link:Apache 2.0|http://www.apache.org/licenses/LICENSE-2.0}|adam|Parsing CSV files
4242
pdfbox-2.0.23.jar|Apache PDFBox®|2.0.11|{link:PDFBox|https://pdfbox.apache.org/}|{link:Apache 2.0|http://www.apache.org/licenses/LICENSE-2.0}|adam|Extract text and produce thumbnails from PDFs
4343
poi-4.1.2.jar|Apache POI|4.0.0|{link:Apache|https://poi.apache.org/}|{link:Apache 2.0|http://www.apache.org/licenses/LICENSE-2.0}|adam|Extracting text from and exporting to Microsoft document formats (Excel, Word, PowerPoint, etc.)

‎bigiron/resources/credits/jars.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{table}
22
Filename|Component|Version|Source|License|LabKey Dev|Purpose
33
jtds-1.3.1.jar|jTDS JDBC Driver|1.3.1|{link:SourceForge|http://jtds.sourceforge.net}|{link:LGPL|http://jtds.sourceforge.net/license.html}|adam|Connect with Microsoft SQL Server database servers
4-
mysql-connector-java-8.0.18.jar|MySQL JDBC Driver|8.0.18|{link:MySQL|http://www.mysql.com/downloads/connector/j}|{link:GPL v2|http://www.gnu.org/licenses/gpl-2.0.html} with {link:Universal FOSS Exception|https://oss.oracle.com/licenses/universal-foss-exception/}|adam|Connect with MySQL database servers
4+
mysql-connector-java-8.0.23.jar|MySQL JDBC Driver|8.0.23|{link:MySQL|http://www.mysql.com/downloads/connector/j}|{link:GPL v2|http://www.gnu.org/licenses/gpl-2.0.html} with {link:Universal FOSS Exception|https://oss.oracle.com/licenses/universal-foss-exception/}|adam|Connect with MySQL database servers
55
{table}

‎core/resources/credits/jars.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{table}
22
Filename|Component|Version|Source|License|LabKey Dev|Purpose
3-
commons-fileupload-1.3.1.jar|Commons File Upload|1.3.1|{link:Apache|http://jakarta.apache.org/commons/fileupload/}|{link:Apache 2.0|http://www.apache.org/licenses/LICENSE-2.0}|jeckels|Parses HTTP multipart/form-data POSTs
3+
commons-fileupload-1.4.jar|Commons File Upload|1.4|{link:Apache|http://jakarta.apache.org/commons/fileupload/}|{link:Apache 2.0|http://www.apache.org/licenses/LICENSE-2.0}|jeckels|Parses HTTP multipart/form-data POSTs
44
commons-math3-3.6.1.jar|Commons Math|3.6.1|{link:Apache|http://commons.apache.org/math/}|{link:Apache 2.0|http://www.apache.org/licenses/LICENSE-2.0}|klum|Lightweight, self-contained mathematics and statistics components
55
radeox-1.0-b2.jar|Radeox|1.0b3|{link:Radeox|http://www.radeox.org/}|{link:Apache 2.0|http://www.apache.org/licenses/LICENSE-2.0}|mbellew|Wiki renderer
66
graal-sdk-20.0.0.jar|GraalJS|20.0.0|{link:GraalJS|https://github.com/graalvm/graaljs}|{link:Universal Permissive License|https://github.com/graalvm/graaljs/blob/master/LICENSE}|matthewb|Server-side JavaScript evaluation

‎experiment/build.gradle

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
import org.labkey.gradle.util.BuildUtils
2+
import org.labkey.gradle.util.ExternalDependency
3+
24
plugins {
35
id 'org.labkey.build.module'
46
}
@@ -13,9 +15,21 @@ sourceSets {
1315
}
1416
}
1517

18+
1619
dependencies{
1720
implementation "com.opencsv:opencsv:${opencsvVersion}"
18-
external "org.apache.commons:commons-math3:${commonsMath3Version}"
21+
BuildUtils.addExternalDependency(
22+
project,
23+
new ExternalDependency(
24+
"org.apache.commons:commons-math3:${commonsMath3Version}",
25+
"Commons Math",
26+
"Apache",
27+
"http://commons.apache.org/math/",
28+
ExternalDependency.APACHE_2_LICENSE_NAME,
29+
ExternalDependency.APACHE_2_LICENSE_URL,
30+
"Lightweight, self-contained mathematics and statistics components"
31+
)
32+
)
1933
BuildUtils.addLabKeyDependency(project: project, config: "modules", depProjectPath: BuildUtils.getPlatformModuleProjectPath(project.gradle, "pipeline"), depProjectConfig: "published", depExtension: "module")
2034
BuildUtils.addLabKeyDependency(project: project, config: "modules", depProjectPath: BuildUtils.getPlatformModuleProjectPath(project.gradle, "query"), depProjectConfig: "published", depExtension: "module")
2135
}

‎experiment/resources/credits/jars.txt

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)