You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by fl...@apache.org on 2020/06/09 10:46:22 UTC
[tinkerpop] branch master updated (ec18b3e -> b08630b)
This is an automated email from the ASF dual-hosted git repository.
florianhockmann pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git.
from ec18b3e Merge branch '3.4-dev'
add 1e9eda7 TINKERPOP-2288 Replace closed connections directly
add f51cdfa Merge branch 'TINKERPOP-2288' into 3.4-dev
new b08630b Merge branch '3.4-dev'
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
docs/src/reference/gremlin-variants.asciidoc | 4 +
docs/src/upgrade/release-3.4.x.asciidoc | 8 +
gremlin-dotnet/glv/Gremlin.Net.csproj.template | 1 +
.../src/Gremlin.Net/Driver/ConnectionFactory.cs | 4 +-
.../src/Gremlin.Net/Driver/ConnectionPool.cs | 135 +++++++++----
.../Gremlin.Net/Driver/ConnectionPoolSettings.cs | 70 ++++++-
.../src/Gremlin.Net/Driver/GremlinClient.cs | 2 +-
.../src/Gremlin.Net/Driver/IConnection.cs | 4 +
.../Gremlin.Net/Driver/IConnectionFactory.cs} | 8 +-
.../src/Gremlin.Net/Driver/ProxyConnection.cs | 26 ++-
gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj | 1 +
.../src/Gremlin.Net/Properties/AssemblyInfo.cs | 3 +-
.../Driver/ConnectionPoolSettingsTests.cs | 19 ++
.../Driver/ConnectionPoolTests.cs | 216 +++++++++++++++++++++
14 files changed, 442 insertions(+), 59 deletions(-)
copy gremlin-dotnet/{test/Gremlin.Net.UnitTest/Structure/IO/GraphSON/TestClass.cs => src/Gremlin.Net/Driver/IConnectionFactory.cs} (85%)
create mode 100644 gremlin-dotnet/test/Gremlin.Net.UnitTest/Driver/ConnectionPoolTests.cs
[tinkerpop] 01/01: Merge branch '3.4-dev'
Posted by fl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
florianhockmann pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit b08630b9475d4b646af70f66d23ae22a751d4f3f
Merge: ec18b3e f51cdfa
Author: Florian Hockmann <fh...@florian-hockmann.de>
AuthorDate: Tue Jun 9 12:33:21 2020 +0200
Merge branch '3.4-dev'
docs/src/reference/gremlin-variants.asciidoc | 4 +
docs/src/upgrade/release-3.4.x.asciidoc | 8 +
gremlin-dotnet/glv/Gremlin.Net.csproj.template | 1 +
.../src/Gremlin.Net/Driver/ConnectionFactory.cs | 4 +-
.../src/Gremlin.Net/Driver/ConnectionPool.cs | 135 +++++++++----
.../Gremlin.Net/Driver/ConnectionPoolSettings.cs | 70 ++++++-
.../src/Gremlin.Net/Driver/GremlinClient.cs | 2 +-
.../src/Gremlin.Net/Driver/IConnection.cs | 4 +
.../{IConnection.cs => IConnectionFactory.cs} | 9 +-
.../src/Gremlin.Net/Driver/ProxyConnection.cs | 26 ++-
gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj | 1 +
.../src/Gremlin.Net/Properties/AssemblyInfo.cs | 3 +-
.../Driver/ConnectionPoolSettingsTests.cs | 19 ++
.../Driver/ConnectionPoolTests.cs | 216 +++++++++++++++++++++
14 files changed, 440 insertions(+), 62 deletions(-)
diff --cc gremlin-dotnet/glv/Gremlin.Net.csproj.template
index 3d6891d,aeb2df9..c7d27d1
--- a/gremlin-dotnet/glv/Gremlin.Net.csproj.template
+++ b/gremlin-dotnet/glv/Gremlin.Net.csproj.template
@@@ -61,11 -61,18 +61,12 @@@ NOTE that versions suffixed with "-rc"
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
- <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
+ <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+ <PackageReference Include="System.Text.Json" Version="4.7.1" />
<PackageReference Include="Microsoft.CSharp" Version="4.3.0" />
+ <PackageReference Include="Polly" Version="7.2.0" />
</ItemGroup>
- <ItemGroup Condition="'\$(TargetFramework)' == 'netstandard1.3'">
- <PackageReference Include="System.Net.WebSockets" Version="4.3.0" />
- <PackageReference Include="System.Net.WebSockets.Client" Version="4.3.2" />
- <PackageReference Include="System.Reflection.TypeExtensions" Version="4.3.0" />
- </ItemGroup>
-
<ItemGroup>
<None Include="../../LICENSE" Pack="true" PackagePath="" />
<None Include="../../NOTICE" Pack="true" PackagePath="" />
diff --cc gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
index 9eedc40,8926322..687f6ca
--- a/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
+++ b/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
@@@ -61,11 -61,18 +61,12 @@@ NOTE that versions suffixed with "-rc"
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
- <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
+ <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+ <PackageReference Include="System.Text.Json" Version="4.7.1" />
<PackageReference Include="Microsoft.CSharp" Version="4.3.0" />
+ <PackageReference Include="Polly" Version="7.2.0" />
</ItemGroup>
- <ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.3'">
- <PackageReference Include="System.Net.WebSockets" Version="4.3.0" />
- <PackageReference Include="System.Net.WebSockets.Client" Version="4.3.2" />
- <PackageReference Include="System.Reflection.TypeExtensions" Version="4.3.0" />
- </ItemGroup>
-
<ItemGroup>
<None Include="../../LICENSE" Pack="true" PackagePath="" />
<None Include="../../NOTICE" Pack="true" PackagePath="" />