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

updates to version number and junit dependencies #111

Merged
merged 2 commits into from
Jan 10, 2017
+26 −17
Merged

updates to version number and junit dependencies #111

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f4dfd5
update version number and junit dependencies
Jan 9, 2017
1a0b3da
updating ant script
Jan 10, 2017
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
18 changes: 9 additions & 9 deletions build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apply plugin: 'java'

archivesBaseName = 'mssql-jdbc'
version = '6.1.1'
version = '6.1.2'

allprojects {
tasks.withType(JavaCompile) {
@@ -62,14 +62,14 @@ dependencies {
compile 'com.microsoft.azure:azure-keyvault:0.9.7'

testCompile 'junit:junit:4.12',
'org.junit.platform:junit-platform-console:1.0.0-M2',
'org.junit.platform:junit-platform-commons:1.0.0-M2',
'org.junit.platform:junit-platform-engine:1.0.0-M2',
'org.junit.platform:junit-platform-launcher:1.0.0-M2',
'org.junit.platform:junit-platform-runner:1.0.0-M2',
'org.junit.platform:junit-platform-surefire-provider:1.0.0-M2',
'org.junit.jupiter:junit-jupiter-api:5.0.0-M2',
'org.junit.jupiter:junit-jupiter-engine:5.0.0-M2'
'org.junit.platform:junit-platform-console:1.0.0-M3',
'org.junit.platform:junit-platform-commons:1.0.0-M3',
'org.junit.platform:junit-platform-engine:1.0.0-M3',
'org.junit.platform:junit-platform-launcher:1.0.0-M3',
'org.junit.platform:junit-platform-runner:1.0.0-M3',
'org.junit.platform:junit-platform-surefire-provider:1.0.0-M3',
'org.junit.jupiter:junit-jupiter-api:5.0.0-M3',
'org.junit.jupiter:junit-jupiter-engine:5.0.0-M3'
}


23 changes: 16 additions & 7 deletions build.xml
View file
Original file line number Diff line number Diff line change
@@ -4,17 +4,26 @@
</description>
<!-- set global properties for this build -->
<property name="artifactId" value="mssql-jdbc"/>
<property name="version" value="6.1.1"/>
<property name="version" value="6.1.2"/>

<property name="src" location="src/main/java"/>
<property name="build" location="build"/>
<property name="test" location="src/test/java"/>
<property name="bvtTest" location="src/test/java/com/microsoft/sqlserver/jdbc/bvt/"/>
<property name="bvtTest_Classes" location="${build}/classes/test/bvt"/>

<!-- download dependencies -->
<ivy:resolve>
<dependency org="com.microsoft.azure" name="azure-keyvault" rev="0.9.7"/>
<dependency org="junit" name="junit" rev="4.12"/>
<dependency org="org.junit.platform" name="junit-platform-console" rev="1.0.0-M3"/>
<dependency org="org.junit.platform" name="junit-platform-commons" rev="1.0.0-M3"/>
<dependency org="org.junit.platform" name="junit-platform-engine" rev="1.0.0-M3"/>
<dependency org="org.junit.platform" name="junit-platform-launcher" rev="1.0.0-M3"/>
<dependency org="org.junit.platform" name="junit-platform-runner" rev="1.0.0-M3"/>
<dependency org="org.junit.platform" name="junit-platform-surefire-provider" rev="1.0.0-M3"/>
<dependency org="org.junit.jupiter" name="junit-jupiter-api" rev="5.0.0-M3"/>
<dependency org="org.junit.jupiter" name="junit-jupiter-engine" rev="5.0.0-M3"/>

</ivy:resolve>

<!-- retrieves all the dependencies of the resolve call to lib directory -->
@@ -96,7 +105,7 @@

<target name="compile_test"
description="compile the junit source">
<javac classpathref="${JDBC_VERSION}" srcdir="${test}"
<javac classpathref="${JDBC_VERSION}" srcdir="${bvtTest}"
destdir="${bvtTest_Classes}"
encoding="UTF-8"
source="${JAVA_VERSION}"
@@ -110,10 +119,10 @@
<param name="JAVA_VERSION" value="1.7"/>
<param name="JDBC_VERSION" value="test_classpath41"/>
</antcall>
<junit haltonfailure="true" printsummary="true" showoutput="true">
<junit haltonfailure="true" printsummary="true" showoutput="true" fork="true">
<formatter type="plain" usefile="false" />
<classpath><path refid="test_classpath41" /></classpath>
<test name="bvtTest"></test>
<test name="com.microsoft.sqlserver.jdbc.bvt.bvtTest"></test>
</junit>
</target>

@@ -122,10 +131,10 @@
<param name="JAVA_VERSION" value="1.8"/>
<param name="JDBC_VERSION" value="test_classpath42"/>
</antcall>
<junit haltonfailure="true" printsummary="true" showoutput="true">
<junit haltonfailure="true" printsummary="true" showoutput="true" fork="true">
<formatter type="plain" usefile="false" />
<classpath><path refid="test_classpath42" /></classpath>
<test name="bvtTest"></test>
<test name="com.microsoft.sqlserver.jdbc.bvt.bvtTest"></test>
</junit>
</target>

2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@

<groupId>com.microsoft.sqlserver</groupId>
<artifactId>mssql-jdbc</artifactId>
<version>6.1.1</version>
<version>6.1.2</version>

<packaging>jar</packaging>