Merge pull request #25 from PhilippSalvisberg/develop

Update project dependencies

Author: PhilippSalvisberg

README.md

@@ -47,8 +47,8 @@ Please file your bug reports, enhancement requests, questions and other support
 
 ## How to Build
 
-1. [Download](http://www.oracle.com/technetwork/developer-tools/sql-developer/downloads/index.html) and install SQL Developer 17.4.0
-2. [Download](https://maven.apache.org/download.cgi) and install Apache Maven 3.5.2
+1. [Download](http://www.oracle.com/technetwork/developer-tools/sql-developer/downloads/index.html) and install SQL Developer 18.2.0
+2. [Download](https://maven.apache.org/download.cgi) and install Apache Maven 3.5.4
 3. [Download](https://git-scm.com/downloads) and install a git command line client
 4. Clone the utPLSQL-SQLDeveloper repository
 5. Open a terminal window in the utPLSQL-SQLDeveloper root folder and type
@@ -57,10 +57,10 @@ Please file your bug reports, enhancement requests, questions and other support
 
 6. Run maven build by the following command
 
-		mvn -Dsqldev.basedir=/Applications/SQLDeveloper17.4.0.app/Contents/Resources/sqldeveloper -DskipTests=true clean package
+		mvn -Dsqldev.basedir=/Applications/SQLDeveloper18.2.0.app/Contents/Resources/sqldeveloper -DskipTests=true clean package
 
 	Amend the parameter sqldev.basedir to match the path of your SQL Developer installation. This folder is used to reference Oracle jar files which are not available in public Maven repositories
-7. The resulting file ```utplsql_for_SQLDev_x.x.x-SNAPSHOT.zip``` in the ```target``` directory may be installed within SQL Developer
+7. The resulting file ```utplsql_for_SQLDev_x.x.x-SNAPSHOT.zip``` in the ```target``` directory can be installed within SQL Developer
 
 ## License
 

sqldev/pom.xml

@@ -11,9 +11,9 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<jdk.version>1.8</jdk.version>
 		<jdk.version.test>1.8</jdk.version.test>
-		<xtend.version>2.12.0</xtend.version>
+		<xtend.version>2.15.0</xtend.version>
 		<!-- requires SQL Developer 4.1.0 or higher (first version based on JDK 1.8) -->
-		<sqldev.basedir>/Applications/SQLDeveloper17.4.0.app/Contents/Resources/sqldeveloper</sqldev.basedir>
+		<sqldev.basedir>/Applications/SQLDeveloper18.2.0.app/Contents/Resources/sqldeveloper</sqldev.basedir>
 		<final.name>utplsql_for_SQLDev_${project.version}</final.name>
 	</properties>
 	<dependencies>
@@ -86,7 +86,7 @@
 			<artifactId>oracle.dbtools-common</artifactId>
 			<version>12.2.0</version>
 			<scope>system</scope>
-			<systemPath>${sqldev.basedir}/sqldeveloper/lib/oracle.dbtools-common.jar</systemPath>
+			<systemPath>${sqldev.basedir}/sqldeveloper/lib/dbtools-common.jar</systemPath>
 		</dependency>
 		<dependency>
 			<groupId>oracle</groupId>
@@ -155,7 +155,7 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-jdbc</artifactId>
-			<version>5.0.2.RELEASE</version>
+			<version>5.1.0.RELEASE</version>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
@@ -208,7 +208,7 @@
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
-				<version>3.6.2</version>
+				<version>3.8.0</version>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<configuration>
 					<source>${jdk.version}</source>
@@ -238,7 +238,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>2.20</version>
+				<version>2.22.0</version>
 				<configuration>
 					<!-- -noverify is required in some environments to avoid java.lang.VerifyError -->
 					<argLine>-noverify
@@ -374,7 +374,7 @@
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
-				<version>3.5.0</version>
+				<version>4.0.0</version>
 				<extensions>true</extensions>
 				<configuration>
 					<finalName>${project.name}</finalName>
@@ -470,7 +470,7 @@
 									<pluginExecutionFilter>
 										<groupId>org.apache.maven.plugins</groupId>
 										<artifactId>maven-dependency-plugin</artifactId>
-										<versionRange>[3.0.1,)</versionRange>
+										<versionRange>[3.1.1,)</versionRange>
 										<goals>
 											<goal>copy-dependencies</goal>
 										</goals>

sqldev/src/main/java/org/utplsql/sqldev/UtplsqlWorksheet.xtend

@@ -30,11 +30,11 @@ import org.utplsql.sqldev.model.preference.PreferenceModel
 import org.utplsql.sqldev.resources.UtplsqlResources
 
 class UtplsqlWorksheet {
-	private static val Logger logger = Logger.getLogger(UtplsqlWorksheet.name);
+	static val Logger logger = Logger.getLogger(UtplsqlWorksheet.name);
 
-	private var PreferenceModel preferences
-	private var String connectionName
-	private var List<String> pathList
+	var PreferenceModel preferences
+	var String connectionName
+	var List<String> pathList
 
 	new(List<String> pathList, String connectionName) {
 		this.pathList = pathList

sqldev/src/main/java/org/utplsql/sqldev/dal/UtplsqlDao.xtend

@@ -26,16 +26,16 @@ import org.utplsql.sqldev.model.ut.Annotation
 
 class UtplsqlDao {
 	public static val UTPLSQL_PACKAGE_NAME = "UT" 
-	private var Connection conn
-	private var JdbcTemplate jdbcTemplate
+	var Connection conn
+	var JdbcTemplate jdbcTemplate
 	// cache fields
-	private Boolean cachedDbaViewAccessible
-	private String cachedUtplsqlSchema
-	private Boolean cachedUtAnnotationManagerInstalled
+	Boolean cachedDbaViewAccessible
+	String cachedUtplsqlSchema
+	Boolean cachedUtAnnotationManagerInstalled
 
-	new(Connection conn) {
-		this.conn = conn
-		this.jdbcTemplate = new JdbcTemplate(new SingleConnectionDataSource(conn, true))
+	new(Connection connection) {
+		conn = connection
+		jdbcTemplate = new JdbcTemplate(new SingleConnectionDataSource(conn, true))
 	}
 
 	def boolean isDbaViewAccessible() {

sqldev/src/main/java/org/utplsql/sqldev/menu/UtplsqlController.xtend

@@ -40,8 +40,8 @@ import org.utplsql.sqldev.model.preference.PreferenceModel
 import org.utplsql.sqldev.parser.UtplsqlParser
 
 class UtplsqlController implements Controller {
-	private static final Logger logger = Logger.getLogger(UtplsqlController.name);
-	private val extension URLTools urlTools = new URLTools
+	static final Logger logger = Logger.getLogger(UtplsqlController.name);
+	val extension URLTools urlTools = new URLTools
 
 	public static int UTLPLSQL_TEST_CMD_ID = Ide.findCmdID("utplsql.test")
 	public static final IdeAction UTLPLSQL_TEST_ACTION = IdeAction.get(UtplsqlController.UTLPLSQL_TEST_CMD_ID)

sqldev/src/main/java/org/utplsql/sqldev/parser/UtplsqlParser.xtend

@@ -24,11 +24,11 @@ import org.utplsql.sqldev.model.parser.PlsqlObject
 import org.utplsql.sqldev.model.parser.Unit
 
 class UtplsqlParser {
-	private String owner
-	private String plsql
-	private String plsqlReduced
-	private ArrayList<PlsqlObject> objects = new ArrayList<PlsqlObject>
-	private ArrayList<Unit> units = new ArrayList<Unit>
+	String owner
+	String plsql
+	String plsqlReduced
+	ArrayList<PlsqlObject> objects = new ArrayList<PlsqlObject>
+	ArrayList<Unit> units = new ArrayList<Unit>
 
 	new(String plsql, Connection conn, String owner) {
 		setPlsql(plsql)

sqldev/src/main/java/org/utplsql/sqldev/resources/UtplsqlResources.xtend

@@ -18,9 +18,9 @@ package org.utplsql.sqldev.resources
 import oracle.dbtools.raptor.utils.MessagesBase
 
 class UtplsqlResources extends MessagesBase {
-	private static final ClassLoader CLASS_LOADER = UtplsqlResources.classLoader
-	private static final String CLASS_NAME = UtplsqlResources.canonicalName
-	private static final UtplsqlResources INSTANCE = new UtplsqlResources()
+	static final ClassLoader CLASS_LOADER = UtplsqlResources.classLoader
+	static final String CLASS_NAME = UtplsqlResources.canonicalName
+	static final UtplsqlResources INSTANCE = new UtplsqlResources()
 
 	private new() {
 		super(CLASS_NAME, CLASS_LOADER)

sqldev/src/test/java/org/utplsql/sqldev/tests/UrlToolsTest.xtend

@@ -5,7 +5,7 @@ import org.junit.Test
 import org.utplsql.sqldev.model.URLTools
 
 class UrlToolsTest {
-	private val extension URLTools urlTools = new URLTools
+	val extension URLTools urlTools = new URLTools
 
 	@Test
 	def void testReplacePlusSign() {

sqldev/src/test/java/org/utplsql/sqldev/tests/UtplsqlParserTest.xtend

@@ -24,7 +24,7 @@ import org.utplsql.sqldev.parser.UtplsqlParser
 
 class UtplsqlParserTest extends AbstractJdbcTest {
 
-	private static val sqlScript = '''
+	static val sqlScript = '''
 		PROMPT
 		PROMPT Install utPLSQL test package
 		PROMPT