Merge branch 'develop' of https://github.com/astrapi69/mystic-crypt.git

into develop Conflicts: CHANGELOG.md
astrapi69 · Jun 20, 2019 · ae2eca9 · ae2eca9
2 parents db097f5 + 7f51ef5
commit ae2eca9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,9 @@ CHANGED:
 
 - constant class CryptConst tags as deprecated, will be removed in next minor release
 - update of parent version to 5
+- update of guava version to 27.1-jre
+- update of commons-codec version to 1.12
+- update of bouncycastle version to 1.61
 
 Version 5.8
 -------------

diff --git a/crypt-data/pom.xml b/crypt-data/pom.xml
@@ -17,7 +17,6 @@
 		<dependency>
 			<groupId>javax.xml.bind</groupId>
 			<artifactId>jaxb-api</artifactId>
-			<scope>test</scope>
 		</dependency>
 
 		<dependency>

diff --git a/pom.xml b/pom.xml
@@ -46,8 +46,8 @@
 		<randomizer-api.version>${randomizer.version}</randomizer-api.version>
 		<randomizer-data.version>${randomizer.version}</randomizer-data.version>
 		<!-- EXTERNAL LIBRARIES versions -->
-		<commons-codec.version>1.11</commons-codec.version>
-		<bouncycastle.version>1.60</bouncycastle.version>
+		<commons-codec.version>1.12</commons-codec.version>
+		<bouncycastle.version>1.61</bouncycastle.version>
 		<!-- GUAVA version -->
 		<guava.version>27.1-jre</guava.version>
 		<!-- MEANBEAN version -->