From 94d6f38b2145f2f3a4fb48997e63c66261111f23 Mon Sep 17 00:00:00 2001
From: Gary O'Neall <gary@sourceauditor.com>
Date: Mon, 6 Feb 2023 10:56:09 -0800
Subject: [PATCH 1/3] Update POM with correct Java versions

The indirect dependency on Apache Jena requires Java 11

This commit updates the POM file to reflect the correct Java versions
in the POM file

Signed-off-by: Gary O'Neall <gary@sourceauditor.com>
---
 pom.xml                                | 6 +++---
 src/main/java/org/spdx/tools/Main.java | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 516933a..bf9e603 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
 		<profile>
 			<id>doclint-java8-disable</id>
 			<activation>
-				<jdk>[1.8,)</jdk>
+				<jdk>[1.8,11)</jdk>
 			</activation>
 			<properties>
 				<javadoc.opts>-Xdoclint:none</javadoc.opts>
@@ -190,8 +190,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>3.6.1</version>
 				<configuration>
-					<source>1.8</source>
-					<target>1.8</target>
+					<source>11</source>
+					<target>11</target>
 					<encoding>${project.build.sourceEncoding}</encoding>
 					<showDeprecation>true</showDeprecation>
 					<showWarnings>true</showWarnings>
diff --git a/src/main/java/org/spdx/tools/Main.java b/src/main/java/org/spdx/tools/Main.java
index faa4e72..a59389b 100644
--- a/src/main/java/org/spdx/tools/Main.java
+++ b/src/main/java/org/spdx/tools/Main.java
@@ -31,7 +31,7 @@
  */
 public class Main {
 
-	private static final String CURRENT_TOOL_VERSION = "1.1.4";
+	private static final String CURRENT_TOOL_VERSION = "1.1.5";
 
     /**
 	 * @param args args[0] is the name of the tools with the remaining args being the tool parameters

From c43f5cb8cd618dbbe958166627b2b1fa01aa35e5 Mon Sep 17 00:00:00 2001
From: Gary O'Neall <gary@sourceauditor.com>
Date: Mon, 6 Feb 2023 11:16:31 -0800
Subject: [PATCH 2/3] Turn off doclint

Signed-off-by: Gary O'Neall <gary@sourceauditor.com>
---
 pom.xml | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index bf9e603..7afc8c3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,17 +56,9 @@
 	  <sonar.organization>spdx</sonar.organization>
 	  <sonar.projectKey>tools-java</sonar.projectKey>
 	  <dependency-check-maven.version>8.0.1</dependency-check-maven.version>
+	  <javadoc.opts>-Xdoclint:none</javadoc.opts>
     </properties>
 	<profiles>
-		<profile>
-			<id>doclint-java8-disable</id>
-			<activation>
-				<jdk>[1.8,11)</jdk>
-			</activation>
-			<properties>
-				<javadoc.opts>-Xdoclint:none</javadoc.opts>
-			</properties>
-		</profile>
 		<profile>
 			<id>gpg-signing</id>
 			<build>

From 7e053a8fc88e3dbda504cb0469b4fc3c302d5bdc Mon Sep 17 00:00:00 2001
From: Gary O'Neall <gary@sourceauditor.com>
Date: Tue, 7 Feb 2023 22:32:07 -0800
Subject: [PATCH 3/3] Switch form source/target to release in Maven compiler

Signed-off-by: Gary O'Neall <gary@sourceauditor.com>
---
 pom.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7afc8c3..7d1869c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -182,8 +182,7 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>3.6.1</version>
 				<configuration>
-					<source>11</source>
-					<target>11</target>
+					<release>11</release>
 					<encoding>${project.build.sourceEncoding}</encoding>
 					<showDeprecation>true</showDeprecation>
 					<showWarnings>true</showWarnings>