Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Samples to be usable with Eclipse directly #679

Merged
merged 2 commits into from
Apr 26, 2018
Merged

Update Samples to be usable with Eclipse directly #679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2eeb916
Update Samples to be usable with Eclipse directly
cheenamalhotra Apr 18, 2018
0f85d9d
Merge branch 'dev' into cleanup
cheenamalhotra Apr 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<optional>true</optional>
</dependency>

<!-- dependency for running tests -->
<!-- dependencies for running tests -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand Down Expand Up @@ -125,14 +125,6 @@
<version>2.2.0</version>
<scope>test</scope>
</dependency>
<!--
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<version>4.12.0-M3</version>
<scope>test</scope>
</dependency>
-->
</dependencies>

<profiles>
Expand Down
12 changes: 6 additions & 6 deletions src/samples/adaptive/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<dependency>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>mssql-jdbc</artifactId>
<version>6.1.0.jre8</version>
<version>6.4.0.jre9</version>
</dependency>
</dependencies>

Expand All @@ -35,7 +35,7 @@
<artifactId>exec-maven-plugin</artifactId>
<version>1.2.1</version>
<configuration>
<mainClass>executeStoredProcedure</mainClass>
<mainClass>adaptive.src.main.java.executeStoredProcedure</mainClass>
</configuration>
</plugin>
</plugins>
Expand All @@ -53,7 +53,7 @@
<artifactId>exec-maven-plugin</artifactId>
<version>1.2.1</version>
<configuration>
<mainClass>readLargeData</mainClass>
<mainClass>adaptive.src.main.java.readLargeData</mainClass>
</configuration>
</plugin>
</plugins>
Expand All @@ -71,7 +71,7 @@
<artifactId>exec-maven-plugin</artifactId>
<version>1.2.1</version>
<configuration>
<mainClass>updateLargeData</mainClass>
<mainClass>adaptive.src.main.java.updateLargeData</mainClass>
</configuration>
</plugin>
</plugins>
Expand All @@ -85,8 +85,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.8</source>
<target>1.8</target>
<source>9</source>
<target>9</target>
</configuration>
</plugin>

Expand Down
1 change: 1 addition & 0 deletions src/samples/adaptive/src/main/java/executeStoredProcedure.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions src/samples/adaptive/src/main/java/readLargeData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions src/samples/adaptive/src/main/java/updateLargeData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions src/samples/alwaysencrypted/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<dependency>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>mssql-jdbc</artifactId>
<version>6.1.0.jre8</version>
<version>6.4.0.jre9</version>
</dependency>
</dependencies>

Expand All @@ -35,7 +35,7 @@
<artifactId>exec-maven-plugin</artifactId>
<version>1.2.1</version>
<configuration>
<mainClass>AlwaysEncrypted</mainClass>
<mainClass>alwaysencrypted.src.main.java.AlwaysEncrypted</mainClass>
</configuration>
</plugin>
</plugins>
Expand All @@ -49,8 +49,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.8</source>
<target>1.8</target>
<source>9</source>
<target>9</target>
</configuration>
</plugin>

Expand Down
1 change: 1 addition & 0 deletions src/samples/alwaysencrypted/src/main/java/AlwaysEncrypted.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/samples/azureactivedirectoryauthentication/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<dependency>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>mssql-jdbc</artifactId>
<version>6.1.0.jre8</version>
<version>6.4.0.jre9</version>
</dependency>
</dependencies>

Expand All @@ -35,7 +35,7 @@
<artifactId>exec-maven-plugin</artifactId>
<version>1.2.1</version>
<configuration>
<mainClass>AzureActiveDirectoryAuthentication</mainClass>
<mainClass>azureactivedirectoryauthentication.src.main.java.AzureActiveDirectoryAuthentication</mainClass>
</configuration>
</plugin>
</plugins>
Expand Down
1 change: 1 addition & 0 deletions .../azureactivedirectoryauthentication/src/main/java/AzureActiveDirectoryAuthentication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions src/samples/connections/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<dependency>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>mssql-jdbc</artifactId>
<version>6.1.0.jre8</version>
<version>6.4.0.jre9</version>
</dependency>
</dependencies>

