From 998b82c501a710b674fa3f546c953e7c1bf2fac6 Mon Sep 17 00:00:00 2001
From: Philipp Salvisberg <philipp.salvisberg@trivadis.com>
Date: Fri, 25 Feb 2022 09:27:49 +0100
Subject: [PATCH 1/4] update missing dependencies according #136

---
 sqldev/pom.xml | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/sqldev/pom.xml b/sqldev/pom.xml
index d9eb3c0..faaf2ac 100644
--- a/sqldev/pom.xml
+++ b/sqldev/pom.xml
@@ -164,6 +164,14 @@
 			<scope>system</scope>
 			<systemPath>${sqldev.basedir}/ide/extensions/oracle.ide.runner.jar</systemPath>
 		</dependency>
+		<dependency>
+			<!-- overriding oddgen dependency -->
+			<groupId>oracle</groupId>
+			<artifactId>javatools-nodeps</artifactId>
+			<version>12.2.1</version>
+			<scope>system</scope>
+			<systemPath>${sqldev.basedir}/modules/oracle.javatools/javatools-nodeps.jar</systemPath>
+		</dependency>
 		<!-- SQL Developer specific dependencies part 2 (used for tests only) -->
 		<dependency>
 			<groupId>oracle</groupId>
@@ -181,7 +189,13 @@
 		</dependency>		
 		<!-- SQL Developer specific dependencies part 3 (available in public maven repositories) -->
 		<dependency>
-			<!-- SQL Developer is using this older version -->
+			<groupId>com.google.code.findbugs</groupId>
+			<artifactId>jsr305</artifactId>
+			<version>3.0.2</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<!-- SQL Developer is using this older version, osgi.core-5.0.0.jar -->
 			<groupId>org.osgi</groupId>
 			<artifactId>org.osgi.core</artifactId>
 			<version>5.0.0</version>

From 499b53ec7b0f802b5b23d8d587ba69f66fdf0a47 Mon Sep 17 00:00:00 2001
From: Philipp Salvisberg <philipp.salvisberg@trivadis.com>
Date: Fri, 25 Feb 2022 09:28:30 +0100
Subject: [PATCH 2/4] change version of extension to 1.4.0-SNAPSHOT

---
 sqldev/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sqldev/pom.xml b/sqldev/pom.xml
index faaf2ac..6635d83 100644
--- a/sqldev/pom.xml
+++ b/sqldev/pom.xml
@@ -6,7 +6,7 @@
 	<!-- The Basics -->
 	<groupId>org.utplsql</groupId>
 	<artifactId>org.utplsql.sqldev</artifactId>
-	<version>1.3.2-SNAPSHOT</version>
+	<version>1.4.0-SNAPSHOT</version>
 	<packaging>bundle</packaging>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

From f08c703b50a3c14ea4b34d9fe4dbc46fc5a578df Mon Sep 17 00:00:00 2001
From: Philipp Salvisberg <philipp.salvisberg@trivadis.com>
Date: Fri, 25 Feb 2022 14:29:44 +0100
Subject: [PATCH 3/4] avoid JDK8 related warning: Classes found in the wrong
 directory: {META-INF/versions/9/module-info.class=module-info}

---
 sqldev/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sqldev/pom.xml b/sqldev/pom.xml
index 6635d83..47be110 100644
--- a/sqldev/pom.xml
+++ b/sqldev/pom.xml
@@ -472,6 +472,7 @@
 							org.springframework.core.style,
 							org.springframework.lang
 						</_exportcontents>
+						<_noee>true</_noee>
 						<Require-Bundle>
 							oracle.javatools,
 							oracle.javatools-nodeps,

From f3a62e4a85078faab458c17a3026f61ecdd1d74b Mon Sep 17 00:00:00 2001
From: Philipp Salvisberg <philipp.salvisberg@trivadis.com>
Date: Fri, 25 Feb 2022 14:30:16 +0100
Subject: [PATCH 4/4] update dependencies based on SQLDev 21.4.2

---
 sqldev/pom.xml | 62 +++++++++++++++++++++++++-------------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/sqldev/pom.xml b/sqldev/pom.xml
index 47be110..2956d52 100644
--- a/sqldev/pom.xml
+++ b/sqldev/pom.xml
@@ -13,7 +13,7 @@
 		<jdk.version>1.8</jdk.version>
 		<jdk.version.test>1.8</jdk.version.test>
 		<!-- requires SQL Developer 4.1.0 or higher (first version based on JDK 1.8) -->
-		<sqldev.basedir>/Applications/SQLDeveloper20.4.0.app/Contents/Resources/sqldeveloper</sqldev.basedir>
+		<sqldev.basedir>/Applications/SQLDeveloper21.4.2.app/Contents/Resources/sqldeveloper</sqldev.basedir>
 		<final.name>utplsql_for_SQLDev_${project.version}</final.name>
 		<!-- arguments to by added by jacoco plugin for test runs with coverage -->
 		<!-- -noverify is required in some environments to avoid java.lang.VerifyError -->
