From a64c1a99ba85d787a75820789496f6ccb8beb670 Mon Sep 17 00:00:00 2001 From: Steve Hawkins Date: Wed, 25 Oct 2023 08:42:36 -0400 Subject: [PATCH] task: moves the crd annotations into generator annotations closes #5429 --- CHANGELOG.md | 1 + .../java/io/fabric8/crd/generator/annotation/Annotations.java | 0 .../main/java/io/fabric8/crd/generator/annotation/Labels.java | 0 .../fabric8/crd/generator/annotation/PreserveUnknownFields.java | 0 .../java/io/fabric8/crd/generator/annotation/PrinterColumn.java | 0 .../java/io/fabric8/crd/generator/annotation/SchemaFrom.java | 0 .../java/io/fabric8/crd/generator/annotation/SchemaSwap.java | 0 .../java/io/fabric8/crd/generator/annotation/SchemaSwaps.java | 0 8 files changed, 1 insertion(+) rename {crd-generator/api => generator-annotations}/src/main/java/io/fabric8/crd/generator/annotation/Annotations.java (100%) rename {crd-generator/api => generator-annotations}/src/main/java/io/fabric8/crd/generator/annotation/Labels.java (100%) rename {crd-generator/api => generator-annotations}/src/main/java/io/fabric8/crd/generator/annotation/PreserveUnknownFields.java (100%) rename {crd-generator/api => generator-annotations}/src/main/java/io/fabric8/crd/generator/annotation/PrinterColumn.java (100%) rename {crd-generator/api => generator-annotations}/src/main/java/io/fabric8/crd/generator/annotation/SchemaFrom.java (100%) rename {crd-generator/api => generator-annotations}/src/main/java/io/fabric8/crd/generator/annotation/SchemaSwap.java (100%) rename {crd-generator/api => generator-annotations}/src/main/java/io/fabric8/crd/generator/annotation/SchemaSwaps.java (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 671dc0fc9a2..bc48998eb81 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ #### Bugs #### Improvements +* Fix #5429: moved crd generator annotations to generator-annotations instead of crd-generator-api. Using generator-annotations introduces no transitive dependencies. * Fix #5535: Add lombok and sundrio dependencies to the generated bom #### Dependency Upgrade diff --git a/crd-generator/api/src/main/java/io/fabric8/crd/generator/annotation/Annotations.java b/generator-annotations/src/main/java/io/fabric8/crd/generator/annotation/Annotations.java similarity index 100% rename from crd-generator/api/src/main/java/io/fabric8/crd/generator/annotation/Annotations.java rename to generator-annotations/src/main/java/io/fabric8/crd/generator/annotation/Annotations.java diff --git a/crd-generator/api/src/main/java/io/fabric8/crd/generator/annotation/Labels.java b/generator-annotations/src/main/java/io/fabric8/crd/generator/annotation/Labels.java similarity index 100% rename from crd-generator/api/src/main/java/io/fabric8/crd/generator/annotation/Labels.java rename to generator-annotations/src/main/java/io/fabric8/crd/generator/annotation/Labels.java diff --git a/crd-generator/api/src/main/java/io/fabric8/crd/generator/annotation/PreserveUnknownFields.java b/generator-annotations/src/main/java/io/fabric8/crd/generator/annotation/PreserveUnknownFields.java similarity index 100% rename from crd-generator/api/src/main/java/io/fabric8/crd/generator/annotation/PreserveUnknownFields.java rename to generator-annotations/src/main/java/io/fabric8/crd/generator/annotation/PreserveUnknownFields.java diff --git a/crd-generator/api/src/main/java/io/fabric8/crd/generator/annotation/PrinterColumn.java b/generator-annotations/src/main/java/io/fabric8/crd/generator/annotation/PrinterColumn.java similarity index 100% rename from crd-generator/api/src/main/java/io/fabric8/crd/generator/annotation/PrinterColumn.java rename to generator-annotations/src/main/java/io/fabric8/crd/generator/annotation/PrinterColumn.java diff --git a/crd-generator/api/src/main/java/io/fabric8/crd/generator/annotation/SchemaFrom.java b/generator-annotations/src/main/java/io/fabric8/crd/generator/annotation/SchemaFrom.java similarity index 100% rename from crd-generator/api/src/main/java/io/fabric8/crd/generator/annotation/SchemaFrom.java rename to generator-annotations/src/main/java/io/fabric8/crd/generator/annotation/SchemaFrom.java diff --git a/crd-generator/api/src/main/java/io/fabric8/crd/generator/annotation/SchemaSwap.java b/generator-annotations/src/main/java/io/fabric8/crd/generator/annotation/SchemaSwap.java similarity index 100% rename from crd-generator/api/src/main/java/io/fabric8/crd/generator/annotation/SchemaSwap.java rename to generator-annotations/src/main/java/io/fabric8/crd/generator/annotation/SchemaSwap.java diff --git a/crd-generator/api/src/main/java/io/fabric8/crd/generator/annotation/SchemaSwaps.java b/generator-annotations/src/main/java/io/fabric8/crd/generator/annotation/SchemaSwaps.java similarity index 100% rename from crd-generator/api/src/main/java/io/fabric8/crd/generator/annotation/SchemaSwaps.java rename to generator-annotations/src/main/java/io/fabric8/crd/generator/annotation/SchemaSwaps.java