From 957ff8b1a65abaa7f8d5909e0daeb45e2197a97f Mon Sep 17 00:00:00 2001 From: Andrea Lam Date: Thu, 5 Oct 2017 10:44:21 -0700 Subject: [PATCH] Update Java tutorials Upgrade JDBC Driver version --- samples/tutorials/java/.gitignore | 133 ------------------ samples/tutorials/java/RHEL/README.md | 10 +- .../RHEL/SqlServerColumnstoreSample/pom.xml | 2 +- .../RHEL/SqlServerHibernateSample/pom.xml | 2 +- .../java/RHEL/SqlServerSample/pom.xml | 2 +- samples/tutorials/java/Ubuntu/README.md | 10 +- .../Ubuntu/SqlServerColumnstoreSample/pom.xml | 2 +- .../Ubuntu/SqlServerHibernateSample/pom.xml | 2 +- .../java/Ubuntu/SqlServerSample/pom.xml | 2 +- samples/tutorials/java/Windows/README.md | 10 +- .../SqlServerColumnstoreSample/pom.xml | 2 +- .../Windows/SqlServerHibernateSample/pom.xml | 2 +- .../java/Windows/SqlServerSample/pom.xml | 2 +- samples/tutorials/java/macOS/README.md | 10 +- .../macOS/SqlServerColumnstoreSample/pom.xml | 2 +- .../macOS/SqlServerHibernateSample/pom.xml | 2 +- .../java/macOS/SqlServerSample/pom.xml | 2 +- .../macOS/SqlServerSpringDataSample/pom.xml | 2 +- 18 files changed, 37 insertions(+), 162 deletions(-) delete mode 100644 samples/tutorials/java/.gitignore diff --git a/samples/tutorials/java/.gitignore b/samples/tutorials/java/.gitignore deleted file mode 100644 index ebf50ad8..00000000 --- a/samples/tutorials/java/.gitignore +++ /dev/null @@ -1,133 +0,0 @@ - -# Created by https://www.gitignore.io/api/intellij,eclipse,java,maven,mac - -### Eclipse ### - -.metadata -bin/ -tmp/ -*.tmp -*.bak -*.swp -*~.nib -local.properties -.settings/ -.loadpath -.recommenders - -# Eclipse Core -.project - -# External tool builders -.externalToolBuilders/ - -# Locally stored "Eclipse launch configurations" -*.launch - -# PyDev specific (Python IDE for Eclipse) -*.pydevproject - -# CDT-specific (C/C++ Development Tooling) -.cproject - -# JDT-specific (Eclipse Java Development Tools) -.classpath - -# Java annotation processor (APT) -.factorypath - -# PDT-specific (PHP Development Tools) -.buildpath - -# sbteclipse plugin -.target - -# Tern plugin -.tern-project - -# TeXlipse plugin -.texlipse - -# STS (Spring Tool Suite) -.springBeans - -# Code Recommenders -.recommenders/ - -### Intellij ### -# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm -# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 - -# User-specific stuff: -.idea - -## File-based project format: -*.iws -*.iml - -## Plugin-specific files: - -# IntelliJ -/out/ - -# mpeltonen/sbt-idea plugin -.idea_modules/ - -# JIRA plugin -atlassian-ide-plugin.xml - -# Crashlytics plugin (for Android Studio and IntelliJ) -com_crashlytics_export_strings.xml -crashlytics.properties -crashlytics-build.properties -fabric.properties - -### Intellij Patch ### -# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721 - -# *.iml -# modules.xml -# .idea/misc.xml -# *.ipr - -### Java ### -# Compiled class file -*.class - -# Log file -*.log - -# BlueJ files -*.ctxt - -# Mobile Tools for Java (J2ME) -.mtj.tmp/ - -# Package Files # -*.jar -*.war -*.ear -*.zip -*.tar.gz -*.rar - -# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml -hs_err_pid* - -#!! ERROR: mac is undefined. Use list command to see defined gitignore types !!# - -### Maven ### -target/ -pom.xml.tag -pom.xml.releaseBackup -pom.xml.versionsBackup -pom.xml.next -release.properties -dependency-reduced-pom.xml -buildNumber.properties -.mvn/timing.properties - -# Exclude maven wrapper -!/.mvn/wrapper/maven-wrapper.jar - -# End of https://www.gitignore.io/api/intellij,eclipse,java,maven,mac diff --git a/samples/tutorials/java/RHEL/README.md b/samples/tutorials/java/RHEL/README.md index cde80272..e274b1c7 100644 --- a/samples/tutorials/java/RHEL/README.md +++ b/samples/tutorials/java/RHEL/README.md @@ -40,21 +40,23 @@ To run this sample, you need the following prerequisites. ## Run this sample -1. From your favorite text editor, open the App.java file and update the connection string username and password with your own. +1. Select the specific tutorial you want to run through. -2. From your terminal, build the project and jar by performing the following command: +2. From your favorite text editor, open the App.java file and update the connection string username and password with your own. + +3. From your terminal, change directories to the tutorial folder (ex. SqlServerSample) you're running through. Build the project and jar by performing the following command: ``` mvn package ``` -3. Run the program by performing the following command: +4. Run the program by performing the following command: ``` mvn -q exec:java -Dexec.mainClass=com.sqlsamples.App.java ``` -4. Repeat the above steps for any of the three samples provided. +5. Repeat the above steps for any of the other tutorials provided. diff --git a/samples/tutorials/java/RHEL/SqlServerColumnstoreSample/pom.xml b/samples/tutorials/java/RHEL/SqlServerColumnstoreSample/pom.xml index e9a389ee..38e7d043 100644 --- a/samples/tutorials/java/RHEL/SqlServerColumnstoreSample/pom.xml +++ b/samples/tutorials/java/RHEL/SqlServerColumnstoreSample/pom.xml @@ -22,7 +22,7 @@ com.microsoft.sqlserver mssql-jdbc - 6.1.0.jre8 + 6.2.2.jre8 diff --git a/samples/tutorials/java/RHEL/SqlServerHibernateSample/pom.xml b/samples/tutorials/java/RHEL/SqlServerHibernateSample/pom.xml index e4ec09d6..e8cb7eea 100644 --- a/samples/tutorials/java/RHEL/SqlServerHibernateSample/pom.xml +++ b/samples/tutorials/java/RHEL/SqlServerHibernateSample/pom.xml @@ -22,7 +22,7 @@ com.microsoft.sqlserver mssql-jdbc - 6.1.0.jre8 + 6.2.2.jre8 org.hibernate diff --git a/samples/tutorials/java/RHEL/SqlServerSample/pom.xml b/samples/tutorials/java/RHEL/SqlServerSample/pom.xml index e9a389ee..38e7d043 100644 --- a/samples/tutorials/java/RHEL/SqlServerSample/pom.xml +++ b/samples/tutorials/java/RHEL/SqlServerSample/pom.xml @@ -22,7 +22,7 @@ com.microsoft.sqlserver mssql-jdbc - 6.1.0.jre8 + 6.2.2.jre8 diff --git a/samples/tutorials/java/Ubuntu/README.md b/samples/tutorials/java/Ubuntu/README.md index d55991ea..2ce27065 100644 --- a/samples/tutorials/java/Ubuntu/README.md +++ b/samples/tutorials/java/Ubuntu/README.md @@ -40,21 +40,23 @@ To run this sample, you need the following prerequisites. ## Run this sample -1. From your favorite text editor, open the App.java file and update the connection string username and password with your own. +1. Select the specific tutorial you want to run through. -2. From your terminal, build the project and jar by performing the following command: +2. From your favorite text editor, open the App.java file and update the connection string username and password with your own. + +3. From your terminal, change directories to the tutorial folder (ex. SqlServerSample) you're running through. Build the project and jar by performing the following command: ``` mvn package ``` -3. Run the program by performing the following command: +4. Run the program by performing the following command: ``` mvn -q exec:java -Dexec.mainClass=com.sqlsamples.App.java ``` -4. Repeat the above steps for any of the three samples provided. +5. Repeat the above steps for any of the other tutorials provided. diff --git a/samples/tutorials/java/Ubuntu/SqlServerColumnstoreSample/pom.xml b/samples/tutorials/java/Ubuntu/SqlServerColumnstoreSample/pom.xml index e9a389ee..38e7d043 100644 --- a/samples/tutorials/java/Ubuntu/SqlServerColumnstoreSample/pom.xml +++ b/samples/tutorials/java/Ubuntu/SqlServerColumnstoreSample/pom.xml @@ -22,7 +22,7 @@ com.microsoft.sqlserver mssql-jdbc - 6.1.0.jre8 + 6.2.2.jre8 diff --git a/samples/tutorials/java/Ubuntu/SqlServerHibernateSample/pom.xml b/samples/tutorials/java/Ubuntu/SqlServerHibernateSample/pom.xml index e4ec09d6..e8cb7eea 100644 --- a/samples/tutorials/java/Ubuntu/SqlServerHibernateSample/pom.xml +++ b/samples/tutorials/java/Ubuntu/SqlServerHibernateSample/pom.xml @@ -22,7 +22,7 @@ com.microsoft.sqlserver mssql-jdbc - 6.1.0.jre8 + 6.2.2.jre8 org.hibernate diff --git a/samples/tutorials/java/Ubuntu/SqlServerSample/pom.xml b/samples/tutorials/java/Ubuntu/SqlServerSample/pom.xml index e9a389ee..38e7d043 100644 --- a/samples/tutorials/java/Ubuntu/SqlServerSample/pom.xml +++ b/samples/tutorials/java/Ubuntu/SqlServerSample/pom.xml @@ -22,7 +22,7 @@ com.microsoft.sqlserver mssql-jdbc - 6.1.0.jre8 + 6.2.2.jre8 diff --git a/samples/tutorials/java/Windows/README.md b/samples/tutorials/java/Windows/README.md index 42d2f524..7f2bc82c 100644 --- a/samples/tutorials/java/Windows/README.md +++ b/samples/tutorials/java/Windows/README.md @@ -40,21 +40,23 @@ To run this sample, you need the following prerequisites. ## Run this sample -1. From your favorite text editor, open the App.java file and update the connection string username and password with your own. +1. Select the specific tutorial you want to run through. -2. From your terminal, build the project and jar by performing the following command: +2. From your favorite text editor, open the App.java file and update the connection string username and password with your own. + +3. From your terminal, change directories to the tutorial folder (ex. SqlServerSample) you're running through. Build the project and jar by performing the following command: ``` mvn package ``` -3. Run the program by performing the following command: +4. Run the program by performing the following command: ``` mvn -q exec:java -Dexec.mainClass=com.sqlsamples.App.java ``` -4. Repeat the above steps for any of the three samples provided. +5. Repeat the above steps for any of the other tutorials provided. diff --git a/samples/tutorials/java/Windows/SqlServerColumnstoreSample/pom.xml b/samples/tutorials/java/Windows/SqlServerColumnstoreSample/pom.xml index e9a389ee..38e7d043 100644 --- a/samples/tutorials/java/Windows/SqlServerColumnstoreSample/pom.xml +++ b/samples/tutorials/java/Windows/SqlServerColumnstoreSample/pom.xml @@ -22,7 +22,7 @@ com.microsoft.sqlserver mssql-jdbc - 6.1.0.jre8 + 6.2.2.jre8 diff --git a/samples/tutorials/java/Windows/SqlServerHibernateSample/pom.xml b/samples/tutorials/java/Windows/SqlServerHibernateSample/pom.xml index e4ec09d6..e8cb7eea 100644 --- a/samples/tutorials/java/Windows/SqlServerHibernateSample/pom.xml +++ b/samples/tutorials/java/Windows/SqlServerHibernateSample/pom.xml @@ -22,7 +22,7 @@ com.microsoft.sqlserver mssql-jdbc - 6.1.0.jre8 + 6.2.2.jre8 org.hibernate diff --git a/samples/tutorials/java/Windows/SqlServerSample/pom.xml b/samples/tutorials/java/Windows/SqlServerSample/pom.xml index e9a389ee..38e7d043 100644 --- a/samples/tutorials/java/Windows/SqlServerSample/pom.xml +++ b/samples/tutorials/java/Windows/SqlServerSample/pom.xml @@ -22,7 +22,7 @@ com.microsoft.sqlserver mssql-jdbc - 6.1.0.jre8 + 6.2.2.jre8 diff --git a/samples/tutorials/java/macOS/README.md b/samples/tutorials/java/macOS/README.md index e592f158..25a48f7d 100644 --- a/samples/tutorials/java/macOS/README.md +++ b/samples/tutorials/java/macOS/README.md @@ -40,21 +40,23 @@ To run this sample, you need the following prerequisites. ## Run this sample -1. From your favorite text editor, open the App.java file and update the connection string username and password with your own. +1. Select the specific tutorial you want to run through. -2. From your terminal, build the project and jar by performing the following command: +2. From your favorite text editor, open the App.java file and update the connection string username and password with your own. + +3. From your terminal, change directories to the tutorial folder (ex. SqlServerSample) you're running through. Build the project and jar by performing the following command: ``` mvn package ``` -3. Run the program by performing the following command: +4. Run the program by performing the following command: ``` mvn -q exec:java -Dexec.mainClass=com.sqlsamples.App.java ``` -4. Repeat the above steps for any of the three samples provided. +5. Repeat the above steps for any of the other tutorials provided. diff --git a/samples/tutorials/java/macOS/SqlServerColumnstoreSample/pom.xml b/samples/tutorials/java/macOS/SqlServerColumnstoreSample/pom.xml index e9a389ee..38e7d043 100644 --- a/samples/tutorials/java/macOS/SqlServerColumnstoreSample/pom.xml +++ b/samples/tutorials/java/macOS/SqlServerColumnstoreSample/pom.xml @@ -22,7 +22,7 @@ com.microsoft.sqlserver mssql-jdbc - 6.1.0.jre8 + 6.2.2.jre8 diff --git a/samples/tutorials/java/macOS/SqlServerHibernateSample/pom.xml b/samples/tutorials/java/macOS/SqlServerHibernateSample/pom.xml index e4ec09d6..e8cb7eea 100644 --- a/samples/tutorials/java/macOS/SqlServerHibernateSample/pom.xml +++ b/samples/tutorials/java/macOS/SqlServerHibernateSample/pom.xml @@ -22,7 +22,7 @@ com.microsoft.sqlserver mssql-jdbc - 6.1.0.jre8 + 6.2.2.jre8 org.hibernate diff --git a/samples/tutorials/java/macOS/SqlServerSample/pom.xml b/samples/tutorials/java/macOS/SqlServerSample/pom.xml index e9a389ee..38e7d043 100644 --- a/samples/tutorials/java/macOS/SqlServerSample/pom.xml +++ b/samples/tutorials/java/macOS/SqlServerSample/pom.xml @@ -22,7 +22,7 @@ com.microsoft.sqlserver mssql-jdbc - 6.1.0.jre8 + 6.2.2.jre8 diff --git a/samples/tutorials/java/macOS/SqlServerSpringDataSample/pom.xml b/samples/tutorials/java/macOS/SqlServerSpringDataSample/pom.xml index b087a8ce..d2f1a10b 100644 --- a/samples/tutorials/java/macOS/SqlServerSpringDataSample/pom.xml +++ b/samples/tutorials/java/macOS/SqlServerSpringDataSample/pom.xml @@ -16,7 +16,7 @@ 1.8 - 6.1.0.jre8 + 6.2.2.jre8