@@ -21,13 +21,13 @@
 	</properties>
 	<dependencies>
 		<!-- SQL Developer specific dependencies part 1 (not available in public Maven repositories) -->
-		<!-- Versions of scope system are based on SQL Developer 19.4.0. -->
+		<!-- Versions of scope system are based on SQL Developer 21.4.2. Version numbers are reduced to major.minor.bugfix format. -->
 		<!-- The actual version is not that important, since the these libraries are provided. -->
-		<!-- Therefore it is not planned to update them with every change of sqldev.basedir. -->
+		<!-- Therefore it is not planned to update them with every change of sqldev.basedir. Updated for 21.4.2 -->
 		<dependency>
 			<groupId>oracle</groupId>
 			<artifactId>idert</artifactId>
-			<version>13.0.0</version>
+			<version>12.2.1</version>
 			<scope>system</scope>
 			<systemPath>${sqldev.basedir}/ide/lib/idert.jar</systemPath>
 		</dependency>
@@ -41,126 +41,126 @@
 		<dependency>
 			<groupId>oracle</groupId>
 			<artifactId>javatools</artifactId>
-			<version>13.0.0</version>
+			<version>12.2.1</version>
 			<scope>system</scope>
 			<systemPath>${sqldev.basedir}/ide/lib/javatools.jar</systemPath>
 		</dependency>
 		<dependency>
 			<groupId>oracle</groupId>
 			<artifactId>oracle.ide.ceditor</artifactId>
-			<version>13.0.0</version>
+			<version>12.2.1</version>
 			<scope>system</scope>
 			<systemPath>${sqldev.basedir}/ide/extensions/oracle.ide.ceditor.jar</systemPath>
 		</dependency>
 		<dependency>
 			<groupId>oracle</groupId>
 			<artifactId>oracle.ide</artifactId>
-			<version>13.0.0</version>
+			<version>12.2.1</version>
 			<scope>system</scope>
 			<systemPath>${sqldev.basedir}/ide/extensions/oracle.ide.jar</systemPath>
 		</dependency>
 		<dependency>
 			<groupId>oracle</groupId>
 			<artifactId>uic</artifactId>
-			<version>13.0.0</version>
+			<version>12.2.1</version>
 			<scope>system</scope>
 			<systemPath>${sqldev.basedir}/ide/lib/uic.jar</systemPath>
 		</dependency>
 		<dependency>
 			<groupId>oracle</groupId>
 			<artifactId>oracle.ide.navigator</artifactId>
-			<version>13.0.0</version>
+			<version>12.2.1</version>
 			<scope>system</scope>
 			<systemPath>${sqldev.basedir}/ide/extensions/oracle.ide.navigator.jar</systemPath>
 		</dependency>
 		<dependency>
 			<groupId>oracle</groupId>
 			<artifactId>javax-ide</artifactId>
-			<version>13.0.0</version>
+			<version>12.2.1</version>
 			<scope>system</scope>
 			<systemPath>${sqldev.basedir}/ide/lib/javax-ide.jar</systemPath>
 		</dependency>
 		<dependency>
 			<groupId>oracle</groupId>
 			<artifactId>oracle.dbtools-common</artifactId>
-			<version>19.4.0</version>
+			<version>21.4.1</version>
 			<scope>system</scope>
 			<systemPath>${sqldev.basedir}/sqldeveloper/lib/dbtools-common.jar</systemPath>
 		</dependency>
 		<dependency>
 			<groupId>oracle</groupId>
 			<artifactId>oracle.sqldeveloper</artifactId>
-			<version>19.3.0</version>
+			<version>21.4.2</version>
 			<scope>system</scope>
 			<systemPath>${sqldev.basedir}/sqldeveloper/extensions/oracle.sqldeveloper.jar</systemPath>
 		</dependency>
 		<dependency>
 			<groupId>oracle</groupId>
 			<artifactId>oracle.sqldeveloper.utils</artifactId>
-			<version>19.3.0</version>
+			<version>21.4.2</version>
 			<scope>system</scope>
 			<systemPath>${sqldev.basedir}/sqldeveloper/extensions/oracle.sqldeveloper.utils.jar</systemPath>
 		</dependency>
 		<dependency>
 			<groupId>oracle</groupId>
 			<artifactId>oracle.sqldeveloper.worksheet</artifactId>
-			<version>19.3.0</version>
+			<version>21.4.2</version>
 			<scope>system</scope>
 			<systemPath>${sqldev.basedir}/sqldeveloper/extensions/oracle.sqldeveloper.worksheet.jar</systemPath>
 		</dependency>
 		<dependency>
 			<groupId>oracle</groupId>
 			<artifactId>oracle.sqldeveloper.schemabrowser</artifactId>
