diff options
Diffstat (limited to 'test/servlet-containers/karaf/karaf-run/pom.xml')
| -rw-r--r-- | test/servlet-containers/karaf/karaf-run/pom.xml | 80 |
1 files changed, 71 insertions, 9 deletions
diff --git a/test/servlet-containers/karaf/karaf-run/pom.xml b/test/servlet-containers/karaf/karaf-run/pom.xml index d00f7a58d7..63b030044e 100644 --- a/test/servlet-containers/karaf/karaf-run/pom.xml +++ b/test/servlet-containers/karaf/karaf-run/pom.xml @@ -10,6 +10,7 @@ <modelVersion>4.0.0</modelVersion> <artifactId>karaf-run</artifactId> + <packaging>pom</packaging> <name>Vaadin Karaf Test Runner</name> <dependencies> @@ -24,33 +25,92 @@ <artifactId>vaadin-themes</artifactId> <scope>provided</scope> </dependency> + <dependency> + <groupId>com.vaadin</groupId> + <artifactId>vaadin-karaf-bundle1</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>com.vaadin</groupId> + <artifactId>vaadin-karaf-bundle2</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> </dependencies> + <profiles> + <profile> + <id>windows</id> + <activation> + <os> + <family>Windows</family> + </os> + </activation> + <properties> + <karaf.script>karaf.bat</karaf.script> + </properties> + </profile> + </profiles> + + <properties> + <karaf.script>karaf</karaf.script> + <karaf.home>${project.basedir}/apache-karaf-${karaf.plugin.version}-minimal</karaf.home> + </properties> + <build> <plugins> <plugin> + <artifactId>maven-clean-plugin</artifactId> + <executions> + <execution><id>clean-karaf</id> + <phase>pre-integration-test</phase> + <goals><goal>clean</goal></goals> + <configuration> + <failOnError>false</failOnError> + <excludeDefaultDirectories>true</excludeDefaultDirectories> + <filesets> + <fileset> + <directory>${karaf.home}</directory> + <includes> + <include>lock</include> + <include>karaf.pid</include> + <include>instances/*</include> + <include>data/*</include> + <include>data/*</include> + <include>data/*/**</include> + </includes> + </fileset> + </filesets> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>exec-maven-plugin</artifactId> <version>1.6.0</version> <executions> <execution> + <id>start-karaf-background</id> <phase>pre-integration-test</phase> <goals> <goal>exec</goal> </goals> <configuration> - <executable>mvn</executable> + <executable>${karaf.home}/bin/${karaf.script} + </executable> <async>true</async> <asyncDestroyOnShutdown>true</asyncDestroyOnShutdown> - <commandlineArgs>-f karaf-run-pom.xml karaf:run</commandlineArgs> + <commandlineArgs>server</commandlineArgs> + <workingDirectory>${project.build.directory}</workingDirectory> </configuration> </execution> </executions> - </plugin> <plugin> <groupId>org.apache.karaf.tooling</groupId> <artifactId>karaf-maven-plugin</artifactId> - <version>4.0.8</version> + <version>4.2.1</version> <executions> <execution> <id>karaf-client-ctrl</id> @@ -66,17 +126,19 @@ <command>shutdown -f +10</command> <command>feature:install http</command> <command>feature:install http-whiteboard</command> - <command>bundle:install -s mvn:org.jsoup/jsoup/1.8.3</command> + <command>bundle:install -s mvn:org.jsoup/jsoup/1.11.2</command> <command>bundle:install -s mvn:com.vaadin.external/gentyref/1.2.0.vaadin1</command> <command>bundle:install -s mvn:com.vaadin/vaadin-shared/${vaadin.version}</command> <command>bundle:install -s mvn:com.vaadin/vaadin-server/${vaadin.version}</command> - <command>bundle:install -s mvn:com.vaadin/vaadin-osgi-integration/${vaadin.version}</command> - <command>bundle:install -s mvn:com.vaadin/vaadin-client-compiled/${vaadin.version}</command> + <command>bundle:install -s mvn:com.vaadin/vaadin-osgi-integration/${vaadin.version} + </command> + <command>bundle:install -s mvn:com.vaadin/vaadin-client-compiled/${vaadin.version} + </command> <command>bundle:install -s mvn:com.vaadin/vaadin-themes/${vaadin.version}</command> <command> - <![CDATA[bundle:install -s file:./../vaadin-karaf-bundle1/target/vaadin-karaf-bundle1-${project.version}.jar]]></command> + <![CDATA[bundle:install -s file:./../../vaadin-karaf-bundle1/target/vaadin-karaf-bundle1-${project.version}.jar]]></command> <command> - <![CDATA[bundle:install -s file:./../vaadin-karaf-bundle2/target/vaadin-karaf-bundle2-${project.version}.jar]]></command> + <![CDATA[bundle:install -s file:./../../vaadin-karaf-bundle2/target/vaadin-karaf-bundle2-${project.version}.jar]]></command> </commands> </configuration> </execution> |