Merge remote-tracking branch 'origin/develop' into develop.next · microsoft/azure-tools-for-java@2936d8c · GitHub
Skip to content

Commit 2936d8c

Browse files
wangmingliang-mswangmingliang-ms
committed
Merge remote-tracking branch 'origin/develop' into develop.next
2 parents 7e4d451 + d57366f commit 2936d8c

18 files changed

Lines changed: 118 additions & 24 deletions

File tree

‎PluginsAndFeatures/AddLibrary/JDBCLibrary/JavaEE6/com.microsoft.sqljdbc4.feature/feature.xml‎

Lines changed: 3 additions & 3 deletions

‎PluginsAndFeatures/AddLibrary/JDBCLibrary/JavaEE6/com.microsoft.sqljdbc4.feature/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010
<version>${azuretool.eclipse.version}</version>
1111
</parent>
1212
<artifactId>com.microsoft.sqljdbc4.feature</artifactId>
13-
<version>9.4.0.jre8</version>
13+
<version>10.2.4.jre11</version>
1414
<packaging>eclipse-feature</packaging>
1515
</project>

‎PluginsAndFeatures/AddLibrary/JDBCLibrary/JavaEE6/com.microsoft.sqljdbc4.ui/META-INF/MANIFEST.MF‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
3-
Bundle-Name: Microsoft JDBC Driver 9.4 for SQL Server UI
3+
Bundle-Name: Microsoft JDBC Driver 10.2 for SQL Server UI
44
Bundle-SymbolicName: com.microsoft.sqljdbc4.ui;singleton:=true
5-
Bundle-Version: 9.4.0.jre8
5+
Bundle-Version: 10.2.4.jre11
66
Bundle-Activator: com.microsoft.sqljdbc4.ui.activator.Activator
77
Bundle-Vendor: Microsoft Corp.
88
Require-Bundle: org.eclipse.ui,

‎PluginsAndFeatures/AddLibrary/JDBCLibrary/JavaEE6/com.microsoft.sqljdbc4.ui/plugin.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
page.name=Microsoft JDBC Driver 9.4 for SQL Server
1+
page.name=Microsoft JDBC Driver 10.2 for SQL Server

‎PluginsAndFeatures/AddLibrary/JDBCLibrary/JavaEE6/com.microsoft.sqljdbc4.ui/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010
<version>${azuretool.eclipse.version}</version>
1111
</parent>
1212
<artifactId>com.microsoft.sqljdbc4.ui</artifactId>
13-
<version>9.4.0.jre8</version>
13+
<version>10.2.4.jre11</version>
1414
<packaging>eclipse-plugin</packaging>
1515
</project>

‎PluginsAndFeatures/AddLibrary/JDBCLibrary/JavaEE6/com.microsoft.sqljdbc4.ui/src/main/java/com/microsoft/sqljdbc4/ui/classpath/messages.properties‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
containerDesc=Microsoft JDBC Driver 9.4 for SQL Server
2-
desc=Add the Microsoft JDBC Driver 9.4 for SQL Server to your build path.
1+
containerDesc=Microsoft JDBC Driver 10.2 for SQL Server
2+
desc=Add the Microsoft JDBC Driver 10.2 for SQL Server to your build path.
33
excp=Exception in getClasspathEntries
44
lblLocation=Location:
55
lblVersion=Version:
66
libNotAvail=Library is not available.
77
notFound=Not found
88
sdkContainer=com.microsoft.sqljdbc4.DRIVER_JAVAEE6
99
sdkID=com.microsoft.sqljdbc4
10-
sdkJar=target/lib/mssql-jdbc-9.4.0.jre8.jar
11-
title=Microsoft JDBC Driver 9.4 for SQL Server
10+
sdkJar=target/lib/mssql-jdbc-10.2.4.jre11.jar
11+
title=Microsoft JDBC Driver 10.2 for SQL Server
1212
verNotAvail=The selected version is not available.
13-
version1=Microsoft JDBC Driver 9.4 for SQL Server, version %s.%s.%s
14-
version2=Microsoft JDBC Driver 9.4 for SQL Server, version %s
13+
version1=Microsoft JDBC Driver 10.2 for SQL Server, version %s.%s.%s
14+
version2=Microsoft JDBC Driver 10.2 for SQL Server, version %s
1515
depChkBox=Include in the project deployment assembly
1616
jstDep=org.eclipse.jst.component.dependency
1717
edtLbr=Edit Library

‎PluginsAndFeatures/AddLibrary/JDBCLibrary/JavaEE6/com.microsoft.sqljdbc4/META-INF/MANIFEST.MF‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
3-
Bundle-Name: Microsoft JDBC Driver 9.4 for SQL Server Library
3+
Bundle-Name: Microsoft JDBC Driver 10.2 for SQL Server Library
44
Bundle-SymbolicName: com.microsoft.sqljdbc4
5-
Bundle-Version: 9.4.0.jre8
6-
Bundle-ClassPath: target/lib/mssql-jdbc-9.4.0.jre8.jar
5+
Bundle-Version: 10.2.4.jre11
6+
Bundle-ClassPath: target/lib/mssql-jdbc-10.2.4.jre11.jar
77
Bundle-Vendor: Microsoft Corp.
88
Export-Package: com.microsoft.sqlserver.jdbc,
99
microsoft.sql

‎PluginsAndFeatures/AddLibrary/JDBCLibrary/JavaEE6/com.microsoft.sqljdbc4/build.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
bin.includes = META-INF/,\
2-
target/lib/mssql-jdbc-9.4.0.jre8.jar
2+
target/lib/mssql-jdbc-10.2.4.jre11.jar

‎PluginsAndFeatures/AddLibrary/JDBCLibrary/JavaEE6/com.microsoft.sqljdbc4/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
<version>${azuretool.eclipse.version}</version>
1111
</parent>
1212
<artifactId>com.microsoft.sqljdbc4</artifactId>
13-
<version>9.4.0.jre8</version>
13+
<version>10.2.4.jre11</version>
1414
<packaging>eclipse-plugin</packaging>
1515
<dependencies>
1616
<dependency>
1717
<groupId>com.microsoft.sqlserver</groupId>
1818
<artifactId>mssql-jdbc</artifactId>
19-
<version>9.4.0.jre8</version>
19+
<version>10.2.4.jre11</version>
2020
</dependency>
2121
</dependencies>
2222
<build>

‎PluginsAndFeatures/azure-toolkit-for-eclipse/WindowsAzurePlugin4EJ/category.xml‎

Lines changed: 1 addition & 1 deletion

0 commit comments

Comments
 (0)