Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
33 changes: 1 addition & 32 deletions google-cloud-bigquery/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
</parent>
<properties>
<site.installationModule>google-cloud-bigquery</site.installationModule>
<netty.version>4.1.119.Final</netty.version>
</properties>
<dependencies>
<dependency>
Expand Down Expand Up @@ -117,37 +116,6 @@
<dependency>
<groupId>org.apache.arrow</groupId>
<artifactId>arrow-memory-netty</artifactId>
<!--
Due to JDK8 requirement, we are forced to use arrow version below v18
which has io.netty:netty-common a dep. and its vulnerabilities
-->
<exclusions>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-common</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
</exclusion>
</exclusions>
<scope>runtime</scope>
</dependency>
<!--
Define io.netty versions to override org.apache.arrow:arrow-memory-netty
transitive dependency versions which contains vulnerabilities.
-->
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-common</artifactId>
<version>${netty.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
<version>${netty.version}</version>
<scope>runtime</scope>
</dependency>

<!-- auto-value creates a class that uses an annotation from error_prone_annotations -->
Expand Down Expand Up @@ -290,6 +258,7 @@
<fork>true</fork>
<compilerArgs>
<arg>-J--add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED</arg>
<arg>-J--add-opens=java.base/java.nio=java-base,ALL-UNNAMED</arg>
</compilerArgs>
</configuration>
</plugin>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,62 @@
"name":"java.nio.DirectByteBuffer",
"methods":[{"name":"<init>","parameterTypes":["long","int"] }]
},

{
"name":"org.apache.arrow.memory.BaseAllocator",
"allDeclaredFields":true,
"queryAllDeclaredFields":true,
"queryAllDeclaredMethods":true,
"queryAllDeclaredConstructors":true
},
{
"name":"org.apache.arrow.memory.BaseAllocator$Config",
"allDeclaredFields":true,
"queryAllDeclaredFields":true,
"queryAllDeclaredMethods":true,
"queryAllDeclaredConstructors":true
},
{
"name":"org.apache.arrow.memory.DefaultAllocationManagerOption",
"allDeclaredFields":true,
"queryAllDeclaredFields":true,
"queryAllDeclaredMethods":true,
"queryAllDeclaredConstructors":true
},
{
"name":"org.apache.arrow.memory.netty.NettyAllocationManager$1",
"allDeclaredFields":true,
"queryAllDeclaredFields":true,
"queryAllDeclaredMethods":true,
"queryAllDeclaredConstructors":true
},
{
"name":"org.apache.arrow.memory.netty.DefaultAllocationManagerFactory",
"allDeclaredFields":true,
"queryAllDeclaredFields":true,
"queryAllDeclaredMethods":true,
"queryAllDeclaredConstructors":true
},
{
"name":"org.apache.arrow.memory.DefaultAllocationManagerFactory",
"allDeclaredFields":true,
"queryAllDeclaredFields":true,
"queryAllDeclaredMethods":true,
"queryAllDeclaredConstructors":true
},
{
"name":"org.apache.arrow.memory.RootAllocator",
"allDeclaredFields":true,
"queryAllDeclaredFields":true,
"queryAllDeclaredMethods":true,
"queryAllDeclaredConstructors":true
},
{
"name":"org.apache.arrow.memory.DefaultAllocationManagerFactory",
"fields":[{"name":"FACTORY"}]
"allDeclaredFields":true,
"queryAllDeclaredFields":true,
"queryAllDeclaredMethods":true,
"queryAllDeclaredConstructors":true
},
{
"name":"org.apache.arrow.vector.types.pojo.ArrowType",
Expand All @@ -50,6 +103,18 @@
"allDeclaredFields":true,
"queryAllDeclaredMethods":true
},
{
"name": "org.apache.arrow.vector.types.pojo.DictionaryEncoding",
"allDeclaredFields": true
},
{
"name": "org.apache.arrow.vector.types.pojo.Field",
"allDeclaredFields": true
},
{
"name": "org.apache.arrow.vector.types.pojo.Schema",
"allDeclaredFields": true
},
{
"name":"io.netty.buffer.AbstractReferenceCountedByteBuf",
"fields":[{"name":"refCnt"}]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,26 @@
{
"resources":{
"includes":[{
"pattern":"\\Qorg/apache/arrow/memory/DefaultAllocationManagerFactory.class\\E"
}]}
"includes":[
{
"pattern":"\\Qorg/apache/arrow/memory/DefaultAllocationManagerFactory.class\\E"
},
{
"pattern":"\\Qorg/apache/arrow/memory/netty/DefaultAllocationManagerFactory.class\\E"
},
{
"pattern":"\\Qorg/apache/arrow/memory/unsafe/DefaultAllocationManagerFactory.class\\E"
}
]
},
"globs":[
{
"glob": "org/apache/arrow/memory/DefaultAllocationManagerFactory.class"
},
{
"glob": "org/apache/arrow/memory/netty/DefaultAllocationManagerFactory.class"
},
{
"glob": "org/apache/arrow/memory/unsafe/DefaultAllocationManagerFactory.class"
}
]
}
Loading