This is an automated email from the ASF dual-hosted git repository.
shuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/unomi.git
The following commit(s) were added to refs/heads/master by this push:
new e97965e - Attempt to fix integration tests - Activate GraphQL feature
by default
e97965e is described below
commit e97965ea5e965ac67b51be97d8c7220154fca15a
Author: Serge Huber <[email protected]>
AuthorDate: Fri May 29 17:33:58 2020 +0200
- Attempt to fix integration tests
- Activate GraphQL feature by default
---
graphql/cxs-impl/pom.xml | 10 ++--
graphql/karaf-feature/pom.xml | 32 ++----------
graphql/karaf-feature/src/main/feature/feature.xml | 57 ++++++++++++++++++++++
graphql/pom.xml | 1 -
.../test/java/org/apache/unomi/itests/AllITs.java | 37 ++++++++------
.../test/java/org/apache/unomi/itests/BaseIT.java | 16 ------
package/pom.xml | 10 ++++
.../resources/OSGI-INF/blueprint/blueprint.xml | 1 +
8 files changed, 99 insertions(+), 65 deletions(-)
diff --git a/graphql/cxs-impl/pom.xml b/graphql/cxs-impl/pom.xml
index cd52e78..d79a7ce 100644
--- a/graphql/cxs-impl/pom.xml
+++ b/graphql/cxs-impl/pom.xml
@@ -50,31 +50,31 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
- <version>${jackson.version}</version>
+ <version>${version.jackson.core}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
- <version>${jackson.version}</version>
+ <version>${version.jackson.core}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>${jackson.version}</version>
+ <version>${version.jackson.databind}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jdk8</artifactId>
- <version>${jackson.version}</version>
+ <version>${version.jackson.core}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-jaxb-annotations</artifactId>
- <version>${jackson.version}</version>
+ <version>${version.jackson.jaxb}</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/graphql/karaf-feature/pom.xml b/graphql/karaf-feature/pom.xml
index a5cb670..07f4478 100644
--- a/graphql/karaf-feature/pom.xml
+++ b/graphql/karaf-feature/pom.xml
@@ -31,37 +31,14 @@
<description>Apache Unomi Context GraphQL API Karaf Feature</description>
<dependencies>
-
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- <version>${jackson.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- <version>${jackson.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.module</groupId>
- <artifactId>jackson-module-jaxb-annotations</artifactId>
- <version>${jackson.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- <version>${jackson.version}</version>
- <scope>compile</scope>
- </dependency>
+ <!--
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jdk8</artifactId>
- <version>${jackson.version}</version>
+ <version>${version.jackson.core}</version>
<scope>compile</scope>
</dependency>
+ -->
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
@@ -135,8 +112,7 @@
<extensions>true</extensions>
<configuration>
<startLevel>80</startLevel>
- <addTransitiveFeatures>true</addTransitiveFeatures>
-
<includeTransitiveDependency>true</includeTransitiveDependency>
+
<includeTransitiveDependency>false</includeTransitiveDependency>
</configuration>
</plugin>
</plugins>
diff --git a/graphql/karaf-feature/src/main/feature/feature.xml
b/graphql/karaf-feature/src/main/feature/feature.xml
new file mode 100644
index 0000000..3579d2b
--- /dev/null
+++ b/graphql/karaf-feature/src/main/feature/feature.xml
@@ -0,0 +1,57 @@
+<?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="cdp-graphql-feature">
+ <feature name="cdp-graphql-feature" description="Apache Unomi :: GraphQL
API :: Karaf Feature" version="2.0.0.SNAPSHOT">
+ <details>Apache Unomi Context GraphQL API Karaf Feature</details>
+ <feature>unomi-kar</feature>
+ <feature prerequisite="true" dependency="false">wrap</feature>
+ <bundle start-level="80">mvn:com.google.guava/guava/24.1.1-jre</bundle>
+ <bundle
start-level="80">wrap:mvn:com.google.code.findbugs/jsr305/1.3.9</bundle>
+ <bundle
start-level="80">wrap:mvn:org.checkerframework/checker-compat-qual/2.0.0</bundle>
+ <bundle
start-level="80">wrap:mvn:com.google.errorprone/error_prone_annotations/2.1.3</bundle>
+ <bundle
start-level="80">wrap:mvn:com.google.j2objc/j2objc-annotations/1.1</bundle>
+ <bundle
start-level="80">wrap:mvn:org.codehaus.mojo/animal-sniffer-annotations/1.14</bundle>
+ <bundle
start-level="80">mvn:commons-fileupload/commons-fileupload/1.3.1</bundle>
+ <bundle start-level="80">mvn:commons-io/commons-io/2.4</bundle>
+ <bundle start-level="80">mvn:org.antlr/antlr4-runtime/4.7.1</bundle>
+ <bundle
start-level="80">mvn:com.graphql-java/java-dataloader/2.2.0</bundle>
+ <bundle
start-level="80">mvn:org.reactivestreams/reactive-streams/1.0.2</bundle>
+ <bundle
start-level="80">mvn:com.graphql-java/graphql-java/14.0</bundle>
+ <bundle
start-level="80">mvn:io.github.graphql-java/graphql-java-annotations/8.0</bundle>
+ <bundle
start-level="80">mvn:javax.validation/validation-api/1.1.0.Final</bundle>
+ <bundle
start-level="80">wrap:mvn:com.graphql-java/graphql-java-extended-scalars/1.0</bundle>
+ <bundle
start-level="80">wrap:mvn:com.squareup.okhttp3/okhttp/3.2.0</bundle>
+ <bundle start-level="80">wrap:mvn:com.squareup.okio/okio/1.6.0</bundle>
+ <bundle
start-level="80">mvn:io.reactivex.rxjava2/rxjava/2.2.19</bundle>
+ <bundle
start-level="80">mvn:org.eclipse.jetty.websocket/websocket-server/9.4.28.v20200408</bundle>
+ <bundle
start-level="80">mvn:org.eclipse.jetty.websocket/websocket-common/9.4.28.v20200408</bundle>
+ <bundle
start-level="80">mvn:org.eclipse.jetty.websocket/websocket-api/9.4.28.v20200408</bundle>
+ <bundle
start-level="80">mvn:org.eclipse.jetty/jetty-util/9.4.28.v20200408</bundle>
+ <bundle
start-level="80">mvn:org.eclipse.jetty/jetty-io/9.4.28.v20200408</bundle>
+ <bundle
start-level="80">mvn:org.eclipse.jetty.websocket/websocket-client/9.4.28.v20200408</bundle>
+ <bundle
start-level="80">mvn:org.eclipse.jetty/jetty-client/9.4.28.v20200408</bundle>
+ <bundle
start-level="80">mvn:org.eclipse.jetty/jetty-xml/9.4.28.v20200408</bundle>
+ <bundle
start-level="80">mvn:org.eclipse.jetty.websocket/websocket-servlet/9.4.28.v20200408</bundle>
+ <bundle
start-level="80">mvn:javax.servlet/javax.servlet-api/3.0.1</bundle>
+ <bundle
start-level="80">mvn:org.eclipse.jetty/jetty-servlet/9.4.28.v20200408</bundle>
+ <bundle
start-level="80">mvn:org.eclipse.jetty/jetty-security/9.4.28.v20200408</bundle>
+ <bundle
start-level="80">mvn:org.eclipse.jetty/jetty-server/9.4.28.v20200408</bundle>
+ <bundle
start-level="80">mvn:org.eclipse.jetty/jetty-http/9.4.28.v20200408</bundle>
+ <bundle start-level="80"
start="false">mvn:org.apache.unomi/cdp-graphql-api-impl/2.0.0-SNAPSHOT</bundle>
+ </feature>
+</features>
diff --git a/graphql/pom.xml b/graphql/pom.xml
index 2b9b53e..eaa4219 100644
--- a/graphql/pom.xml
+++ b/graphql/pom.xml
@@ -35,7 +35,6 @@
<graphql.java.version>14.0</graphql.java.version>
<graphql.java.annotations.version>8.0</graphql.java.annotations.version>
<graphql.java.extended.scalars.version>1.0</graphql.java.extended.scalars.version>
- <jackson.version>2.9.7</jackson.version>
<reactivex.version>2.2.19</reactivex.version>
<jetty.websocket.version>9.4.28.v20200408</jetty.websocket.version>
</properties>
diff --git a/itests/src/test/java/org/apache/unomi/itests/AllITs.java
b/itests/src/test/java/org/apache/unomi/itests/AllITs.java
index 73245e7..7a870d9 100644
--- a/itests/src/test/java/org/apache/unomi/itests/AllITs.java
+++ b/itests/src/test/java/org/apache/unomi/itests/AllITs.java
@@ -17,6 +17,7 @@
package org.apache.unomi.itests;
+import org.apache.unomi.itests.graphql.*;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
import org.junit.runners.Suite.SuiteClasses;
@@ -28,21 +29,27 @@ import org.junit.runners.Suite.SuiteClasses;
*/
@RunWith(Suite.class)
@SuiteClasses({
- BasicIT.class,
- ConditionEvaluatorIT.class,
- ConditionESQueryBuilderIT.class,
- SegmentIT.class,
- ProfileServiceIT.class,
- ProfileImportBasicIT.class,
- ProfileImportSurfersIT.class,
- ProfileImportRankingIT.class,
- ProfileImportActorsIT.class,
- ProfileExportIT.class,
- PropertiesUpdateActionIT.class,
- ModifyConsentIT.class,
- PatchIT.class,
- ContextServletIT.class,
- SecurityIT.class
+ BasicIT.class,
+ ConditionEvaluatorIT.class,
+ ConditionESQueryBuilderIT.class,
+ SegmentIT.class,
+ ProfileServiceIT.class,
+ ProfileImportBasicIT.class,
+ ProfileImportSurfersIT.class,
+ ProfileImportRankingIT.class,
+ ProfileImportActorsIT.class,
+ ProfileExportIT.class,
+ PropertiesUpdateActionIT.class,
+ ModifyConsentIT.class,
+ PatchIT.class,
+ ContextServletIT.class,
+ SecurityIT.class,
+ GraphQLEventIT.class,
+ GraphQLListIT.class,
+ GraphQLProfileIT.class,
+ GraphQLProfilePropertiesIT.class,
+ GraphQLSegmentIT.class,
+ GraphQLWebSocketIT.class
})
public class AllITs {
}
diff --git a/itests/src/test/java/org/apache/unomi/itests/BaseIT.java
b/itests/src/test/java/org/apache/unomi/itests/BaseIT.java
index 60afb36..336771d 100644
--- a/itests/src/test/java/org/apache/unomi/itests/BaseIT.java
+++ b/itests/src/test/java/org/apache/unomi/itests/BaseIT.java
@@ -59,20 +59,6 @@ public abstract class BaseIT {
.type("tar.gz")
.versionAsInProject();
- MavenUrlReference routerRepo = maven()
- .groupId("org.apache.unomi")
- .artifactId("unomi-router-karaf-feature")
- .classifier("features")
- .type("xml")
- .versionAsInProject();
-
- MavenUrlReference cdpGraphQLRepo = maven()
- .groupId("org.apache.unomi")
- .artifactId("cdp-graphql-feature")
- .classifier("features")
- .type("xml")
- .versionAsInProject();
-
List<Option> options = new ArrayList<>();
Option[] commonOptions = new Option[]{
@@ -116,8 +102,6 @@ public abstract class BaseIT {
systemProperty("org.apache.unomi.hazelcast.tcp-ip.members").value("127.0.0.1"),
systemProperty("org.apache.unomi.hazelcast.tcp-ip.interface").value("127.0.0.1"),
systemProperty("unomi.autoStart").value("true"),
- features(routerRepo, "unomi-router-karaf-feature"),
- features(cdpGraphQLRepo, "cdp-graphql-feature"),
CoreOptions.bundleStartLevel(100),
CoreOptions.frameworkStartLevel(100)
};
diff --git a/package/pom.xml b/package/pom.xml
index b28a92a..c995048 100644
--- a/package/pom.xml
+++ b/package/pom.xml
@@ -114,6 +114,15 @@
<type>xml</type>
<scope>runtime</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.unomi</groupId>
+ <artifactId>cdp-graphql-feature</artifactId>
+ <version>${project.version}</version>
+ <classifier>features</classifier>
+ <type>xml</type>
+ <scope>runtime</scope>
+ </dependency>
</dependencies>
<build>
@@ -334,6 +343,7 @@
<feature>unomi-kar</feature>
<feature>unomi-router-karaf-feature</feature>
<feature>unomi-web-tracker-karaf-kar</feature>
+ <feature>cdp-graphql-feature</feature>
</bootFeatures>
<!--
<libraries>
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 d490a0f..446f821 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
@@ -56,6 +56,7 @@
<value>org.apache.unomi.router-rest</value>
<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>
</list>
</property>
<property name="bundleContext" ref="blueprintBundleContext"/>
