Skip to content

Commit 016f09d

Browse files
pxLipxLi
authored
Fix auto merge conflict 11948 [skip ci] (#11952)
resolve merge conflict at #11948 this must be merged as `create a merge commit`
2 parents de91bc0 + c787510 commit 016f09d

File tree

49 files changed

+56
-51
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+56
-51
lines changed

‎CHANGELOG.md

+8-3

‎aggregator/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Copyright (c) 2021-2024, NVIDIA CORPORATION.
3+
Copyright (c) 2021-2025, NVIDIA CORPORATION.
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.

‎api_validation/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Copyright (c) 2020-2024, NVIDIA CORPORATION.
3+
Copyright (c) 2020-2025, NVIDIA CORPORATION.
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.

‎datagen/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Copyright (c) 2023-2024 NVIDIA CORPORATION.
3+
Copyright (c) 2023-2025 NVIDIA CORPORATION.
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.

‎delta-lake/delta-20x/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Copyright (c) 2023-2024 NVIDIA CORPORATION.
3+
Copyright (c) 2023-2025 NVIDIA CORPORATION.
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.

‎delta-lake/delta-21x/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Copyright (c) 2023-2024 NVIDIA CORPORATION.
3+
Copyright (c) 2023-2025 NVIDIA CORPORATION.
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.

‎delta-lake/delta-22x/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Copyright (c) 2023-2024 NVIDIA CORPORATION.
3+
Copyright (c) 2023-2025 NVIDIA CORPORATION.
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.

‎delta-lake/delta-23x/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Copyright (c) 2023-2024 NVIDIA CORPORATION.
3+
Copyright (c) 2023-2025 NVIDIA CORPORATION.
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.

‎delta-lake/delta-24x/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Copyright (c) 2023-2024 NVIDIA CORPORATION.
3+
Copyright (c) 2023-2025 NVIDIA CORPORATION.
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.

‎delta-lake/delta-spark330db/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Copyright (c) 2023-2024 NVIDIA CORPORATION.
3+
Copyright (c) 2023-2025 NVIDIA CORPORATION.
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.

‎delta-lake/delta-spark332db/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Copyright (c) 2023-2024 NVIDIA CORPORATION.
3+
Copyright (c) 2023-2025 NVIDIA CORPORATION.
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.

‎delta-lake/delta-spark341db/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Copyright (c) 2023-2024 NVIDIA CORPORATION.
3+
Copyright (c) 2023-2025 NVIDIA CORPORATION.
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.

‎delta-lake/delta-spark350db143/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Copyright (c) 2023-2024 NVIDIA CORPORATION.
3+
Copyright (c) 2023-2025 NVIDIA CORPORATION.
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.

‎delta-lake/delta-stub/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Copyright (c) 2023-2024 NVIDIA CORPORATION.
3+
Copyright (c) 2023-2025 NVIDIA CORPORATION.
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.

‎integration_tests/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Copyright (c) 2020-2024, NVIDIA CORPORATION.
3+
Copyright (c) 2020-2025, NVIDIA CORPORATION.
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.

‎jdk-profiles/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Copyright (c) 2023-2024 NVIDIA CORPORATION.
3+
Copyright (c) 2023-2025 NVIDIA CORPORATION.
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.

‎jenkins/databricks/create.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2020-2024, NVIDIA CORPORATION.
1+
# Copyright (c) 2020-2025, NVIDIA CORPORATION.
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.

‎jenkins/version-def.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22
#
3-
# Copyright (c) 2020-2024, NVIDIA CORPORATION. All rights reserved.
3+
# Copyright (c) 2020-2025, NVIDIA CORPORATION. All rights reserved.
44
#
55
# Licensed under the Apache License, Version 2.0 (the "License");
66
# you may not use this file except in compliance with the License.

‎scala2.13/aggregator/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Copyright (c) 2021-2024, NVIDIA CORPORATION.
3+
Copyright (c) 2021-2025, NVIDIA CORPORATION.
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.

‎scala2.13/api_validation/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Copyright (c) 2020-2024, NVIDIA CORPORATION.
3+
Copyright (c) 2020-2025, NVIDIA CORPORATION.
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.

‎scala2.13/datagen/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Copyright (c) 2023-2024 NVIDIA CORPORATION.
3+
Copyright (c) 2023-2025 NVIDIA CORPORATION.
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.

‎scala2.13/delta-lake/delta-20x/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Copyright (c) 2023-2024 NVIDIA CORPORATION.
3+
Copyright (c) 2023-2025 NVIDIA CORPORATION.
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.

‎scala2.13/delta-lake/delta-21x/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Copyright (c) 2023-2024 NVIDIA CORPORATION.
3+
Copyright (c) 2023-2025 NVIDIA CORPORATION.
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.

‎scala2.13/delta-lake/delta-22x/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Copyright (c) 2023-2024 NVIDIA CORPORATION.
3+
Copyright (c) 2023-2025 NVIDIA CORPORATION.
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.

‎scala2.13/delta-lake/delta-23x/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Copyright (c) 2023-2024 NVIDIA CORPORATION.
3+
Copyright (c) 2023-2025 NVIDIA CORPORATION.
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.

‎scala2.13/delta-lake/delta-24x/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Copyright (c) 2023-2024 NVIDIA CORPORATION.
3+
Copyright (c) 2023-2025 NVIDIA CORPORATION.
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.

‎scala2.13/delta-lake/delta-spark330db/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Copyright (c) 2023-2024 NVIDIA CORPORATION.
3+
Copyright (c) 2023-2025 NVIDIA CORPORATION.
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.

‎scala2.13/delta-lake/delta-spark332db/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Copyright (c) 2023-2024 NVIDIA CORPORATION.
3+
Copyright (c) 2023-2025 NVIDIA CORPORATION.
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.

‎scala2.13/delta-lake/delta-spark341db/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Copyright (c) 2023-2024 NVIDIA CORPORATION.
3+
Copyright (c) 2023-2025 NVIDIA CORPORATION.
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.

‎scala2.13/delta-lake/delta-spark350db143/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Copyright (c) 2023-2024 NVIDIA CORPORATION.
3+
Copyright (c) 2023-2025 NVIDIA CORPORATION.
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.

‎scala2.13/delta-lake/delta-stub/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Copyright (c) 2023-2024 NVIDIA CORPORATION.
3+
Copyright (c) 2023-2025 NVIDIA CORPORATION.
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.

‎scala2.13/integration_tests/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Copyright (c) 2020-2024, NVIDIA CORPORATION.
3+
Copyright (c) 2020-2025, NVIDIA CORPORATION.
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.

‎scala2.13/jdk-profiles/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Copyright (c) 2023-2024 NVIDIA CORPORATION.
3+
Copyright (c) 2023-2025 NVIDIA CORPORATION.
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.

‎scala2.13/shim-deps/cloudera/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Copyright (c) 2023-2024 NVIDIA CORPORATION.
3+
Copyright (c) 2023-2025 NVIDIA CORPORATION.
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.

‎scala2.13/shim-deps/databricks/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Copyright (c) 2023-2024 NVIDIA CORPORATION.
3+
Copyright (c) 2023-2025 NVIDIA CORPORATION.
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.

‎scala2.13/shim-deps/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Copyright (c) 2023-2024 NVIDIA CORPORATION.
3+
Copyright (c) 2023-2025 NVIDIA CORPORATION.
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.

‎scala2.13/shuffle-plugin/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Copyright (c) 2020-2024, NVIDIA CORPORATION.
3+
Copyright (c) 2020-2025, NVIDIA CORPORATION.
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.

‎scala2.13/sql-plugin-api/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Copyright (c) 2023-2024 NVIDIA CORPORATION.
3+
Copyright (c) 2023-2025 NVIDIA CORPORATION.
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.

‎scala2.13/tests/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Copyright (c) 2020-2024, NVIDIA CORPORATION.
3+
Copyright (c) 2020-2025, NVIDIA CORPORATION.
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.

‎scala2.13/udf-compiler/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Copyright (c) 2020-2024, NVIDIA CORPORATION.
3+
Copyright (c) 2020-2025, NVIDIA CORPORATION.
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.

‎shim-deps/cloudera/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Copyright (c) 2023-2024 NVIDIA CORPORATION.
3+
Copyright (c) 2023-2025 NVIDIA CORPORATION.
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.

‎shim-deps/databricks/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Copyright (c) 2023-2024 NVIDIA CORPORATION.
3+
Copyright (c) 2023-2025 NVIDIA CORPORATION.
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.

‎shim-deps/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Copyright (c) 2023-2024 NVIDIA CORPORATION.
3+
Copyright (c) 2023-2025 NVIDIA CORPORATION.
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.

‎shuffle-plugin/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Copyright (c) 2020-2024, NVIDIA CORPORATION.
3+
Copyright (c) 2020-2025, NVIDIA CORPORATION.
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.

‎sql-plugin-api/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Copyright (c) 2023-2024 NVIDIA CORPORATION.
3+
Copyright (c) 2023-2025 NVIDIA CORPORATION.
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.

‎sql-plugin-api/src/main/scala/com/nvidia/spark/rapids/ShimLoader.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2020-2024, NVIDIA CORPORATION.
2+
* Copyright (c) 2020-2025, NVIDIA CORPORATION.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)