This is an automated email from the ASF dual-hosted git repository. JiriOndrusek pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 9d28cb151555b6c3742373dd1b4136f683236576 Author: jiriOndrusek-agent <[email protected]> AuthorDate: Fri Nov 13 12:27:32 2026 +0000 Remove the ognl extension camel-ognl was removed from Apache Camel (CAMEL-24786). Remove the camel-quarkus-ognl extension, its integration test, BOM and catalog entries and docs, and add a 4.0.0 migration guide note. Co-Authored-By: Claude Sonnet 5.5 <[email protected]> --- catalog/pom.xml | 13 -- docs/modules/ROOT/examples/languages/ognl.yml | 13 -- docs/modules/ROOT/nav.adoc | 1 - docs/modules/ROOT/pages/migration-guide/4.0.0.adoc | 6 + .../ROOT/pages/reference/extensions/ognl.adoc | 46 ------ extensions/ognl/deployment/pom.xml | 61 -------- .../component/ognl/deployment/OgnlProcessor.java | 63 -------- extensions/ognl/pom.xml | 37 ----- extensions/ognl/runtime/pom.xml | 70 --------- .../main/resources/META-INF/quarkus-extension.yaml | 36 ----- extensions/pom.xml | 1 - integration-tests/ognl/pom.xml | 161 --------------------- .../quarkus/component/ognl/it/OgnlResource.java | 76 ---------- .../camel/quarkus/component/ognl/it/OgnlRoute.java | 50 ------- .../quarkus/component/ognl/it/model/Animal.java | 60 -------- .../camel/quarkus/component/ognl/it/OgnlIT.java | 23 --- .../camel/quarkus/component/ognl/it/OgnlTest.java | 84 ----------- integration-tests/pom.xml | 1 - poms/bom/pom.xml | 15 -- poms/bom/src/main/generated/flattened-full-pom.xml | 15 -- .../src/main/generated/flattened-reduced-pom.xml | 15 -- .../generated/flattened-reduced-verbose-pom.xml | 15 -- tooling/scripts/test-categories.yaml | 1 - 23 files changed, 6 insertions(+), 857 deletions(-) diff --git a/catalog/pom.xml b/catalog/pom.xml index afe78f517dc..0521e725cc1 100644 --- a/catalog/pom.xml +++ b/catalog/pom.xml @@ -3074,19 +3074,6 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-ognl</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>*</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-olingo4</artifactId> diff --git a/docs/modules/ROOT/examples/languages/ognl.yml b/docs/modules/ROOT/examples/languages/ognl.yml deleted file mode 100644 index f56d0cfa367..00000000000 --- a/docs/modules/ROOT/examples/languages/ognl.yml +++ /dev/null @@ -1,13 +0,0 @@ -# Do not edit directly! -# This file was generated by camel-quarkus-maven-plugin:update-extension-doc-page -cqArtifactId: camel-quarkus-ognl -cqArtifactIdBase: ognl -cqNativeSupported: true -cqStatus: Stable -cqDeprecated: true -cqJvmSince: 1.0.0 -cqNativeSince: 3.2.0 -cqCamelPartName: ognl -cqCamelPartTitle: OGNL -cqCamelPartDescription: Evaluates an OGNL expression (Apache Commons OGNL) -cqExtensionPageTitle: OGNL diff --git a/docs/modules/ROOT/nav.adoc b/docs/modules/ROOT/nav.adoc index 0208871b2d6..77706370044 100644 --- a/docs/modules/ROOT/nav.adoc +++ b/docs/modules/ROOT/nav.adoc @@ -254,7 +254,6 @@ *** xref:reference/extensions/oaipmh.adoc[OAI-PMH] *** xref:reference/extensions/ocsf.adoc[OCSF] *** xref:reference/extensions/odata.adoc[OData] -*** xref:reference/extensions/ognl.adoc[OGNL] *** xref:reference/extensions/milo.adoc[OPC UA Browser] *** xref:reference/extensions/oauth.adoc[Oauth] *** xref:reference/extensions/observability-services.adoc[Observability Services] diff --git a/docs/modules/ROOT/pages/migration-guide/4.0.0.adoc b/docs/modules/ROOT/pages/migration-guide/4.0.0.adoc index 11e75ecb077..55604d2da33 100644 --- a/docs/modules/ROOT/pages/migration-guide/4.0.0.adoc +++ b/docs/modules/ROOT/pages/migration-guide/4.0.0.adoc @@ -200,3 +200,9 @@ The internal `camel-quarkus-support-retrofit` artifact was removed. `camel-quarkus-consul`, `camel-quarkus-influxdb`, `camel-quarkus-langchain4j-web-search` and `camel-quarkus-pubnub` no longer bring in `io.quarkus:quarkus-kotlin`. `camel-quarkus-langchain4j-web-search` also no longer brings in `com.squareup.retrofit2:retrofit`. An application that relies on either of these dependencies must declare them itself. + +== `camel-quarkus-ognl` removed + +The `camel-quarkus-ognl` extension was removed, because the `camel-ognl` component was removed from Apache Camel. + +Use another expression language instead, such as `simple` or `groovy`. diff --git a/docs/modules/ROOT/pages/reference/extensions/ognl.adoc b/docs/modules/ROOT/pages/reference/extensions/ognl.adoc deleted file mode 100644 index 2af0276c087..00000000000 --- a/docs/modules/ROOT/pages/reference/extensions/ognl.adoc +++ /dev/null @@ -1,46 +0,0 @@ -// Do not edit directly! -// This file was generated by camel-quarkus-maven-plugin:update-extension-doc-page -[id="extensions-ognl"] -= OGNL -:page-aliases: extensions/ognl.adoc -:linkattrs: -:cq-artifact-id: camel-quarkus-ognl -:cq-native-supported: true -:cq-status: Stable -:cq-status-deprecation: Stable Deprecated -:cq-description: Evaluates an OGNL expression (Apache Commons OGNL) -:cq-deprecated: true -:cq-jvm-since: 1.0.0 -:cq-native-since: 3.2.0 - -ifeval::[{doc-show-badges} == true] -[.badges] -[.badge-key]##JVM since##[.badge-supported]##1.0.0## [.badge-key]##Native since##[.badge-supported]##3.2.0## [.badge-key]##⚠️##[.badge-unsupported]##Deprecated## -endif::[] - -Evaluates an OGNL expression (Apache Commons OGNL) - -[id="extensions-ognl-whats-inside"] -== What's inside - -* OGNL - - - -[id="extensions-ognl-maven-coordinates"] -== Maven coordinates - -https://{link-quarkus-code-generator}/?extension-search=camel-quarkus-ognl[Create a new project with this extension on {link-quarkus-code-generator}, window="_blank"] - -Or add the coordinates to your existing project: - -[source,xml] ----- -<dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-ognl</artifactId> -</dependency> ----- -ifeval::[{doc-show-user-guide-link} == true] -Check the xref:user-guide/index.adoc[User guide] for more information about writing Camel Quarkus applications. -endif::[] diff --git a/extensions/ognl/deployment/pom.xml b/extensions/ognl/deployment/pom.xml deleted file mode 100644 index c4f669fee4a..00000000000 --- a/extensions/ognl/deployment/pom.xml +++ /dev/null @@ -1,61 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - ---> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-ognl-parent</artifactId> - <version>4.0.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <artifactId>camel-quarkus-ognl-deployment</artifactId> - <name>Camel Quarkus :: OGNL :: Deployment</name> - - <dependencies> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-core-deployment</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-ognl</artifactId> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <annotationProcessorPaths> - <path> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-extension-processor</artifactId> - <version>${quarkus.version}</version> - </path> - </annotationProcessorPaths> - </configuration> - </plugin> - </plugins> - </build> - -</project> diff --git a/extensions/ognl/deployment/src/main/java/org/apache/camel/quarkus/component/ognl/deployment/OgnlProcessor.java b/extensions/ognl/deployment/src/main/java/org/apache/camel/quarkus/component/ognl/deployment/OgnlProcessor.java deleted file mode 100644 index bd7f70b1377..00000000000 --- a/extensions/ognl/deployment/src/main/java/org/apache/camel/quarkus/component/ognl/deployment/OgnlProcessor.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.quarkus.component.ognl.deployment; - -import java.lang.reflect.Method; -import java.util.HashSet; -import java.util.Set; - -import io.quarkus.deployment.annotations.BuildProducer; -import io.quarkus.deployment.annotations.BuildStep; -import io.quarkus.deployment.builditem.CombinedIndexBuildItem; -import io.quarkus.deployment.builditem.FeatureBuildItem; -import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; -import io.quarkus.deployment.pkg.steps.NativeOrNativeSourcesBuild; -import org.apache.camel.language.ognl.RootObject; -import org.jboss.jandex.ClassInfo; -import org.jboss.jandex.DotName; -import org.jboss.jandex.IndexView; - -class OgnlProcessor { - private static final String FEATURE = "camel-ognl"; - - @BuildStep - FeatureBuildItem feature() { - return new FeatureBuildItem(FEATURE); - } - - @BuildStep(onlyIf = NativeOrNativeSourcesBuild.class) - void registerReflectiveClasses(CombinedIndexBuildItem combinedIndexBuildItem, - BuildProducer<ReflectiveClassBuildItem> reflectiveClass) { - IndexView view = combinedIndexBuildItem.getIndex(); - Set<Class<?>> types = new HashSet<>(); - types.add(RootObject.class); - for (Method method : RootObject.class.getMethods()) { - if (!method.getDeclaringClass().equals(Object.class)) { - Class<?> returnType = method.getReturnType(); - if (types.add(returnType) && returnType.getPackageName().equals("org.apache.camel")) { - reflectiveClass.produce( - ReflectiveClassBuildItem - .builder(view.getAllKnownImplementations(returnType).stream().map(ClassInfo::name) - .map(DotName::toString).toArray(String[]::new)) - .constructors(false).methods().build()); - } - } - } - reflectiveClass.produce(ReflectiveClassBuildItem.builder(types.toArray(new Class<?>[0])).constructors(false) - .methods().build()); - } -} diff --git a/extensions/ognl/pom.xml b/extensions/ognl/pom.xml deleted file mode 100644 index ae6e4b9d2f6..00000000000 --- a/extensions/ognl/pom.xml +++ /dev/null @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - ---> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-extensions</artifactId> - <version>4.0.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <artifactId>camel-quarkus-ognl-parent</artifactId> - <name>Camel Quarkus :: OGNL</name> - <packaging>pom</packaging> - - <modules> - <module>deployment</module> - <module>runtime</module> - </modules> -</project> diff --git a/extensions/ognl/runtime/pom.xml b/extensions/ognl/runtime/pom.xml deleted file mode 100644 index 79b91abc5d4..00000000000 --- a/extensions/ognl/runtime/pom.xml +++ /dev/null @@ -1,70 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - ---> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-ognl-parent</artifactId> - <version>4.0.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <artifactId>camel-quarkus-ognl</artifactId> - <name>Camel Quarkus :: OGNL :: Runtime</name> - <description>Evaluates an OGNL expression (Apache Commons OGNL)</description> - - <properties> - <camel.quarkus.jvmSince>1.0.0</camel.quarkus.jvmSince> - <camel.quarkus.nativeSince>3.2.0</camel.quarkus.nativeSince> - </properties> - - <dependencies> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-core</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-ognl</artifactId> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-extension-maven-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <annotationProcessorPaths> - <path> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-extension-processor</artifactId> - <version>${quarkus.version}</version> - </path> - </annotationProcessorPaths> - </configuration> - </plugin> - </plugins> - </build> -</project> diff --git a/extensions/ognl/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/ognl/runtime/src/main/resources/META-INF/quarkus-extension.yaml deleted file mode 100644 index a3690b5ac1e..00000000000 --- a/extensions/ognl/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ /dev/null @@ -1,36 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# This is a generated file. Do not edit directly! -# To re-generate, run the following command from the top level directory: -# -# mvn -N cq:update-quarkus-metadata -# ---- -name: "Camel OGNL" -description: "Evaluates an OGNL expression (Apache Commons OGNL)" -metadata: - icon-url: "https://raw.githubusercontent.com/apache/camel-website/main/antora-ui-camel/src/img/logo-d.svg" - sponsor: "Apache Software Foundation" - guide: "https://camel.apache.org/camel-quarkus/latest/reference/extensions/ognl.html" - categories: - - "integration" - status: "deprecated" - integrates: - - name: "Camel" - artifact: "org.apache.camel:camel-base" - version: "${camel.version}" \ No newline at end of file diff --git a/extensions/pom.xml b/extensions/pom.xml index acca2ac7c00..9460a676736 100644 --- a/extensions/pom.xml +++ b/extensions/pom.xml @@ -224,7 +224,6 @@ <module>observability-services</module> <module>ocsf</module> <module>odata</module> - <module>ognl</module> <module>olingo4</module> <module>once</module> <module>openai</module> diff --git a/integration-tests/ognl/pom.xml b/integration-tests/ognl/pom.xml deleted file mode 100644 index 0671db7d807..00000000000 --- a/integration-tests/ognl/pom.xml +++ /dev/null @@ -1,161 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - ---> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-build-parent-it</artifactId> - <version>4.0.0-SNAPSHOT</version> - <relativePath>../../poms/build-parent-it/pom.xml</relativePath> - </parent> - - <artifactId>camel-quarkus-integration-test-ognl</artifactId> - <name>Camel Quarkus :: Integration Tests :: OGNL</name> - <description>Integration tests for Camel Quarkus OGNL extension</description> - - <dependencies> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-direct</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-kamelet</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-bean</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-ognl</artifactId> - </dependency> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-resteasy</artifactId> - </dependency> - - <!-- test dependencies --> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>io.rest-assured</groupId> - <artifactId>rest-assured</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - - <profiles> - <profile> - <id>virtualDependencies</id> - <activation> - <property> - <name>!noVirtualDependencies</name> - </property> - </activation> - <dependencies> - <!-- The following dependencies guarantee that this module is built after them. You can update them by running `mvn process-resources -Pformat -N` from the source tree root directory --> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-bean-deployment</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>*</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-direct-deployment</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>*</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-kamelet-deployment</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>*</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-ognl-deployment</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>*</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> - </dependencies> - </profile> - <profile> - <id>native</id> - <activation> - <property> - <name>native</name> - </property> - </activation> - <properties> - <quarkus.native.enabled>true</quarkus.native.enabled> - </properties> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-failsafe-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>integration-test</goal> - <goal>verify</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> - -</project> diff --git a/integration-tests/ognl/src/main/java/org/apache/camel/quarkus/component/ognl/it/OgnlResource.java b/integration-tests/ognl/src/main/java/org/apache/camel/quarkus/component/ognl/it/OgnlResource.java deleted file mode 100644 index f8a7705003b..00000000000 --- a/integration-tests/ognl/src/main/java/org/apache/camel/quarkus/component/ognl/it/OgnlResource.java +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.quarkus.component.ognl.it; - -import java.util.Map; - -import jakarta.enterprise.context.ApplicationScoped; -import jakarta.inject.Inject; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.core.MediaType; -import org.apache.camel.ProducerTemplate; -import org.apache.camel.quarkus.component.ognl.it.model.Animal; - -@Path("/ognl") -@ApplicationScoped -public class OgnlResource { - - @Inject - ProducerTemplate producerTemplate; - - @POST - @Path("/hello") - @Consumes(MediaType.TEXT_PLAIN) - @Produces(MediaType.TEXT_PLAIN) - public String hello(String message) { - return producerTemplate.requestBody("direct:ognlHello", message, String.class); - } - - @GET - @Path("/hi") - public String hi() { - return producerTemplate.requestBody("direct:ognlHi", null, String.class); - } - - @POST - @Path("/predicate") - @Consumes(MediaType.TEXT_PLAIN) - @Produces(MediaType.TEXT_PLAIN) - public String predicate(String message) { - return producerTemplate.requestBody("direct:predicate", Integer.valueOf(message), String.class); - } - - @GET - @Path("/invokeMethod") - @Produces(MediaType.TEXT_PLAIN) - public String invokeMethod() { - Animal animal = new Animal("Tony the Tiger", 12); - return producerTemplate.requestBody("direct:invokeMethod", animal, String.class); - } - - @GET - @Path("/ognlExpressions") - @Produces(MediaType.TEXT_PLAIN) - public String ognlExpressions() { - return producerTemplate.requestBodyAndHeaders("direct:ognlExpressions", "<hello id='m123'>world!</hello>", - Map.of("foo", "abc", "bar", 123), String.class); - } -} diff --git a/integration-tests/ognl/src/main/java/org/apache/camel/quarkus/component/ognl/it/OgnlRoute.java b/integration-tests/ognl/src/main/java/org/apache/camel/quarkus/component/ognl/it/OgnlRoute.java deleted file mode 100644 index d0b6a9497c4..00000000000 --- a/integration-tests/ognl/src/main/java/org/apache/camel/quarkus/component/ognl/it/OgnlRoute.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.quarkus.component.ognl.it; - -import org.apache.camel.builder.RouteBuilder; - -public class OgnlRoute extends RouteBuilder { - @Override - public void configure() { - routeTemplate("whereTo") - .templateParameter("bar") - .templateBean("myBar", "ognl", "\"Hi\"") - .from("kamelet:source") - .to("bean:{{myBar}}?method=toString") - .setBody().ognl("request.body + \" {{bar}}\""); - - from("direct:ognlHi") - .kamelet("whereTo?bar=John"); - - from("direct:ognlHello") - .transform().ognl("\"Hello \" + request.body + \" from OGNL!\""); - - from("direct:invokeMethod") - .transform().ognl("request.body.name + \"/\" + request.body.isDangerous()"); - from("direct:ognlExpressions") - .setBody() - .ognl("exchange.getIn().body + \"/\" + getRequest().body + \"/\" + request.body + \"/\" + getRequest().headers['foo'] + \"/\" + getRequest().headers.foo + \"/\" + request.headers.foo"); - - from("direct:predicate") - .choice() - .when().ognl("request.body / 2 > 10") - .setBody().constant("High").endChoice() - .otherwise() - .setBody().constant("Low").endChoice(); - } -} diff --git a/integration-tests/ognl/src/main/java/org/apache/camel/quarkus/component/ognl/it/model/Animal.java b/integration-tests/ognl/src/main/java/org/apache/camel/quarkus/component/ognl/it/model/Animal.java deleted file mode 100644 index 90cb4fe5e83..00000000000 --- a/integration-tests/ognl/src/main/java/org/apache/camel/quarkus/component/ognl/it/model/Animal.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.quarkus.component.ognl.it.model; - -import io.quarkus.runtime.annotations.RegisterForReflection; - -@RegisterForReflection -public class Animal { - private String name; - private int age; - private Animal friend; - - public Animal(String name, int age) { - this.name = name; - this.age = age; - } - - public String getName() { - return name; - } - - public int getAge() { - return age; - } - - public Animal getFriend() { - return friend; - } - - public void setFriend(Animal friend) { - this.friend = friend; - } - - public boolean isDangerous() { - return name.contains("Tiger"); - } - - @Override - public String toString() { - return name; - } - - public static String getClassName() { - return "Animal"; - } -} diff --git a/integration-tests/ognl/src/test/java/org/apache/camel/quarkus/component/ognl/it/OgnlIT.java b/integration-tests/ognl/src/test/java/org/apache/camel/quarkus/component/ognl/it/OgnlIT.java deleted file mode 100644 index 550445f7c57..00000000000 --- a/integration-tests/ognl/src/test/java/org/apache/camel/quarkus/component/ognl/it/OgnlIT.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.quarkus.component.ognl.it; - -import io.quarkus.test.junit.QuarkusIntegrationTest; - -@QuarkusIntegrationTest -public class OgnlIT extends OgnlTest { -} diff --git a/integration-tests/ognl/src/test/java/org/apache/camel/quarkus/component/ognl/it/OgnlTest.java b/integration-tests/ognl/src/test/java/org/apache/camel/quarkus/component/ognl/it/OgnlTest.java deleted file mode 100644 index 262ff254957..00000000000 --- a/integration-tests/ognl/src/test/java/org/apache/camel/quarkus/component/ognl/it/OgnlTest.java +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.quarkus.component.ognl.it; - -import io.quarkus.test.junit.QuarkusTest; -import io.restassured.RestAssured; -import org.hamcrest.CoreMatchers; -import org.junit.jupiter.api.Test; - -@QuarkusTest -class OgnlTest { - - @Test - void ognlHello() { - RestAssured.given() - .body("Jack Smith") - .post("/ognl/hello") - .then() - .statusCode(200) - .body(CoreMatchers.is("Hello Jack Smith from OGNL!")); - } - - @Test - void ognlHi() { - RestAssured.given() - .get("/ognl/hi") - .then() - .statusCode(200) - .body(CoreMatchers.is("Hi John")); - } - - @Test - void ognlHigh() { - RestAssured.given() - .body("45") - .post("/ognl/predicate") - .then() - .statusCode(200) - .body(CoreMatchers.is("High")); - } - - @Test - void ognlLow() { - RestAssured.given() - .body("13") - .post("/ognl/predicate") - .then() - .statusCode(200) - .body(CoreMatchers.is("Low")); - } - - @Test - void invokeMethod() { - RestAssured.given() - .get("/ognl/invokeMethod") - .then() - .statusCode(200) - .body(CoreMatchers.is("Tony the Tiger/true")); - } - - @Test - void ognlExpressions() { - RestAssured.given() - .get("/ognl/ognlExpressions") - .then() - .statusCode(200) - .body(CoreMatchers.is( - "<hello id='m123'>world!</hello>/<hello id='m123'>world!</hello>/<hello id='m123'>world!</hello>/abc/abc/abc")); - } -} diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index 2b7d86fb229..705fbe1e3d9 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -199,7 +199,6 @@ <module>observability-services</module> <module>ocsf</module> <module>odata</module> - <module>ognl</module> <module>olingo4</module> <module>once</module> <module>openai</module> diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index ad9f88f771e..a27e7142044 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -2502,11 +2502,6 @@ <artifactId>camel-odata</artifactId> <version>${camel.version}</version> </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-ognl</artifactId> - <version>${camel.version}</version> - </dependency> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-olingo4</artifactId> @@ -5818,16 +5813,6 @@ <artifactId>camel-quarkus-odata-deployment</artifactId> <version>${camel-quarkus.version}</version> </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-ognl</artifactId> - <version>${camel-quarkus.version}</version> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-ognl-deployment</artifactId> - <version>${camel-quarkus.version}</version> - </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-olingo4</artifactId> diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 96011172d48..ef3ebd551f5 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -2425,11 +2425,6 @@ <artifactId>camel-odata</artifactId> <version>4.24.0-SNAPSHOT</version> </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-ognl</artifactId> - <version>4.24.0-SNAPSHOT</version> - </dependency> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-olingo4</artifactId> @@ -5723,16 +5718,6 @@ <artifactId>camel-quarkus-odata-deployment</artifactId> <version>4.0.0-SNAPSHOT</version> </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-ognl</artifactId> - <version>4.0.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-ognl-deployment</artifactId> - <version>4.0.0-SNAPSHOT</version> - </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-olingo4</artifactId> diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 6dfc93af3f4..04b9a37b1ad 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -3830,11 +3830,6 @@ <artifactId>camel-odata</artifactId> <version>4.24.0-SNAPSHOT</version> </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-ognl</artifactId> - <version>4.24.0-SNAPSHOT</version> - </dependency> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-olingo4</artifactId> @@ -7133,16 +7128,6 @@ <artifactId>camel-quarkus-odata-deployment</artifactId> <version>4.0.0-SNAPSHOT</version> </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-ognl</artifactId> - <version>4.0.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-ognl-deployment</artifactId> - <version>4.0.0-SNAPSHOT</version> - </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-olingo4</artifactId> diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index ea4293e835b..f720b71e015 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -3830,11 +3830,6 @@ <artifactId>camel-odata</artifactId> <version>4.24.0-SNAPSHOT</version> </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-ognl</artifactId> - <version>4.24.0-SNAPSHOT</version> - </dependency> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-olingo4</artifactId> @@ -7133,16 +7128,6 @@ <artifactId>camel-quarkus-odata-deployment</artifactId> <version>4.0.0-SNAPSHOT</version> </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-ognl</artifactId> - <version>4.0.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-ognl-deployment</artifactId> - <version>4.0.0-SNAPSHOT</version> - </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-olingo4</artifactId> diff --git a/tooling/scripts/test-categories.yaml b/tooling/scripts/test-categories.yaml index 1c2d1607309..5675675db41 100644 --- a/tooling/scripts/test-categories.yaml +++ b/tooling/scripts/test-categories.yaml @@ -140,7 +140,6 @@ group-07: - langchain4j-rag-bridge-ql4j - ldap - lumberjack - - ognl - olingo4 - openai - optaplanner
