resolved conflict

Author: blasttoys

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+
+### V2.1
+
+- Release for APEX 2
+
 ### V2.0.0-SNAPSHOT
 
 - Library to use authParam

README.md

@@ -166,23 +166,6 @@ Authorization: Apex_l1_eg realm="https://XYZ.api.gov.sg/abc/def", apex_l1_eg_app
 
 ### Parameters
 
-#### realm
-This is an identifier for the caller. Any value can be used here.
-
-**Note:** This is currently handled by the library
-
-#### authPrefix
-
-Authorization Header scheme prefix. There are 4 possible values for this
-depending on the zone and the authentication method.
-
-1. Apex_l1_ig
-2. Apex_l1_eg
-3. Apex_l2_ig
-4. Apex_l2_eg
-
-**Note:** This is currently handled by the library
-
 #### httpMethod
 
 The HTTP method, i.e. `GET`, `POST`, etc.

build.gradle

@@ -4,7 +4,8 @@ plugins {
     id 'com.github.kt3k.coveralls' version '2.6.3'
 }
 
-version '2.0.0-SNAPSHOT'
+
+version '2.1.0'
 
 tasks.withType(JavaCompile) {
     options.encoding = "UTF-8"

pom.xml

@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.api.util</groupId>
   <artifactId>ApiSecurity</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
+  <version>2.1.0</version>
   <build>
     <plugins>
       <plugin>
@@ -80,12 +80,12 @@
   	<dependency>
 		    <groupId>org.apache.logging.log4j</groupId>
 		    <artifactId>log4j-api</artifactId>
-		    <version>2.14.1</version>
+		    <version>2.15.0</version>
 	</dependency>
   	<dependency>
 		    <groupId>org.apache.logging.log4j</groupId>
 		    <artifactId>log4j-core</artifactId>
-		    <version>2.14.1</version>
+		    <version>2.15.0</version>
 	</dependency>
   	<dependency>
             <groupId>commons-lang</groupId>

src/main/java/com/api/util/ApiSecurity/ApiSigning.java

@@ -16,6 +16,10 @@
 import org.bouncycastle.pkcs.PKCS8EncryptedPrivateKeyInfo;
 
 
+import org.bouncycastle.operator.InputDecryptorProvider;
+import org.bouncycastle.pkcs.PKCS8EncryptedPrivateKeyInfo;
+
+
 import javax.crypto.Mac;
 import javax.crypto.spec.SecretKeySpec;
 
@@ -612,6 +616,7 @@ public static String getBaseString(String authPrefix
 
         String baseString = null;
 
+
         try {
             authPrefix = authPrefix.toLowerCase();