This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch kem-kyber
in repository https://gitbox.apache.org/repos/asf/camel.git
discard 633d18b4013 Camel-PQC: Added KYBER KEM algorithm
add 10f821a66d9 (chores) camel-ai: replace langchain4j RC versions with
their final versions
add 6c9e1f7716b chore(deps): Bump
com.googlecode.libphonenumber:libphonenumber (#19032)
add 03262964d17 chore(deps): Bump huaweicloud-sdk-version from 3.1.163 to
3.1.164 (#19022)
add 04e7b82db52 chore(deps): Bump
org.elasticsearch.client:elasticsearch-rest-client-sniffer (#19024)
add a9df3b4d188 chore(deps): Bump redis.clients:jedis from 6.1.0 to 6.2.0
(#19029)
add efcc3461062 CAMEL-22386: camel-catalog - Some components with boolean
option should have defaultValue as boolean type in json metadata (#19037)
add a8a163d3e13 CAMEL-22386: camel-catalog - Some components with boolean
option should have defaultValue as boolean type in json metadata
add 214b6fa4555 chore(deps): Bump elasticsearch-java-client-version from
9.1.2 to 9.1.3 (#19025)
add 80e3d19d279 chore(deps): Bump metrics-version from 4.2.34 to 4.2.35
(#19027)
add b74b85919af chore(deps): Bump com.microsoft.azure:msal4j from 1.22.0
to 1.23.0 (#19034)
add 64891391529 chore(deps): Bump org.apache.zookeeper:zookeeper from
3.9.3 to 3.9.4 (#19031)
add 8aaa76a08bc Upgrade zookeeper
add d96a39c0c1e chore(deps): Bump hadoop3-version from 3.4.1 to 3.4.2
(#19021)
add f31e42d3e16 Make Camel Infra command more tool friendly
add 6dde6dc8d70 chore(deps): Bump langchain4j-version from 1.3.0 to 1.4.0
add 3bdf5496a74 CAMEL-22387: camel-quartz - Should be suspendable so no
new jobs is triggered while camel is shutting down (#19040)
add 095619d7615 Polished
add 68244727ce0 fix(components): telemetry-dev async
add 3f772108f73 chore(deps): Bump langchain4j-beta-version (#19023)
add 17ec1eef8b2 CAMEL-22391: camel-core - Disabled does not work for
inlined anonymous processors in Java DSL
add 51c27adc3ee Camel-PQC: Added KYBER KEM algorithm
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (633d18b4013)
\
N -- N -- N refs/heads/kem-kyber (51c27adc3ee)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
.../beans/CaffeineAggregationRepository.json | 2 +-
.../beans/CassandraAggregationRepository.json | 2 +-
.../catalog/beans/CronScheduledRoutePolicy.json | 2 +-
.../catalog/beans/DefaultHeaderFilterStrategy.json | 2 +-
.../beans/EhcacheAggregationRepository.json | 2 +-
.../catalog/beans/FileIdempotentRepository.json | 2 +-
.../beans/HazelcastAggregationRepository.json | 2 +-
.../InfinispanEmbeddedAggregationRepository.json | 2 +-
.../InfinispanRemoteAggregationRepository.json | 2 +-
.../catalog/beans/JdbcAggregationRepository.json | 2 +-
.../catalog/beans/JdbcMessageIdRepository.json | 2 +-
.../catalog/beans/KafkaIdempotentRepository.json | 2 +-
.../beans/LevelDBAggregationRepository.json | 2 +-
.../catalog/beans/LoggingHttpActivityListener.json | 2 +-
.../catalog/beans/MemoryIdempotentRepository.json | 2 +-
.../catalog/beans/SimpleScheduledRoutePolicy.json | 2 +-
.../beans/ThrottlingExceptionRoutePolicy.json | 2 +-
.../beans/ThrottlingInflightRoutePolicy.json | 2 +-
.../catalog/beans/ZipAggregationStrategy.json | 2 +-
.../apache/camel/catalog/components/activemq.json | 4 +-
.../apache/camel/catalog/components/activemq6.json | 4 +-
.../org/apache/camel/catalog/components/amqp.json | 8 +-
.../apache/camel/catalog/components/arangodb.json | 6 +-
.../org/apache/camel/catalog/components/as2.json | 4 +-
.../camel/catalog/components/azure-files.json | 4 +-
.../catalog/components/azure-storage-blob.json | 12 +-
.../catalog/components/azure-storage-datalake.json | 20 +-
.../catalog/components/azure-storage-queue.json | 4 +-
.../org/apache/camel/catalog/components/box.json | 4 +-
.../apache/camel/catalog/components/braintree.json | 2 +-
.../apache/camel/catalog/components/consul.json | 4 +-
.../apache/camel/catalog/components/crypto.json | 4 +-
.../org/apache/camel/catalog/components/cxf.json | 8 +-
.../org/apache/camel/catalog/components/dhis2.json | 4 +-
.../camel/catalog/components/digitalocean.json | 4 +-
.../apache/camel/catalog/components/docker.json | 12 +-
.../org/apache/camel/catalog/components/drill.json | 2 +-
.../org/apache/camel/catalog/components/fhir.json | 12 +-
.../org/apache/camel/catalog/components/file.json | 4 +-
.../org/apache/camel/catalog/components/ftp.json | 4 +-
.../org/apache/camel/catalog/components/ftps.json | 4 +-
.../camel/catalog/components/google-calendar.json | 6 +-
.../camel/catalog/components/google-drive.json | 16 +-
.../camel/catalog/components/google-mail.json | 6 +-
.../catalog/components/google-pubsub-lite.json | 4 +-
.../camel/catalog/components/google-pubsub.json | 4 +-
.../camel/catalog/components/google-sheets.json | 4 +-
.../camel/catalog/components/iec60870-client.json | 4 +-
.../camel/catalog/components/iec60870-server.json | 4 +-
.../camel/catalog/components/ignite-idgen.json | 2 +-
.../org/apache/camel/catalog/components/jetty.json | 6 +-
.../org/apache/camel/catalog/components/jira.json | 6 +-
.../org/apache/camel/catalog/components/jms.json | 4 +-
.../org/apache/camel/catalog/components/jpa.json | 2 +-
.../org/apache/camel/catalog/components/kafka.json | 128 +-
.../apache/camel/catalog/components/knative.json | 4 +-
.../catalog/components/kubernetes-config-maps.json | 2 +-
.../catalog/components/kubernetes-cronjob.json | 2 +-
.../components/kubernetes-custom-resources.json | 2 +-
.../catalog/components/kubernetes-deployments.json | 2 +-
.../catalog/components/kubernetes-events.json | 2 +-
.../camel/catalog/components/kubernetes-hpa.json | 2 +-
.../camel/catalog/components/kubernetes-job.json | 2 +-
.../catalog/components/kubernetes-namespaces.json | 2 +-
.../camel/catalog/components/kubernetes-nodes.json | 2 +-
.../kubernetes-persistent-volumes-claims.json | 2 +-
.../components/kubernetes-persistent-volumes.json | 2 +-
.../camel/catalog/components/kubernetes-pods.json | 2 +-
.../kubernetes-replication-controllers.json | 2 +-
.../components/kubernetes-resources-quota.json | 2 +-
.../catalog/components/kubernetes-secrets.json | 2 +-
.../components/kubernetes-service-accounts.json | 2 +-
.../catalog/components/kubernetes-services.json | 2 +-
.../catalog/components/langchain4j-web-search.json | 4 +-
.../org/apache/camel/catalog/components/log.json | 4 +-
.../org/apache/camel/catalog/components/mllp.json | 28 +-
.../apache/camel/catalog/components/mongodb.json | 22 +-
.../components/openshift-build-configs.json | 2 +-
.../camel/catalog/components/openshift-builds.json | 2 +-
.../components/openshift-deploymentconfigs.json | 2 +-
.../camel/catalog/components/optaplanner.json | 2 +-
.../catalog/components/pg-replication-slot.json | 6 +-
.../apache/camel/catalog/components/pgevent.json | 2 +-
.../apache/camel/catalog/components/pinecone.json | 4 +-
.../camel/catalog/components/reactive-streams.json | 2 +-
.../camel/catalog/components/salesforce.json | 38 +-
.../camel/catalog/components/servicenow.json | 60 +-
.../org/apache/camel/catalog/components/sftp.json | 4 +-
.../org/apache/camel/catalog/components/sjms.json | 2 +-
.../org/apache/camel/catalog/components/sjms2.json | 2 +-
.../org/apache/camel/catalog/components/smb.json | 4 +-
.../apache/camel/catalog/components/smooks.json | 2 +-
.../org/apache/camel/catalog/components/smpp.json | 22 +-
.../org/apache/camel/catalog/components/smpps.json | 22 +-
.../apache/camel/catalog/components/telegram.json | 4 +-
.../apache/camel/catalog/components/thymeleaf.json | 4 +-
.../catalog/components/twitter-directmessage.json | 4 +-
.../camel/catalog/components/twitter-search.json | 4 +-
.../camel/catalog/components/twitter-timeline.json | 4 +-
.../apache/camel/catalog/components/undertow.json | 20 +-
.../org/apache/camel/catalog/components/vertx.json | 2 +-
.../camel/catalog/components/xmlsecurity-sign.json | 20 +-
.../catalog/components/xmlsecurity-verify.json | 20 +-
.../apache/camel/catalog/components/zendesk.json | 2 +-
.../apache/camel/catalog/dataformats/barcode.json | 4 +-
.../apache/camel/catalog/dataformats/base64.json | 2 +-
.../apache/camel/catalog/dataformats/crypto.json | 2 +-
.../camel/catalog/dataformats/snakeYaml.json | 2 +-
.../apache/camel/catalog/dataformats/tarFile.json | 2 +-
.../apache/camel/catalog/dataformats/zipFile.json | 2 +-
.../jbang/camel-jbang-configuration-metadata.json | 14 +-
.../main/camel-main-configuration-metadata.json | 198 +--
.../org/apache/camel/catalog/models/barcode.json | 4 +-
.../org/apache/camel/catalog/models/base64.json | 2 +-
.../apache/camel/catalog/models/batchConfig.json | 2 +-
.../catalog/models/cachingServiceDiscovery.json | 2 +-
.../catalog/models/consulServiceDiscovery.json | 2 +-
.../org/apache/camel/catalog/models/crypto.json | 2 +-
.../models/faultToleranceConfiguration.json | 12 +-
.../camel/catalog/models/redeliveryPolicy.json | 2 +-
.../catalog/models/resilience4jConfiguration.json | 16 +-
.../org/apache/camel/catalog/models/route.json | 4 +-
.../apache/camel/catalog/models/streamConfig.json | 2 +-
.../org/apache/camel/catalog/models/tarFile.json | 2 +-
.../org/apache/camel/catalog/models/yaml.json | 2 +-
.../org/apache/camel/catalog/models/zipFile.json | 2 +-
.../apache/camel/catalog/schemas/camel-spring.xsd | 4 +-
.../apache/camel/catalog/schemas/camel-xml-io.xsd | 4 +-
.../apache/camel/component/activemq/activemq.json | 4 +-
.../camel/component/activemq6/activemq6.json | 4 +-
components/camel-ai/camel-langchain4j-chat/pom.xml | 2 +-
.../camel-ai/camel-langchain4j-tokenizer/pom.xml | 2 +-
.../camel-ai/camel-langchain4j-tools/pom.xml | 2 +-
.../web/search/langchain4j-web-search.json | 4 +-
.../apache/camel/component/pinecone/pinecone.json | 4 +-
.../org/apache/camel/component/amqp/amqp.json | 8 +-
.../apache/camel/component/arangodb/arangodb.json | 6 +-
.../org/apache/camel/component/as2/as2.json | 4 +-
.../camel/component/file/azure/azure-files.json | 4 +-
.../azure/storage/blob/azure-storage-blob.json | 12 +-
.../storage/datalake/azure-storage-datalake.json | 20 +-
.../azure/storage/queue/azure-storage-queue.json | 4 +-
.../apache/camel/dataformat/barcode/barcode.json | 4 +-
.../org/apache/camel/dataformat/base64/base64.json | 2 +-
.../org/apache/camel/component/box/box.json | 4 +-
.../camel/component/braintree/braintree.json | 2 +-
.../camel/bean/CaffeineAggregationRepository.json | 2 +-
.../camel/bean/CassandraAggregationRepository.json | 2 +-
.../org/apache/camel/component/consul/consul.json | 4 +-
.../org/apache/camel/component/crypto/crypto.json | 4 +-
.../org/apache/camel/converter/crypto/crypto.json | 2 +-
.../org/apache/camel/component/cxf/jaxws/cxf.json | 8 +-
.../org/apache/camel/component/dhis2/dhis2.json | 4 +-
.../camel/component/digitalocean/digitalocean.json | 4 +-
.../org/apache/camel/component/docker/docker.json | 12 +-
.../org/apache/camel/component/drill/drill.json | 2 +-
.../camel/bean/EhcacheAggregationRepository.json | 2 +-
.../org/apache/camel/component/fhir/fhir.json | 12 +-
.../org/apache/camel/component/file/file.json | 4 +-
.../apache/camel/component/file/remote/ftp.json | 4 +-
.../apache/camel/component/file/remote/ftps.json | 4 +-
.../apache/camel/component/file/remote/sftp.json | 4 +-
.../component/google/calendar/google-calendar.json | 6 +-
.../camel/component/google/drive/google-drive.json | 16 +-
.../camel/component/google/mail/google-mail.json | 6 +-
.../google/pubsublite/google-pubsub-lite.json | 4 +-
.../component/google/pubsub/google-pubsub.json | 4 +-
.../component/google/sheets/google-sheets.json | 4 +-
.../camel/bean/HazelcastAggregationRepository.json | 2 +-
.../camel/bean/LoggingHttpActivityListener.json | 2 +-
.../component/iec60870/client/iec60870-client.json | 4 +-
.../component/iec60870/server/iec60870-server.json | 4 +-
.../camel/component/ignite/idgen/ignite-idgen.json | 2 +-
.../InfinispanEmbeddedAggregationRepository.json | 2 +-
.../InfinispanRemoteAggregationRepository.json | 2 +-
.../org/apache/camel/component/jetty12/jetty.json | 6 +-
.../org/apache/camel/component/jira/jira.json | 6 +-
.../org/apache/camel/component/jms/jms.json | 4 +-
.../org/apache/camel/component/jpa/jpa.json | 2 +-
.../camel-jpa/src/main/docs/jpa-component.adoc | 5 +-
.../org/apache/camel/component/kafka/kafka.json | 128 +-
.../camel/bean/KafkaIdempotentRepository.json | 2 +-
.../apache/camel/component/knative/knative.json | 4 +-
.../config_maps/kubernetes-config-maps.json | 2 +-
.../kubernetes/cronjob/kubernetes-cronjob.json | 2 +-
.../kubernetes-custom-resources.json | 2 +-
.../deployments/kubernetes-deployments.json | 2 +-
.../kubernetes/events/kubernetes-events.json | 2 +-
.../component/kubernetes/hpa/kubernetes-hpa.json | 2 +-
.../component/kubernetes/job/kubernetes-job.json | 2 +-
.../namespaces/kubernetes-namespaces.json | 2 +-
.../kubernetes/nodes/kubernetes-nodes.json | 2 +-
.../kubernetes-persistent-volumes.json | 2 +-
.../kubernetes-persistent-volumes-claims.json | 2 +-
.../component/kubernetes/pods/kubernetes-pods.json | 2 +-
.../kubernetes-replication-controllers.json | 2 +-
.../kubernetes-resources-quota.json | 2 +-
.../kubernetes/secrets/kubernetes-secrets.json | 2 +-
.../kubernetes-service-accounts.json | 2 +-
.../kubernetes/services/kubernetes-services.json | 2 +-
.../build_configs/openshift-build-configs.json | 2 +-
.../openshift/builds/openshift-builds.json | 2 +-
.../openshift-deploymentconfigs.json | 2 +-
.../camel/bean/LevelDBAggregationRepository.json | 2 +-
.../camel/component/log/LogEndpointConfigurer.java | 6 +-
.../org/apache/camel/component/log/log.json | 4 +-
.../apache/camel/component/log/LogEndpoint.java | 7 +-
.../org/apache/camel/component/mllp/mllp.json | 28 +-
.../apache/camel/component/mongodb/mongodb.json | 22 +-
.../optaplanner/OptaPlannerEndpointConfigurer.java | 4 +-
.../camel/component/optaplanner/optaplanner.json | 2 +-
.../optaplanner/OptaPlannerConfiguration.java | 8 +-
.../slot/PgReplicationSlotEndpointUriFactory.java | 2 +-
.../pg/replication/slot/pg-replication-slot.json | 6 +-
.../pgevent/PgEventEndpointUriFactory.java | 2 +-
.../apache/camel/component/pgevent/pgevent.json | 2 +-
.../camel/bean/CronScheduledRoutePolicy.json | 2 +-
.../camel/bean/SimpleScheduledRoutePolicy.json | 2 +-
.../apache/camel/component/quartz/CamelJob.java | 8 +-
.../camel/component/quartz/QuartzConsumer.java | 14 +-
.../reactive/streams/reactive-streams.json | 2 +-
.../camel/component/salesforce/salesforce.json | 38 +-
.../camel/component/servicenow/servicenow.json | 60 +-
.../org/apache/camel/component/sjms/sjms.json | 2 +-
.../org/apache/camel/component/sjms2/sjms2.json | 2 +-
.../org/apache/camel/component/smb/smb.json | 4 +-
.../org/apache/camel/component/smooks/smooks.json | 2 +-
.../component/smpp/SmppEndpointUriFactory.java | 2 +-
.../org/apache/camel/component/smpp/smpp.json | 22 +-
.../org/apache/camel/component/smpp/smpps.json | 22 +-
.../camel/component/snakeyaml/snakeYaml.json | 2 +-
.../camel/bean/JdbcAggregationRepository.json | 2 +-
.../apache/camel/bean/JdbcMessageIdRepository.json | 2 +-
.../apache/camel/dataformat/tarfile/tarFile.json | 2 +-
.../apache/camel/component/telegram/telegram.json | 4 +-
.../apache/camel/telemetrydev/DevSpanAdapter.java | 10 +-
.../org/apache/camel/telemetrydev/DevTrace.java | 72 +-
.../apache/camel/telemetrydev/DevTraceFormat.java | 17 +-
.../camel/component/thymeleaf/thymeleaf.json | 4 +-
.../directmessage/twitter-directmessage.json | 4 +-
.../component/twitter/search/twitter-search.json | 4 +-
.../twitter/timeline/twitter-timeline.json | 4 +-
.../apache/camel/component/undertow/undertow.json | 20 +-
.../org/apache/camel/component/vertx/vertx.json | 2 +-
.../component/xmlsecurity/xmlsecurity-sign.json | 20 +-
.../component/xmlsecurity/xmlsecurity-verify.json | 20 +-
.../apache/camel/component/zendesk/zendesk.json | 2 +-
.../apache/camel/dataformat/zipfile/zipFile.json | 2 +-
.../apache/camel/bean/ZipAggregationStrategy.json | 2 +-
.../camel/model/cloud/cachingServiceDiscovery.json | 2 +-
.../camel/model/cloud/consulServiceDiscovery.json | 2 +-
.../org/apache/camel/model/config/batchConfig.json | 2 +-
.../apache/camel/model/config/streamConfig.json | 2 +-
.../org/apache/camel/model/dataformat/barcode.json | 4 +-
.../org/apache/camel/model/dataformat/base64.json | 2 +-
.../org/apache/camel/model/dataformat/crypto.json | 2 +-
.../org/apache/camel/model/dataformat/tarFile.json | 2 +-
.../org/apache/camel/model/dataformat/yaml.json | 2 +-
.../org/apache/camel/model/dataformat/zipFile.json | 2 +-
.../camel/model/faultToleranceConfiguration.json | 12 +-
.../org/apache/camel/model/redeliveryPolicy.json | 2 +-
.../camel/model/resilience4jConfiguration.json | 16 +-
.../META-INF/org/apache/camel/model/route.json | 4 +-
.../org/apache/camel/processor/WrapProcessor.java | 15 +-
.../component/log/LogEndpointOptionsTest.java | 2 +-
.../camel-main-configuration-metadata.json | 198 +--
.../camel/bean/DefaultHeaderFilterStrategy.json | 2 +-
.../camel/bean/FileIdempotentRepository.json | 2 +-
.../camel/bean/MemoryIdempotentRepository.json | 2 +-
.../camel/bean/ThrottlingExceptionRoutePolicy.json | 2 +-
.../camel/bean/ThrottlingInflightRoutePolicy.json | 2 +-
.../support/processor/DelegateAsyncProcessor.java | 15 +-
.../support/processor/DelegateSyncProcessor.java | 14 +-
.../component/dsl/AmqpComponentBuilderFactory.java | 4 +
.../AzureStorageBlobComponentBuilderFactory.java | 2 -
...zureStorageDatalakeComponentBuilderFactory.java | 10 +
.../component/dsl/CxfComponentBuilderFactory.java | 2 +
.../dsl/KafkaComponentBuilderFactory.java | 2 -
.../dsl/SalesforceComponentBuilderFactory.java | 12 +
.../dsl/ServicenowComponentBuilderFactory.java | 26 +
.../endpoint/dsl/CxfEndpointBuilderFactory.java | 12 +
.../dsl/DataLakeEndpointBuilderFactory.java | 30 +
.../dsl/JettyHttp12EndpointBuilderFactory.java | 2 +
.../endpoint/dsl/JpaEndpointBuilderFactory.java | 2 +
...KubernetesConfigMapsEndpointBuilderFactory.java | 6 +
.../KubernetesCronJobEndpointBuilderFactory.java | 2 +
...netesCustomResourcesEndpointBuilderFactory.java | 6 +
...ubernetesDeploymentsEndpointBuilderFactory.java | 6 +
.../KubernetesEventsEndpointBuilderFactory.java | 6 +
.../dsl/KubernetesHPAEndpointBuilderFactory.java | 6 +
.../dsl/KubernetesJobEndpointBuilderFactory.java | 2 +
...KubernetesNamespacesEndpointBuilderFactory.java | 6 +
.../dsl/KubernetesNodesEndpointBuilderFactory.java | 6 +
...sistentVolumesClaimsEndpointBuilderFactory.java | 2 +
...tesPersistentVolumesEndpointBuilderFactory.java | 2 +
.../dsl/KubernetesPodsEndpointBuilderFactory.java | 6 +
...plicationControllersEndpointBuilderFactory.java | 6 +
...rnetesResourcesQuotaEndpointBuilderFactory.java | 2 +
.../KubernetesSecretsEndpointBuilderFactory.java | 2 +
...netesServiceAccountsEndpointBuilderFactory.java | 2 +
.../KubernetesServicesEndpointBuilderFactory.java | 6 +
...LangChain4jWebSearchEndpointBuilderFactory.java | 2 +
.../endpoint/dsl/LogEndpointBuilderFactory.java | 9 +-
...penshiftBuildConfigsEndpointBuilderFactory.java | 2 +
.../dsl/OpenshiftBuildsEndpointBuilderFactory.java | 2 +
...iftDeploymentConfigsEndpointBuilderFactory.java | 6 +
.../dsl/OptaPlannerEndpointBuilderFactory.java | 30 +-
.../dsl/SalesforceEndpointBuilderFactory.java | 36 +
.../dsl/ServiceNowEndpointBuilderFactory.java | 26 +
.../dsl/ThymeleafEndpointBuilderFactory.java | 4 +
.../dsl/UndertowEndpointBuilderFactory.java | 2 +
.../endpoint/dsl/VertxEndpointBuilderFactory.java | 6 +
.../camel-jbang-configuration-metadata.json | 14 +-
.../core/commands/infra/InfraBaseCommand.java | 44 +-
.../dsl/jbang/core/commands/infra/InfraPs.java | 11 +-
.../dsl/jbang/core/commands/infra/InfraRun.java | 4 +-
.../dsl/yaml/deserializers/ModelDeserializers.java | 936 ++++++-------
.../maven/dsl/yaml/support/YamlProperties.java | 2 +-
.../generated/resources/schema/camelYamlDsl.json | 1398 +++++++++++++-------
parent/pom.xml | 25 +-
.../camel/tooling/model/BaseOptionModel.java | 11 +
.../org/apache/camel/tooling/model/JsonMapper.java | 8 +-
322 files changed, 2937 insertions(+), 2038 deletions(-)
