Skip to content

Commit c45ad0e

Browse files
committed
Merge branch 'main' into PR #3083 to update
2 parents 4e871df + cca8649 commit c45ad0e

File tree

7 files changed

+521
-3
lines changed

7 files changed

+521
-3
lines changed

google-cloud-bigquerystorage-bom/pom.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,13 @@
116116
<skip>true</skip>
117117
</configuration>
118118
</plugin>
119+
<plugin>
120+
<groupId>org.codehaus.mojo</groupId>
121+
<artifactId>exec-maven-plugin</artifactId>
122+
<configuration>
123+
<skip>true</skip>
124+
</configuration>
125+
</plugin>
119126
</plugins>
120127
</build>
121128
</project>

pom.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,15 @@
190190
</plugin>
191191
</plugins>
192192
</pluginManagement>
193+
<plugins>
194+
<plugin>
195+
<groupId>org.codehaus.mojo</groupId>
196+
<artifactId>exec-maven-plugin</artifactId>
197+
<configuration>
198+
<skip>true</skip>
199+
</configuration>
200+
</plugin>
201+
</plugins>
193202
</build>
194203

195204
<modules>

samples/install-without-bom/pom.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<groupId>com.google.cloud.samples</groupId>
1616
<artifactId>shared-configuration</artifactId>
1717
<version>1.2.2</version>
18+
<relativePath/>
1819
</parent>
1920

2021
<properties>
@@ -31,7 +32,7 @@
3132
<dependency>
3233
<groupId>com.google.cloud</groupId>
3334
<artifactId>google-cloud-bigquerystorage</artifactId>
34-
<version>3.16.1</version>
35+
<version>3.17.2</version>
3536
</dependency>
3637
<!-- [END bigquerystorage_install_without_bom] -->
3738

@@ -55,6 +56,11 @@
5556
<artifactId>arrow-memory-netty</artifactId>
5657
<version>${arrow.version}</version>
5758
</dependency>
59+
<dependency>
60+
<groupId>org.apache.arrow</groupId>
61+
<artifactId>arrow-memory-core</artifactId>
62+
<version>${arrow.version}</version>
63+
</dependency>
5864
<dependency>
5965
<groupId>io.opentelemetry</groupId>
6066
<artifactId>opentelemetry-exporter-logging</artifactId>

samples/pom.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,13 @@
5151
<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
5252
</configuration>
5353
</plugin>
54+
<plugin>
55+
<groupId>org.codehaus.mojo</groupId>
56+
<artifactId>exec-maven-plugin</artifactId>
57+
<configuration>
58+
<skip>true</skip>
59+
</configuration>
60+
</plugin>
5461
</plugins>
5562
</build>
5663
</project>

samples/snippets/pom.xml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<groupId>com.google.cloud.samples</groupId>
1616
<artifactId>shared-configuration</artifactId>
1717
<version>1.2.2</version>
18+
<relativePath/>
1819
</parent>
1920

2021
<properties>
@@ -32,7 +33,7 @@
3233
<dependency>
3334
<groupId>com.google.cloud</groupId>
3435
<artifactId>libraries-bom</artifactId>
35-
<version>26.65.0</version>
36+
<version>26.70.0</version>
3637
<type>pom</type>
3738
<scope>import</scope>
3839
</dependency>
@@ -42,7 +43,7 @@
4243
<version>1.52.0</version>
4344
<type>pom</type>
4445
<scope>import</scope>
45-
</dependency>
46+
</dependency>
4647
</dependencies>
4748
</dependencyManagement>
4849

@@ -73,6 +74,11 @@
7374
<artifactId>arrow-memory-netty</artifactId>
7475
<version>${arrow.version}</version>
7576
</dependency>
77+
<dependency>
78+
<groupId>org.apache.arrow</groupId>
79+
<artifactId>arrow-memory-core</artifactId>
80+
<version>${arrow.version}</version>
81+
</dependency>
7682
<dependency>
7783
<groupId>io.opentelemetry</groupId>
7884
<artifactId>opentelemetry-exporter-logging</artifactId>

0 commit comments

Comments
 (0)