This is an automated email from the ASF dual-hosted git repository.
arina pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/drill.git
The following commit(s) were added to refs/heads/master by this push:
new cd370d0 DRILL-7713: Upgrade misc libraries which outdated versions
have reported vulnerabilities
cd370d0 is described below
commit cd370d0a07058e4c0455543533437ef058396679
Author: Arina Ielchiieva <[email protected]>
AuthorDate: Sat Apr 18 18:58:20 2020 +0300
DRILL-7713: Upgrade misc libraries which outdated versions have reported
vulnerabilities
1. Jackson
2. Retrofit
3. Commons-beanutils
4. Xalan
5. Xerdes
6. Commons-codec
7. Snakeyaml
8. Metadata-extractor
9. Protostuff
---
contrib/storage-hive/hive-exec-shade/pom.xml | 6 +
contrib/storage-opentsdb/pom.xml | 8 +-
exec/java-exec/pom.xml | 1 -
.../drill/exec/planner/PhysicalPlanReader.java | 2 +-
.../drill/exec/store/image/ImageRecordReader.java | 13 +-
.../exec/store/pojo/DynamicPojoRecordReader.java | 12 +-
.../src/test/resources/store/image/jpeg.json | 124 ++++++++---------
.../src/test/resources/store/image/mov.json | 46 +++----
.../src/test/resources/store/image/mp4.json | 57 ++++----
.../src/test/resources/store/image/png.json | 35 +++--
.../src/test/resources/store/image/psd.json | 146 ++++++++++-----------
.../src/test/resources/store/image/tiff.json | 119 ++++++++++++-----
exec/jdbc-all/pom.xml | 4 +-
pom.xml | 85 ++++++++++--
protocol/pom.xml | 2 -
15 files changed, 398 insertions(+), 262 deletions(-)
diff --git a/contrib/storage-hive/hive-exec-shade/pom.xml
b/contrib/storage-hive/hive-exec-shade/pom.xml
index 778ba68..ac56de4 100644
--- a/contrib/storage-hive/hive-exec-shade/pom.xml
+++ b/contrib/storage-hive/hive-exec-shade/pom.xml
@@ -208,6 +208,12 @@
<exclude>shaded/parquet/org/**</exclude>
</excludes>
</filter>
+ <filter>
+ <artifact>com.fasterxml.jackson.core:*</artifact>
+ <excludes>
+ <exclude>module-info.class</exclude>
+ </excludes>
+ </filter>
</filters>
</configuration>
</plugin>
diff --git a/contrib/storage-opentsdb/pom.xml b/contrib/storage-opentsdb/pom.xml
index 5229802..23f193d 100644
--- a/contrib/storage-opentsdb/pom.xml
+++ b/contrib/storage-opentsdb/pom.xml
@@ -30,6 +30,10 @@
<name>contrib/opentsdb-storage-plugin</name>
+ <properties>
+ <retrofit.version>2.8.1</retrofit.version>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.drill.exec</groupId>
@@ -64,12 +68,12 @@
<dependency>
<groupId>com.squareup.retrofit2</groupId>
<artifactId>retrofit</artifactId>
- <version>2.1.0</version>
+ <version>${retrofit.version}</version>
</dependency>
<dependency>
<groupId>com.squareup.retrofit2</groupId>
<artifactId>converter-jackson</artifactId>
- <version>2.1.0</version>
+ <version>${retrofit.version}</version>
</dependency>
<dependency>
<groupId>com.madhukaraphatak</groupId>
diff --git a/exec/java-exec/pom.xml b/exec/java-exec/pom.xml
index 49890c9..809539d 100644
--- a/exec/java-exec/pom.xml
+++ b/exec/java-exec/pom.xml
@@ -608,7 +608,6 @@
<dependency>
<groupId>com.drewnoakes</groupId>
<artifactId>metadata-extractor</artifactId>
- <version>2.11.0</version>
</dependency>
<dependency>
<groupId>fr.bmartel</groupId>
diff --git
a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/PhysicalPlanReader.java
b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/PhysicalPlanReader.java
index f693744..45975f2 100644
---
a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/PhysicalPlanReader.java
+++
b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/PhysicalPlanReader.java
@@ -67,7 +67,7 @@ public class PhysicalPlanReader {
.addSerializer(MajorType.class, new MajorTypeSerDe.Se())
.addDeserializer(MajorType.class, new MajorTypeSerDe.De())
.addDeserializer(DynamicPojoRecordReader.class,
- new StdDelegatingDeserializer<>(new
DynamicPojoRecordReader.Converter<>(lpMapper)))
+ new StdDelegatingDeserializer<>(new
DynamicPojoRecordReader.Converter(lpMapper)))
.addSerializer(Path.class, new PathSerDe.Se());
lpMapper.registerModule(serDeModule);
diff --git
a/exec/java-exec/src/main/java/org/apache/drill/exec/store/image/ImageRecordReader.java
b/exec/java-exec/src/main/java/org/apache/drill/exec/store/image/ImageRecordReader.java
index 08ed4fd..fa01743 100644
---
a/exec/java-exec/src/main/java/org/apache/drill/exec/store/image/ImageRecordReader.java
+++
b/exec/java-exec/src/main/java/org/apache/drill/exec/store/image/ImageRecordReader.java
@@ -15,7 +15,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.drill.exec.store.image;
import io.netty.buffer.DrillBuf;
@@ -23,14 +22,14 @@ import io.netty.buffer.DrillBuf;
import java.io.BufferedInputStream;
import java.util.Date;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
import java.util.TimeZone;
-import com.adobe.xmp.XMPException;
-import com.adobe.xmp.XMPMeta;
-import com.adobe.xmp.options.IteratorOptions;
-import com.adobe.xmp.properties.XMPPropertyInfo;
+import com.adobe.internal.xmp.XMPException;
+import com.adobe.internal.xmp.XMPIterator;
+import com.adobe.internal.xmp.XMPMeta;
+import com.adobe.internal.xmp.options.IteratorOptions;
+import com.adobe.internal.xmp.properties.XMPPropertyInfo;
import com.drew.imaging.FileType;
import com.drew.imaging.FileTypeDetector;
@@ -266,7 +265,7 @@ public class ImageRecordReader extends AbstractRecordReader
{
if (xmpMeta != null) {
try {
IteratorOptions iteratorOptions = new
IteratorOptions().setJustLeafnodes(true);
- for (final Iterator i = xmpMeta.iterator(iteratorOptions);
i.hasNext(); ) {
+ for (final XMPIterator i = xmpMeta.iterator(iteratorOptions);
i.hasNext(); ) {
try {
XMPPropertyInfo prop = (XMPPropertyInfo) i.next();
String path = prop.getPath();
diff --git
a/exec/java-exec/src/main/java/org/apache/drill/exec/store/pojo/DynamicPojoRecordReader.java
b/exec/java-exec/src/main/java/org/apache/drill/exec/store/pojo/DynamicPojoRecordReader.java
index fc0b4cb..149779d 100644
---
a/exec/java-exec/src/main/java/org/apache/drill/exec/store/pojo/DynamicPojoRecordReader.java
+++
b/exec/java-exec/src/main/java/org/apache/drill/exec/store/pojo/DynamicPojoRecordReader.java
@@ -92,7 +92,7 @@ public class DynamicPojoRecordReader<T> extends
AbstractPojoRecordReader<List<T>
* An utility class that converts from {@link
com.fasterxml.jackson.databind.JsonNode}
* to DynamicPojoRecordReader during physical plan fragment deserialization.
*/
- public static class Converter<T> extends StdConverter<JsonNode,
DynamicPojoRecordReader<T>> {
+ public static class Converter extends StdConverter<JsonNode,
DynamicPojoRecordReader> {
private static final TypeReference<LinkedHashMap<String, Class<?>>>
schemaType =
new TypeReference<LinkedHashMap<String, Class<?>>>() {};
@@ -103,15 +103,15 @@ public class DynamicPojoRecordReader<T> extends
AbstractPojoRecordReader<List<T>
}
@Override
- public DynamicPojoRecordReader<T> convert(JsonNode value) {
- LinkedHashMap<String, Class<T>> schema =
mapper.convertValue(value.get("schema"), schemaType);
- List<List<T>> records = new ArrayList<>();
+ public DynamicPojoRecordReader convert(JsonNode value) {
+ LinkedHashMap<String, Class<?>> schema =
mapper.convertValue(value.get("schema"), schemaType);
+ List<List<?>> records = new ArrayList<>();
JsonNode serializedRecords = value.get("records");
for (JsonNode serializedRecord : serializedRecords) {
- List<T> record = new ArrayList<>(schema.size());
+ List<Object> record = new ArrayList<>(schema.size());
Iterator<JsonNode> recordsIterator = serializedRecord.elements();
- for (Class<T> fieldType : schema.values()) {
+ for (Class<?> fieldType : schema.values()) {
record.add(mapper.convertValue(recordsIterator.next(), fieldType));
}
records.add(record);
diff --git a/exec/java-exec/src/test/resources/store/image/jpeg.json
b/exec/java-exec/src/test/resources/store/image/jpeg.json
index 2bb357b..cc297ca 100644
--- a/exec/java-exec/src/test/resources/store/image/jpeg.json
+++ b/exec/java-exec/src/test/resources/store/image/jpeg.json
@@ -1,10 +1,10 @@
{
"Format" : "JPEG",
- "DPIWidth" : "300",
- "DPIHeight" : "300",
"PixelWidth" : "600",
"PixelHeight" : "400",
"BitsPerPixel" : "24",
+ "DPIWidth" : "300",
+ "DPIHeight" : "300",
"Orientaion" : "Top, left side (Horizontal / normal)",
"ColorMode" : "RGB",
"HasAlpha" : "false",
@@ -14,11 +14,15 @@
"AudioCodec" : "Unknown",
"AudioSampleSize" : "0",
"AudioSampleRate" : "0",
- "FileType" : {
- "DetectedFileTypeName" : "JPEG",
- "DetectedFileTypeLongName" : "Joint Photographic Experts Group",
- "DetectedMIMEType" : "image/jpeg",
- "ExpectedFileNameExtension" : "jpg"
+ "JPEG" : {
+ "CompressionType" : "Baseline",
+ "DataPrecision" : "8 bits",
+ "ImageHeight" : "400 pixels",
+ "ImageWidth" : "600 pixels",
+ "NumberOfComponents" : "3",
+ "Component1" : "Y component: Quantization table 0, Sampling factors 2
horiz/2 vert",
+ "Component2" : "Cb component: Quantization table 1, Sampling factors 1
horiz/1 vert",
+ "Component3" : "Cr component: Quantization table 1, Sampling factors 1
horiz/1 vert"
},
"JFIF" : {
"Version" : "1.2",
@@ -29,7 +33,8 @@
"ThumbnailHeightPixels" : "0"
},
"ExifIFD0" : {
- "ImageDescription" : "Communications","Make" : "FUJIFILM",
+ "ImageDescription" : "Communications",
+ "Make" : "FUJIFILM",
"Model" : "FinePixS1Pro",
"Orientation" : "Top, left side (Horizontal / normal)",
"XResolution" : "300 dots per inch",
@@ -52,7 +57,7 @@
"ComponentsConfiguration" : "YCbCr",
"ShutterSpeedValue" : "1/724 sec",
"ApertureValue" : "f/16.0",
- "BrightnessValue" : "333/1280",
+ "BrightnessValue" : "0.26",
"ExposureBiasValue" : "-1090519041/1677721600 EV",
"MeteringMode" : "Multi-segment",
"Flash" : "Flash did not fire",
@@ -86,47 +91,48 @@
"ThumbnailLength" : "3662 bytes"
},
"XMP" : {
- "XMPValueCount" : "33",
+ "XMPValueCount" : "25",
"Photoshop" : {
+ "CaptionWriter" : "Ian Britton",
+ "Headline" : "Communications",
"AuthorsPosition" : "Photographer",
- "Urgency" : "5",
- "SupplementalCategories" : ["Communications"],
- "DateCreated" : "2002-06-20",
"Credit" : "Ian Britton",
- "CaptionWriter" : "Ian Britton",
+ "Source" : "FreeFoto.com",
"City" : " ",
- "Headline" : "Communications",
"State" : " ",
- "Source" : "FreeFoto.com",
+ "Country" : "Ubited Kingdom",
"Category" : "BUS",
- "Country" : "Ubited Kingdom"
+ "DateCreated" : "2002-06-20",
+ "Urgency" : "5",
+ "SupplementalCategories" : [ "Communications" ]
},
- "Dc" : {
- "Creator" : ["Ian Britton"],
- "Description" : "Communications",
- "Rights" : "ian Britton - FreeFoto.com",
- "Title" : "Communications",
- "Subject" : ["Communications"]
+ "XmpBJ" : {
+ "JobRef" : [ {
+ "Name" : "Photographer"
+ } ]
},
"XmpMM" : {
"DocumentID" :
"adobe:docid:photoshop:84d4dba8-9b11-11d6-895d-c4d063a70fb0",
"InstanceID" : "uuid:3ff5d382-9b12-11d6-895d-c4d063a70fb0"
},
- "XmpBJ" : {
- "JobRef" : [{
- "Name" : "Photographer"
- }]
- },
"XmpRights" : {
- "Marked" : "True",
- "WebStatement" : "www.freefoto.com"
+ "WebStatement" : "www.freefoto.com",
+ "Marked" : "True"
+ },
+ "Dc" : {
+ "Description" : "Communications",
+ "Creator" : [ "Ian Britton" ],
+ "Title" : "Communications",
+ "Rights" : "ian Britton - FreeFoto.com",
+ "Subject" : [ "Communications" ]
}
},
- "ICCProfile": {
+ "ICCProfile" : {
"ProfileSize" : "3144",
"CMMType" : "Lino",
"Version" : "2.1.0",
- "Class" : "Display Device","ColorSpace" : "RGB ",
+ "Class" : "Display Device",
+ "ColorSpace" : "RGB ",
"ProfileConnectionSpace" : "XYZ ",
"ProfileDateTime" : "1998:02:09 06:49:00",
"Signature" : "acsp",
@@ -153,15 +159,25 @@
"GreenTRC" : "0.0, 0.0000763, 0.0001526, 0.0002289, 0.0003052, 0.0003815,
0.0004578, 0.0005341, 0.0006104, 0.0006867, 0.000763, 0.0008392, 0.0009003,
0.0009766, 0.0010529, 0.0011292, 0.0012055, 0.0012818, 0.0013581, 0.0014343,
0.0015106, 0.0015869, 0.0016632, 0.0017395, 0.0018158, 0.0018921, 0.0019684,
0.0020447, 0.002121, 0.0021973, 0.0022736, 0.0023499, 0.0024262, 0.0025025,
0.0025788, 0.0026551, 0.0027161, 0.0027924, 0.0028687, 0.002945, 0.0030213,
0.0030976, 0.0031739, 0.0032502, [...]
"BlueTRC" : "0.0, 0.0000763, 0.0001526, 0.0002289, 0.0003052, 0.0003815,
0.0004578, 0.0005341, 0.0006104, 0.0006867, 0.000763, 0.0008392, 0.0009003,
0.0009766, 0.0010529, 0.0011292, 0.0012055, 0.0012818, 0.0013581, 0.0014343,
0.0015106, 0.0015869, 0.0016632, 0.0017395, 0.0018158, 0.0018921, 0.0019684,
0.0020447, 0.002121, 0.0021973, 0.0022736, 0.0023499, 0.0024262, 0.0025025,
0.0025788, 0.0026551, 0.0027161, 0.0027924, 0.0028687, 0.002945, 0.0030213,
0.0030976, 0.0031739, 0.0032502, [...]
},
- "JPEG" : {
- "CompressionType" : "Baseline",
- "DataPrecision" : "8 bits",
- "ImageHeight" : "400 pixels",
- "ImageWidth" : "600 pixels",
- "NumberOfComponents" : "3",
- "Component1" : "Y component: Quantization table 0, Sampling factors 2
horiz/2 vert",
- "Component2" : "Cb component: Quantization table 1, Sampling factors 1
horiz/1 vert",
- "Component3" : "Cr component: Quantization table 1, Sampling factors 1
horiz/1 vert"
+ "Photoshop" : {
+ "CaptionDigest" : "245 138 68 109 96 203 177 136 63 66 1 237 68 32 172 54",
+ "ResolutionInfo" : "300x300 DPI",
+ "PrintScale" : "Centered, Scale 1.0",
+ "GlobalAngle" : "30",
+ "GlobalAltitude" : "30",
+ "PrintFlags" : "0 0 0 0 0 0 0 0 1",
+ "CopyrightFlag" : "Yes",
+ "URL" : "www.freefoto.com",
+ "PrintFlagsInformation" : "0 1 0 0 0 0 0 0 0 2",
+ "ColorHalftoningInformation" : "[72 values]",
+ "ColorTransferFunctions" : "[112 values]",
+ "GridAndGuidesInformation" : "0 0 0 1 0 0 2 64 0 0 2 64 0 0 0 0",
+ "URLList" : "0",
+ "Slices" : "04_02_10_a5 (0,0,1600,2400) 1 Slices",
+ "SeedNumber" : "1",
+ "ThumbnailData" : "JpegRGB, 128x85, Decomp 32640 bytes, 1572865 bpp, 3662
bytes",
+ "VersionInfo" : "1 (Adobe Photoshop, Adobe Photoshop 7.0) 1",
+ "JPEGQuality" : "9 (High), Standard format, 3 scans"
},
"IPTC" : {
"ApplicationRecordVersion" : "2",
@@ -183,25 +199,7 @@
"Keywords" : "Communications",
"CopyrightNotice" : "ian Britton - FreeFoto.com"
},
- "Photoshop" : {
- "CaptionDigest" : "245 138 68 109 96 203 177 136 63 66 1 237 68 32 172 54",
- "ResolutionInfo" : "300x300 DPI",
- "PrintScale" : "Centered, Scale 1.0",
- "GlobalAngle" : "30","GlobalAltitude" : "30",
- "PrintFlags" : "0 0 0 0 0 0 0 0 1",
- "CopyrightFlag" : "Yes","URL" : "www.freefoto.com",
- "PrintFlagsInformation" : "0 1 0 0 0 0 0 0 0 2",
- "ColorHalftoningInformation" : "[72 values]",
- "ColorTransferFunctions" : "[112 values]",
- "GridAndGuidesInformation" : "0 0 0 1 0 0 2 64 0 0 2 64 0 0 0 0",
- "URLList" : "0",
- "Slices" : "04_02_10_a5 (0,0,1600,2400) 1 Slices",
- "SeedNumber" : "1",
- "ThumbnailData" : "JpegRGB, 128x85, Decomp 32640 bytes, 1572865 bpp, 3662
bytes",
- "VersionInfo" : "1 (Adobe Photoshop, Adobe Photoshop 7.0) 1",
- "JPEGQuality" : "9 (High), Standard format, 3 scans"
- },
- "AdobeJPEG": {
+ "AdobeJPEG" : {
"DCTEncodeVersion" : "25600",
"Flags0" : "64",
"Flags1" : "0",
@@ -209,5 +207,11 @@
},
"Huffman" : {
"NumberOfTables" : "4 Huffman tables"
+ },
+ "FileType" : {
+ "DetectedFileTypeName" : "JPEG",
+ "DetectedFileTypeLongName" : "Joint Photographic Experts Group",
+ "DetectedMIMEType" : "image/jpeg",
+ "ExpectedFileNameExtension" : "jpg"
}
}
diff --git a/exec/java-exec/src/test/resources/store/image/mov.json
b/exec/java-exec/src/test/resources/store/image/mov.json
index bf174ca..e7ff53d 100644
--- a/exec/java-exec/src/test/resources/store/image/mov.json
+++ b/exec/java-exec/src/test/resources/store/image/mov.json
@@ -1,33 +1,28 @@
{
"Format" : "MOV",
- "Orientaion" : "Unknown (0)",
- "DPIWidth" : "72",
- "DPIHeight" : "72",
+ "Duration" : "01:32:3650",
"PixelWidth" : "560",
"PixelHeight" : "320",
- "BitsPerPixel" : "0",
- "ColorMode" : "RGB",
- "HasAlpha" : "false",
- "Duration" : "00:00:05",
+ "DPIWidth" : "72",
+ "DPIHeight" : "72",
+ "BitsPerPixel" : "24",
"VideoCodec" : "MPEG-4",
- "FrameRate" : "0",
+ "FrameRate" : "30",
"AudioCodec" : "MPEG-4, Advanced Audio Coding (AAC)",
"AudioSampleSize" : "16",
"AudioSampleRate" : "44100",
- "FileType" : {
- "DetectedFileTypeName" : "MOV",
- "DetectedFileTypeLongName" : "QuickTime Movie",
- "DetectedMIMEType" : "video/quicktime",
- "ExpectedFileNameExtension" : "mov"
- },
+ "Orientaion" : "Unknown (0)",
+ "ColorMode" : "RGB",
+ "HasAlpha" : "false",
"QuickTime" : {
"MajorBrand" : "Apple QuickTime (.MOV/QT)",
"MinorVersion" : "512",
"CompatibleBrands" : "[Apple QuickTime (.MOV/QT)]",
"CreationTime" : "Fri Jan 01 00:00:00 +00:00 1904",
"ModificationTime" : "Fri Jan 01 00:00:00 +00:00 1904",
- "Duration" : "00:00:05",
+ "Duration" : "5570",
"MediaTimeScale" : "1000",
+ "DurationInSeconds" : "00:00:06",
"PreferredRate" : "1",
"PreferredVolume" : "1",
"PreviewTime" : "0",
@@ -39,8 +34,8 @@
"NextTrackID" : "3"
},
"QuickTimeVideo" : {
- "CreationTime" : "Fri Jan 01 00:00:00 UTC 1904",
- "ModificationTime" : "Fri Jan 01 00:00:00 UTC 1904",
+ "CreationTime" : "Fri Jan 01 00:00:00 +00:00 1904",
+ "ModificationTime" : "Fri Jan 01 00:00:00 +00:00 1904",
"Opcolor" : "0 0 0",
"GraphicsMode" : "Copy",
"Vendor" : "FFmpeg",
@@ -50,18 +45,25 @@
"Width" : "560 pixels",
"Height" : "320 pixels",
"CompressorName" : "mpeg4",
- "Depth" : "Unknown (0)",
- "ColorTable" : "Color table within file",
+ "Depth" : "24-bit color",
+ "ColorTable" : "None",
"HorizontalResolution" : "72",
- "VerticalResolution" : "72"
+ "VerticalResolution" : "72",
+ "FrameRate" : "30"
},
"QuickTimeSound" : {
- "CreationTime" : "Fri Jan 01 00:00:00 UTC 1904",
- "ModificationTime" : "Fri Jan 01 00:00:00 UTC 1904",
+ "CreationTime" : "Fri Jan 01 00:00:00 +00:00 1904",
+ "ModificationTime" : "Fri Jan 01 00:00:00 +00:00 1904",
"Balance" : "0",
"Format" : "MPEG-4, Advanced Audio Coding (AAC)",
"NumberOfChannels" : "1",
"SampleSize" : "16",
"SampleRate" : "44100"
+ },
+ "FileType" : {
+ "DetectedFileTypeName" : "MOV",
+ "DetectedFileTypeLongName" : "QuickTime Movie",
+ "DetectedMIMEType" : "video/quicktime",
+ "ExpectedFileNameExtension" : "mov"
}
}
diff --git a/exec/java-exec/src/test/resources/store/image/mp4.json
b/exec/java-exec/src/test/resources/store/image/mp4.json
index 1e581c3..12160e7 100644
--- a/exec/java-exec/src/test/resources/store/image/mp4.json
+++ b/exec/java-exec/src/test/resources/store/image/mp4.json
@@ -1,56 +1,63 @@
{
"Format" : "MP4",
- "Orientaion" : "Unknown (0)",
- "DPIWidth" : "72",
- "DPIHeight" : "72",
+ "Duration" : "139:12:500400",
"PixelWidth" : "560",
"PixelHeight" : "320",
+ "DPIWidth" : "72",
+ "DPIHeight" : "72",
"BitsPerPixel" : "24",
- "ColorMode" : "RGB",
- "HasAlpha" : "false",
- "Duration" : "00:00:05",
- "VideoCodec" : "JVT/AVC Coding",
+ "VideoCodec" : "H.264",
"FrameRate" : "30",
- "AudioCodec" : "Sat Mar 20 21:29:11 UTC 2010",
+ "AudioCodec" : "MPEG-4, Advanced Audio Coding (AAC)",
"AudioSampleSize" : "16",
"AudioSampleRate" : "48000",
- "FileType" : {
- "DetectedFileTypeName" : "MP4",
- "DetectedFileTypeLongName" : "MPEG-4 Part 14",
- "DetectedMIMEType" : "video/mp4",
- "ExpectedFileNameExtension" : "mp4"
- },
+ "Orientaion" : "Unknown (0)",
+ "ColorMode" : "RGB",
+ "HasAlpha" : "false",
"MP4" : {
"MajorBrand" : "MP4 v2 [ISO 14496-14]",
"MinorVersion" : "0",
"CompatibleBrands" : "[MP4 v2 [ISO 14496-14], MP4 Base Media v1 [IS0
14496-12:2003], MP4 Base w/ AVC ext [ISO 14496-12:2005]]",
"CreationTime" : "Sat Mar 20 21:29:11 UTC 2010",
"ModificationTime" : "Sat Mar 20 21:29:12 UTC 2010",
- "Duration" : "00:00:05",
+ "Duration" : "501120",
"MediaTimeScale" : "90000",
+ "DurationInSeconds" : "00:00:06",
"TransformationMatrix" : "65536 0 0 0 65536 0 0 0 1073741824",
"PreferredRate" : "1",
"PreferredVolume" : "1",
- "NextTrackID" : "3"
+ "NextTrackID" : "3",
+ "Rotation" : "0"
},
"MP4Video" : {
- "Vendor" : "Sat Mar 20 21:29:11 UTC 2010",
- "TemporalQuality" : "Sat Mar 20 21:29:12 UTC 2010",
- "Width" : "560 pixels",
+ "CreationTime" : "Sat Mar 20 21:29:11 +00:00 2010",
+ "ModificationTime" : "Sat Mar 20 21:29:12 +00:00 2010",
+ "ISO6392LanguageCode" : "und",
"Opcolor" : "0 0 0",
"GraphicsMode" : "Copy",
+ "CompressionType" : "H.264",
+ "Width" : "560 pixels",
"Height" : "320 pixels",
- "CompressionType" : "JVT/AVC Coding",
- "Depth" : "Unknown (24)",
+ "CompressorName" : "JVT/AVC Coding",
+ "Depth" : "24-bit color",
"HorizontalResolution" : "72",
"VerticalResolution" : "72",
"FrameRate" : "30"
},
"MP4Sound" : {
- "Format" : "Sat Mar 20 21:29:11 UTC 2010",
- "NumberOfChannels" : "1",
- "SampleRate" : "48000",
+ "CreationTime" : "Sat Mar 20 21:29:11 +00:00 2010",
+ "ModificationTime" : "Sat Mar 20 21:29:12 +00:00 2010",
+ "ISO6392LanguageCode" : "eng",
"Balance" : "0",
- "SampleSize" : "16"
+ "Format" : "MPEG-4, Advanced Audio Coding (AAC)",
+ "NumberOfChannels" : "1",
+ "SampleSize" : "16",
+ "SampleRate" : "48000"
+ },
+ "FileType" : {
+ "DetectedFileTypeName" : "MP4",
+ "DetectedFileTypeLongName" : "MPEG-4 Part 14",
+ "DetectedMIMEType" : "video/mp4",
+ "ExpectedFileNameExtension" : "mp4"
}
}
diff --git a/exec/java-exec/src/test/resources/store/image/png.json
b/exec/java-exec/src/test/resources/store/image/png.json
index a883d5b..fa53b35 100644
--- a/exec/java-exec/src/test/resources/store/image/png.json
+++ b/exec/java-exec/src/test/resources/store/image/png.json
@@ -14,12 +14,6 @@
"AudioCodec" : "Unknown",
"AudioSampleSize" : "0",
"AudioSampleRate" : "0",
- "FileType" : {
- "DetectedFileTypeName" : "PNG",
- "DetectedFileTypeLongName" : "Portable Network Graphics",
- "DetectedMIMEType" : "image/png",
- "ExpectedFileNameExtension" : "png"
- },
"PNGIHDR" : {
"ImageWidth" : "128",
"ImageHeight" : "174",
@@ -29,20 +23,9 @@
"FilterMethod" : "Adaptive",
"InterlaceMethod" : "No Interlace"
},
- "PNGTEXt" : {
- "TextualData" : [
- "date:create: 2015-06-22T09:06:26-04:00",
- "date:modify: 2015-06-22T09:06:26-04:00"
- ]
- },
"PNGSRGB" : {
"SRGBRenderingIntent" : "Perceptual"
},
- "PNGPHYs" : {
- "PixelsPerUnitX" : "2835",
- "PixelsPerUnitY" : "2835",
- "UnitSpecifier" : "Metres"
- },
"PNGChromaticities" : {
"WhitePointX" : "31269",
"WhitePointY" : "32899",
@@ -53,5 +36,21 @@
"BlueX" : "15000",
"BlueY" : "5999"
},
- "PNGBKGD" : { }
+ "PNGBKGD" : {
+ "BackgroundColor" : "R 255, G 255, B 255"
+ },
+ "PNGPHYs" : {
+ "PixelsPerUnitX" : "2835",
+ "PixelsPerUnitY" : "2835",
+ "UnitSpecifier" : "Metres"
+ },
+ "PNGTEXt" : {
+ "TextualData" : [ "date:create: 2015-06-22T09:06:26-04:00", "date:modify:
2015-06-22T09:06:26-04:00" ]
+ },
+ "FileType" : {
+ "DetectedFileTypeName" : "PNG",
+ "DetectedFileTypeLongName" : "Portable Network Graphics",
+ "DetectedMIMEType" : "image/png",
+ "ExpectedFileNameExtension" : "png"
+ }
}
diff --git a/exec/java-exec/src/test/resources/store/image/psd.json
b/exec/java-exec/src/test/resources/store/image/psd.json
index a8d646a..1d59104 100644
--- a/exec/java-exec/src/test/resources/store/image/psd.json
+++ b/exec/java-exec/src/test/resources/store/image/psd.json
@@ -1,12 +1,12 @@
{
"Format" : "PSD",
- "Orientaion" : "Top, left side (Horizontal / normal)",
- "DPIWidth" : "72",
- "DPIHeight" : "72",
"PixelWidth" : "128",
"PixelHeight" : "174",
"BitsPerPixel" : "32",
"ColorMode" : "RGB",
+ "Orientaion" : "Top, left side (Horizontal / normal)",
+ "DPIWidth" : "72",
+ "DPIHeight" : "72",
"HasAlpha" : "false",
"Duration" : "00:00:00",
"VideoCodec" : "Unknown",
@@ -14,70 +14,12 @@
"AudioCodec" : "Unknown",
"AudioSampleSize" : "0",
"AudioSampleRate" : "0",
- "FileType" : {
- "DetectedFileTypeName" : "PSD",
- "DetectedFileTypeLongName" : "Photoshop Document",
- "DetectedMIMEType" : "image/vnd.adobe.photoshop",
- "ExpectedFileNameExtension" : "psd"
- },
- "ExifIFD0" : {
- "Orientation" : "Top, left side (Horizontal / normal)",
- "XResolution" : "72009/1000 dots per inch",
- "YResolution" : "72009/1000 dots per inch",
- "ResolutionUnit" : "Inch",
- "Software" : "Adobe Photoshop CS2 Windows",
- "DateTime" : "2016:02:06 00:08:57"
- },
- "ExifSubIFD" : {
- "ColorSpace" : "Undefined",
- "ExifImageWidth" : "128 pixels",
- "ExifImageHeight" : "174 pixels"
- },
- "ExifThumbnail" : {
- "Compression" : "JPEG (old-style)",
- "XResolution" : "72 dots per inch",
- "YResolution" : "72 dots per inch",
- "ResolutionUnit" : "Inch",
- "ThumbnailOffset" : "302 bytes",
- "ThumbnailLength" : "0 bytes"
- },
- "XMP" : {
- "XMPValueCount" : "22",
- "Xmp" : {
- "ModifyDate" : "2016-02-06T00:08:57+09:00",
- "MetadataDate" : "2016-02-06T00:08:57+09:00",
- "CreatorTool" : "Adobe Photoshop CS2 Windows",
- "CreateDate" : "2016-02-06T00:08:57+09:00"
- },
- "Photoshop" : {
- "History" : "",
- "ICCProfile" : "sRGB IEC61966-2.1",
- "ColorMode" : "3"
- },
- "Tiff" : {
- "XResolution" : "720090/10000",
- "NativeDigest" :
"256,257,258,259,262,274,277,284,530,531,282,283,296,301,318,319,529,532,306,270,271,272,305,315,33432;F3A2BBED3F60568C7329EB637603055D",
- "ResolutionUnit" : "2",
- "Orientation" : "1",
- "YResolution" : "720090/10000"
- },
- "XmpMM" : {
- "DerivedFrom": {
- "DocumentID" : "uuid:365756FF19CCE511BCD0B4FE57F853AF",
- "InstanceID" : "uuid:365756FF19CCE511BCD0B4FE57F853AF"
- },
- "DocumentID" : "uuid:375756FF19CCE511BCD0B4FE57F853AF",
- "InstanceID" : "uuid:385756FF19CCE511BCD0B4FE57F853AF"
- },
- "Exif" : {
- "PixelYDimension" : "174",
- "ColorSpace" : "-1",
- "PixelXDimension" : "128",
- "NativeDigest" :
"36864,40960,40961,37121,37122,40962,40963,37510,40964,36867,36868,33434,33437,34850,34852,34855,34856,37377,37378,37379,37380,37381,37382,37383,37384,37385,37386,37396,41483,41484,41486,41487,41488,41492,41493,41495,41728,41729,41730,41985,41986,41987,41988,41989,41990,41991,41992,41993,41994,41995,41996,42016,0,2,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,20,22,23,24,25,26,27,28,30;07837EFC5AF54CDBA4998B26FEFAF26C"
- },
- "Dc" : {
- "Format" : "application/vnd.adobe.photoshop"
- }
+ "PSDHeader" : {
+ "ChannelCount" : "4 channels",
+ "ImageHeight" : "174 pixels",
+ "ImageWidth" : "128 pixels",
+ "BitsPerChannel" : "8 bits per channel",
+ "ColorMode" : "RGB"
},
"Photoshop" : {
"CaptionDigest" : "0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0",
@@ -109,11 +51,69 @@
"PlugIn1Data" : "[268 values]",
"PlugIn2Data" : "[28 values]"
},
- "PSDHeader" : {
- "ChannelCount" : "4 channels",
- "ImageHeight" : "174 pixels",
- "ImageWidth" : "128 pixels",
- "BitsPerChannel" : "8 bits per channel",
- "ColorMode" : "RGB"
+ "XMP" : {
+ "XMPValueCount" : "21",
+ "XmpMM" : {
+ "DocumentID" : "uuid:375756FF19CCE511BCD0B4FE57F853AF",
+ "InstanceID" : "uuid:385756FF19CCE511BCD0B4FE57F853AF",
+ "DerivedFrom" : {
+ "InstanceID" : "uuid:365756FF19CCE511BCD0B4FE57F853AF",
+ "DocumentID" : "uuid:365756FF19CCE511BCD0B4FE57F853AF"
+ }
+ },
+ "Xmp" : {
+ "CreateDate" : "2016-02-06T00:08:57+09:00",
+ "ModifyDate" : "2016-02-06T00:08:57+09:00",
+ "MetadataDate" : "2016-02-06T00:08:57+09:00",
+ "CreatorTool" : "Adobe Photoshop CS2 Windows"
+ },
+ "Dc" : {
+ "Format" : "application/vnd.adobe.photoshop"
+ },
+ "Photoshop" : {
+ "ColorMode" : "3",
+ "ICCProfile" : "sRGB IEC61966-2.1",
+ "History" : ""
+ },
+ "Tiff" : {
+ "Orientation" : "1",
+ "XResolution" : "720090/10000",
+ "YResolution" : "720090/10000",
+ "ResolutionUnit" : "2",
+ "NativeDigest" :
"256,257,258,259,262,274,277,284,530,531,282,283,296,301,318,319,529,532,306,270,271,272,305,315,33432;F3A2BBED3F60568C7329EB637603055D"
+ },
+ "Exif" : {
+ "PixelXDimension" : "128",
+ "PixelYDimension" : "174",
+ "ColorSpace" : "-1",
+ "NativeDigest" :
"36864,40960,40961,37121,37122,40962,40963,37510,40964,36867,36868,33434,33437,34850,34852,34855,34856,37377,37378,37379,37380,37381,37382,37383,37384,37385,37386,37396,41483,41484,41486,41487,41488,41492,41493,41495,41728,41729,41730,41985,41986,41987,41988,41989,41990,41991,41992,41993,41994,41995,41996,42016,0,2,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,20,22,23,24,25,26,27,28,30;07837EFC5AF54CDBA4998B26FEFAF26C"
+ }
+ },
+ "ExifIFD0" : {
+ "Orientation" : "Top, left side (Horizontal / normal)",
+ "XResolution" : "72009/1000 dots per inch",
+ "YResolution" : "72009/1000 dots per inch",
+ "ResolutionUnit" : "Inch",
+ "Software" : "Adobe Photoshop CS2 Windows",
+ "DateTime" : "2016:02:06 00:08:57"
+ },
+ "ExifSubIFD" : {
+ "ColorSpace" : "Undefined",
+ "ExifImageWidth" : "128 pixels",
+ "ExifImageHeight" : "174 pixels"
+ },
+ "ExifThumbnail" : {
+ "Compression" : "JPEG (old-style)",
+ "XResolution" : "72 dots per inch",
+ "YResolution" : "72 dots per inch",
+ "ResolutionUnit" : "Inch",
+ "ThumbnailOffset" : "302 bytes",
+ "ThumbnailLength" : "0 bytes"
+ },
+ "FileType" : {
+ "DetectedFileTypeName" : "PSD",
+ "DetectedFileTypeLongName" : "Photoshop Document",
+ "DetectedMIMEType" : "image/vnd.adobe.photoshop",
+ "ExpectedFileNameExtension" : "psd"
}
}
diff --git a/exec/java-exec/src/test/resources/store/image/tiff.json
b/exec/java-exec/src/test/resources/store/image/tiff.json
index 9c26a72..c7db164 100644
--- a/exec/java-exec/src/test/resources/store/image/tiff.json
+++ b/exec/java-exec/src/test/resources/store/image/tiff.json
@@ -14,11 +14,6 @@
"AudioCodec" : "Unknown",
"AudioSampleSize" : "0",
"AudioSampleRate" : "0",
- "FileType" : {
- "DetectedFileTypeName" : "ARW",
- "DetectedFileTypeLongName" : "Sony Camera Raw",
- "ExpectedFileNameExtension" : "arw"
- },
"ExifIFD0" : {
"NewSubfileType" : "Full-resolution image",
"ImageWidth" : "128 pixels",
@@ -37,51 +32,109 @@
"ResolutionUnit" : "Inch",
"Software" : "Adobe Photoshop CS2 Windows",
"DateTime" : "2016:02:05 01:25:42",
- "Predictor" : "2",
- "UnknownTag(0x8649)" : "[5390 values]",
- "InterColorProfile" : "[3144 values]"
- },
- "ExifSubIFD" : {
- "ColorSpace" : "sRGB",
- "ExifImageWidth" : "128 pixels",
- "ExifImageHeight" : "174 pixels"
+ "Predictor" : "2"
},
"XMP" : {
- "XMPValueCount" : "22",
+ "XMPValueCount" : "21",
+ "XmpMM" : {
+ "DocumentID" : "uuid:785EFE1B5BCBE51191D2BA1A4A34CC1F",
+ "InstanceID" : "uuid:795EFE1B5BCBE51191D2BA1A4A34CC1F",
+ "DerivedFrom" : {
+ "InstanceID" : "uuid:765EFE1B5BCBE51191D2BA1A4A34CC1F",
+ "DocumentID" : "uuid:755EFE1B5BCBE51191D2BA1A4A34CC1F"
+ }
+ },
"Xmp" : {
+ "CreateDate" : "2016-02-05T01:25:42+09:00",
"ModifyDate" : "2016-02-05T01:25:42+09:00",
"MetadataDate" : "2016-02-05T01:25:42+09:00",
- "CreatorTool" : "Adobe Photoshop CS2 Windows",
- "CreateDate" : "2016-02-05T01:25:42+09:00"
+ "CreatorTool" : "Adobe Photoshop CS2 Windows"
+ },
+ "Dc" : {
+ "Format" : "image/tiff"
},
"Photoshop" : {
- "History" : "",
+ "ColorMode" : "3",
"ICCProfile" : "sRGB IEC61966-2.1",
- "ColorMode" : "3"
+ "History" : ""
},
"Tiff" : {
+ "Orientation" : "1",
"XResolution" : "720090/10000",
- "NativeDigest" :
"256,257,258,259,262,274,277,284,530,531,282,283,296,301,318,319,529,532,306,270,271,272,305,315,33432;6A3819C79FDE56A3CEB49BE0CECF0E4B",
+ "YResolution" : "720090/10000",
"ResolutionUnit" : "2",
- "Orientation" : "1",
- "YResolution" : "720090/10000"
- },
- "XmpMM" : {
- "DerivedFrom" : {
- "DocumentID" : "uuid:755EFE1B5BCBE51191D2BA1A4A34CC1F",
- "InstanceID" : "uuid:765EFE1B5BCBE51191D2BA1A4A34CC1F"
- },
- "DocumentID" : "uuid:785EFE1B5BCBE51191D2BA1A4A34CC1F",
- "InstanceID" : "uuid:795EFE1B5BCBE51191D2BA1A4A34CC1F"
+ "NativeDigest" :
"256,257,258,259,262,274,277,284,530,531,282,283,296,301,318,319,529,532,306,270,271,272,305,315,33432;6A3819C79FDE56A3CEB49BE0CECF0E4B"
},
"Exif" : {
+ "PixelXDimension" : "128",
"PixelYDimension" : "174",
"ColorSpace" : "1",
- "PixelXDimension" : "128",
"NativeDigest" :
"36864,40960,40961,37121,37122,40962,40963,37510,40964,36867,36868,33434,33437,34850,34852,34855,34856,37377,37378,37379,37380,37381,37382,37383,37384,37385,37386,37396,41483,41484,41486,41487,41488,41492,41493,41495,41728,41729,41730,41985,41986,41987,41988,41989,41990,41991,41992,41993,41994,41995,41996,42016,0,2,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,20,22,23,24,25,26,27,28,30;EB685DEADF67388F7E939885A41C0ECF"
- },
- "Dc" : {
- "Format" : "image/tiff"
}
+ },
+ "Photoshop" : {
+ "CaptionDigest" : "0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0",
+ "ResolutionInfo" : "72.01x72.01 DPI",
+ "PrintScale" : "Centered, Scale 1.0",
+ "GlobalAngle" : "30",
+ "GlobalAltitude" : "30",
+ "PrintFlags" : "0 0 0 0 0 0 0 0 1",
+ "CopyrightFlag" : "No",
+ "PrintFlagsInformation" : "0 1 0 0 0 0 0 0 0 2",
+ "ColorHalftoningInformation" : "[72 values]",
+ "ColorTransferFunctions" : "[112 values]",
+ "LayerStateInformation" : "0 0",
+ "LayersGroupInformation" : "0 0",
+ "LayerGroupsEnabledID" : "1",
+ "LayerSelectionIDs" : "0 1 0 0 0 3",
+ "GridAndGuidesInformation" : "0 0 0 1 0 0 2 64 0 0 2 64 0 0 0 0",
+ "URLList" : "0",
+ "Slices" : "flower-rose-red-transparent-background-0128-10030.tiff
(0,0,174,128) 1 Slices",
+ "PixelAspectRatio" : "1.0",
+ "SeedNumber" : "4",
+ "ThumbnailData" : "JpegRGB, 118x160, Decomp 56960 bytes, 1572865 bpp, 3786
bytes",
+ "VersionInfo" : "1 (Adobe Photoshop, Adobe Photoshop CS2) 1"
+ },
+ "ExifSubIFD" : {
+ "ColorSpace" : "sRGB",
+ "ExifImageWidth" : "128 pixels",
+ "ExifImageHeight" : "174 pixels"
+ },
+ "ICCProfile" : {
+ "ProfileSize" : "3144",
+ "CMMType" : "Lino",
+ "Version" : "2.1.0",
+ "Class" : "Display Device",
+ "ColorSpace" : "RGB ",
+ "ProfileConnectionSpace" : "XYZ ",
+ "ProfileDateTime" : "1998:02:09 06:49:00",
+ "Signature" : "acsp",
+ "PrimaryPlatform" : "Microsoft Corporation",
+ "DeviceManufacturer" : "IEC ",
+ "DeviceModel" : "sRGB",
+ "XYZValues" : "0.964 1 0.825",
+ "TagCount" : "17",
+ "Copyright" : "Copyright (c) 1998 Hewlett-Packard Company",
+ "ProfileDescription" : "sRGB IEC61966-2.1",
+ "MediaWhitePoint" : "(0.9505, 1, 1.0891)",
+ "MediaBlackPoint" : "(0, 0, 0)",
+ "RedColorant" : "(0.4361, 0.2225, 0.0139)",
+ "GreenColorant" : "(0.3851, 0.7169, 0.0971)",
+ "BlueColorant" : "(0.1431, 0.0606, 0.7141)",
+ "DeviceMfgDescription" : "IEC http://www.iec.ch";,
+ "DeviceModelDescription" : "IEC 61966-2.1 Default RGB colour space - sRGB",
+ "ViewingConditionsDescription" : "Reference Viewing Condition in
IEC61966-2.1",
+ "ViewingConditions" : "view (0x76696577): 36 bytes",
+ "Luminance" : "(76.0365, 80, 87.1246)",
+ "Measurement" : "1931 2° Observer, Backing (0, 0, 0), Geometry Unknown,
Flare 1%, Illuminant D65",
+ "Technology" : "CRT ",
+ "RedTRC" : "0.0, 0.0000763, 0.0001526, 0.0002289, 0.0003052, 0.0003815,
0.0004578, 0.0005341, 0.0006104, 0.0006867, 0.000763, 0.0008392, 0.0009003,
0.0009766, 0.0010529, 0.0011292, 0.0012055, 0.0012818, 0.0013581, 0.0014343,
0.0015106, 0.0015869, 0.0016632, 0.0017395, 0.0018158, 0.0018921, 0.0019684,
0.0020447, 0.002121, 0.0021973, 0.0022736, 0.0023499, 0.0024262, 0.0025025,
0.0025788, 0.0026551, 0.0027161, 0.0027924, 0.0028687, 0.002945, 0.0030213,
0.0030976, 0.0031739, 0.0032502, 0 [...]
+ "GreenTRC" : "0.0, 0.0000763, 0.0001526, 0.0002289, 0.0003052, 0.0003815,
0.0004578, 0.0005341, 0.0006104, 0.0006867, 0.000763, 0.0008392, 0.0009003,
0.0009766, 0.0010529, 0.0011292, 0.0012055, 0.0012818, 0.0013581, 0.0014343,
0.0015106, 0.0015869, 0.0016632, 0.0017395, 0.0018158, 0.0018921, 0.0019684,
0.0020447, 0.002121, 0.0021973, 0.0022736, 0.0023499, 0.0024262, 0.0025025,
0.0025788, 0.0026551, 0.0027161, 0.0027924, 0.0028687, 0.002945, 0.0030213,
0.0030976, 0.0031739, 0.0032502, [...]
+ "BlueTRC" : "0.0, 0.0000763, 0.0001526, 0.0002289, 0.0003052, 0.0003815,
0.0004578, 0.0005341, 0.0006104, 0.0006867, 0.000763, 0.0008392, 0.0009003,
0.0009766, 0.0010529, 0.0011292, 0.0012055, 0.0012818, 0.0013581, 0.0014343,
0.0015106, 0.0015869, 0.0016632, 0.0017395, 0.0018158, 0.0018921, 0.0019684,
0.0020447, 0.002121, 0.0021973, 0.0022736, 0.0023499, 0.0024262, 0.0025025,
0.0025788, 0.0026551, 0.0027161, 0.0027924, 0.0028687, 0.002945, 0.0030213,
0.0030976, 0.0031739, 0.0032502, [...]
+ },
+ "FileType" : {
+ "DetectedFileTypeName" : "ARW",
+ "DetectedFileTypeLongName" : "Sony Camera Raw",
+ "ExpectedFileNameExtension" : "arw"
}
}
diff --git a/exec/jdbc-all/pom.xml b/exec/jdbc-all/pom.xml
index 4504136..929c9f1 100644
--- a/exec/jdbc-all/pom.xml
+++ b/exec/jdbc-all/pom.xml
@@ -435,6 +435,7 @@
<exclude>META-INF/services/javax.ws.*</exclude>
<exclude>META-INF/**/*.properties</exclude>
<exclude>**/org.codehaus.commons.compiler.properties</exclude>
+ <exclude>module-info.class</exclude>
<exclude>**/*.SF</exclude>
<exclude>**/*.RSA</exclude>
<exclude>**/*.DSA</exclude>
@@ -537,7 +538,7 @@
This is likely due to you adding new dependencies to a
java-exec and not updating the excludes in this module. This is important as it
minimizes the size of the dependency of Drill application users.
</message>
- <maxsize>45000000</maxsize>
+ <maxsize>46000000</maxsize>
<minsize>15000000</minsize>
<files>
<file>${project.build.directory}/drill-jdbc-all-${project.version}.jar</file>
@@ -765,6 +766,7 @@
<exclude>META-INF/services/javax.ws.*</exclude>
<exclude>META-INF/**/*.properties</exclude>
<exclude>**/org.codehaus.commons.compiler.properties</exclude>
+ <exclude>module-info.class</exclude>
<exclude>**/*.SF</exclude>
<exclude>**/*.RSA</exclude>
<exclude>**/*.DSA</exclude>
diff --git a/pom.xml b/pom.xml
index 515988a..29d2358 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,6 +50,7 @@
<guava.version>19.0</guava.version>
<forkCount>2</forkCount>
<parquet.version>1.11.0</parquet.version>
+ <parquet.format.version>2.8.0</parquet.format.version>
<!--
For development purposes to be able to use custom Calcite versions (e.g.
not present in jitpack
repository or from local repository) update this property to desired
value (e.g. org.apache.calcite).
@@ -61,8 +62,7 @@
<avatica.version>1.15.0</avatica.version>
<janino.version>3.0.11</janino.version>
<sqlline.version>1.9.0</sqlline.version>
- <jackson.version>2.9.9</jackson.version>
- <jackson.databind.version>2.9.9</jackson.databind.version>
+ <jackson.version>2.10.3</jackson.version>
<zookeeper.version>3.5.7</zookeeper.version>
<mapr.release.version>6.1.0-mapr</mapr.release.version>
<ojai.version>3.0-mapr-1808</ojai.version>
@@ -106,6 +106,7 @@
<commons.validator.version>1.6</commons.validator.version>
<commons.text.version>1.6</commons.text.version>
<protobuf.version>3.11.1</protobuf.version>
+ <protostuff.version>1.7.1</protostuff.version>
<codemodel.version>2.6</codemodel.version>
<joda.version>2.10.5</joda.version>
<javax.el.version>3.0.0</javax.el.version>
@@ -117,6 +118,15 @@
<libthrift.version>0.13.0</libthrift.version>
<derby.version>10.14.2.0</derby.version>
<commons.cli.version>1.4</commons.cli.version>
+ <snakeyaml.version>1.26</snakeyaml.version>
+ <commons.lang3.version>3.10</commons.lang3.version>
+ <typesafe.config.version>1.0.0</typesafe.config.version>
+ <commons.codec.version>1.14</commons.codec.version>
+ <metadata.extractor.version>2.13.0</metadata.extractor.version>
+ <xalan.version>2.7.2</xalan.version>
+ <xerces.version>2.12.0</xerces.version>
+ <commons.configuration.version>1.10</commons.configuration.version>
+ <commons.beanutils.version>1.9.4</commons.beanutils.version>
</properties>
<scm>
@@ -617,6 +627,7 @@
<exclude>org.apache.calcite:*</exclude>
<exclude>commons-httpclient:*</exclude>
<exclude>tomcat:*</exclude>
+ <exclude>commons-beanutils:commons-beanutils-core</exclude>
</excludes>
</bannedDependencies>
</rules>
@@ -1004,7 +1015,7 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.10</version>
+ <version>${commons.codec.version}</version>
</dependency>
<dependency>
@@ -1558,7 +1569,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>${jackson.databind.version}</version>
+ <version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
@@ -1735,7 +1746,7 @@
<dependency>
<groupId>org.apache.parquet</groupId>
<artifactId>parquet-format</artifactId>
- <version>2.8.0</version>
+ <version>${parquet.format.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.hadoop</groupId>
@@ -1765,12 +1776,12 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.2</version>
+ <version>${commons.lang3.version}</version>
</dependency>
<dependency>
<groupId>com.typesafe</groupId>
<artifactId>config</artifactId>
- <version>1.0.0</version>
+ <version>${typesafe.config.version}</version>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
@@ -1874,6 +1885,16 @@
<version>${protobuf.version}</version>
</dependency>
<dependency>
+ <groupId>io.protostuff</groupId>
+ <artifactId>protostuff-core</artifactId>
+ <version>${protostuff.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.protostuff</groupId>
+ <artifactId>protostuff-json</artifactId>
+ <version>${protostuff.version}</version>
+ </dependency>
+ <dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>${joda.version}</version>
@@ -1918,6 +1939,48 @@
<artifactId>commons-cli</artifactId>
<version>${commons.cli.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.yaml</groupId>
+ <artifactId>snakeyaml</artifactId>
+ <version>${snakeyaml.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.drewnoakes</groupId>
+ <artifactId>metadata-extractor</artifactId>
+ <version>${metadata.extractor.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>${xerces.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ <version>${xalan.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ <version>${commons.configuration.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>${commons.beanutils.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -2705,12 +2768,12 @@
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
- <version>2.11.0</version>
+ <version>${xerces.version}</version>
</dependency>
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
- <version>2.7.1</version>
+ <version>${xalan.version}</version>
</dependency>
<dependency>
<groupId>net.sf.jpam</groupId>
@@ -3126,12 +3189,12 @@
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
- <version>2.11.0</version>
+ <version>${xerces.version}</version>
</dependency>
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
- <version>2.7.1</version>
+ <version>${xalan.version}</version>
</dependency>
<dependency>
<groupId>org.apache.parquet</groupId>
diff --git a/protocol/pom.xml b/protocol/pom.xml
index 6f60e52..85bf3c6 100644
--- a/protocol/pom.xml
+++ b/protocol/pom.xml
@@ -39,12 +39,10 @@
<dependency>
<groupId>io.protostuff</groupId>
<artifactId>protostuff-core</artifactId>
- <version>1.6.0</version>
</dependency>
<dependency>
<groupId>io.protostuff</groupId>
<artifactId>protostuff-json</artifactId>
- <version>1.6.0</version>
</dependency>
</dependencies>
