This is an automated email from the ASF dual-hosted git repository. shuber pushed a commit to branch UNOMI-528-fix-groovy-actions in repository https://gitbox.apache.org/repos/asf/unomi.git
commit faf6e9dd31d86e4e49e196774d1e4dbd61b88eb9 Author: Serge Huber <[email protected]> AuthorDate: Tue Nov 16 18:05:57 2021 +0100 Fix Groovy actions startup: - Removed Groovy actions bundles from Unomi KAR - Added a feature.xml file for the Groovy Actions feature - Added the Groovy actions bundles to the unomi:start managed bundles - Fix a (weird) problem with the dependencies for the integration tests --- extensions/groovy-actions/karaf-kar/pom.xml | 55 ---------------------- .../karaf-kar/src/main/feature/feature.xml | 31 ++++++++++++ itests/pom.xml | 6 +++ kar/src/main/feature/feature.xml | 2 - .../resources/OSGI-INF/blueprint/blueprint.xml | 2 + 5 files changed, 39 insertions(+), 57 deletions(-) diff --git a/extensions/groovy-actions/karaf-kar/pom.xml b/extensions/groovy-actions/karaf-kar/pom.xml index f5be462..651d918 100644 --- a/extensions/groovy-actions/karaf-kar/pom.xml +++ b/extensions/groovy-actions/karaf-kar/pom.xml @@ -32,56 +32,6 @@ </description> <packaging>kar</packaging> - <dependencies> - <dependency> - <groupId>org.apache.unomi</groupId> - <artifactId>unomi-api</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.unomi</groupId> - <artifactId>unomi-services</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy</artifactId> - <version>${groovy.version}</version> - </dependency> - <dependency> - <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-xml</artifactId> - <version>${groovy.version}</version> - </dependency> - <dependency> - <groupId>org.apache.unomi</groupId> - <artifactId>unomi-groovy-actions-services</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.unomi</groupId> - <artifactId>unomi-groovy-actions-rest</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>io.github.http-builder-ng</groupId> - <artifactId>http-builder-ng-core</artifactId> - <version>1.0.4</version> - </dependency> - <dependency> - <groupId>org.jsoup</groupId> - <artifactId>jsoup</artifactId> - <version>1.13.1</version> - </dependency> - <dependency> - <groupId>com.sun.activation</groupId> - <artifactId>javax.activation</artifactId> - <version>1.2.0</version> - </dependency> - </dependencies> - <build> <pluginManagement> <plugins> @@ -90,11 +40,6 @@ <artifactId>karaf-maven-plugin</artifactId> <extensions>true</extensions> <configuration> - <dependencyFeatures> - <dependencyFeature> - unomi-kar - </dependencyFeature> - </dependencyFeatures> <includeTransitiveDependency>false</includeTransitiveDependency> </configuration> </plugin> diff --git a/extensions/groovy-actions/karaf-kar/src/main/feature/feature.xml b/extensions/groovy-actions/karaf-kar/src/main/feature/feature.xml new file mode 100644 index 0000000..ff73575 --- /dev/null +++ b/extensions/groovy-actions/karaf-kar/src/main/feature/feature.xml @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<!-- + ~ 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. + --> +<features xmlns="http://karaf.apache.org/xmlns/features/v1.6.0"; name="unomi-groovy-actions"> + <feature name="unomi-groovy-actions" description="${project.name}" version="${project.version}"> + <details>${project.description}</details> + <feature prerequisite="true" dependency="false">wrap</feature> + <feature>unomi-kar</feature> + <bundle start-level="85">mvn:org.codehaus.groovy/groovy/3.0.3</bundle> + <bundle start-level="85">mvn:org.codehaus.groovy/groovy-xml/3.0.3</bundle> + <bundle start-level="85" start="false">mvn:org.apache.unomi/unomi-groovy-actions-services/${project.version}</bundle> + <bundle start-level="85" start="false">mvn:org.apache.unomi/unomi-groovy-actions-rest/${project.version}</bundle> + <bundle start-level="85">wrap:mvn:io.github.http-builder-ng/http-builder-ng-core/1.0.4</bundle> + <bundle start-level="85">mvn:org.jsoup/jsoup/1.13.1</bundle> + <bundle start-level="85">mvn:com.sun.activation/javax.activation/1.2.0</bundle> + </feature> +</features> diff --git a/itests/pom.xml b/itests/pom.xml index 50c1ccf..86955ad 100644 --- a/itests/pom.xml +++ b/itests/pom.xml @@ -76,6 +76,12 @@ <scope>provided</scope> </dependency> <dependency> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy</artifactId> + <version>${groovy.version}</version> + <scope>provided</scope> + </dependency> + <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient-osgi</artifactId> <type>bundle</type> diff --git a/kar/src/main/feature/feature.xml b/kar/src/main/feature/feature.xml index ce4ea37..3b0d695 100644 --- a/kar/src/main/feature/feature.xml +++ b/kar/src/main/feature/feature.xml @@ -78,8 +78,6 @@ <bundle start-level="77" start="false">mvn:org.apache.unomi/cxs-geonames-rest/${project.version}</bundle> <bundle start-level="77" start="false">mvn:org.apache.unomi/cxs-privacy-extension-services/${project.version}</bundle> <bundle start-level="77" start="false">mvn:org.apache.unomi/cxs-privacy-extension-rest/${project.version}</bundle> - <bundle start-level="77" start="false">mvn:org.apache.unomi/unomi-groovy-actions-services/${project.version}</bundle> - <bundle start-level="77" start="false">mvn:org.apache.unomi/unomi-groovy-actions-rest/${project.version}</bundle> <bundle start-level="78" start="false">mvn:org.apache.unomi/unomi-rest/${project.version}</bundle> <bundle start-level="85" start="false">mvn:org.apache.unomi/unomi-wab/${project.version}</bundle> <bundle start-level="85" start="false">mvn:org.apache.unomi/unomi-plugins-base/${project.version}</bundle> diff --git a/tools/shell-commands/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/tools/shell-commands/src/main/resources/OSGI-INF/blueprint/blueprint.xml index fcd4c87..a6223d5 100644 --- a/tools/shell-commands/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/tools/shell-commands/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -58,6 +58,8 @@ <value>org.apache.unomi.shell-dev-commands</value> <value>org.apache.unomi.web-tracker-wab</value> <value>org.apache.unomi.cdp-graphql-api-impl</value> + <value>org.apache.unomi.groovy-actions-services</value> + <value>org.apache.unomi.groovy-actions-rest</value> </list> </property> <property name="bundleContext" ref="blueprintBundleContext"/>
