Prepare for new release

Author: gretard

src/sonar-sql-plugin/pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>org.sonar.plugins</groupId>
 	<artifactId>sonar-sql-plugin</artifactId>
-	<version>1.0.0</version>
+	<version>1.0.1</version>
 	<packaging>sonar-plugin</packaging>
 
 	<name>SQL language plugin</name>
@@ -23,6 +23,27 @@
 	</properties>
 
 	<dependencies>
+		<!-- https://mvnrepository.com/artifact/com.sun.xml.bind/jaxb-impl -->
+		<dependency>
+			<groupId>javax.xml.bind</groupId>
+			<artifactId>jaxb-api</artifactId>
+			<version>2.2.11</version>
+		</dependency>
+		<dependency>
+			<groupId>com.sun.xml.bind</groupId>
+			<artifactId>jaxb-core</artifactId>
+			<version>2.2.11</version>
+		</dependency>
+		<dependency>
+			<groupId>com.sun.xml.bind</groupId>
+			<artifactId>jaxb-impl</artifactId>
+			<version>2.2.11</version>
+		</dependency>
+		<dependency>
+			<groupId>javax.activation</groupId>
+			<artifactId>activation</artifactId>
+			<version>1.1.1</version>
+		</dependency>
 		<dependency>
 			<groupId>org.reflections</groupId>
 			<artifactId>reflections</artifactId>
@@ -35,9 +56,6 @@
 			<version>${sonar.apiVersion}</version>
 			<scope>provided</scope>
 		</dependency>
-
-
-
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>
@@ -49,9 +67,6 @@
 			<artifactId>commons-io</artifactId>
 			<version>2.6</version>
 		</dependency>
-		<!-- <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-io</artifactId> 
-			<version>1.3.2</version> </dependency> -->
-		<!-- unit tests -->
 		<dependency>
 			<groupId>org.sonarsource.sonarqube</groupId>
 			<artifactId>sonar-testing-harness</artifactId>
@@ -64,8 +79,6 @@
 			<version>4.13-beta-2</version>
 			<scope>test</scope>
 		</dependency>
-
-		<!-- https://mvnrepository.com/artifact/org.antlr/antlr4-runtime -->
 		<dependency>
 			<groupId>org.antlr</groupId>
 			<artifactId>antlr4-runtime</artifactId>

src/sonar-sql-plugin/src/main/java/org/sonar/plugins/sql/sensors/CGIssuesSensor.java

@@ -72,19 +72,19 @@ public void execute(SensorContext context) {
 			final String[] args = new String[] { externalTool, "-source", sourceDir, "-out",
 					tempResultsFile.getAbsolutePath(), "/include:all" };
 
-			final Process process = new ProcessBuilder(args).start();
+			final Process process = new ProcessBuilder(args).inheritIO().start();
 			LOGGER.debug("Running SQLCodeGuard with {}", Arrays.toString(args));
 
 			final int result = process.waitFor();
-			if (result != 0 || !tempResultsFile.exists() || tempResultsFile.length() == 0) {
-				LOGGER.warn("Was not able to run SQLCodeGuard with {}", Arrays.toString(args));
+			if (!tempResultsFile.exists() || tempResultsFile.length() == 0) {
+				LOGGER.warn("SQLCodeGuard returned with '{}'. Arguments were: {}", result, Arrays.toString(args));
 				return;
 			}
-			try (BOMInputStream stream = new BOMInputStream(new FileInputStream(tempResultsFile))) {
+			try (final BOMInputStream stream = new BOMInputStream(new FileInputStream(tempResultsFile))) {
 
 				final CodeGuardIssues issues = read(stream);
 
-				for (org.sonar.plugins.sql.models.cgissues.CodeGuardIssues.File f : issues.getFile()) {
+				for (final org.sonar.plugins.sql.models.cgissues.CodeGuardIssues.File f : issues.getFile()) {
 
 					final List<InputFile> files = find(context, f.getFullname());
 					if (files.isEmpty()) {
@@ -94,10 +94,10 @@ public void execute(SensorContext context) {
 					final InputFile file = files.get(0);
 					for (final Issue is : f.getIssue()) {
 						try {
-							NewExternalIssue newExternalIssue = context.newExternalIssue().ruleId(is.getCode())
+							final NewExternalIssue newExternalIssue = context.newExternalIssue().ruleId(is.getCode())
 									.engineId(repositoryName).type(RuleType.CODE_SMELL);
-							NewIssueLocation location = newExternalIssue.newLocation().on(file).message(is.getText())
-									.at(file.selectLine(is.getLine()));
+							final NewIssueLocation location = newExternalIssue.newLocation().on(file)
+									.message(is.getText()).at(file.selectLine(is.getLine()));
 							newExternalIssue.at(location).severity(extractSeverity(is.getSeverity())).save();
 						} catch (Throwable e) {
 							LOGGER.warn("Unexpected error adding issue on file " + f.getFullname(), e);
@@ -113,16 +113,24 @@ public void execute(SensorContext context) {
 
 	}
 
-	private final Severity extractSeverity(String severity) {
-		String val = "MAJOR";
-
-		if (severity != null) {
-			val = severity.toUpperCase();
+	private final Severity extractSeverity(final String severityValue) {
+		String severity = "MAJOR";
+		if (severityValue != null) {
+			severity = severityValue.toUpperCase();
+		}
+		if ("ERROR".equalsIgnoreCase(severity)) {
+			return Severity.CRITICAL;
+		}
+		if ("WARNING".equalsIgnoreCase(severity)) {
+			return Severity.MAJOR;
 		}
-		if ("WARNING".equalsIgnoreCase(val)) {
-			val = "MAJOR";
+		try {
+			return Severity.valueOf(severity);
+		} catch (Exception e) {
+
 		}
-		return Severity.valueOf(val);
+		return Severity.MAJOR;
+
 	}
 
 }