This is an automated email from the ASF dual-hosted git repository.
martijnvisser pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/flink-connector-kafka.git
commit ff1d3c738c8e989365c82ad9a25ffddf97b59ae6
Author: Martijn Visser <mvis...@confluent.io>
AuthorDate: Fri Feb 10 16:18:00 2023 +0100
[hotfix] Update Archunit to 1.0.0. This currently sets
`archRule.failOnEmptyShould = false` to let the build pass.
As a follow-up, we should consider further splitting up the Archunit rules
and connectors only using rules that actually apply to some class of the
connector.
---
...08947b3037 => 27a0a5e4-29c2-4069-b381-952746c90862} | 0
...99914abdb5 => 3030609a-c417-456d-af43-1799a4445197} | 0
...2a0e2d42cb => 3b06cb2f-1036-4d54-a358-c37f163611ee} | 0
...927c65fccf => 4b58b35e-f9cd-43dc-a664-7af4fa8ec2d0} | 0
...76ca0cd052 => 511f0c00-adea-49a2-98f7-c4597ee714ee} | 0
...0feb4ba679 => 5b7ce6b8-e525-400c-935f-81a09bc7f0fe} | 0
...f5edaba284 => 6182d789-a081-4f26-b3f4-24a22bc1f248} | 0
...99914abdb5 => 661bd4bd-792c-4ba4-af39-87b7d16dcf75} | 0
...99914abdb5 => 690729ae-756f-4ccc-831b-2667db3fdae5} | 0
...99914abdb5 => 8511d84b-cbaa-4b54-9e3e-895926935dd7} | 0
...76ca0cd052 => 86dfd459-67a9-4b26-9b5c-0b0bbf22681a} | 0
...08947b3037 => b5eddef1-75c6-44b3-b5d5-387aa4fb9d4d} | 0
...99914abdb5 => cdd3929e-b7bc-4541-a0ae-46ed4fbb2001} | 0
...921c0f4761 => d853eb69-8c04-4246-9a5e-4f5911286b1d} | 0
...921c0f4761 => e0624cac-4ea1-4bf8-879a-ecedb41ce334} | 0
...99914abdb5 => f5cd467c-4694-4798-9e9a-cf7946b31265} | 0
flink-connector-kafka/archunit-violations/stored.rules | 18 +++++++++---------
.../src/test/resources/archunit.properties | 4 +++-
pom.xml | 2 +-
19 files changed, 13 insertions(+), 11 deletions(-)
diff --git
a/flink-connector-kafka/archunit-violations/56338f7a-0a43-48b3-bd49-d608947b3037
b/flink-connector-kafka/archunit-violations/27a0a5e4-29c2-4069-b381-952746c90862
similarity index 100%
copy from
flink-connector-kafka/archunit-violations/56338f7a-0a43-48b3-bd49-d608947b3037
copy to
flink-connector-kafka/archunit-violations/27a0a5e4-29c2-4069-b381-952746c90862
diff --git
a/flink-connector-kafka/archunit-violations/07901255-6093-4231-89df-dc99914abdb5
b/flink-connector-kafka/archunit-violations/3030609a-c417-456d-af43-1799a4445197
similarity index 100%
copy from
flink-connector-kafka/archunit-violations/07901255-6093-4231-89df-dc99914abdb5
copy to
flink-connector-kafka/archunit-violations/3030609a-c417-456d-af43-1799a4445197
diff --git
a/flink-connector-kafka/archunit-violations/6da4051b-51c1-4d58-b142-b92a0e2d42cb
b/flink-connector-kafka/archunit-violations/3b06cb2f-1036-4d54-a358-c37f163611ee
similarity index 100%
rename from
flink-connector-kafka/archunit-violations/6da4051b-51c1-4d58-b142-b92a0e2d42cb
rename to
flink-connector-kafka/archunit-violations/3b06cb2f-1036-4d54-a358-c37f163611ee
diff --git
a/flink-connector-kafka/archunit-violations/8248e31e-b706-4471-bb65-4c927c65fccf
b/flink-connector-kafka/archunit-violations/4b58b35e-f9cd-43dc-a664-7af4fa8ec2d0
similarity index 100%
rename from
flink-connector-kafka/archunit-violations/8248e31e-b706-4471-bb65-4c927c65fccf
rename to
flink-connector-kafka/archunit-violations/4b58b35e-f9cd-43dc-a664-7af4fa8ec2d0
diff --git
a/flink-connector-kafka/archunit-violations/97dda445-f6bc-43e2-8106-5876ca0cd052
b/flink-connector-kafka/archunit-violations/511f0c00-adea-49a2-98f7-c4597ee714ee
similarity index 100%
copy from
flink-connector-kafka/archunit-violations/97dda445-f6bc-43e2-8106-5876ca0cd052
copy to
flink-connector-kafka/archunit-violations/511f0c00-adea-49a2-98f7-c4597ee714ee
diff --git
a/flink-connector-kafka/archunit-violations/ad23edc8-a42b-46e5-902a-b70feb4ba679
b/flink-connector-kafka/archunit-violations/5b7ce6b8-e525-400c-935f-81a09bc7f0fe
similarity index 100%
rename from
flink-connector-kafka/archunit-violations/ad23edc8-a42b-46e5-902a-b70feb4ba679
rename to
flink-connector-kafka/archunit-violations/5b7ce6b8-e525-400c-935f-81a09bc7f0fe
diff --git
a/flink-connector-kafka/archunit-violations/c64cc609-1ef6-4087-a9e2-2ff5edaba284
b/flink-connector-kafka/archunit-violations/6182d789-a081-4f26-b3f4-24a22bc1f248
similarity index 100%
rename from
flink-connector-kafka/archunit-violations/c64cc609-1ef6-4087-a9e2-2ff5edaba284
rename to
flink-connector-kafka/archunit-violations/6182d789-a081-4f26-b3f4-24a22bc1f248
diff --git
a/flink-connector-kafka/archunit-violations/07901255-6093-4231-89df-dc99914abdb5
b/flink-connector-kafka/archunit-violations/661bd4bd-792c-4ba4-af39-87b7d16dcf75
similarity index 100%
copy from
flink-connector-kafka/archunit-violations/07901255-6093-4231-89df-dc99914abdb5
copy to
flink-connector-kafka/archunit-violations/661bd4bd-792c-4ba4-af39-87b7d16dcf75
diff --git
a/flink-connector-kafka/archunit-violations/07901255-6093-4231-89df-dc99914abdb5
b/flink-connector-kafka/archunit-violations/690729ae-756f-4ccc-831b-2667db3fdae5
similarity index 100%
copy from
flink-connector-kafka/archunit-violations/07901255-6093-4231-89df-dc99914abdb5
copy to
flink-connector-kafka/archunit-violations/690729ae-756f-4ccc-831b-2667db3fdae5
diff --git
a/flink-connector-kafka/archunit-violations/07901255-6093-4231-89df-dc99914abdb5
b/flink-connector-kafka/archunit-violations/8511d84b-cbaa-4b54-9e3e-895926935dd7
similarity index 100%
copy from
flink-connector-kafka/archunit-violations/07901255-6093-4231-89df-dc99914abdb5
copy to
flink-connector-kafka/archunit-violations/8511d84b-cbaa-4b54-9e3e-895926935dd7
diff --git
a/flink-connector-kafka/archunit-violations/97dda445-f6bc-43e2-8106-5876ca0cd052
b/flink-connector-kafka/archunit-violations/86dfd459-67a9-4b26-9b5c-0b0bbf22681a
similarity index 100%
rename from
flink-connector-kafka/archunit-violations/97dda445-f6bc-43e2-8106-5876ca0cd052
rename to
flink-connector-kafka/archunit-violations/86dfd459-67a9-4b26-9b5c-0b0bbf22681a
diff --git
a/flink-connector-kafka/archunit-violations/56338f7a-0a43-48b3-bd49-d608947b3037
b/flink-connector-kafka/archunit-violations/b5eddef1-75c6-44b3-b5d5-387aa4fb9d4d
similarity index 100%
rename from
flink-connector-kafka/archunit-violations/56338f7a-0a43-48b3-bd49-d608947b3037
rename to
flink-connector-kafka/archunit-violations/b5eddef1-75c6-44b3-b5d5-387aa4fb9d4d
diff --git
a/flink-connector-kafka/archunit-violations/07901255-6093-4231-89df-dc99914abdb5
b/flink-connector-kafka/archunit-violations/cdd3929e-b7bc-4541-a0ae-46ed4fbb2001
similarity index 100%
copy from
flink-connector-kafka/archunit-violations/07901255-6093-4231-89df-dc99914abdb5
copy to
flink-connector-kafka/archunit-violations/cdd3929e-b7bc-4541-a0ae-46ed4fbb2001
diff --git
a/flink-connector-kafka/archunit-violations/c4173e5c-1e1d-4b91-ba87-de921c0f4761
b/flink-connector-kafka/archunit-violations/d853eb69-8c04-4246-9a5e-4f5911286b1d
similarity index 100%
copy from
flink-connector-kafka/archunit-violations/c4173e5c-1e1d-4b91-ba87-de921c0f4761
copy to
flink-connector-kafka/archunit-violations/d853eb69-8c04-4246-9a5e-4f5911286b1d
diff --git
a/flink-connector-kafka/archunit-violations/c4173e5c-1e1d-4b91-ba87-de921c0f4761
b/flink-connector-kafka/archunit-violations/e0624cac-4ea1-4bf8-879a-ecedb41ce334
similarity index 100%
rename from
flink-connector-kafka/archunit-violations/c4173e5c-1e1d-4b91-ba87-de921c0f4761
rename to
flink-connector-kafka/archunit-violations/e0624cac-4ea1-4bf8-879a-ecedb41ce334
diff --git
a/flink-connector-kafka/archunit-violations/07901255-6093-4231-89df-dc99914abdb5
b/flink-connector-kafka/archunit-violations/f5cd467c-4694-4798-9e9a-cf7946b31265
similarity index 100%
rename from
flink-connector-kafka/archunit-violations/07901255-6093-4231-89df-dc99914abdb5
rename to
flink-connector-kafka/archunit-violations/f5cd467c-4694-4798-9e9a-cf7946b31265
diff --git a/flink-connector-kafka/archunit-violations/stored.rules
b/flink-connector-kafka/archunit-violations/stored.rules
index 146ddcc..3721990 100644
--- a/flink-connector-kafka/archunit-violations/stored.rules
+++ b/flink-connector-kafka/archunit-violations/stored.rules
@@ -1,10 +1,10 @@
#
-#Fri Dec 09 05:12:03 PST 2022
-Return\ and\ argument\ types\ of\ methods\ annotated\ with\ @Public\ must\ be\
annotated\ with\ @Public.=07901255-6093-4231-89df-dc99914abdb5
-Connector\ production\ code\ must\ not\ depend\ on\ non-public\ API\ outside\
of\ connector\ packages=c64cc609-1ef6-4087-a9e2-2ff5edaba284
-ITCASE\ tests\ should\ use\ a\ MiniCluster\ resource\ or\
extension=97dda445-f6bc-43e2-8106-5876ca0cd052
-Production\ code\ must\ not\ call\ methods\ annotated\ with\
@VisibleForTesting=56338f7a-0a43-48b3-bd49-d608947b3037
-Tests\ inheriting\ from\ AbstractTestBase\ should\ have\ name\ ending\ with\
ITCase=8248e31e-b706-4471-bb65-4c927c65fccf
-Options\ for\ connectors\ and\ formats\ should\ reside\ in\ a\ consistent\
package\ and\ be\ public\ API.=ad23edc8-a42b-46e5-902a-b70feb4ba679
-Return\ and\ argument\ types\ of\ methods\ annotated\ with\ @PublicEvolving\
must\ be\ annotated\ with\
@Public(Evolving).=c4173e5c-1e1d-4b91-ba87-de921c0f4761
-Classes\ in\ API\ packages\ should\ have\ at\ least\ one\ API\ visibility\
annotation.=6da4051b-51c1-4d58-b142-b92a0e2d42cb
+#Fri Feb 10 21:57:58 CET 2023
+Return\ and\ argument\ types\ of\ methods\ annotated\ with\ @Public\ must\ be\
annotated\ with\ @Public.=690729ae-756f-4ccc-831b-2667db3fdae5
+Connector\ production\ code\ must\ not\ depend\ on\ non-public\ API\ outside\
of\ connector\ packages=3030609a-c417-456d-af43-1799a4445197
+ITCASE\ tests\ should\ use\ a\ MiniCluster\ resource\ or\
extension=86dfd459-67a9-4b26-9b5c-0b0bbf22681a
+Production\ code\ must\ not\ call\ methods\ annotated\ with\
@VisibleForTesting=27a0a5e4-29c2-4069-b381-952746c90862
+Options\ for\ connectors\ and\ formats\ should\ reside\ in\ a\ consistent\
package\ and\ be\ public\ API.=3b06cb2f-1036-4d54-a358-c37f163611ee
+Tests\ inheriting\ from\ AbstractTestBase\ should\ have\ name\ ending\ with\
ITCase=cdd3929e-b7bc-4541-a0ae-46ed4fbb2001
+Return\ and\ argument\ types\ of\ methods\ annotated\ with\ @PublicEvolving\
must\ be\ annotated\ with\
@Public(Evolving).=d853eb69-8c04-4246-9a5e-4f5911286b1d
+Classes\ in\ API\ packages\ should\ have\ at\ least\ one\ API\ visibility\
annotation.=661bd4bd-792c-4ba4-af39-87b7d16dcf75
diff --git a/flink-connector-kafka/src/test/resources/archunit.properties
b/flink-connector-kafka/src/test/resources/archunit.properties
index 15be88c..8c7a451 100644
--- a/flink-connector-kafka/src/test/resources/archunit.properties
+++ b/flink-connector-kafka/src/test/resources/archunit.properties
@@ -17,7 +17,7 @@
#
# By default we allow removing existing violations, but fail when new
violations are added.
-freeze.store.default.allowStoreUpdate=true
+#freeze.store.default.allowStoreUpdate=true
# Enable this if a new (frozen) rule has been added in order to create the
initial store and record the existing violations.
#freeze.store.default.allowStoreCreation=true
@@ -29,3 +29,5 @@ freeze.store.default.allowStoreUpdate=true
#freeze.refreeze=true
freeze.store.default.path=archunit-violations
+
+archRule.failOnEmptyShould = false
diff --git a/pom.xml b/pom.xml
index bbe068b..c7f5fd9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,7 @@ under the License.
<junit4.version>4.13.2</junit4.version>
<junit5.version>5.9.1</junit5.version>
<assertj.version>3.23.1</assertj.version>
- <archunit.version>0.22.0</archunit.version>
+ <archunit.version>1.0.0</archunit.version>
<testcontainers.version>1.17.2</testcontainers.version>
<mockito.version>3.4.6</mockito.version>
<hamcrest.version>1.3</hamcrest.version>