-			<version>19.3.0</version>
+			<version>21.4.2</version>
 			<scope>system</scope>
 			<systemPath>${sqldev.basedir}/sqldeveloper/extensions/oracle.sqldeveloper.schemabrowser.jar</systemPath>
 		</dependency>
 		<dependency>
 			<groupId>oracle</groupId>
 			<artifactId>ojdbc8</artifactId>
-			<version>19.3.0</version>
+			<version>21.4.0</version>
 			<scope>system</scope>
 			<systemPath>${sqldev.basedir}/jdbc/lib/ojdbc8.jar</systemPath>
 		</dependency>
 		<dependency>
 			<groupId>oracle</groupId>
 			<artifactId>dbapi</artifactId>
-			<version>19.3.0</version>
+			<version>21.4.2</version>
 			<scope>system</scope>
 			<systemPath>${sqldev.basedir}/ide/lib/dbapi.jar</systemPath>
 		</dependency>
 		<dependency>
 			<groupId>oracle</groupId>
 			<artifactId>oracle.ide.db</artifactId>
-			<version>19.3.0</version>
+			<version>21.4.2</version>
 			<scope>system</scope>
 			<systemPath>${sqldev.basedir}/ide/extensions/oracle.ide.db.jar</systemPath>
 		</dependency>
 		<dependency>
 			<groupId>oracle</groupId>
 			<artifactId>oracle.jdeveloper.db.connection</artifactId>
-			<version>19.3.0</version>
+			<version>21.4.2</version>
 			<scope>system</scope>
 			<systemPath>${sqldev.basedir}/jdev/extensions/oracle.jdeveloper.db.connection.jar</systemPath>
 		</dependency>
 		<dependency>
 			<groupId>oracle</groupId>
 			<artifactId>oracle.jdeveloper.java.core.jar</artifactId>
-			<version>13.0.0</version>
+			<version>12.2.1</version>
 			<scope>system</scope>
 			<systemPath>${sqldev.basedir}/jdev/extensions/oracle.jdeveloper.java.core.jar</systemPath>
 		</dependency>
 		<dependency>
 			<groupId>oracle</groupId>
 			<artifactId>oracle.jdeveloper.runner.jar</artifactId>
-			<version>13.0.0</version>
+			<version>12.2.1</version>
 			<scope>system</scope>
 			<systemPath>${sqldev.basedir}/jdev/extensions/oracle.jdeveloper.runner.jar</systemPath>
 		</dependency>
 		<dependency>
 			<groupId>oracle</groupId>
 			<artifactId>oracle.ide.runner</artifactId>
-			<version>19.3.0</version>
+			<version>12.2.1</version>
 			<scope>system</scope>
 			<systemPath>${sqldev.basedir}/ide/extensions/oracle.ide.runner.jar</systemPath>
 		</dependency>
@@ -176,14 +176,14 @@
 		<dependency>
 			<groupId>oracle</groupId>
 			<artifactId>jewt4.jar</artifactId>
-			<version>13.0.0</version>
+			<version>12.2.1</version>
 			<scope>system</scope>
 			<systemPath>${sqldev.basedir}/modules/oracle.bali.jewt/jewt4.jar</systemPath>
 		</dependency>		
 		<dependency>
 			<groupId>oracle</groupId>
 			<artifactId>share.jar</artifactId>
-			<version>13.0.0</version>
+			<version>12.2.1</version> <!-- original version is JEWT_MAIN_GENERIC_210114.0102.S, that's basically a date -->
 			<scope>system</scope>
 			<systemPath>${sqldev.basedir}/modules/oracle.bali.share/share.jar</systemPath>
 		</dependency>		
@@ -206,19 +206,19 @@
 			<!-- used mainly to access the database via JdbcTemplate -->
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-jdbc</artifactId>
-			<version>5.3.2</version>
+			<version>5.3.16</version>
 		</dependency>
 		<dependency>
 			<!-- transitive reference, but IntelliJ wants to have it explicit (to avoid warnings) -->
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-core</artifactId>
-			<version>5.3.2</version>
+			<version>5.3.16</version>
 		</dependency>
 		<dependency>
 			<!-- used for HtmlUtils.htmlEscape in RunnerPanel -->
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-web</artifactId>
-			<version>5.3.2</version>
+			<version>5.3.16</version>
 		</dependency>
 		<dependency>
 			<!-- optional, for RunGenerator and TestGenerator -->
@@ -230,13 +230,13 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.13.1</version>
+			<version>4.13.2</version>
 			<scope>test</scope>
 		</dependency>
         <dependency>
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>
-            <version>20.1.0</version>
+            <version>23.0.0</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
@@ -256,7 +256,7 @@
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
-				<version>3.8.1</version>
+				<version>3.10.0</version>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<configuration>
 					<source>${jdk.version}</source>
@@ -599,7 +599,7 @@
 				<plugin>
 					<groupId>org.codehaus.mojo</groupId>
 					<artifactId>buildnumber-maven-plugin</artifactId>
-					<version>1.4</version>
+					<version>3.0.0</version>
 				</plugin>
 			</plugins>
 		</pluginManagement>