Merge branch 'hotfix/v1.0.1'

johnnymillergh · Oct 19, 2020 · 599c4a2 · 599c4a2
2 parents 3ebb771 + a3f9dc4
commit 599c4a2
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,10 @@
-#  (2020-10-19)
+## 1.0.1 (2020-10-19)
+
+* fix(POM): update and fix conflict version number ([cc2a201](https://github.com/johnnymillergh/media-streaming/commit/cc2a201))
+
+
+
+# 1.0.0 (2020-10-19)
 
 
 ### Bug Fixes

diff --git a/media-streaming-sample-app/pom.xml b/media-streaming-sample-app/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.jmframework.boot</groupId>
         <artifactId>media-streaming</artifactId>
-        <version>1.0.0</version>
+        <version>1.0.1</version>
     </parent>
     <groupId>com.jmsoftware.boot</groupId>
     <artifactId>media-streaming-sample-app</artifactId>

diff --git a/media-streaming-spring-boot-autoconfigure/pom.xml b/media-streaming-spring-boot-autoconfigure/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.jmframework.boot</groupId>
         <artifactId>media-streaming</artifactId>
-        <version>1.0.0</version>
+        <version>1.0.1</version>
     </parent>
     <artifactId>media-streaming-spring-boot-autoconfigure</artifactId>
     <name>Media Streaming :: Spring Boot Autoconfigure</name>

diff --git a/media-streaming-spring-boot-starter/pom.xml b/media-streaming-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.jmframework.boot</groupId>
         <artifactId>media-streaming</artifactId>
-        <version>1.0.0</version>
+        <version>1.0.1</version>
     </parent>
     <artifactId>media-streaming-spring-boot-starter</artifactId>
     <name>Media Streaming :: Spring Boot Starter</name>

diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <!-- Project Basics -->
     <groupId>com.jmframework.boot</groupId>
     <artifactId>media-streaming</artifactId>
-    <version>1.0.0</version>
+    <version>1.0.1</version>
     <name>Media Steaming</name>
     <description>Media Streaming for Java</description>
     <packaging>pom</packaging>