Skip to content

Commit

Permalink
Fix: add classifier field of maven artifact
Browse files Browse the repository at this point in the history
  • Loading branch information
@claudio4j @squakez
claudio4j authored and squakez committed Feb 7, 2024
1 parent a80ea61 commit 6e3080c
Show file tree
Hide file tree
Showing 21 changed files with 473 additions and 106 deletions.
48 changes: 42 additions & 6 deletions config/crd/bases/camel.apache.org_builds.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -370,15 +370,21 @@ spec:
extension:
description: The Maven build extensions. See https://maven.apache.org/guides/mini/guide-using-extensions.html.
items:
description: MavenArtifact defines a GAV (Group:Artifact:Version)
description: MavenArtifact defines a GAV (Group:Artifact:Type:Version:Classifier)
Maven artifact.
properties:
artifactId:
description: Maven Artifact
type: string
classifier:
description: Maven Classifier
type: string
groupId:
description: Maven Group
type: string
type:
description: Maven Type
type: string
version:
description: Maven Version
type: string
Expand Down Expand Up @@ -637,15 +643,21 @@ spec:
properties:
dependencies:
items:
description: MavenArtifact defines a GAV (Group:Artifact:Version)
description: MavenArtifact defines a GAV (Group:Artifact:Type:Version:Classifier)
Maven artifact.
properties:
artifactId:
description: Maven Artifact
type: string
classifier:
description: Maven Classifier
type: string
groupId:
description: Maven Group
type: string
type:
description: Maven Type
type: string
version:
description: Maven Version
type: string
Expand All @@ -663,15 +675,21 @@ spec:
description: list of dependencies needed to run the
application
items:
description: MavenArtifact defines a GAV (Group:Artifact:Version)
description: MavenArtifact defines a GAV (Group:Artifact:Type:Version:Classifier)
Maven artifact.
properties:
artifactId:
description: Maven Artifact
type: string
classifier:
description: Maven Classifier
type: string
groupId:
description: Maven Group
type: string
type:
description: Maven Type
type: string
version:
description: Maven Version
type: string
Expand Down Expand Up @@ -1167,15 +1185,21 @@ spec:
extension:
description: The Maven build extensions. See https://maven.apache.org/guides/mini/guide-using-extensions.html.
items:
description: MavenArtifact defines a GAV (Group:Artifact:Version)
description: MavenArtifact defines a GAV (Group:Artifact:Type:Version:Classifier)
Maven artifact.
properties:
artifactId:
description: Maven Artifact
type: string
classifier:
description: Maven Classifier
type: string
groupId:
description: Maven Group
type: string
type:
description: Maven Type
type: string
version:
description: Maven Version
type: string
Expand Down Expand Up @@ -1434,15 +1458,21 @@ spec:
properties:
dependencies:
items:
description: MavenArtifact defines a GAV (Group:Artifact:Version)
description: MavenArtifact defines a GAV (Group:Artifact:Type:Version:Classifier)
Maven artifact.
properties:
artifactId:
description: Maven Artifact
type: string
classifier:
description: Maven Classifier
type: string
groupId:
description: Maven Group
type: string
type:
description: Maven Type
type: string
version:
description: Maven Version
type: string
Expand All @@ -1460,15 +1490,21 @@ spec:
description: list of dependencies needed to run the
application
items:
description: MavenArtifact defines a GAV (Group:Artifact:Version)
description: MavenArtifact defines a GAV (Group:Artifact:Type:Version:Classifier)
Maven artifact.
properties:
artifactId:
description: Maven Artifact
type: string
classifier:
description: Maven Classifier
type: string
groupId:
description: Maven Group
type: string
type:
description: Maven Type
type: string
version:
description: Maven Version
type: string
Expand Down
54 changes: 51 additions & 3 deletions config/crd/bases/camel.apache.org_camelcatalogs.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,9 @@ spec:
artifactId:
description: Maven Artifact
type: string
classifier:
description: Maven Classifier
type: string
dataformats:
description: accepted data formats
items:
Expand All @@ -98,6 +101,9 @@ spec:
artifactId:
description: Maven Artifact
type: string
classifier:
description: Maven Classifier
type: string
exclusions:
description: provide a list of artifacts to exclude for
this dependency
Expand All @@ -119,6 +125,9 @@ spec:
groupId:
description: Maven Group
type: string
type:
description: Maven Type
type: string
version:
description: Maven Version
type: string
Expand Down Expand Up @@ -179,6 +188,9 @@ spec:
artifactId:
description: Maven Artifact
type: string
classifier:
description: Maven Classifier
type: string
exclusions:
description: provide a list of artifacts to
exclude for this dependency
Expand All @@ -200,6 +212,9 @@ spec:
groupId:
description: Maven Group
type: string
type:
description: Maven Type
type: string
version:
description: Maven Version
type: string
Expand Down Expand Up @@ -231,6 +246,9 @@ spec:
artifactId:
description: Maven Artifact
type: string
classifier:
description: Maven Classifier
type: string
exclusions:
description: provide a list of artifacts to
exclude for this dependency
Expand All @@ -252,6 +270,9 @@ spec:
groupId:
description: Maven Group
type: string
type:
description: Maven Type
type: string
version:
description: Maven Version
type: string
Expand All @@ -267,6 +288,9 @@ spec:
- passive
type: object
type: array
type:
description: Maven Type
type: string
version:
description: Maven Version
type: string
Expand All @@ -284,19 +308,28 @@ spec:
artifactId:
description: Maven Artifact
type: string
classifier:
description: Maven Classifier
type: string
dependencies:
description: a list of additional dependencies required beside
the base one
items:
description: MavenArtifact defines a GAV (Group:Artifact:Version)
description: MavenArtifact defines a GAV (Group:Artifact:Type:Version:Classifier)
Maven artifact.
properties:
artifactId:
description: Maven Artifact
type: string
classifier:
description: Maven Classifier
type: string
groupId:
description: Maven Group
type: string
type:
description: Maven Type
type: string
version:
description: Maven Version
type: string
Expand All @@ -318,6 +351,9 @@ spec:
type: string
description: the metadata of the loader
type: object
type:
description: Maven Type
type: string
version:
description: Maven Version
type: string
Expand All @@ -341,15 +377,21 @@ spec:
properties:
dependencies:
items:
description: MavenArtifact defines a GAV (Group:Artifact:Version)
description: MavenArtifact defines a GAV (Group:Artifact:Type:Version:Classifier)
Maven artifact.
properties:
artifactId:
description: Maven Artifact
type: string
classifier:
description: Maven Classifier
type: string
groupId:
description: Maven Group
type: string
type:
description: Maven Type
type: string
version:
description: Maven Version
type: string
Expand All @@ -366,15 +408,21 @@ spec:
dependencies:
description: list of dependencies needed to run the application
items:
description: MavenArtifact defines a GAV (Group:Artifact:Version)
description: MavenArtifact defines a GAV (Group:Artifact:Type:Version:Classifier)
Maven artifact.
properties:
artifactId:
description: Maven Artifact
type: string
classifier:
description: Maven Classifier
type: string
groupId:
description: Maven Group
type: string
type:
description: Maven Type
type: string
version:
description: Maven Version
type: string
Expand Down
16 changes: 14 additions & 2 deletions config/crd/bases/camel.apache.org_integrationplatforms.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,15 +195,21 @@ spec:
extension:
description: The Maven build extensions. See https://maven.apache.org/guides/mini/guide-using-extensions.html.
items:
description: MavenArtifact defines a GAV (Group:Artifact:Version)
description: MavenArtifact defines a GAV (Group:Artifact:Type:Version:Classifier)
Maven artifact.
properties:
artifactId:
description: Maven Artifact
type: string
classifier:
description: Maven Classifier
type: string
groupId:
description: Maven Group
type: string
type:
description: Maven Type
type: string
version:
description: Maven Version
type: string
Expand Down Expand Up @@ -2007,15 +2013,21 @@ spec:
extension:
description: The Maven build extensions. See https://maven.apache.org/guides/mini/guide-using-extensions.html.
items:
description: MavenArtifact defines a GAV (Group:Artifact:Version)
description: MavenArtifact defines a GAV (Group:Artifact:Type:Version:Classifier)
Maven artifact.
properties:
artifactId:
description: Maven Artifact
type: string
classifier:
description: Maven Classifier
type: string
groupId:
description: Maven Group
type: string
type:
description: Maven Type
type: string
version:
description: Maven Version
type: string
Expand Down
16 changes: 15 additions & 1 deletion docs/modules/ROOT/partials/apis/camel-k-crds.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3918,7 +3918,7 @@ Language represents a supported language (Camel DSL).
* <<#_camel_apache_org_v1_MavenSpec, MavenSpec>>
* <<#_camel_apache_org_v1_RuntimeSpec, RuntimeSpec>>
MavenArtifact defines a GAV (Group:Artifact:Version) Maven artifact.
MavenArtifact defines a GAV (Group:Artifact:Type:Version:Classifier) Maven artifact.
[cols="2,2a",options="header"]
|===
Expand All @@ -3939,13 +3939,27 @@ string
Maven Artifact
|`type` +
string
|
Maven Type
|`version` +
string
|
Maven Version
|`classifier` +
string
|
Maven Classifier
|===
Expand Down
Loading

0 comments on commit 6e3080c

Please sign in to comment.