Expand All @@ -35,7 +35,7 @@
<artifactId>exec-maven-plugin</artifactId>
<version>1.2.1</version>
<configuration>
<mainClass>connectURL</mainClass>
<mainClass>connections.src.main.java.connectURL</mainClass>
</configuration>
</plugin>
</plugins>
Expand All @@ -53,7 +53,7 @@
<artifactId>exec-maven-plugin</artifactId>
<version>1.2.1</version>
<configuration>
<mainClass>connectDS</mainClass>
<mainClass>connections.src.main.java.connectDS</mainClass>
</configuration>
</plugin>
</plugins>
Expand Down
1 change: 1 addition & 0 deletions src/samples/connections/src/main/java/connectDS.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions src/samples/connections/src/main/java/connectURL.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/samples/constrained/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<dependency>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>mssql-jdbc</artifactId>
<version>6.1.5.jre8-preview</version>
<version>6.4.0.jre9</version>
</dependency>
</dependencies>

Expand All @@ -37,7 +37,7 @@
<artifactId>exec-maven-plugin</artifactId>
<version>1.6.0</version>
<configuration>
<mainClass>ConstrainedSample</mainClass>
<mainClass>constrained.src.main.java.ConstrainedSample</mainClass>
</configuration>
</plugin>
</plugins>
Expand Down
2 changes: 2 additions & 0 deletions src/samples/constrained/src/main/java/ConstrainedSample.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
package constrained.src.main.java;

import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
import java.sql.Connection;
Expand Down
10 changes: 5 additions & 5 deletions src/samples/datatypes/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<dependency>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>mssql-jdbc</artifactId>
<version>6.1.0.jre8</version>
<version>6.4.0.jre9</version>
</dependency>
</dependencies>

Expand All @@ -35,7 +35,7 @@
<artifactId>exec-maven-plugin</artifactId>
<version>1.2.1</version>
<configuration>
<mainClass>basicDT</mainClass>
<mainClass>datatypes.src.main.java.basicDT</mainClass>
</configuration>
</plugin>
</plugins>
Expand All @@ -53,7 +53,7 @@
<artifactId>exec-maven-plugin</artifactId>
<version>1.2.1</version>
<configuration>
<mainClass>sqlxmlExample</mainClass>
<mainClass>datatypes.src.main.java.sqlxmlExample</mainClass>
</configuration>
</plugin>
</plugins>
Expand All @@ -67,8 +67,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.8</source>
<target>1.8</target>
<source>9</source>
<target>9</target>
</configuration>
</plugin>

Expand Down
1 change: 1 addition & 0 deletions src/samples/datatypes/src/main/java/basicDT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions src/samples/datatypes/src/main/java/sqlxmlExample.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
12 changes: 6 additions & 6 deletions src/samples/resultsets/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<dependency>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>mssql-jdbc</artifactId>
<version>6.1.0.jre8</version>
<version>6.4.0.jre9</version>
</dependency>
</dependencies>

Expand All @@ -35,7 +35,7 @@
<artifactId>exec-maven-plugin</artifactId>
<version>1.2.1</version>
<configuration>
<mainClass>cacheRS</mainClass>
<mainClass>resultsets.src.main.java.cacheRS</mainClass>
</configuration>
</plugin>
</plugins>
Expand All @@ -53,7 +53,7 @@
<artifactId>exec-maven-plugin</artifactId>
<version>1.2.1</version>
<configuration>
<mainClass>retrieveRS</mainClass>
<mainClass>resultsets.src.main.java.retrieveRS</mainClass>
</configuration>
</plugin>
</plugins>
Expand All @@ -71,7 +71,7 @@
<artifactId>exec-maven-plugin</artifactId>
<version>1.2.1</version>
<configuration>
<mainClass>updateRS</mainClass>
<mainClass>resultsets.src.main.java.updateRS</mainClass>
</configuration>
</plugin>
</plugins>
Expand All @@ -85,8 +85,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.8</source>
<target>1.8</target>
<source>9</source>
<target>9</target>
</configuration>
</plugin>

Expand Down
1 change: 1 addition & 0 deletions src/samples/resultsets/src/main/java/cacheRS.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions src/samples/resultsets/src/main/java/retrieveRS.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions src/samples/resultsets/src/main/java/updateRS.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions src/samples/sparse/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<dependency>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>mssql-jdbc</artifactId>
<version>6.1.0.jre8</version>
<version>6.4.0.jre9</version>
</dependency>
</dependencies>

Expand All @@ -35,7 +35,7 @@
<artifactId>exec-maven-plugin</artifactId>
<version>1.2.1</version>
<configuration>
<mainClass>SparseColumns</mainClass>
<mainClass>sparse.src.main.java.SparseColumns</mainClass>
</configuration>
</plugin>
</plugins>
Expand All @@ -49,8 +49,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.8</source>
<target>1.8</target>
<source>9</source>
<target>9</target>
</configuration>
</plugin>

Expand Down
1 change: 1 addition & 0 deletions src/samples/sparse/src/main/java/SparseColumns.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down