This is an automated email from the ASF dual-hosted git repository.
martijnvisser pushed a commit to branch v3.0
in repository https://gitbox.apache.org/repos/asf/flink-connector-rabbitmq.git
commit 75292d0ac2524aee0ffc95ddf4d266891fe92254
Author: Martijn Visser <mvis...@confluent.io>
AuthorDate: Mon Apr 3 14:21:10 2023 +0200
[FLINK-31701][Connector/RabbitMQ] Upgrade Archunit to 1.0.0
This upgrade is necessary because Flink 1.17 is upgraded to 1.0.0 too.
Upgrading this requires to add `archRule.failOnEmptyShould = false` and then
once run with `freeze.store.default.allowStoreCreation=true` before disabling
this again. This recreates the initial store with archunit violations which can
be used by Archunit 1.0.0
(cherry picked from commit 2c0afa421ac74ce70b8a48ddc82bea62745bb122)
---
...40a17ab23e => 54a3d1fc-24ac-4bdc-bf15-56e8d7831aed} | 0
...2ea364a2e4 => 675cade4-c44e-4b2b-aacf-0c23d2032e4a} | 0
...f8e4826fe7 => 6fdbfe74-a937-4a8a-8e1b-9f0a3391f3fe} | 0
...820f00de12 => 7f91844b-8c84-41e0-af5f-0554eae1f7a3} | 0
...7354a43ccb => 871721c9-4c5f-4523-b8f6-a419e8a0085f} | 0
...800dd0d530 => deb59a69-6a64-49f2-8aa3-84985ee63d70} | 0
...e9ce4ee776 => f67f70fc-4a24-448c-a247-354e7ce69167} | 0
...40f96d22f8 => f968a79f-e5e4-4d60-b360-f03ce1b4e6d4} | 0
.../archunit-violations/stored.rules | 18 +++++++++---------
.../src/test/resources/archunit.properties | 3 +++
pom.xml | 2 +-
11 files changed, 13 insertions(+), 10 deletions(-)
diff --git
a/flink-connector-rabbitmq/archunit-violations/22086d11-ddf8-434e-96c5-fa40a17ab23e
b/flink-connector-rabbitmq/archunit-violations/54a3d1fc-24ac-4bdc-bf15-56e8d7831aed
similarity index 100%
rename from
flink-connector-rabbitmq/archunit-violations/22086d11-ddf8-434e-96c5-fa40a17ab23e
rename to
flink-connector-rabbitmq/archunit-violations/54a3d1fc-24ac-4bdc-bf15-56e8d7831aed
diff --git
a/flink-connector-rabbitmq/archunit-violations/5a2e5113-39c5-4eb6-909f-112ea364a2e4
b/flink-connector-rabbitmq/archunit-violations/675cade4-c44e-4b2b-aacf-0c23d2032e4a
similarity index 100%
rename from
flink-connector-rabbitmq/archunit-violations/5a2e5113-39c5-4eb6-909f-112ea364a2e4
rename to
flink-connector-rabbitmq/archunit-violations/675cade4-c44e-4b2b-aacf-0c23d2032e4a
diff --git
a/flink-connector-rabbitmq/archunit-violations/621a723f-8a32-41f8-b2a5-9af8e4826fe7
b/flink-connector-rabbitmq/archunit-violations/6fdbfe74-a937-4a8a-8e1b-9f0a3391f3fe
similarity index 100%
rename from
flink-connector-rabbitmq/archunit-violations/621a723f-8a32-41f8-b2a5-9af8e4826fe7
rename to
flink-connector-rabbitmq/archunit-violations/6fdbfe74-a937-4a8a-8e1b-9f0a3391f3fe
diff --git
a/flink-connector-rabbitmq/archunit-violations/812e4273-9fd1-4c6b-8c29-26820f00de12
b/flink-connector-rabbitmq/archunit-violations/7f91844b-8c84-41e0-af5f-0554eae1f7a3
similarity index 100%
rename from
flink-connector-rabbitmq/archunit-violations/812e4273-9fd1-4c6b-8c29-26820f00de12
rename to
flink-connector-rabbitmq/archunit-violations/7f91844b-8c84-41e0-af5f-0554eae1f7a3
diff --git
a/flink-connector-rabbitmq/archunit-violations/307488e0-e1a9-4cf2-b553-927354a43ccb
b/flink-connector-rabbitmq/archunit-violations/871721c9-4c5f-4523-b8f6-a419e8a0085f
similarity index 100%
rename from
flink-connector-rabbitmq/archunit-violations/307488e0-e1a9-4cf2-b553-927354a43ccb
rename to
flink-connector-rabbitmq/archunit-violations/871721c9-4c5f-4523-b8f6-a419e8a0085f
diff --git
a/flink-connector-rabbitmq/archunit-violations/8c639c33-2f7a-4162-8b5d-de800dd0d530
b/flink-connector-rabbitmq/archunit-violations/deb59a69-6a64-49f2-8aa3-84985ee63d70
similarity index 100%
rename from
flink-connector-rabbitmq/archunit-violations/8c639c33-2f7a-4162-8b5d-de800dd0d530
rename to
flink-connector-rabbitmq/archunit-violations/deb59a69-6a64-49f2-8aa3-84985ee63d70
diff --git
a/flink-connector-rabbitmq/archunit-violations/c24c7b04-08c8-464c-b627-44e9ce4ee776
b/flink-connector-rabbitmq/archunit-violations/f67f70fc-4a24-448c-a247-354e7ce69167
similarity index 100%
rename from
flink-connector-rabbitmq/archunit-violations/c24c7b04-08c8-464c-b627-44e9ce4ee776
rename to
flink-connector-rabbitmq/archunit-violations/f67f70fc-4a24-448c-a247-354e7ce69167
diff --git
a/flink-connector-rabbitmq/archunit-violations/d421b256-1055-4fec-a856-2a40f96d22f8
b/flink-connector-rabbitmq/archunit-violations/f968a79f-e5e4-4d60-b360-f03ce1b4e6d4
similarity index 100%
rename from
flink-connector-rabbitmq/archunit-violations/d421b256-1055-4fec-a856-2a40f96d22f8
rename to
flink-connector-rabbitmq/archunit-violations/f968a79f-e5e4-4d60-b360-f03ce1b4e6d4
diff --git a/flink-connector-rabbitmq/archunit-violations/stored.rules
b/flink-connector-rabbitmq/archunit-violations/stored.rules
index 903aa92..14d465e 100644
--- a/flink-connector-rabbitmq/archunit-violations/stored.rules
+++ b/flink-connector-rabbitmq/archunit-violations/stored.rules
@@ -1,10 +1,10 @@
#
-#Tue Dec 13 10:12:23 CET 2022
-Return\ and\ argument\ types\ of\ methods\ annotated\ with\ @Public\ must\ be\
annotated\ with\ @Public.=c24c7b04-08c8-464c-b627-44e9ce4ee776
-Connector\ production\ code\ must\ not\ depend\ on\ non-public\ API\ outside\
of\ connector\ packages=812e4273-9fd1-4c6b-8c29-26820f00de12
-ITCASE\ tests\ should\ use\ a\ MiniCluster\ resource\ or\
extension=621a723f-8a32-41f8-b2a5-9af8e4826fe7
-Production\ code\ must\ not\ call\ methods\ annotated\ with\
@VisibleForTesting=d421b256-1055-4fec-a856-2a40f96d22f8
-Tests\ inheriting\ from\ AbstractTestBase\ should\ have\ name\ ending\ with\
ITCase=22086d11-ddf8-434e-96c5-fa40a17ab23e
-Options\ for\ connectors\ and\ formats\ should\ reside\ in\ a\ consistent\
package\ and\ be\ public\ API.=8c639c33-2f7a-4162-8b5d-de800dd0d530
-Return\ and\ argument\ types\ of\ methods\ annotated\ with\ @PublicEvolving\
must\ be\ annotated\ with\
@Public(Evolving).=307488e0-e1a9-4cf2-b553-927354a43ccb
-Classes\ in\ API\ packages\ should\ have\ at\ least\ one\ API\ visibility\
annotation.=5a2e5113-39c5-4eb6-909f-112ea364a2e4
+#Mon Apr 03 14:18:47 CEST 2023
+Return\ and\ argument\ types\ of\ methods\ annotated\ with\ @Public\ must\ be\
annotated\ with\ @Public.=f67f70fc-4a24-448c-a247-354e7ce69167
+Connector\ production\ code\ must\ not\ depend\ on\ non-public\ API\ outside\
of\ connector\ packages=deb59a69-6a64-49f2-8aa3-84985ee63d70
+ITCASE\ tests\ should\ use\ a\ MiniCluster\ resource\ or\
extension=6fdbfe74-a937-4a8a-8e1b-9f0a3391f3fe
+Production\ code\ must\ not\ call\ methods\ annotated\ with\
@VisibleForTesting=f968a79f-e5e4-4d60-b360-f03ce1b4e6d4
+Options\ for\ connectors\ and\ formats\ should\ reside\ in\ a\ consistent\
package\ and\ be\ public\ API.=7f91844b-8c84-41e0-af5f-0554eae1f7a3
+Tests\ inheriting\ from\ AbstractTestBase\ should\ have\ name\ ending\ with\
ITCase=675cade4-c44e-4b2b-aacf-0c23d2032e4a
+Return\ and\ argument\ types\ of\ methods\ annotated\ with\ @PublicEvolving\
must\ be\ annotated\ with\
@Public(Evolving).=871721c9-4c5f-4523-b8f6-a419e8a0085f
+Classes\ in\ API\ packages\ should\ have\ at\ least\ one\ API\ visibility\
annotation.=54a3d1fc-24ac-4bdc-bf15-56e8d7831aed
diff --git a/flink-connector-rabbitmq/src/test/resources/archunit.properties
b/flink-connector-rabbitmq/src/test/resources/archunit.properties
index 15be88c..bcd0408 100644
--- a/flink-connector-rabbitmq/src/test/resources/archunit.properties
+++ b/flink-connector-rabbitmq/src/test/resources/archunit.properties
@@ -29,3 +29,6 @@ freeze.store.default.allowStoreUpdate=true
#freeze.refreeze=true
freeze.store.default.path=archunit-violations
+
+# To allow all rules to be evaluated without checking any classes you can set
the following property
+archRule.failOnEmptyShould = false
diff --git a/pom.xml b/pom.xml
index cc7ae65..11afffb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,7 +52,7 @@ under the License.
<junit5.version>5.8.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>2.21.0</mockito.version>
<hamcrest.version>1.3</hamcrest.version>
