fix (extensions/tekton) : Clashing package names in trigger model dependencies (#5113)

CHANGELOG.md

@@ -10,6 +10,7 @@
 * Fix #5293: Ensured the mock server uses only generic or JsonNode parsing
 * Fix #5298: Prevent requests needing authentication from causing a 403 response
 * Fix #5327: Ensured that the informer reconnect task terminates after client close
+* Fix #5113: Clashing package names in trigger model dependencies
 
 #### Improvements
 * Fix #5166: Remove opinionated messages from Config's `errorMessages` and deprecate it

extensions/tekton/generator-triggers/cmd/generate/generate-v1alpha1.go

@@ -51,6 +51,10 @@ func main() {
 		"k8s.io/api/core/v1":                                     "io.fabric8.kubernetes.api.model",
 		"k8s.io/apimachinery/pkg/apis/meta/v1":                   "io.fabric8.kubernetes.api.model",
 		"github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1": "io.fabric8.tekton.pipeline.v1beta1",
+		"knative.dev/pkg/apis/duck/v1":                           "io.fabric8.knative.internal.pkg.apis.duck.v1",
+		"knative.dev/pkg/apis/duck/v1alpha1":                     "io.fabric8.knative.internal.pkg.apis.duck.v1alpha1",
+		"knative.dev/pkg/apis/duck/v1beta1":                      "io.fabric8.knative.internal.pkg.apis.duck.v1beta1",
+		"knative.dev/pkg/apis":                                   "io.fabric8.knative.internal.pkg.apis",
 	}
 
 	// mapping of go packages of this module to the resulting java package
@@ -63,9 +67,7 @@ func main() {
 	//  - replace <key> with <value> aka "package prefix"
 	//  - replace '/' with '.' for a valid java package name
 	// e.g. github.com/tektoncd/pipeline/pkg/apis/pipeline/pod/Template is mapped to "io.fabric8.tekton.internal.pipeline.pkg.apis.pipeline.pod.Template"
-	mappingSchema := map[string]string{
-		"knative.dev": "io.fabric8.tekton.triggers.internal.knative",
-	}
+	mappingSchema := map[string]string{}
 
 	// overwriting some types
 	manualTypeMap := map[reflect.Type]string{

extensions/tekton/generator-triggers/cmd/generate/generate-v1beta1.go

@@ -49,6 +49,10 @@ func main() {
 		"k8s.io/api/core/v1":                                     "io.fabric8.kubernetes.api.model",
 		"k8s.io/apimachinery/pkg/apis/meta/v1":                   "io.fabric8.kubernetes.api.model",
 		"github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1": "io.fabric8.tekton.pipeline.v1beta1",
+		"knative.dev/pkg/apis/duck/v1":                           "io.fabric8.knative.internal.pkg.apis.duck.v1",
+		"knative.dev/pkg/apis/duck/v1alpha1":                     "io.fabric8.knative.internal.pkg.apis.duck.v1alpha1",
+		"knative.dev/pkg/apis/duck/v1beta1":                      "io.fabric8.knative.internal.pkg.apis.duck.v1beta1",
+		"knative.dev/pkg/apis":                                   "io.fabric8.knative.internal.pkg.apis",
 	}
 
 	// mapping of go packages of this module to the resulting java package
@@ -61,9 +65,7 @@ func main() {
 	//  - replace <key> with <value> aka "package prefix"
 	//  - replace '/' with '.' for a valid java package name
 	// e.g. github.com/tektoncd/pipeline/pkg/apis/pipeline/pod/Template is mapped to "io.fabric8.tekton.internal.pipeline.pkg.apis.pipeline.pod.Template"
-	mappingSchema := map[string]string{
-		"knative.dev": "io.fabric8.tekton.triggers.internal.knative",
-	}
+	mappingSchema := map[string]string{}
 
 	// overwriting some types
 	manualTypeMap := map[reflect.Type]string{

extensions/tekton/model-triggers-v1alpha1/pom.xml

@@ -37,7 +37,8 @@
       *
     </osgi.import>
     <osgi.export>
-      io.fabric8.tekton.*
+      io.fabric8.tekton.*,
+      io.fabric8.knative.internal.pkg.apis.*
     </osgi.export>
   </properties>