This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch dependabot/npm_and_yarn/docs/gulp-5.0.1
in repository https://gitbox.apache.org/repos/asf/camel.git
discard a6ca9a312ad chore(deps-dev): Bump gulp from 4.0.2 to 5.0.1 in /docs
add 2c7fef3640a Polished
add 4a26b4c8939 chore(deps): Bump aws-java-sdk2-version from 2.31.58 to
2.31.59 (#18314)
add b382e773b11 chore(deps): Bump org.owasp:dependency-check-maven from
12.1.1 to 12.1.2 (#18323)
add 6b606d5b1df chore(deps): Bump com.google.cloud:google-cloud-bigquery
(#18313)
add bb2af3d5f57 chore(deps): Bump com.google.cloud:google-cloud-pubsublite
(#18317)
add c16be0d7aaf chore(deps): Bump com.microsoft.azure:msal4j from 1.20.1
to 1.21.0 (#18318)
add eb18859c12c chore(deps): Bump com.github.ben-manes.caffeine:caffeine
(#18315)
add 358e68a1e35 chore(deps): Bump junit-jupiter-version from 5.13.0 to
5.13.1 (#18320)
add a15f5bbcd83 chore(deps): Bump io.smallrye.config:smallrye-config
(#18322)
add 04458ba7897 chore(deps): Bump io.opentelemetry:opentelemetry-bom-alpha
(#18319)
add 652ed6cacef chore(deps): Bump opentelemetry-version from 1.50.0 to
1.51.0 (#18321)
add fa25a8f0371 Regen
add e52fc49104e CAMEL-22160: camel-http: Add option skipControlHeaders to
let Camel s… (#18324)
add f9f64596e69 Use .head.repo.pushed_at in pr-comment workflow instead of
.pushed_at. Thanks to Alexander Barabanov from Intel for his finding.
add d9464d32bfa CAMEL-22161: camel-amqp: Add brokerUrl option so you can
use the url as-is without breaing it up into many options. And configure this
in component DSL in Camel. (#18326)
add 5d4b3350952 CAMEL-22161: Remove outdated docs
add 87365a8ca91 Slow test on other platforms
add acb5e191f30 Slow test on other platforms
add bfe0613c604 chore(deps): Bump aws-java-sdk2-version from 2.31.59 to
2.31.60
add e66f9959bf1 chore(deps-dev): Bump io.projectreactor:reactor-core from
3.7.6 to 3.7.7 (#18330)
add 12224ddd453 chore(deps): Bump mongo-java-driver-version from 5.5.0 to
5.5.1 (#18331)
add 9038dc5f5c3 chore(deps): Bump micrometer-tracing-version from 1.5.0 to
1.5.1 (#18329)
add ed1ce8c9378 chore(deps): Bump micrometer-version from 1.15.0 to 1.15.1
(#18328)
add 61e696de7dc CAMEL-22155: camel-main: Fix duplicate route id detection
when loading mulitple resources where routes can be inlined in rest-dsl.
add f3a75c17191 CAMEL-21429: camel-kafka: Upgrade to Kafka 3.9.1 (#18333)
add dbe1d6767a7 Polished
add f4e9a36c3c0 CAMEL-21429: camel-kafka: Upgrade test-infra to Kafka
3.9.1 (#18334)
add 2bb0af5da4d CAMEL-22157: Skip test on windows
add cf9404e5e79 CAMEL-22156: camel-management: Fix some tests running on
windows
add 08f2b8e2246 chore(deps): Bump aws-java-sdk2-version from 2.31.60 to
2.31.61 (#18336)
add bf34574c218 chore(deps): Bump com.github.mwiede:jsch from 2.27.0 to
2.27.2 (#18338)
add d3b0f43fac7 chore(deps): Bump io.projectreactor.netty:reactor-netty
(#18339)
add 873ea0c1821 chore(deps): Bump org.codehaus.plexus:plexus-cipher from
2.0 to 2.1.0 (#18337)
add eab8cccbe34 chore(deps): Bump org.owasp:dependency-check-maven from
12.1.2 to 12.1.3 (#18340)
add 9e7f05fcdf2 CAMEL-22138: camel-jbang-core: Use test log file
add 38e8ab1567d feat: setting span statusCode based on error indicator
add bf2b881673f Use jakarta namespace in camel-jbang Quarkus injection docs
add 8321f7c3274 camel-langchain4j-tools: Fix incorrect URI scheme in
documentation code snippets (#18345)
add 01eee5e77b5 chore(deps-dev): Bump org.postgresql:postgresql (#18346)
add 183583302db Upgrade postgres
add db3d24c7a75 enable tests as emulator can run on arm
add 77771a22a0a Use a fixed port (default one) when running services via
camel infra (#18344)
add cd034099216 Upgrade Q
add 9d77df417d1 camel-google-pubsub: Fix test
add 2f3a24fcb15 Polished
add 76cd0fdc1b0 fix(KafkaRecordBatchingProcessor): improve handling of
expired records and batch processing (#18343)
add a0f441882f4 Update Whatsapp parameter to allow payload (#18347)
add c6fb5b40def Polished
add fa0f8930fbc chore(deps-dev): Bump org.postgresql:postgresql from
42.7.6 to 42.7.7 (#18349)
add cc2eba155f3 chore(deps): Bump org.wiremock:wiremock from 3.13.0 to
3.13.1 (#18350)
add d27ca588380 chore(deps): Bump
com.atlassian.oai:swagger-request-validator-core (#18352)
add 577714efa27 chore(deps): Bump
com.google.apis:google-api-services-sheets (#18353)
add e2ab4b582c1 chore(deps): Bump aws-java-sdk2-version from 2.31.61 to
2.31.62 (#18348)
add f5eb3562a31 CAMEL-22096: Upgrade Langchain4j version for
Langchain4j-chat and langchain4j-tools components
add 339bbb9fdb2 camel-google-pubsub: Fix test
add c785a83d40e CAMEL-22166: camel-http - Also set HTTP_RESPONSE_CODE and
HTTP_RESPONSE_TEXT when throw exception on failure
add c0f1eb190d0 Upgrade Bouncycastle to version 1.81 (#18354)
add f4dfb65644e Format
add 8abc6bd5029 CAMEL-22140: camel-jbang - Fix quarkus export should strip
path if exporting relative file on windows.
add c2d3e668a3d CAMEL-22148: Fixed test on windows
add 2bec53358d7 CAMEL-22159: Fix test on windows
add e9113b83120 CAMEL-22159: Fix test on windows
add 4ed3259c6cf chore(CLI): Refactor Dependency Runtime command (#18308)
add b74a943e268 chore(docs): Add Format and Sorting commands to the
contribution guide (#18357)
add 2ad64c0989b CAMEL-22096: Upgrade Langchain4j Embedding component and
Vector Databases to Langchain4j 1.0.1 (#18355)
add 93289bfca84 CAMEL-22165: camel-jbang dependency runtime (deep analysis
to resolve from parent poms) (#18358)
add de7ceebb91c Upgrade spring
add bc5b7abf53a CAMEL-22165: camel-jbang dependency runtime (deep analysis
to resolve from parent poms)
add 9289a6d0a38 CAMEL-22165: camel-jbang dependency runtime (deep analysis
to resolve from parent poms)
add aa7eea55c1b chore(deps): Bump huaweicloud-sdk-version from 3.1.151 to
3.1.152 (#18359)
add 769c039c25a chore(deps): Bump aws-java-sdk2-version from 2.31.62 to
2.31.63 (#18360)
add 96ae86a12d2 chore(deps): Bump com.twilio.sdk:twilio from 10.9.1 to
10.9.2 (#18364)
add 91f3327883f chore(deps): Bump spring-ldap-version from 3.3.0 to 3.3.1
(#18361)
add b76fa0423f1 CAMEL-22165: camel-jbang dependency runtime (deep analysis
to resolve from parent poms)
add 22500858740 chore(deps): Bump io.smallrye.config:smallrye-config
(#18362)
add 6fbdcacde4d CAMEL-22145: camel-core: Include source location when
throwing failed to create or start route exception so end user can better known
which file has the problem.
add ab3f15e3d2e fix compile
add 04ec360ded8 camel-jbang: Avoid NPE
add 4cab0a6fd28 camel-jbang: Avoid NPE
add 30a6ff8622e Regen
add 04721d330ba chore(deps-dev): Bump eslint-plugin-n from 17.19.0 to
17.20.0 in /docs (#18366)
add daa04e6bd35 chore(deps-dev): Bump gulp from 4.0.2 to 5.0.1 in /docs
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 (a6ca9a312ad)
\
N -- N -- N refs/heads/dependabot/npm_and_yarn/docs/gulp-5.0.1
(daa04e6bd35)
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:
.github/workflows/pr-comment.yml | 2 +-
.../org/apache/camel/catalog/components/amqp.json | 235 ++++++------
.../camel/catalog/components/google-pubsub.json | 32 +-
.../org/apache/camel/catalog/components/http.json | 194 +++++-----
.../org/apache/camel/catalog/components/https.json | 194 +++++-----
.../camel/catalog/components/langchain4j-chat.json | 4 +-
.../catalog/components/langchain4j-tools.json | 4 +-
.../apache/camel/catalog/models/pollEnrich.json | 4 +-
.../apache/camel/catalog/schemas/camel-spring.xsd | 10 +-
.../apache/camel/catalog/schemas/camel-xml-io.xsd | 10 +-
components/camel-ai/camel-langchain4j-chat/pom.xml | 17 +-
.../chat/LangChain4jChatComponentConfigurer.java | 4 +-
.../LangChain4jChatConfigurationConfigurer.java | 4 +-
.../chat/LangChain4jChatEndpointConfigurer.java | 4 +-
.../langchain4j/chat/langchain4j-chat.json | 4 +-
.../src/main/docs/langchain4j-chat-component.adoc | 4 +-
.../chat/LangChain4jChatConfiguration.java | 10 +-
.../langchain4j/chat/LangChain4jChatProducer.java | 20 +-
.../openai/OpenAiChatLanguageModelBuilder.java | 4 +-
.../chat/rag/LangChain4jRagAggregatorStrategy.java | 3 +-
.../langchain4j.chat/LangChain4jChatIT.java | 9 +-
.../LangChain4jRagAggregatorTest.java | 3 +-
.../langchain4j.chat/OllamaTestSupport.java | 8 +-
.../camel-ai/camel-langchain4j-embeddings/pom.xml | 14 +-
.../camel-ai/camel-langchain4j-tools/pom.xml | 10 +-
.../tools/LangChain4jToolsComponentConfigurer.java | 4 +-
.../LangChain4jToolsConfigurationConfigurer.java | 4 +-
.../tools/LangChain4jToolsEndpointConfigurer.java | 4 +-
.../langchain4j/tools/langchain4j-tools.json | 4 +-
.../src/main/docs/langchain4j-tools-component.adoc | 6 +-
.../tools/LangChain4jToolsConfiguration.java | 10 +-
.../tools/LangChain4jToolsEndpoint.java | 46 ++-
.../tools/LangChain4jToolsProducer.java | 29 +-
.../tools/spec/NamedJsonSchemaProperty.java | 10 +-
.../langchain4j/tools/LangChain4jToolIT.java | 14 +-
.../tools/LangChain4jToolMultipleCallsIT.java | 17 +-
.../tools/LangChain4jToolMultipleGroupsIT.java | 14 +-
.../LangChain4jToolMultipleMatchingGroupsIT.java | 14 +-
.../tools/LangChain4jToolNoToolsExistIT.java | 14 +-
.../tools/LangChain4jToolNoToolsToBeCalledIT.java | 14 +-
components/camel-ai/camel-milvus/pom.xml | 1 +
components/camel-ai/camel-neo4j/pom.xml | 1 +
components/camel-ai/camel-pinecone/pom.xml | 1 +
components/camel-ai/camel-qdrant/pom.xml | 1 +
.../QdrantEmbeddingsDataTypeTransformer.java | 7 +-
components/camel-ai/camel-weaviate/pom.xml | 1 +
.../component/amqp/AMQPComponentConfigurer.java | 6 +
.../org/apache/camel/component/amqp/amqp.json | 235 ++++++------
.../camel-amqp/src/main/docs/amqp-component.adoc | 49 ---
.../apache/camel/component/amqp/AMQPComponent.java | 24 +-
.../component/amqp/AMQPConnectionDetails.java | 9 +-
.../camel-google/camel-google-pubsub/pom.xml | 4 +-
.../component/google/pubsub/google-pubsub.json | 32 +-
.../google/pubsub/GooglePubsubEndpoint.java | 46 +--
...edgementIT.java => AcknowledgementAsyncIT.java} | 16 +-
.../pubsub/integration/AcknowledgementIT.java | 4 -
...ntIT.java => ManualAcknowledgementAsyncIT.java} | 78 +---
.../integration/ManualAcknowledgementIT.java | 63 +---
.../component/http/HttpComponentConfigurer.java | 6 +
.../component/http/HttpEndpointConfigurer.java | 6 +
.../component/http/HttpEndpointUriFactory.java | 3 +-
.../org/apache/camel/component/http/http.json | 194 +++++-----
.../org/apache/camel/component/http/https.json | 194 +++++-----
.../apache/camel/component/http/HttpComponent.java | 20 +-
.../apache/camel/component/http/HttpEndpoint.java | 35 +-
.../apache/camel/component/http/HttpProducer.java | 25 +-
.../component/http/helper/HttpMethodHelper.java | 14 +-
...erTest.java => HttpSkipControlHeadersTest.java} | 35 +-
.../http/HttpThrowExceptionOnFailureTest.java | 6 +
.../camel-infinispan/camel-infinispan/pom.xml | 1 +
.../batching/KafkaRecordBatchingProcessor.java | 5 +-
.../kafka/integration/KafkaConsumerStopIT.java | 6 +-
components/camel-opentelemetry/pom.xml | 2 +-
.../opentelemetry/OpenTelemetrySpanAdapter.java | 2 +
.../opentelemetry2/OpenTelemetrySpanAdapter.java | 2 +
.../apache/camel/component/pqc/PQCComponent.java | 4 -
.../component/pqc/PQCSignatureAlgorithms.java | 3 +-
.../pqc/crypto/PQCDefaultRainbowMaterial.java | 54 ---
.../pqc/PQCSignatureRainbowNoAutowiredTest.java | 76 ----
.../component/pqc/PQCSignatureRainbowTest.java | 97 -----
.../smb/SmbConsumerPartialReadNoPathIT.java | 12 +-
.../camel/spring/CamelSpringXSDValidateTest.java | 3 +-
.../FileConsumerIdempotentLoadStoreTest.java | 2 +-
.../camel/component/whatsapp/model/Parameter.java | 9 +
.../apache/camel/FailedToCreateRouteException.java | 31 +-
.../apache/camel/FailedToStartRouteException.java | 19 +-
.../impl/engine/InternalRouteStartupManager.java | 8 +-
.../org/apache/camel/impl/engine/RouteService.java | 17 +-
.../src/main/docs/modules/eips/pages/toD-eip.adoc | 4 +-
.../org/apache/camel/impl/DefaultCamelContext.java | 2 +-
.../java/org/apache/camel/impl/DefaultModel.java | 2 +-
.../org/apache/camel/model/pollEnrich.json | 4 +-
.../apache/camel/model/PollEnrichDefinition.java | 24 +-
.../camel/model/ProcessorDefinitionHelper.java | 3 +
.../org/apache/camel/reifier/RouteReifier.java | 21 +-
.../direct/DirectEndpointRouteInlinedTest.java | 2 +-
.../seda/SedaConcurrentConsumersNPEIssueTest.java | 4 +-
.../GracefulShutdownNoAutoStartOrderClashTest.java | 2 +-
.../org/apache/camel/issues/RouteIdClashTest.java | 2 +-
.../model/StartingRoutesErrorReportedTest.java | 12 +-
.../InterceptSendToEndpointDynamicTest.java | 4 +-
.../org/apache/camel/main/RoutesConfigurer.java | 34 +-
.../main/MainPropertyPlaceholderWithEnvTest.java | 35 +-
.../java/org/apache/camel/main/MainScan3Test.java | 6 +-
.../ManagedBrowsableEndpointAsJSonFileTest.java | 16 +-
.../ManagedBrowsableEndpointAsXmlFileTest.java | 16 +-
.../camel/management/ManagedDuplicateIdTest.java | 2 +-
.../org/apache/camel/support/LoggerHelper.java | 18 +
docs/.pnp.cjs | 130 +++----
docs/main/modules/contributing/pages/index.adoc | 16 +-
docs/package.json | 2 +-
.../modules/ROOT/pages/camel-jbang.adoc | 6 +-
docs/yarn.lock | 10 +-
.../component/dsl/AmqpComponentBuilderFactory.java | 17 +
.../component/dsl/HttpComponentBuilderFactory.java | 30 +-
.../dsl/HttpsComponentBuilderFactory.java | 30 +-
.../Langchain4jChatComponentBuilderFactory.java | 10 +-
.../Langchain4jToolsComponentBuilderFactory.java | 10 +-
.../dsl/GooglePubsubEndpointBuilderFactory.java | 401 +++++++++++----------
.../endpoint/dsl/HttpEndpointBuilderFactory.java | 58 ++-
.../dsl/LangChain4jChatEndpointBuilderFactory.java | 42 +--
.../LangChain4jToolsEndpointBuilderFactory.java | 42 +--
.../dsl/jbang/core/commands/CommandHelper.java | 6 +-
.../dsl/jbang/core/commands/DependencyRuntime.java | 306 +++++++++-------
.../dsl/jbang/core/commands/ExportQuarkus.java | 23 +-
.../dsl/jbang/core/commands/ExportSpringBoot.java | 4 +-
.../apache/camel/dsl/jbang/core/commands/Run.java | 6 +-
.../camel/dsl/jbang/core/commands/RunHelper.java | 173 ++++++---
.../core/commands/catalog/CatalogBaseCommand.java | 10 +-
.../jbang/core/commands/catalog/CatalogDoc.java | 10 +-
.../core/commands/infra/InfraBaseCommand.java | 1 +
.../camel/dsl/jbang/core/common/CatalogLoader.java | 72 +++-
.../camel/dsl/jbang/core/common/RuntimeType.java | 16 +-
.../jbang/core/commands/DependencyRuntimeTest.java | 136 +++++++
.../camel/dsl/jbang/core/commands/ExportTest.java | 21 ++
.../src/test/resources/log4j2.properties | 2 +-
.../src/test/resources/pom-xml-files/main-pom.xml} | 139 +++----
.../test/resources/pom-xml-files/quarkus-pom.xml | 78 ++++
.../resources/pom-xml-files/springboot-pom.xml} | 64 +++-
.../camel/dsl/jbang/it/CustomJarsITCase.java | 2 +-
.../core/commands/kubernetes/CatalogHelper.java | 13 +-
.../core/commands/kubernetes/KubernetesExport.java | 2 +-
.../commands/kubernetes/traits/ServiceTrait.java | 2 +-
.../commands/kubernetes/traits/TraitContext.java | 4 +-
.../commands/kubernetes/traits/TraitHelper.java | 4 +-
.../traits/knative/KnativeServiceTrait.java | 2 +-
.../commands/kubernetes/MetadataHelperTest.java | 2 +-
dsl/camel-jbang/camel-launcher/pom.xml | 2 +-
.../camel-main-known-dependencies.properties | 4 +-
.../dsl/yaml/deserializers/ModelDeserializers.java | 4 +-
dsl/camel-yaml-dsl/camel-yaml-dsl/pom.xml | 2 +-
.../generated/resources/schema/camelYamlDsl.json | 4 +-
parent/pom.xml | 50 +--
.../artemis/services/ArtemisAllInfraService.java | 2 +-
.../infra/artemis/services/ArtemisContainer.java | 10 +
.../test/infra/aws2/services/AWSContainer.java | 17 +-
.../services/AWSLocalContainerInfraService.java | 3 +-
.../common/services/AzureStorageInfraService.java | 3 +-
.../azure/common/services/AzuriteContainer.java | 12 +-
.../common/services/ContainerEnvironmentUtil.java | 10 +
.../CouchDbLocalContainerInfraService.java | 20 +-
.../ElasticSearchLocalContainerInfraService.java | 31 +-
.../services/FhirLocalContainerInfraService.java | 31 +-
.../GooglePubSubLocalContainerInfraService.java | 15 +-
.../HashicorpVaultLocalContainerInfraService.java | 27 +-
.../LocalHiveMQSparkplugTCKInfraService.java | 17 +-
.../InfinispanLocalContainerInfraService.java | 37 +-
.../services/ContainerLocalKafkaInfraService.java | 14 +-
.../test/infra/kafka/services/container.properties | 4 +-
.../MicroprofileLRALocalContainerInfraService.java | 23 +-
.../services/MilvusLocalContainerInfraService.java | 16 +-
.../services/MinioLocalContainerInfraService.java | 33 +-
.../MongoDBLocalContainerInfraService.java | 27 +-
.../MosquittoLocalContainerInfraService.java | 7 +-
.../services/NatsLocalContainerInfraService.java | 21 +-
.../services/Neo4jLocalContainerInfraService.java | 20 +-
.../services/OllamaLocalContainerInfraService.java | 14 +-
.../infra/openldap/services/OpenLdapContainer.java | 11 +-
.../OpenldapLocalContainerInfraService.java | 3 +-
.../OpenSearchLocalContainerInfraService.java | 35 +-
.../pinecone/services/PineconeIndexContainer.java | 10 +-
.../PineconeLocalContainerInfraService.java | 18 +-
.../PostgresLocalContainerInfraService.java | 15 +-
.../services/PulsarLocalContainerInfraService.java | 18 +-
.../services/QdrantLocalContainerInfraService.java | 19 +-
.../RabbitMQLocalContainerInfraService.java | 16 +-
.../test/infra/redis/services/RedisContainer.java | 15 +-
.../services/RedisLocalContainerInfraService.java | 4 +-
.../rocketmq/services/RocketMQBrokerContainer.java | 16 +-
.../services/RocketMQContainerInfraService.java | 4 +-
.../test/infra/smb/services/SmbContainer.java | 11 +-
.../services/SmbLocalContainerInfraService.java | 3 +-
.../test/infra/solr/services/SolrContainer.java | 13 +-
.../services/SolrLocalContainerInfraService.java | 4 +-
.../TorchServeLocalContainerInfraService.java | 31 +-
.../WeaviateLocalContainerInfraService.java | 18 +-
.../services/XmppLocalContainerInfraService.java | 3 +-
.../infra/xmpp/services/XmppServerContainer.java | 8 +
198 files changed, 3071 insertions(+), 2279 deletions(-)
copy
components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/{AcknowledgementIT.java
=> AcknowledgementAsyncIT.java} (92%)
copy
components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/{ManualAcknowledgementIT.java
=> ManualAcknowledgementAsyncIT.java} (51%)
copy
components/camel-http/src/test/java/org/apache/camel/component/http/{HttpNoCamelHeaderTest.java
=> HttpSkipControlHeadersTest.java} (74%)
delete mode 100644
components/camel-pqc/src/main/java/org/apache/camel/component/pqc/crypto/PQCDefaultRainbowMaterial.java
delete mode 100644
components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureRainbowNoAutowiredTest.java
delete mode 100644
components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureRainbowTest.java
create mode 100644
dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/DependencyRuntimeTest.java
copy {components/camel-ai/camel-kserve =>
dsl/camel-jbang/camel-jbang-core}/src/test/resources/log4j2.properties (95%)
copy dsl/{camel-xml-jaxb-dsl-test/spring/pom.xml =>
camel-jbang/camel-jbang-core/src/test/resources/pom-xml-files/main-pom.xml}
(50%)
create mode 100644
dsl/camel-jbang/camel-jbang-core/src/test/resources/pom-xml-files/quarkus-pom.xml
copy
dsl/camel-jbang/camel-jbang-core/src/{main/resources/templates/spring-boot-pom.tmpl
=> test/resources/pom-xml-files/springboot-pom.xml} (66%)
