You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by lb...@apache.org on 2019/02/08 15:26:38 UTC

[camel-k] branch master updated (d956b23 -> f25d0c0)

This is an automated email from the ASF dual-hosted git repository.

lburgazzoli pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git.


    from d956b23  Renamed RuntimeTrait in ContextCustomizer since the name clashed and created confusion. Changed ContextCustomizer.apply(...) signature to pass a RuntimeRegistry in addition to CamelContext.
     new af45bf2  runtime: ensure that the generated project uses the right camel version #384
     new f25d0c0  chore(k8s): fix types

The 468 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 Gopkg.lock                                         |   9 +
 cmd/util/publisher/publisher.go                    |  13 +-
 deploy/camel-catalog.yaml                          | 740 +-------------------
 deploy/crd-camel-catalog.yaml                      |  24 +
 deploy/resources.go                                | 768 ++-------------------
 pkg/builder/builder_steps.go                       |  39 +-
 pkg/builder/builder_steps_test.go                  | 107 ++-
 pkg/builder/builder_types.go                       |   3 +
 pkg/builder/kaniko/kaniko.go                       |   3 +-
 pkg/builder/s2i/s2i.go                             |   3 +-
 pkg/builder/springboot/generator.go                |  68 +-
 pkg/cmd/completion_bash.go                         |   7 +-
 pkg/controller/integration/build_image.go          |   3 +
 pkg/controller/integrationcontext/build.go         |   2 +
 pkg/controller/integrationplatform/initialize.go   |   8 +-
 pkg/metadata/http.go                               |  12 +-
 pkg/metadata/metadata.go                           |  18 +-
 pkg/metadata/metadata_dependencies_test.go         |  19 +-
 pkg/metadata/metadata_http_test.go                 |  53 +-
 pkg/metadata/metadata_uri_test.go                  |  34 +-
 pkg/platform/images/images.go                      |  14 +-
 pkg/platform/images/images_test.go                 |   7 +-
 pkg/platform/resources.go                          |  11 -
 pkg/trait/builder_test.go                          |   4 +-
 pkg/trait/debug_test.go                            |   4 +
 pkg/trait/dependencies.go                          |   2 +-
 pkg/trait/environment_test.go                      |   4 +
 pkg/trait/images.go                                |   2 +-
 pkg/trait/knative.go                               |   4 +-
 pkg/trait/knative_service.go                       |   2 +-
 pkg/trait/knative_test.go                          |   5 +
 pkg/trait/rest.go                                  |   2 +-
 pkg/trait/service.go                               |   2 +-
 pkg/trait/trait.go                                 |   3 +
 pkg/trait/trait_test.go                            |   4 +
 pkg/trait/types.go                                 |   5 +-
 pkg/util/camel/catalog.go                          | 158 ++++-
 pkg/util/camel/catalog_test.go                     |   8 +-
 .../log.go => util/defaults/defaults.go}           |  14 +-
 pkg/util/maven/maven.go                            |  12 +-
 pkg/util/maven/maven_project.go                    |  60 +-
 pkg/util/maven/maven_project_types.go              |  23 +-
 pkg/util/source/inspector.go                       |  41 +-
 runtime/camel-k-maven-plugin/pom.xml               |   7 +
 .../camel/k/tooling/maven/GenerateCatalogMojo.java | 225 ++++++
 .../GenerateDependencyListMojo.java                |   2 +-
 .../GenerateResdXML.java => GenerateRestXML.java}  |   4 +-
 .../maven/dependency/GenerateCatalogMojo.java      | 598 ----------------
 .../camel/k/tooling/maven/model/Artifact.java      |  67 ++
 .../camel/k/tooling/maven/model/CamelArtifact.java | 170 +++++
 .../camel/k/tooling/maven/model/CamelScheme.java   |  71 ++
 .../maven/model/CatalogComponentDefinition.java    |  81 +++
 .../maven/model/CatalogDataFormatDefinition.java   |  60 ++
 .../maven/model/CatalogLanguageDefinition.java     |  60 ++
 .../k/tooling/maven/model/CatalogProcessor.java}   |  30 +-
 .../k/tooling/maven/model/CatalogSupport.java      |  47 ++
 .../maven/processors/CatalogProcessor_2_x.java     | 163 +++++
 ...he.camel.k.tooling.maven.model.CatalogProcessor |   1 +
 runtime/camel-k-runtime-core/pom.xml               |   1 +
 runtime/camel-k-runtime-groovy/pom.xml             |  37 +-
 runtime/camel-k-runtime-jvm/pom.xml                |   5 +
 runtime/camel-k-runtime-kotlin/pom.xml             |   5 +
 .../camel-k-runtime-spring-boot-layout/pom.xml     |  35 +-
 .../apache/camel/k/spring/boot/layout/Factory.java |  49 ++
 .../src/main/resources/META-INF/spring.factories   |   2 +
 runtime/camel-k-runtime-spring-boot/pom.xml        |  16 +
 runtime/camel-k-runtime-yaml/pom.xml               |   6 +-
 runtime/camel-knative-http/pom.xml                 |   2 +
 runtime/camel-knative/pom.xml                      |   6 +
 runtime/pom.xml                                    |  35 +
 script/build_catalog.sh                            |   4 +-
 test/build_manager_integration_test.go             |  12 +-
 .../coreos/go-semver}/LICENSE                      |   0
 vendor/github.com/coreos/go-semver/example.go      |  20 +
 .../github.com/coreos/go-semver/semver/semver.go   | 268 +++++++
 .../bash.go => coreos/go-semver/semver/sort.go}    |  33 +-
 76 files changed, 2138 insertions(+), 2308 deletions(-)
 create mode 100644 deploy/crd-camel-catalog.yaml
 copy pkg/{controller/integration/log.go => util/defaults/defaults.go} (79%)
 create mode 100644 runtime/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateCatalogMojo.java
 rename runtime/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/{dependency => }/GenerateDependencyListMojo.java (98%)
 rename runtime/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/{dependency/GenerateResdXML.java => GenerateRestXML.java} (97%)
 delete mode 100644 runtime/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/dependency/GenerateCatalogMojo.java
 create mode 100644 runtime/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/Artifact.java
 create mode 100644 runtime/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CamelArtifact.java
 create mode 100644 runtime/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CamelScheme.java
 create mode 100644 runtime/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CatalogComponentDefinition.java
 create mode 100644 runtime/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CatalogDataFormatDefinition.java
 create mode 100644 runtime/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CatalogLanguageDefinition.java
 copy runtime/{camel-k-runtime-core/src/main/java/org/apache/camel/k/ContextCustomizer.java => camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CatalogProcessor.java} (59%)
 create mode 100644 runtime/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CatalogSupport.java
 create mode 100644 runtime/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/processors/CatalogProcessor_2_x.java
 create mode 100644 runtime/camel-k-maven-plugin/src/main/resources/META-INF/services/org.apache.camel.k.tooling.maven.model.CatalogProcessor
 copy examples/hello.xml => runtime/camel-k-runtime-spring-boot-layout/pom.xml (52%)
 create mode 100644 runtime/camel-k-runtime-spring-boot-layout/src/main/java/org/apache/camel/k/spring/boot/layout/Factory.java
 create mode 100644 runtime/camel-k-runtime-spring-boot-layout/src/main/resources/META-INF/spring.factories
 copy vendor/{k8s.io/kube-openapi => github.com/coreos/go-semver}/LICENSE (100%)
 create mode 100644 vendor/github.com/coreos/go-semver/example.go
 create mode 100644 vendor/github.com/coreos/go-semver/semver/semver.go
 copy vendor/github.com/{operator-framework/operator-sdk/commands/operator-sdk/cmd/completion/bash.go => coreos/go-semver/semver/sort.go} (60%)