Merge branch 'aws:master' into master

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,47 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: "[BUG} "
+labels: bug
+assignees: ''
+
+---
+
+**Logging**
+Add relevent parser library logging.  IMPORTANT NOTE:  Please make sure to NOT share AWS access credentials under any circumstance!  Please make sure they are not in the logs.
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**SDK version number**
+Include the SDK version you are running. If it is a specific commit on master branch, include that
+
+**Open source building**
+If it is a build issue, include 3rd party library version and steps to how you are building it
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/contribution-.md

@@ -0,0 +1,23 @@
+---
+name: 'Contribution '
+about: We always welcome open-source contributions! Please open an issue to tag your
+  pull requeste this issue template's purpose here.
+title: "[CONTRIBUTION] "
+labels: contribution
+assignees: ''
+
+---
+
+PLEASE ADD THE APPROPRIATE TAG TO ALLOW BUCKETIZATION OF THE SOLUTIONS. IF THE TAG IS NOT AVAILABLE, DO NOT WORRY, WE WILL TAKE CARE OF IT!
+
+** Describe the issue you are trying to solve **
+Add a one line description of the issue you are trying to solve
+
+** Details of the changes **
+Give a couple of points to describe the changes you have made
+
+** Test cases **
+Give a detailed description of the tests you are running, if applicable
+
+** Additional context **
+Any details that can be preserved for the future

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: "[FEATURE] "
+labels: enhancement
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/questions-help.md

@@ -0,0 +1,18 @@
+---
+name: Questions/Help
+about: Describe this issue template's purpose here.
+title: "[QUESTION] "
+labels: question
+assignees: ''
+
+---
+
+A one liner description about the use case and what you are trying to achieve
+
+** Logging ** 
+Add relevent SDK logging. IMPORTANT NOTE: Please make sure to NOT share AWS access credentials under any circumstance! Please make sure they are not in the logs.
+
+** Any design considerations/constraints **
+Explain in detail how you would like to integrate our SDK into your solution 
+
+** If you would not like to open an issue to discuss your solution in open-platform, please email your question to [email protected] **

.gitignore

@@ -0,0 +1,3 @@
+.idea*
+*.iml
+target/

README.md

@@ -82,7 +82,7 @@ with the AWS SDK for the Kinesis Video. This example provides examples for
 * Create a stream, deleting and recreating if the stream of the same name already exists.
 * Call PutMedia to stream video fragments into the stream.
 * Simultaneously call GetMedia to stream video fragments out of the stream.
-* It uses the StreamingMkvParser to parse the returned the stream and apply the `OutputSegmentMerger`, `FragmentMetadataVisitor` visitors
+* It uses the StreamingMkvReader to parse the returned the stream and apply the `OutputSegmentMerger`, `FragmentMetadataVisitor` visitors
 along with a local one as part of the same `CompositeMkvElementVisitor` visitor.
 
 ### KinesisVideoRendererExample
@@ -128,6 +128,49 @@ To run the sample follow the below steps:
  the new Kinesis Video stream might be delayed significantly.
 
 ## Release Notes
+
+### Release 1.2.4 (Mar 2022)
+* Update amazon-kinesis-client from 1.14.7 to 1.14.8
+
+### Release 1.2.3 (Feb 2022)
+* Update slf4j-reload4j and slf4j-api from 1.7.35 to 1.7.36
+* Update aws-lambda-java-events from 1.2.0 to 2.2.9
+* Update amazon-kinesis-video-streams-producer-sdk-java from 1.8.0 to 1.12.0
+* Update aws-java-sdk-bom from 1.11.487 to 1.12.162
+
+### Release 1.2.2 (Jan 2022)
+* Update slf4j-reload4j(slf4j-log4j12) and slf4j-api from 1.7.33 to 1.7.35
+* Update amazon-kinesis-client from 1.9.3 to 1.14.7
+* Update aws-lambda-java-core from 1.2.0 to 1.2.1
+* Update junit from 4.13.1 to 4.13.2
+* Update lombok from 1.18.16 to 1.18.22
+* Update commons-lang3 from 3.6 to 3.12.0
+* Update powermock-mockito-release-full from 1.6.3 to 1.6.4
+* Update maven-compiler-plugin from 3.2 to 3.9.0
+* Update lombok-maven-plugin from 1.18.16.0 to 1.18.20.0
+* Update maven-javadoc-plugin from 3.1.1 to 3.3.1
+* Update maven-source-plugin from 3.0.1 to 3.2.1
+* Update maven-shade-plugin from 2.3 to 3.2.4
+
+### Release 1.2.1 (Jan 2022)
+* Update slf4j-log4j12 and slf4j-api from 1.7.25 to 1.7.33
+* Update log4j-slf4j-impl from 2.8.2 to 2.17.1
+
+### Release 1.2.0 (Jan 2022)
+* Move from aws-lambda-java-log4j 1.1.0 to aws-lambda-java-log4j2 1.5.1 to address CVE
+* Update log4j to 2.17.1 to address CVE
+
+### Release 1.1.0 (Dec 2021)
+* Add ListFragment worker and update GetMediaForFragmentListWorker
+* Upgrade Log4j to 2.16 to address CVE
+
+
+### Release 1.0.15 (Aug 2020)
+* Added new cluster packing option to the `OputputSegmentMerger` to enable creation of a playable MKV file from a sparse KVS stream.
+* Added parsing of audio specific fields from the MKV track header.
+* Bump some dependency versions.
+* Modify the log level on some log messages.
+
 ### Release 1.0.14 (Aug 2019)
 * Fixed frame timecode during re-encoding in KinesisVideoRekognitionLambdaExample
 * Fixed region for derived KVS Stream

