You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2022/01/10 09:06:57 UTC
[camel] 03/04: camel-cdi - camel-cdi is not supported on osgi/karaf, remove old cruft.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit ec048364e34896cde7148c9c0ee4b25b3f39f5f9
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Jan 10 10:00:32 2022 +0100
camel-cdi - camel-cdi is not supported on osgi/karaf, remove old cruft.
---
components/camel-cdi/pom.xml | 177 +------------------------------------------
1 file changed, 1 insertion(+), 176 deletions(-)
diff --git a/components/camel-cdi/pom.xml b/components/camel-cdi/pom.xml
index 02fd9f0..1832ca5 100644
--- a/components/camel-cdi/pom.xml
+++ b/components/camel-cdi/pom.xml
@@ -36,41 +36,6 @@
<firstVersion>2.10.0</firstVersion>
<label>java</label>
<title>CDI</title>
-
- <camel.osgi.provide.capability>
- osgi.cdi.extension;osgi.cdi.extension="org.apache.camel.cdi";
- version:Version="${camel.osgi.version}";
- aries.cdi.extension.bean.classes:List<String>="org.apache.camel.cdi.CdiCamelFactory,org.apache.camel.cdi.CdiEventComponent";
- uses:="javax.annotation,javax.enterprise.event,javax.enterprise.inject.spi",
- osgi.service;objectClass:List<String>="javax.enterprise.inject.spi.Extension",
- osgi.service;objectClass:List<String>="javax.enterprise.inject.spi.Extension";
- uses:="javax.enterprise.inject.spi";
- osgi.cdi.extension="org.apache.camel.cdi";
- service.scope=prototype;service.vendor="Apache Software Foundation";
- version:Version="${camel.osgi.version}";
- effective:=active,
- osgi.serviceloader;osgi.serviceloader="javax.enterprise.inject.spi.Extension";
- register:="org.apache.camel.cdi.CdiCamelExtension";
- uses:="javax.enterprise.inject.spi";
- osgi.cdi.extension="org.apache.camel.cdi";
- service.scope=prototype;
- service.vendor="Apache Software Foundation";
- version:Version="${camel.osgi.version}"
- </camel.osgi.provide.capability>
- <camel.osgi.require.capability>
- osgi.extender;filter:="(&(osgi.extender=osgi.cdi)(version>=1.0.0)(!(version>=2.0.0)))",
- osgi.extender;filter:="(&(osgi.extender=osgi.serviceloader.registrar)(version>=1.0.0)(!(version>=2.0.0)))",
- osgi.contract;osgi.contract=JavaInject;filter:="(&(osgi.contract=JavaInject)(version=1.0.0))",
- osgi.contract;osgi.contract=JavaCDI;filter:="(&(osgi.contract=JavaCDI)(version=2.0.0))",
- osgi.contract;osgi.contract=JavaAnnotation;filter:="(&(osgi.contract=JavaAnnotation)(version=1.3.0))"
- </camel.osgi.require.capability>
- <camel.osgi.import>
- !org.apache.camel.cdi.*,
- !org.apache.deltaspike.cdise.api.*,
- javax.xml.bind*;version="[2.2,3.0);optional=true",
- ${camel.osgi.import.defaults},
- *
- </camel.osgi.import>
</properties>
<dependencyManagement>
@@ -293,7 +258,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.10</version>
+ <version>3.2.0</version>
<executions>
<execution>
<id>copy-jaxb</id>
@@ -373,145 +338,5 @@
</dependencies>
</profile>
-
- <profile>
- <id>owb-1.0</id>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/*Cdi12Test.java</exclude>
- <exclude>**/*Cdi20Test.java</exclude>
- <!-- OWB does not call the InjectionTarget#preDestroy method -->
- <exclude>**/UnstoppedCamelContext*Test.java</exclude>
- <!-- Reactivate when OWB-1155 is fixed -->
- <exclude>**/ProgrammaticLookupTest.java</exclude>
- <!-- Reactivate when OWB-1126 is fixed -->
- <exclude>**/Xml*Test.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
-
- <!-- provided dependencies -->
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_1.0_spec</artifactId>
- <version>${geronimo-jcdi-1.0-spec-version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
- <version>${geronimo-atinject-1.0-spec-version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-interceptor_1.1_spec</artifactId>
- <version>${geronimo-interceptor-1.1-spec-version}</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- test dependencies -->
-
- <dependency>
- <groupId>org.apache.openwebbeans.arquillian</groupId>
- <artifactId>owb-arquillian-standalone</artifactId>
- <version>${openwebbeans1-version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-impl</artifactId>
- <version>${openwebbeans1-version}</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
- </profile>
-
- <profile>
- <id>owb-1.2</id>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/*Cdi20Test.java</exclude>
- <!-- Reactivate when OWB-1155 is fixed -->
- <exclude>**/ProgrammaticLookupTest.java</exclude>
- <!-- Reactivate when OWB-1126 is fixed -->
- <exclude>**/Xml*Test.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
-
- <!-- provided dependencies -->
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_1.1_spec</artifactId>
- <version>${geronimo-jcdi-1.1-spec-version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
- <version>${geronimo-atinject-1.0-spec-version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.2_spec</artifactId>
- <version>${geronimo-annotation-1.2-spec-version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-interceptor_1.2_spec</artifactId>
- <version>${geronimo-interceptor-1.2-spec-version}</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- test dependencies -->
-
- <dependency>
- <groupId>org.apache.openwebbeans.arquillian</groupId>
- <artifactId>owb-arquillian-standalone</artifactId>
- <version>${openwebbeans-version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-impl</artifactId>
- <version>${openwebbeans-version}</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
- </profile>
</profiles>
</project>