switch to gradle
gradle files added gradle: plugins added build: files added .travis.yml: gradle cache stored distribution: tar and zip file stuff added broker/build.gradle: osgi plugin added build: bintray upload added pom: files removed distribution: assembly.xml removed gradle: test ouput added to sub builds .editorconfig: gradle files added build: wrapper task added osgi: added to h2_ and mapdb_storage gradle: files cleaned build.gradle: jars used for tar/zip
This commit is contained in:
Andreas Mager
committed by
Andreas Mager
Andreas Mager
parent
7c4f902dbd
commit
e8b105fa90
+1
-1
@@ -2,4 +2,4 @@
|
||||
|
||||
to run the osgi tests use:
|
||||
|
||||
mvn clean && mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V && mvn -B test -pl osgi_test
|
||||
./gradlew install moquette-osgi-test:test --rerun-tasks
|
||||
|
||||
@@ -0,0 +1,22 @@
|
||||
|
||||
description = 'Moquette - OSGi test'
|
||||
|
||||
ext {
|
||||
paxExamVersion = '4.6.0'
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile project(':moquette-broker')
|
||||
compile project(':moquette-h2-storage')
|
||||
compile project(':moquette-mapdb-storage')
|
||||
|
||||
testCompile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.5'
|
||||
testCompile group: 'org.slf4j', name: 'slf4j-log4j12', version: '1.7.5'
|
||||
|
||||
testCompile group: 'org.ops4j.pax.exam', name: 'pax-exam-container-native', version: paxExamVersion
|
||||
testCompile group: 'org.ops4j.pax.exam', name: 'pax-exam-junit4', version: paxExamVersion
|
||||
testCompile group: 'org.ops4j.pax.exam', name: 'pax-exam-link-mvn', version: paxExamVersion
|
||||
testCompile group: 'org.ops4j.pax.url', name: 'pax-url-aether', version:'1.4.0'
|
||||
testCompile group: 'org.apache.felix', name: 'org.apache.felix.framework', version:'5.0.0'
|
||||
testCompile group: 'javax.inject', name: 'javax.inject', version:'1'
|
||||
}
|
||||
@@ -1,183 +0,0 @@
|
||||
<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>
|
||||
<relativePath>../</relativePath>
|
||||
<artifactId>moquette-parent</artifactId>
|
||||
<groupId>io.moquette</groupId>
|
||||
<version>0.11-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>moquette-osgi-test</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
<name>Moquette - OSGi test</name>
|
||||
|
||||
<properties>
|
||||
<pax.exam.version>4.6.0</pax.exam.version>
|
||||
<url.version>1.4.0</url.version>
|
||||
</properties>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>io.moquette</groupId>
|
||||
<artifactId>moquette-broker</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>io.moquette</groupId>
|
||||
<artifactId>moquette-h2-storage</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>io.moquette</groupId>
|
||||
<artifactId>moquette-mapdb-storage</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>javax.servlet-api</artifactId>
|
||||
<version>3.1.0</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-api</artifactId>
|
||||
<version>1.7.5</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-log4j12</artifactId>
|
||||
<version>1.7.5</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.ops4j.pax.exam</groupId>
|
||||
<artifactId>pax-exam-container-native</artifactId>
|
||||
<version>${pax.exam.version}</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.ops4j.pax.exam</groupId>
|
||||
<artifactId>pax-exam-junit4</artifactId>
|
||||
<version>${pax.exam.version}</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.ops4j.pax.exam</groupId>
|
||||
<artifactId>pax-exam-link-mvn</artifactId>
|
||||
<version>${pax.exam.version}</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.ops4j.pax.url</groupId>
|
||||
<artifactId>pax-url-aether</artifactId>
|
||||
<version>${url.version}</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.apache.felix</groupId>
|
||||
<artifactId>org.apache.felix.framework</artifactId>
|
||||
<version>5.0.0</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>javax.inject</groupId>
|
||||
<artifactId>javax.inject</artifactId>
|
||||
<version>1</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-antrun-plugin</artifactId>
|
||||
<version>1.7</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>compile</id>
|
||||
<phase>compile</phase>
|
||||
<configuration>
|
||||
<target>
|
||||
<property name="compile_classpath" refid="maven.compile.classpath"/>
|
||||
<property name="runtime_classpath" refid="maven.runtime.classpath"/>
|
||||
<property name="test_classpath" refid="maven.test.classpath"/>
|
||||
<property name="plugin_classpath" refid="maven.plugin.classpath"/>
|
||||
|
||||
<echo message="compile classpath: ${compile_classpath}"/>
|
||||
<echo message="runtime classpath: ${runtime_classpath}"/>
|
||||
<echo message="test classpath: ${test_classpath}"/>
|
||||
<echo message="plugin classpath: ${plugin_classpath}"/>
|
||||
</target>
|
||||
</configuration>
|
||||
<goals>
|
||||
<goal>run</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
|
||||
<plugin>
|
||||
<groupId>org.ops4j.pax.exam</groupId>
|
||||
<artifactId>exam-maven-plugin</artifactId>
|
||||
<version>${pax.exam.version}</version>
|
||||
<configuration>
|
||||
<configClass>io.moquette.test.osgi.MoquetteOsgiTest</configClass>
|
||||
</configuration>
|
||||
<executions>
|
||||
<execution>
|
||||
<goals>
|
||||
<goal>start-container</goal>
|
||||
<goal>stop-container</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
|
||||
<plugin>
|
||||
<groupId>org.apache.servicemix.tooling</groupId>
|
||||
<artifactId>depends-maven-plugin</artifactId>
|
||||
<version>1.2</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>generate-depends-file</id>
|
||||
<phase>generate-resources</phase>
|
||||
<goals>
|
||||
<goal>generate-depends-file</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-failsafe-plugin</artifactId>
|
||||
<version>2.12</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<goals>
|
||||
<goal>integration-test</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
<configuration>
|
||||
<forkMode>always</forkMode>
|
||||
<parallel>none</parallel>
|
||||
<threadCount>1</threadCount>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</project>
|
||||
@@ -16,11 +16,14 @@
|
||||
|
||||
package io.moquette.test.osgi;
|
||||
|
||||
import static org.junit.Assert.*;
|
||||
import static org.junit.Assert.fail;
|
||||
import static org.ops4j.pax.exam.CoreOptions.*;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.Arrays;
|
||||
import java.util.LinkedList;
|
||||
import java.util.List;
|
||||
import javax.inject.Inject;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.ops4j.pax.exam.Configuration;
|
||||
@@ -30,7 +33,6 @@ import org.osgi.framework.Bundle;
|
||||
import org.osgi.framework.BundleContext;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import javax.inject.Inject;
|
||||
|
||||
/**
|
||||
* Run a set of unit tests inside of an OSGi container to make sure
|
||||
@@ -45,46 +47,34 @@ public class MoquetteOsgiTest {
|
||||
private BundleContext bundleContext;
|
||||
|
||||
@Configuration
|
||||
public Option[] config() {
|
||||
public Option[] config() throws IOException {
|
||||
String nettyV = "4.1.12.Final";
|
||||
|
||||
return options(
|
||||
junitBundles(),
|
||||
|
||||
mavenBundle("com.google.guava", "guava").versionAsInProject(),
|
||||
//mavenBundle("com.google.code.findbugs", "jsr305").versionAsInProject(),
|
||||
mavenBundle("com.hazelcast", "hazelcast"),
|
||||
|
||||
mavenBundle("com.fasterxml.jackson.core", "jackson-core").versionAsInProject().start(),
|
||||
mavenBundle("com.fasterxml.jackson.core", "jackson-databind").versionAsInProject(),
|
||||
mavenBundle("com.fasterxml.jackson.core", "jackson-annotations").versionAsInProject(),
|
||||
//mavenBundle("com.librato.metrics", "librato-java").versionAsInProject(),
|
||||
//mavenBundle("com.librato.metrics", "metrics-librato").versionAsInProject(),
|
||||
mavenBundle("io.dropwizard.metrics", "metrics-core").versionAsInProject(),
|
||||
mavenBundle("io.dropwizard.metrics", "metrics-jvm").versionAsInProject(),
|
||||
mavenBundle("com.hazelcast", "hazelcast").versionAsInProject(),
|
||||
mavenBundle("io.netty", "netty-common", nettyV),
|
||||
mavenBundle("io.netty", "netty-buffer", nettyV),
|
||||
mavenBundle("io.netty", "netty-transport", nettyV),
|
||||
mavenBundle("io.netty", "netty-resolver", nettyV),
|
||||
mavenBundle("io.netty", "netty-handler", nettyV),
|
||||
mavenBundle("io.netty", "netty-codec", nettyV),
|
||||
mavenBundle("io.netty", "netty-codec-http", nettyV),
|
||||
mavenBundle("io.netty", "netty-codec-mqtt", nettyV),
|
||||
mavenBundle("io.netty", "netty-transport-native-epoll", nettyV),
|
||||
mavenBundle("io.netty", "netty-transport-native-unix-common", nettyV),
|
||||
|
||||
mavenBundle("io.netty", "netty-common").versionAsInProject(),
|
||||
mavenBundle("io.netty", "netty-buffer").versionAsInProject(),
|
||||
mavenBundle("io.netty", "netty-transport").versionAsInProject(),
|
||||
mavenBundle("io.netty", "netty-resolver").versionAsInProject(),
|
||||
mavenBundle("io.netty", "netty-handler").versionAsInProject(),
|
||||
mavenBundle("io.netty", "netty-handler").versionAsInProject(),
|
||||
mavenBundle("io.netty", "netty-codec").versionAsInProject(),
|
||||
mavenBundle("io.netty", "netty-codec-http").versionAsInProject(),
|
||||
mavenBundle("io.netty", "netty-codec-mqtt").versionAsInProject(),
|
||||
mavenBundle("io.netty", "netty-transport-native-epoll").versionAsInProject(),
|
||||
mavenBundle("io.netty", "netty-transport-native-unix-common").versionAsInProject(),
|
||||
mavenBundle("commons-codec", "commons-codec"),
|
||||
|
||||
mavenBundle("commons-codec", "commons-codec").versionAsInProject(),
|
||||
mavenBundle("io.moquette", "moquette-broker"),
|
||||
|
||||
mavenBundle("javax.servlet", "javax.servlet-api").versionAsInProject(),
|
||||
mavenBundle("com.h2database", "h2-mvstore"),
|
||||
mavenBundle("io.moquette", "moquette-h2-storage"),
|
||||
|
||||
mavenBundle("io.moquette", "moquette-broker").versionAsInProject(),
|
||||
|
||||
mavenBundle("com.h2database", "h2-mvstore").versionAsInProject(),
|
||||
mavenBundle("io.moquette", "moquette-h2-storage").versionAsInProject(),
|
||||
|
||||
mavenBundle("org.mapdb", "mapdb").versionAsInProject(),
|
||||
mavenBundle("io.moquette", "moquette-mapdb-storage").versionAsInProject()
|
||||
mavenBundle("org.mapdb", "mapdb", "1.0.8"),
|
||||
mavenBundle("io.moquette", "moquette-mapdb-storage")
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user