pom.xml

@@ -6,12 +6,15 @@
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
+        <!-- aws-sdk-java uses jackson databind version 2.6.7 which has security vulnerabilities, updating to 2.12.3-->     
+        <jackson.version>2.12.3</jackson.version>
+        <jackson.databind.version>2.12.3</jackson.databind.version>             
     </properties>
     <groupId>com.amazonaws</groupId>
     <artifactId>amazon-kinesis-video-streams-parser-library</artifactId>
     <packaging>jar</packaging>
     <name>Amazon Kinesis Video Streams Parser Library</name>
-    <version>1.0.14</version>
+    <version>1.2.4</version>
     <description>The Amazon Kinesis Video Streams Parser Library for Java enables Java developers to parse the streams
         returned by GetMedia calls to Amazon Kinesis Video.
     </description>
@@ -30,10 +33,20 @@
     </licenses>
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-databind</artifactId>
+                <version>${jackson.databind.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.dataformat</groupId>
+                <artifactId>jackson-dataformat-cbor</artifactId>
+                <version>${jackson.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.amazonaws</groupId>
                 <artifactId>aws-java-sdk-bom</artifactId>
-                <version>1.11.487</version>
+                <version>1.12.162</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -63,27 +76,27 @@
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>amazon-kinesis-video-streams-producer-sdk-java</artifactId>
-            <version>1.8.0</version>
+            <version>1.12.0</version>
         </dependency>
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>amazon-kinesis-client</artifactId>
-            <version>1.9.3</version>
+            <version>1.14.8</version>
         </dependency>
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-lambda-java-core</artifactId>
-            <version>1.2.0</version>
+            <version>1.2.1</version>
         </dependency>
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-lambda-java-events</artifactId>
-            <version>1.2.0</version>
+            <version>2.2.9</version>
         </dependency>
         <dependency>
             <groupId>com.amazonaws</groupId>
-            <artifactId>aws-lambda-java-log4j</artifactId>
-            <version>1.0.0</version>
+            <artifactId>aws-lambda-java-log4j2</artifactId>
+            <version>1.5.1</version>
         </dependency>
 
         <!-- Encode/Decode dependencies -->
@@ -103,52 +116,52 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.12</version>
+            <version>4.13.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.16.18</version>
+            <version>1.18.22</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.6</version>
+            <version>3.12.0</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.7.10</version>
+            <version>1.7.36</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-slf4j-impl</artifactId>
-            <version>2.8.2</version>
+            <version>2.17.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-            <version>1.7.25</version>
+            <artifactId>slf4j-reload4j</artifactId>
+            <version>1.7.36</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
-            <version>2.8.1</version>
+            <version>2.17.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>2.8.1</version>
+            <version>2.17.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-mockito-release-full</artifactId>
-            <version>1.6.3</version>
+            <version>1.6.4</version>
             <type>pom</type>
             <scope>test</scope>
         </dependency>
@@ -171,7 +184,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.2</version>
+                    <version>3.9.0</version>
                     <configuration>
                         <source>1.8</source>
                         <target>1.8</target>
@@ -185,7 +198,7 @@
             <plugin>
                 <groupId>org.projectlombok</groupId>
                 <artifactId>lombok-maven-plugin</artifactId>
-                <version>1.16.18.1</version>
+                <version>1.18.20.0</version>
                 <executions>
                     <execution>
                         <id>delombok</id>
@@ -218,7 +231,10 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.10.3</version>
+                <version>3.3.1</version>
+                <configuration>
+                    <source>8</source>
+                </configuration>
                 <executions>
                     <execution>
                         <id>attach-javadocs</id>
@@ -231,7 +247,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>3.0.1</version>
+                <version>3.2.1</version>
                 <executions>
                     <execution>
                         <id>attach-sources</id>
@@ -241,12 +257,19 @@
                     </execution>
                 </executions>
             </plugin>
-            <!-- AWS Lambda artificat builder plugin -->
+            <!-- AWS Lambda artifact builder plugin -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>2.3</version>
+                <version>3.2.4</version>
                 <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                            <version>1.18.22</version>
+                        </path>
+                    </annotationProcessorPaths>
                     <createDependencyReducedPom>false</createDependencyReducedPom>
                     <shadedArtifactAttached>true</shadedArtifactAttached>
                     <shadedClassifierName>shaded</shadedClassifierName>
@@ -260,6 +283,7 @@
                     </execution>
                 </executions>
             </plugin>
+
         </plugins>
 
     </build>