Skip to content

Commit

Permalink
Remove the option to set the camel version apache#1229
Browse files Browse the repository at this point in the history
  • Loading branch information
@lburgazzoli
lburgazzoli committed Feb 3, 2020
1 parent 1fc3a88 commit 607101b
Show file tree
Hide file tree
Showing 62 changed files with 2,745 additions and 7,359 deletions.
113 changes: 90 additions & 23 deletions assets/json-schema/CamelCatalog.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,9 +167,9 @@
},
"CamelCatalogSpec": {
"required": [
"version",
"runtimeVersion",
"artifacts"
"runtime",
"artifacts",
"loaders"
],
"properties": {
"artifacts": {
Expand All @@ -181,24 +181,58 @@
},
"type": "object"
},
"runtimeProvider": {
"loaders": {
"patternProperties": {
".*": {
"$schema": "http://json-schema.org/draft-04/schema#",
"$ref": "#/definitions/CamelLoader"
}
},
"type": "object"
},
"runtime": {
"$schema": "http://json-schema.org/draft-04/schema#",
"$ref": "#/definitions/RuntimeProvider"
"$ref": "#/definitions/RuntimeSpec"
}
},
"additionalProperties": false,
"type": "object"
},
"CamelCatalogStatus": {
"additionalProperties": false,
"type": "object"
},
"CamelLoader": {
"required": [
"groupId",
"artifactId"
],
"properties": {
"artifactId": {
"type": "string"
},
"runtimeVersion": {
"dependencies": {
"items": {
"$ref": "#/definitions/MavenArtifact"
},
"type": "array"
},
"groupId": {
"type": "string"
},
"languages": {
"items": {
"type": "string"
},
"type": "array"
},
"version": {
"type": "string"
}
},
"additionalProperties": false,
"type": "object"
},
"CamelCatalogStatus": {
"additionalProperties": false,
"type": "object"
},
"CamelScheme": {
"required": [
"id",
Expand Down Expand Up @@ -248,6 +282,25 @@
"additionalProperties": false,
"type": "object"
},
"MavenArtifact": {
"required": [
"groupId",
"artifactId"
],
"properties": {
"artifactId": {
"type": "string"
},
"groupId": {
"type": "string"
},
"version": {
"type": "string"
}
},
"additionalProperties": false,
"type": "object"
},
"OwnerReference": {
"required": [
"apiVersion",
Expand Down Expand Up @@ -278,28 +331,42 @@
"additionalProperties": false,
"type": "object"
},
"QuarkusRuntimeProvider": {
"RuntimeSpec": {
"required": [
"version",
"provider",
"applicationClass",
"dependencies"
],
"properties": {
"camelQuarkusVersion": {
"applicationClass": {
"type": "string"
},
"dependencies": {
"items": {
"$schema": "http://json-schema.org/draft-04/schema#",
"$ref": "#/definitions/MavenArtifact"
},
"type": "array"
},
"metadata": {
"patternProperties": {
".*": {
"type": "string"
}
},
"type": "object"
},
"provider": {
"type": "string"
},
"quarkusVersion": {
"version": {
"type": "string"
}
},
"additionalProperties": false,
"type": "object"
},
"RuntimeProvider": {
"properties": {
"quarkus": {
"$schema": "http://json-schema.org/draft-04/schema#",
"$ref": "#/definitions/QuarkusRuntimeProvider"
}
},
"additionalProperties": false,
"type": "object"
},
"Time": {
"additionalProperties": false,
"type": "object"
Expand Down
28 changes: 1 addition & 27 deletions assets/json-schema/Integration.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -243,9 +243,6 @@
},
"IntegrationStatus": {
"properties": {
"camelVersion": {
"type": "string"
},
"conditions": {
"items": {
"$schema": "http://json-schema.org/draft-04/schema#",
Expand Down Expand Up @@ -303,8 +300,7 @@
"type": "integer"
},
"runtimeProvider": {
"$schema": "http://json-schema.org/draft-04/schema#",
"$ref": "#/definitions/RuntimeProvider"
"type": "string"
},
"runtimeVersion": {
"type": "string"
Expand Down Expand Up @@ -371,18 +367,6 @@
"additionalProperties": false,
"type": "object"
},
"QuarkusRuntimeProvider": {
"properties": {
"camelQuarkusVersion": {
"type": "string"
},
"quarkusVersion": {
"type": "string"
}
},
"additionalProperties": false,
"type": "object"
},
"ResourceSpec": {
"properties": {
"compression": {
Expand Down Expand Up @@ -410,16 +394,6 @@
"additionalProperties": false,
"type": "object"
},
"RuntimeProvider": {
"properties": {
"quarkus": {
"$schema": "http://json-schema.org/draft-04/schema#",
"$ref": "#/definitions/QuarkusRuntimeProvider"
}
},
"additionalProperties": false,
"type": "object"
},
"SourceSpec": {
"properties": {
"compression": {
Expand Down
28 changes: 1 addition & 27 deletions assets/json-schema/IntegrationKit.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -251,9 +251,6 @@
"baseImage": {
"type": "string"
},
"camelVersion": {
"type": "string"
},
"conditions": {
"items": {
"$schema": "http://json-schema.org/draft-04/schema#",
Expand All @@ -278,8 +275,7 @@
"type": "string"
},
"runtimeProvider": {
"$schema": "http://json-schema.org/draft-04/schema#",
"$ref": "#/definitions/RuntimeProvider"
"type": "string"
},
"runtimeVersion": {
"type": "string"
Expand Down Expand Up @@ -346,28 +342,6 @@
"additionalProperties": false,
"type": "object"
},
"QuarkusRuntimeProvider": {
"properties": {
"camelQuarkusVersion": {
"type": "string"
},
"quarkusVersion": {
"type": "string"
}
},
"additionalProperties": false,
"type": "object"
},
"RuntimeProvider": {
"properties": {
"quarkus": {
"$schema": "http://json-schema.org/draft-04/schema#",
"$ref": "#/definitions/QuarkusRuntimeProvider"
}
},
"additionalProperties": false,
"type": "object"
},
"Time": {
"additionalProperties": false,
"type": "object"
Expand Down
85 changes: 19 additions & 66 deletions build/maven/pom-catalog.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,73 +26,26 @@
<artifactId>camel-k-catalog-generator</artifactId>
<version>1.0.0</version>

<build>
<defaultGoal>generate-resources</defaultGoal>
<plugins>
<plugin>
<groupId>org.apache.camel.k</groupId>
<artifactId>camel-k-maven-plugin</artifactId>
<version>${runtime.version}</version>
<executions>
<execution>
<id>generate-catalog</id>
<goals>
<goal>generate-catalog</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>main</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<build>
<defaultGoal>generate-resources</defaultGoal>
<plugins>
<plugin>
<groupId>org.apache.camel.k</groupId>
<artifactId>camel-k-maven-plugin</artifactId>
<version>${runtime.version}</version>
<executions>
<execution>
<id>generate-catalog</id>
<goals>
<goal>generate-catalog</goal>
</goals>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-catalog</artifactId>
<version>${camel.version}</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>quarkus</id>
<build>
<defaultGoal>generate-resources</defaultGoal>
<plugins>
<plugin>
<groupId>org.apache.camel.k</groupId>
<artifactId>camel-k-maven-plugin</artifactId>
<version>${runtime.version}</version>
<executions>
<execution>
<id>generate-catalog</id>
<goals>
<goal>generate-catalog</goal>
</goals>
</execution>
</executions>
<dependencies>
<!-- The Camel dependency version is driven by Camel Quarkus -->
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-catalog-quarkus</artifactId>
<version>${camel-quarkus.version}</version>
</dependency>
<!-- This is required to retrieve the Quarkus dependency version -->
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-core</artifactId>
<version>${camel-quarkus.version}</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>staging</id>
<activation>
Expand Down
Loading

0 comments on commit 607101b

Please sign in to comment.