Merge pull request #491 from CROSSINGTUD/issue_171_281

Add requested changes from issue 171 and 281

CryptoAnalysis-Android/src/main/java/de/fraunhofer/iem/crypto/CogniCryptAndroidAnalysis.java

@@ -132,7 +132,7 @@ public CrySLResultsReporter getAnalysisListener() {
 		logger.info("Loaded " + rules.size() + " CrySL rules");
 		logger.info("Running CogniCrypt Analysis");
 		scanner.scan(rules);
-		logger.info("Terminated CogniCrypt Analysis");
+		logger.info("Finished CogniCrypt Analysis");
 		System.gc();
 		return errorListener.getErrors();
 	}

README.md

@@ -96,12 +96,12 @@ CogniCrypt<sub>SAST</sub> can also be run on Android Applications using the Andr
 * The absolute path to the directory of the CrySL rules.
 
 ```
-java -cp <path-to-analysis-jar> -Xmx8g -Xss60m de.fraunhofer.iem.crypto.CogniCryptAndroid \
+java -cp <path-to-analysis-jar> -Xmx8g -Xss60m de.fraunhofer.iem.crypto.CogniCryptAndroidAnalysis \
       <path-to-apk> <path-to-android-platforms> <path-to-crysl-rules>
 ```
 As an optional fourth parameter one can specify an output folder: 
 ```
-java -cp <path-to-analysis-jar> -Xmx8g -Xss60m de.fraunhofer.iem.crypto.CogniCryptAndroid \
+java -cp <path-to-analysis-jar> -Xmx8g -Xss60m de.fraunhofer.iem.crypto.CogniCryptAndroidAnalysis \
       <path-to-apk> <path-to-android-platforms> <path-to-crysl-rules> <output-dir>
 ```
 

pom.xml

@@ -110,15 +110,13 @@
 					<target>${maven.compiler.target}</target>
 				</configuration>
 			</plugin>
-			<!-- This plugin flattens the poms and removes not needed elements.
-				 However, for the deployment, it is required to keep the metadata
-				 fields.
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>flatten-maven-plugin</artifactId>
 				<version>1.3.0</version>
 				<configuration>
 					<updatePomFile>true</updatePomFile>
+					<flattenMode>ossrh</flattenMode>
 				</configuration>
 				<executions>
 					<execution>
@@ -137,7 +135,6 @@
 					</execution>
 				</executions>
 			</plugin>
-			-->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-source-plugin</artifactId>