Skip to content

Commit 7768206

Browse files
author
u0028003
committed
Updated dependencies to fix git security warnings
1 parent e9c278d commit 7768206

File tree

4 files changed

+25
-9
lines changed

4 files changed

+25
-9
lines changed

TestResources/Json/GQueryAPI/queryOptions.json

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
true,
4949
false
5050
],
51-
"description": "For vcf input queries, require that vcf records match chr, pos, ref, and at least one alt. Will set 'fetchData' = true. Be sure to vt normalize and decompose_blocksub your vcf input, see https://github.com/atks/vt.",
51+
"description": "For vcf queries, require intersecting vcf records match chr, pos, ref, and at least one alt. Will set 'fetchData' = true. Be sure to vt normalize your vcf input, see https://github.com/atks/vt.",
5252
"defaultOption": false
5353
},
5454
{
@@ -81,6 +81,14 @@
8181
"name": "regExDataLine",
8282
"description": "Require each record data line to match these java regular expressions, semicolon delimited. Note, a .* is added to both ends of each regEx. Will set 'fetchData' = true."
8383
},
84+
{
85+
"examples": [
86+
"Benign",
87+
"FailsQC"
88+
],
89+
"name": "regExDataLineExclude",
90+
"description": "Exclude record data lines that match any of these java regular expressions, semicolon delimited. Note, a .* is added to both ends of each regEx. Will set 'fetchData' = true."
91+
},
8492
{
8593
"name": "matchAllDirPathRegEx",
8694
"options": [

TestResources/Json/GQueryCLI/optionsTest.json

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
true,
5151
false
5252
],
53-
"description": "For vcf input queries, require that vcf records match chr, pos, ref, and at least one alt. Will set 'fetchData' = true. Be sure to vt normalize and decompose_blocksub your vcf input, see https://github.com/atks/vt.",
53+
"description": "For vcf queries, require intersecting vcf records match chr, pos, ref, and at least one alt. Will set 'fetchData' = true. Be sure to vt normalize your vcf input, see https://github.com/atks/vt.",
5454
"defaultOption": false
5555
},
5656
{
@@ -83,6 +83,14 @@
8383
"name": "regExDataLine",
8484
"description": "Require each record data line to match these java regular expressions, semicolon delimited. Note, a .* is added to both ends of each regEx. Will set 'fetchData' = true."
8585
},
86+
{
87+
"examples": [
88+
"Benign",
89+
"FailsQC"
90+
],
91+
"name": "regExDataLineExclude",
92+
"description": "Exclude record data lines that match any of these java regular expressions, semicolon delimited. Note, a .* is added to both ends of each regEx. Will set 'fetchData' = true."
93+
},
8694
{
8795
"name": "matchAllDirPathRegEx",
8896
"options": [
@@ -113,16 +121,16 @@
113121
{
114122
"searchableFiles": [
115123
"Data/B38/clinvar_B38_chr21.vcf.gz",
116-
"Data/B37/TCGA/CU/CU_Test.maf.txt.gz",
117124
"Data/B37/Thor/3994-7.mt2.pass.vcf.gz",
125+
"Data/B37/TCGA/CU/CU_Test.maf.txt.gz",
118126
"Data/B37/TCGA/AP/AP_Test.maf.txt.gz",
119127
"Data/B37/GVCFs/wgSeq_chr22.g.vcf.gz",
120128
"Data/B37/VCFData/chr20-21TRF037738.vcf.gz",
121129
"Data/B37/VCFData/chr20_cosmic.vcf.gz",
122130
"Data/B37/VCFData/chr20_1_3Mut2.vcf.gz",
123-
"Data/Hg19/chr20-22Ribo.bed.gz",
124131
"Data/B37/BedData/chr20-21_Exome_UniObRC.bedGraph.gz",
125-
"Data/B37/BedData/b37EnsGenes_ExonsChr20-21.bed.gz"
132+
"Data/B37/BedData/b37EnsGenes_ExonsChr20-21.bed.gz",
133+
"Data/Hg19/chr20-22Ribo.bed.gz"
126134
],
127135
"name": "dataSources",
128136
"userDirPathRegEx": [".+"],

WebContent/WEB-INF/web.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
<context-param>
6969
<description>Boolean indicating whether authorization is enabled. If true, complete the userGroup param.</description>
7070
<param-name>authorizationEnabled</param-name>
71-
<param-value>false</param-value>
71+
<param-value>true</param-value>
7272
</context-param>
7373
<context-param>
7474
<description>If using authorization, provide a full path to the userGroup file. This parent dir will also be used to store the encryption key so keep it secure.</description>

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<modelVersion>4.0.0</modelVersion>
33
<groupId>GQuery</groupId>
44
<artifactId>GQuery</artifactId>
5-
<version>0.0.1-SNAPSHOT</version>
5+
<version>0.1</version>
66
<packaging>war</packaging>
77
<build>
88
<sourceDirectory>src</sourceDirectory>
@@ -64,7 +64,7 @@
6464
<dependency>
6565
<groupId>org.apache.logging.log4j</groupId>
6666
<artifactId>log4j-core</artifactId>
67-
<version>2.13.0</version>
67+
<version>2.13.2</version>
6868
</dependency>
6969
<dependency>
7070
<groupId>javax.servlet</groupId>
@@ -74,7 +74,7 @@
7474
<dependency>
7575
<groupId>junit</groupId>
7676
<artifactId>junit</artifactId>
77-
<version>4.12</version>
77+
<version>4.13.1</version>
7878
</dependency>
7979
<dependency>
8080
<groupId>com.github.samtools</groupId>

0 commit comments

Comments
 (0)