From 2eeb916d4a12cdd9701a394c8cc73f8485ab4779 Mon Sep 17 00:00:00 2001 From: Cheena Malhotra Date: Tue, 17 Apr 2018 18:02:13 -0700 Subject: [PATCH] Update Samples to be usable with Eclipse directly --- pom.xml | 10 +--------- src/samples/adaptive/pom.xml | 12 ++++++------ .../src/main/java/executeStoredProcedure.java | 1 + .../adaptive/src/main/java/readLargeData.java | 1 + .../adaptive/src/main/java/updateLargeData.java | 1 + src/samples/alwaysencrypted/pom.xml | 8 ++++---- .../src/main/java/AlwaysEncrypted.java | 1 + .../azureactivedirectoryauthentication/pom.xml | 4 ++-- .../java/AzureActiveDirectoryAuthentication.java | 1 + src/samples/connections/pom.xml | 6 +++--- src/samples/connections/src/main/java/connectDS.java | 1 + .../connections/src/main/java/connectURL.java | 1 + src/samples/constrained/pom.xml | 4 ++-- .../constrained/src/main/java/ConstrainedSample.java | 2 ++ src/samples/datatypes/pom.xml | 10 +++++----- src/samples/datatypes/src/main/java/basicDT.java | 1 + .../datatypes/src/main/java/sqlxmlExample.java | 1 + src/samples/resultsets/pom.xml | 12 ++++++------ src/samples/resultsets/src/main/java/cacheRS.java | 1 + src/samples/resultsets/src/main/java/retrieveRS.java | 1 + src/samples/resultsets/src/main/java/updateRS.java | 1 + src/samples/sparse/pom.xml | 8 ++++---- src/samples/sparse/src/main/java/SparseColumns.java | 1 + 23 files changed, 48 insertions(+), 41 deletions(-) diff --git a/pom.xml b/pom.xml index c05cda7cb..d62282b7e 100644 --- a/pom.xml +++ b/pom.xml @@ -57,7 +57,7 @@ true - + junit junit @@ -125,14 +125,6 @@ 2.2.0 test - diff --git a/src/samples/adaptive/pom.xml b/src/samples/adaptive/pom.xml index c6916730c..fbece6732 100644 --- a/src/samples/adaptive/pom.xml +++ b/src/samples/adaptive/pom.xml @@ -19,7 +19,7 @@ com.microsoft.sqlserver mssql-jdbc - 6.1.0.jre8 + 6.4.0.jre9 @@ -35,7 +35,7 @@ exec-maven-plugin 1.2.1 - executeStoredProcedure + adaptive.src.main.java.executeStoredProcedure @@ -53,7 +53,7 @@ exec-maven-plugin 1.2.1 - readLargeData + adaptive.src.main.java.readLargeData @@ -71,7 +71,7 @@ exec-maven-plugin 1.2.1 - updateLargeData + adaptive.src.main.java.updateLargeData @@ -85,8 +85,8 @@ org.apache.maven.plugins maven-compiler-plugin - 1.8 - 1.8 + 9 + 9 diff --git a/src/samples/adaptive/src/main/java/executeStoredProcedure.java b/src/samples/adaptive/src/main/java/executeStoredProcedure.java index 1ce29511b..6fbd21803 100644 --- a/src/samples/adaptive/src/main/java/executeStoredProcedure.java +++ b/src/samples/adaptive/src/main/java/executeStoredProcedure.java @@ -5,6 +5,7 @@ * * This program is made available under the terms of the MIT License. See the LICENSE file in the project root for more information. */ +package adaptive.src.main.java; import java.io.BufferedReader; import java.io.InputStreamReader; diff --git a/src/samples/adaptive/src/main/java/readLargeData.java b/src/samples/adaptive/src/main/java/readLargeData.java index 0fef61ea7..f52d5e18c 100644 --- a/src/samples/adaptive/src/main/java/readLargeData.java +++ b/src/samples/adaptive/src/main/java/readLargeData.java @@ -5,6 +5,7 @@ * * This program is made available under the terms of the MIT License. See the LICENSE file in the project root for more information. */ +package adaptive.src.main.java; import java.io.BufferedReader; import java.io.InputStreamReader; diff --git a/src/samples/adaptive/src/main/java/updateLargeData.java b/src/samples/adaptive/src/main/java/updateLargeData.java index e6fc139f0..f11c1ccc5 100644 --- a/src/samples/adaptive/src/main/java/updateLargeData.java +++ b/src/samples/adaptive/src/main/java/updateLargeData.java @@ -5,6 +5,7 @@ * * This program is made available under the terms of the MIT License. See the LICENSE file in the project root for more information. */ +package adaptive.src.main.java; import java.io.BufferedReader; import java.io.InputStreamReader; diff --git a/src/samples/alwaysencrypted/pom.xml b/src/samples/alwaysencrypted/pom.xml index 4c62203cc..2116cfeda 100644 --- a/src/samples/alwaysencrypted/pom.xml +++ b/src/samples/alwaysencrypted/pom.xml @@ -19,7 +19,7 @@ com.microsoft.sqlserver mssql-jdbc - 6.1.0.jre8 + 6.4.0.jre9 @@ -35,7 +35,7 @@ exec-maven-plugin 1.2.1 - AlwaysEncrypted + alwaysencrypted.src.main.java.AlwaysEncrypted @@ -49,8 +49,8 @@ org.apache.maven.plugins maven-compiler-plugin - 1.8 - 1.8 + 9 + 9 diff --git a/src/samples/alwaysencrypted/src/main/java/AlwaysEncrypted.java b/src/samples/alwaysencrypted/src/main/java/AlwaysEncrypted.java index bf91979c1..abdd4a970 100644 --- a/src/samples/alwaysencrypted/src/main/java/AlwaysEncrypted.java +++ b/src/samples/alwaysencrypted/src/main/java/AlwaysEncrypted.java @@ -5,6 +5,7 @@ * * This program is made available under the terms of the MIT License. See the LICENSE file in the project root for more information. */ +package alwaysencrypted.src.main.java; import java.io.BufferedReader; import java.io.IOException; diff --git a/src/samples/azureactivedirectoryauthentication/pom.xml b/src/samples/azureactivedirectoryauthentication/pom.xml index 8a94b2f7c..17e4522a8 100644 --- a/src/samples/azureactivedirectoryauthentication/pom.xml +++ b/src/samples/azureactivedirectoryauthentication/pom.xml @@ -19,7 +19,7 @@ com.microsoft.sqlserver mssql-jdbc - 6.1.0.jre8 + 6.4.0.jre9 @@ -35,7 +35,7 @@ exec-maven-plugin 1.2.1 - AzureActiveDirectoryAuthentication + azureactivedirectoryauthentication.src.main.java.AzureActiveDirectoryAuthentication diff --git a/src/samples/azureactivedirectoryauthentication/src/main/java/AzureActiveDirectoryAuthentication.java b/src/samples/azureactivedirectoryauthentication/src/main/java/AzureActiveDirectoryAuthentication.java index 915883c1a..6436c9da6 100644 --- a/src/samples/azureactivedirectoryauthentication/src/main/java/AzureActiveDirectoryAuthentication.java +++ b/src/samples/azureactivedirectoryauthentication/src/main/java/AzureActiveDirectoryAuthentication.java @@ -5,6 +5,7 @@ * * This program is made available under the terms of the MIT License. See the LICENSE file in the project root for more information. */ +package azureactivedirectoryauthentication.src.main.java; import java.io.BufferedReader; import java.io.InputStreamReader; diff --git a/src/samples/connections/pom.xml b/src/samples/connections/pom.xml index 91d523c7d..080bd427f 100644 --- a/src/samples/connections/pom.xml +++ b/src/samples/connections/pom.xml @@ -19,7 +19,7 @@ com.microsoft.sqlserver mssql-jdbc - 6.1.0.jre8 + 6.4.0.jre9 @@ -35,7 +35,7 @@ exec-maven-plugin 1.2.1 - connectURL + connections.src.main.java.connectURL @@ -53,7 +53,7 @@ exec-maven-plugin 1.2.1 - connectDS + connections.src.main.java.connectDS diff --git a/src/samples/connections/src/main/java/connectDS.java b/src/samples/connections/src/main/java/connectDS.java index 3fc4ffc5f..d41a37224 100644 --- a/src/samples/connections/src/main/java/connectDS.java +++ b/src/samples/connections/src/main/java/connectDS.java @@ -5,6 +5,7 @@ * * This program is made available under the terms of the MIT License. See the LICENSE file in the project root for more information. */ +package connections.src.main.java; import java.io.BufferedReader; import java.io.InputStreamReader; diff --git a/src/samples/connections/src/main/java/connectURL.java b/src/samples/connections/src/main/java/connectURL.java index f81b2e9fb..57b40f710 100644 --- a/src/samples/connections/src/main/java/connectURL.java +++ b/src/samples/connections/src/main/java/connectURL.java @@ -5,6 +5,7 @@ * * This program is made available under the terms of the MIT License. See the LICENSE file in the project root for more information. */ +package connections.src.main.java; import java.io.BufferedReader; import java.io.InputStreamReader; diff --git a/src/samples/constrained/pom.xml b/src/samples/constrained/pom.xml index e9964b64e..a40873590 100644 --- a/src/samples/constrained/pom.xml +++ b/src/samples/constrained/pom.xml @@ -21,7 +21,7 @@ com.microsoft.sqlserver mssql-jdbc - 6.1.5.jre8-preview + 6.4.0.jre9 @@ -37,7 +37,7 @@ exec-maven-plugin 1.6.0 - ConstrainedSample + constrained.src.main.java.ConstrainedSample diff --git a/src/samples/constrained/src/main/java/ConstrainedSample.java b/src/samples/constrained/src/main/java/ConstrainedSample.java index a8e36454e..59b89ed2a 100644 --- a/src/samples/constrained/src/main/java/ConstrainedSample.java +++ b/src/samples/constrained/src/main/java/ConstrainedSample.java @@ -1,3 +1,5 @@ +package constrained.src.main.java; + import java.security.PrivilegedActionException; import java.security.PrivilegedExceptionAction; import java.sql.Connection; diff --git a/src/samples/datatypes/pom.xml b/src/samples/datatypes/pom.xml index 55ace68b5..687d626e1 100644 --- a/src/samples/datatypes/pom.xml +++ b/src/samples/datatypes/pom.xml @@ -19,7 +19,7 @@ com.microsoft.sqlserver mssql-jdbc - 6.1.0.jre8 + 6.4.0.jre9 @@ -35,7 +35,7 @@ exec-maven-plugin 1.2.1 - basicDT + datatypes.src.main.java.basicDT @@ -53,7 +53,7 @@ exec-maven-plugin 1.2.1 - sqlxmlExample + datatypes.src.main.java.sqlxmlExample @@ -67,8 +67,8 @@ org.apache.maven.plugins maven-compiler-plugin - 1.8 - 1.8 + 9 + 9 diff --git a/src/samples/datatypes/src/main/java/basicDT.java b/src/samples/datatypes/src/main/java/basicDT.java index 903e2b5d1..a0cf01cc8 100644 --- a/src/samples/datatypes/src/main/java/basicDT.java +++ b/src/samples/datatypes/src/main/java/basicDT.java @@ -5,6 +5,7 @@ * * This program is made available under the terms of the MIT License. See the LICENSE file in the project root for more information. */ +package datatypes.src.main.java; import java.io.BufferedReader; import java.io.InputStreamReader; diff --git a/src/samples/datatypes/src/main/java/sqlxmlExample.java b/src/samples/datatypes/src/main/java/sqlxmlExample.java index 83fb5f0a7..0dc314f48 100644 --- a/src/samples/datatypes/src/main/java/sqlxmlExample.java +++ b/src/samples/datatypes/src/main/java/sqlxmlExample.java @@ -5,6 +5,7 @@ * * This program is made available under the terms of the MIT License. See the LICENSE file in the project root for more information. */ +package datatypes.src.main.java; import java.io.BufferedReader; import java.io.InputStreamReader; diff --git a/src/samples/resultsets/pom.xml b/src/samples/resultsets/pom.xml index 6b44e3d6c..d2f466b2e 100644 --- a/src/samples/resultsets/pom.xml +++ b/src/samples/resultsets/pom.xml @@ -19,7 +19,7 @@ com.microsoft.sqlserver mssql-jdbc - 6.1.0.jre8 + 6.4.0.jre9 @@ -35,7 +35,7 @@ exec-maven-plugin 1.2.1 - cacheRS + resultsets.src.main.java.cacheRS @@ -53,7 +53,7 @@ exec-maven-plugin 1.2.1 - retrieveRS + resultsets.src.main.java.retrieveRS @@ -71,7 +71,7 @@ exec-maven-plugin 1.2.1 - updateRS + resultsets.src.main.java.updateRS @@ -85,8 +85,8 @@ org.apache.maven.plugins maven-compiler-plugin - 1.8 - 1.8 + 9 + 9 diff --git a/src/samples/resultsets/src/main/java/cacheRS.java b/src/samples/resultsets/src/main/java/cacheRS.java index 29bba90dc..8484fc348 100644 --- a/src/samples/resultsets/src/main/java/cacheRS.java +++ b/src/samples/resultsets/src/main/java/cacheRS.java @@ -5,6 +5,7 @@ * * This program is made available under the terms of the MIT License. See the LICENSE file in the project root for more information. */ +package resultsets.src.main.java; import java.io.BufferedReader; import java.io.InputStreamReader; diff --git a/src/samples/resultsets/src/main/java/retrieveRS.java b/src/samples/resultsets/src/main/java/retrieveRS.java index 2422d099f..f8b6e7b3b 100644 --- a/src/samples/resultsets/src/main/java/retrieveRS.java +++ b/src/samples/resultsets/src/main/java/retrieveRS.java @@ -5,6 +5,7 @@ * * This program is made available under the terms of the MIT License. See the LICENSE file in the project root for more information. */ +package resultsets.src.main.java; import java.io.BufferedReader; import java.io.InputStreamReader; diff --git a/src/samples/resultsets/src/main/java/updateRS.java b/src/samples/resultsets/src/main/java/updateRS.java index 0eff4c25a..9b2fd1630 100644 --- a/src/samples/resultsets/src/main/java/updateRS.java +++ b/src/samples/resultsets/src/main/java/updateRS.java @@ -5,6 +5,7 @@ * * This program is made available under the terms of the MIT License. See the LICENSE file in the project root for more information. */ +package resultsets.src.main.java; import java.io.BufferedReader; import java.io.InputStreamReader; diff --git a/src/samples/sparse/pom.xml b/src/samples/sparse/pom.xml index fba0f8e6c..fc45c69a4 100644 --- a/src/samples/sparse/pom.xml +++ b/src/samples/sparse/pom.xml @@ -19,7 +19,7 @@ com.microsoft.sqlserver mssql-jdbc - 6.1.0.jre8 + 6.4.0.jre9 @@ -35,7 +35,7 @@ exec-maven-plugin 1.2.1 - SparseColumns + sparse.src.main.java.SparseColumns @@ -49,8 +49,8 @@ org.apache.maven.plugins maven-compiler-plugin - 1.8 - 1.8 + 9 + 9 diff --git a/src/samples/sparse/src/main/java/SparseColumns.java b/src/samples/sparse/src/main/java/SparseColumns.java index c582a82c0..8e03a5ea0 100644 --- a/src/samples/sparse/src/main/java/SparseColumns.java +++ b/src/samples/sparse/src/main/java/SparseColumns.java @@ -5,6 +5,7 @@ * * This program is made available under the terms of the MIT License. See the LICENSE file in the project root for more information. */ +package sparse.src.main.java; import java.io.BufferedReader; import java.io.InputStreamReader;