Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Remove the option to set the camel version apache#1229
Browse files Browse the repository at this point in the history
lburgazzoli committed Jan 30, 2020
1 parent 1fc3a88 commit 668c6f6
Showing 50 changed files with 284 additions and 5,181 deletions.
41 changes: 18 additions & 23 deletions assets/json-schema/CamelCatalog.json
Original file line number Diff line number Diff line change
@@ -167,8 +167,7 @@
},
"CamelCatalogSpec": {
"required": [
"version",
"runtimeVersion",
"runtime",
"artifacts"
],
"properties": {
@@ -181,15 +180,9 @@
},
"type": "object"
},
"runtimeProvider": {
"runtime": {
"$schema": "http://json-schema.org/draft-04/schema#",
"$ref": "#/definitions/RuntimeProvider"
},
"runtimeVersion": {
"type": "string"
},
"version": {
"type": "string"
"$ref": "#/definitions/RuntimeSpec"
}
},
"additionalProperties": false,
@@ -278,28 +271,30 @@
"additionalProperties": false,
"type": "object"
},
"QuarkusRuntimeProvider": {
"RuntimeSpec": {
"required": [
"version",
"provider"
],
"properties": {
"camelQuarkusVersion": {
"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"
28 changes: 1 addition & 27 deletions assets/json-schema/Integration.json
Original file line number Diff line number Diff line change
@@ -243,9 +243,6 @@
},
"IntegrationStatus": {
"properties": {
"camelVersion": {
"type": "string"
},
"conditions": {
"items": {
"$schema": "http://json-schema.org/draft-04/schema#",
@@ -303,8 +300,7 @@
"type": "integer"
},
"runtimeProvider": {
"$schema": "http://json-schema.org/draft-04/schema#",
"$ref": "#/definitions/RuntimeProvider"
"type": "string"
},
"runtimeVersion": {
"type": "string"
@@ -371,18 +367,6 @@
"additionalProperties": false,
"type": "object"
},
"QuarkusRuntimeProvider": {
"properties": {
"camelQuarkusVersion": {
"type": "string"
},
"quarkusVersion": {
"type": "string"
}
},
"additionalProperties": false,
"type": "object"
},
"ResourceSpec": {
"properties": {
"compression": {
@@ -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": {
28 changes: 1 addition & 27 deletions assets/json-schema/IntegrationKit.json
Original file line number Diff line number Diff line change
@@ -251,9 +251,6 @@
"baseImage": {
"type": "string"
},
"camelVersion": {
"type": "string"
},
"conditions": {
"items": {
"$schema": "http://json-schema.org/draft-04/schema#",
@@ -278,8 +275,7 @@
"type": "string"
},
"runtimeProvider": {
"$schema": "http://json-schema.org/draft-04/schema#",
"$ref": "#/definitions/RuntimeProvider"
"type": "string"
},
"runtimeVersion": {
"type": "string"
@@ -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"
85 changes: 19 additions & 66 deletions build/maven/pom-catalog.xml
Original file line number Diff line number Diff line change
@@ -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>
Original file line number Diff line number Diff line change
@@ -18,15 +18,21 @@
apiVersion: camel.apache.org/v1
kind: CamelCatalog
metadata:
name: camel-catalog-3.0.0-1.0.9
name: camel-catalog-1.0.11-snapshot-main
labels:
app: camel-k
camel.apache.org/catalog.version: 3.0.0
camel.apache.org/catalog.loader.version: 3.0.0
camel.apache.org/runtime.version: 1.0.9
camel.apache.org/runtime.version: 1.0.11-SNAPSHOT
camel.apache.org/runtime.provider: main
spec:
version: 3.0.0
runtimeVersion: 1.0.9
runtime:
version: 1.0.11-SNAPSHOT
provider: main
metadata:
camel.version: 3.0.0
quarkus.version: 1.1.0.Final
camel-quarkus.version: 1.0.0-M2
artifacts:
camel-activemq:
groupId: org.apache.camel
@@ -1558,49 +1564,28 @@ spec:
camel-k-loader-groovy:
groupId: org.apache.camel.k
artifactId: camel-k-loader-groovy
dependencies:
- groupId: org.apache.camel
artifactId: camel-endpointdsl
- groupId: org.apache.camel
artifactId: camel-groovy
camel-k-loader-java:
groupId: org.apache.camel.k
artifactId: camel-k-loader-java
dependencies:
- groupId: org.apache.camel
artifactId: camel-endpointdsl
camel-k-loader-js:
groupId: org.apache.camel.k
artifactId: camel-k-loader-js
dependencies:
- groupId: org.apache.camel
artifactId: camel-endpointdsl
camel-k-loader-knative:
groupId: org.apache.camel.k
artifactId: camel-k-loader-knative
camel-k-loader-kotlin:
groupId: org.apache.camel.k
artifactId: camel-k-loader-kotlin
dependencies:
- groupId: org.apache.camel
artifactId: camel-endpointdsl
camel-k-loader-xml:
groupId: org.apache.camel.k
artifactId: camel-k-loader-xml
camel-k-runtime-health:
groupId: org.apache.camel.k
artifactId: camel-k-runtime-health
dependencies:
- groupId: org.apache.camel
artifactId: camel-servlet
- groupId: org.apache.camel.k
artifactId: camel-k-runtime-servlet
camel-k-runtime-knative:
groupId: org.apache.camel.k
artifactId: camel-k-runtime-knative
dependencies:
- groupId: org.apache.camel
artifactId: camel-cloud
- groupId: org.apache.camel.k
artifactId: camel-k-loader-yaml
- groupId: org.apache.camel.k
@@ -1614,23 +1599,12 @@ spec:
camel-k-runtime-main:
groupId: org.apache.camel.k
artifactId: camel-k-runtime-main
dependencies:
- groupId: org.apache.camel
artifactId: camel-core-engine
- groupId: org.apache.camel
artifactId: camel-main
camel-k-runtime-servlet:
groupId: org.apache.camel.k
artifactId: camel-k-runtime-servlet
dependencies:
- groupId: org.apache.camel
artifactId: camel-servlet
camel-k-runtime-webhook:
groupId: org.apache.camel.k
artifactId: camel-k-runtime-webhook
dependencies:
- groupId: org.apache.camel
artifactId: camel-webhook
camel-kafka:
groupId: org.apache.camel
artifactId: camel-kafka
@@ -1648,8 +1622,6 @@ spec:
http: true
passive: false
dependencies:
- groupId: org.apache.camel
artifactId: camel-cloud
- groupId: org.apache.camel.k
artifactId: camel-knative-api
- groupId: org.apache.camel.k
Loading

0 comments on commit 668c6f6

Please sign in to comment.