andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update OSGI Test Suite.

Browse Source
This commit is contained in:
Andrei.Pozolotin 2013-05-01 10:20:18 -05:00 committed by Trustin Lee
parent 2a15f658d6
commit e05fdb3514
6 changed files with 81 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
testsuite-osgi/pom.xml
View File

@ -49,7 +49,7 @@
<build>
<plugins>
<!-- do not deploy this artifact -->
<!-- Do not deploy this artifact. -->
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>

42
testsuite-osgi/testsuite-osgi-deps/pom.xml
View File

@ -25,14 +25,16 @@
</parent>
<artifactId>netty-testsuite-osgi-deps</artifactId>
<packaging>feature</packaging>
<packaging>bundle</packaging>
<name>Netty/Testsuite/OSGi/Deps</name>
<description>verify osgi compliance: all transitive dependencies must be osgi bundles</description>
<dependencies>
<!-- MAIN -->
<!-- include all osgi bundle release modules -->
<!-- Include all Netty OSGI bundle release modules. -->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>netty-buffer</artifactId>
@ -94,7 +96,7 @@
<!-- TEST -->
<!-- file/text conversion -->
<!-- File/text conversion utilities. -->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
@ -106,36 +108,23 @@
<build>
<plugins>
<!-- feature doesn't invoke maven-compile-plugin unless specified explicitly. -->
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<executions>
<execution>
<id>compile</id>
<phase>compile</phase>
<goals>
<goal>compile</goal>
</goals>
</execution>
<execution>
<id>test-compile</id>
<phase>test-compile</phase>
<goals>
<goal>testCompile</goal>
</goals>
</execution>
</executions>
</plugin>
<!-- produce karaf feature.xml -->
<!-- Produce Karaf feature.xml -->
<plugin>
<groupId>org.apache.karaf.tooling</groupId>
<artifactId>karaf-maven-plugin</artifactId>
<version>3.0.0.RC1</version>
<extensions>true</extensions>
<executions>
<execution>
<goals>
<goal>features-generate-descriptor</goal>
</goals>
</execution>
</executions>
</plugin>
<!-- invoke integration tests -->
<!-- Invoke integration tests. -->
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<executions>
@ -149,7 +138,7 @@
</executions>
</plugin>
<!-- do not deploy this artifact -->
<!-- Do not deploy this artifact. -->
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
@ -189,4 +178,5 @@
</plugins>
</pluginManagement>
</build>
</project>

20
testsuite-osgi/testsuite-osgi-deps/src/test/java/io/netty/verify/osgi/package-info.java
View File

@ -1,20 +0,0 @@
/*
* Copyright 2013 The Netty Project
*
* The Netty Project 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.
*/
/**
* OSGI Dependency tests
*/
package io.netty.verify.osgi;

115
testsuite-osgi/testsuite-osgi-exam/pom.xml
View File

@ -31,34 +31,15 @@
<description>verify osgi compliance: run tests inside osgi framework</description>
<properties>
<exam.version>3.0.0</exam.version>
<url.version>1.5.0</url.version>
<pax.exam.version>3.0.3</pax.exam.version>
<pax.url.version>1.5.2</pax.url.version>
</properties>
<dependencies>
<!-- MAIN -->
<!-- logging via http://team.ops4j.org/wiki/display/paxlogging/Pax+Logging -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<!-- osgi scr annotations https://github.com/carrot-garden/carrot-osgi/tree/master/carrot-osgi-anno-scr/carrot-osgi-anno-scr-core -->
<dependency>
<groupId>com.carrotgarden.osgi</groupId>
<artifactId>carrot-osgi-anno-scr-core</artifactId>
<version>1.1.3</version>
</dependency>
<!-- osgi scr runtime http://felix.apache.org/site/apache-felix-service-component-runtime.html -->
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr</artifactId>
<version>1.6.2</version>
</dependency>
<!-- include all netty osgi bundle release modules -->
<!-- Include all Netty OSGI bundle release modules. -->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>netty-buffer</artifactId>
@ -110,9 +91,36 @@
<version>${project.version}</version>
</dependency>
<!-- Logging via http://team.ops4j.org/wiki/display/paxlogging/Pax+Logging -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<!-- OSGI Declarative Services runtime http://felix.apache.org/site/apache-felix-service-component-runtime.html -->
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr</artifactId>
<version>1.6.2</version>
</dependency>
<!-- OSGI specification. -->
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>4.3.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<version>4.3.1</version>
<scope>provided</scope>
</dependency>
<!-- TEST -->
<!-- transport udt tests and deps -->
<!-- Transport UDT tests and dependencies. -->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>netty-transport-udt</artifactId>
@ -131,61 +139,53 @@
<scope>test</scope>
</dependency>
<!-- java 7 compatibility http://blog.osgi.org/2012/10/43-companion-code-for-java-7.html -->
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>4.3.1</version>
<scope>provided</scope>
</dependency>
<!-- pax exam environment -->
<!-- Pax Exam test environment. -->
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-container-native</artifactId>
<version>${exam.version}</version>
<version>${pax.exam.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-junit4</artifactId>
<version>${exam.version}</version>
<version>${pax.exam.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-invoker-junit</artifactId>
<version>${exam.version}</version>
<version>${pax.exam.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-inject</artifactId>
<version>${exam.version}</version>
<version>${pax.exam.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-extender-service</artifactId>
<version>${exam.version}</version>
<version>${pax.exam.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-link-mvn</artifactId>
<version>${exam.version}</version>
<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>
<version>${pax.url.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-wrap</artifactId>
<version>${url.version}</version>
<version>${pax.url.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@ -200,7 +200,7 @@
<build>
<plugins>
<!-- make dependency versions available for pax exam -->
<!-- Make dependency versions available for Pax Exam. -->
<plugin>
<groupId>org.apache.servicemix.tooling</groupId>
<artifactId>depends-maven-plugin</artifactId>
@ -216,25 +216,17 @@
</executions>
</plugin>
<!-- generate osgi scr component descriptors -->
<!-- Generate OSGI Declarative Services component descriptors. -->
<plugin>
<groupId>com.carrotgarden.maven</groupId>
<artifactId>carrot-maven-scr-plugin</artifactId>
<version>1.1.5</version>
<version>3.0.3</version>
<configuration>
<targetDirectorySCR>OSGI-INF/service-component</targetDirectorySCR>
</configuration>
<executions>
<execution>
<id>clean</id>
<phase>clean</phase>
<goals>
<goal>clean</goal>
</goals>
</execution>
<execution>
<id>generate</id>
<phase>process-classes</phase>
<phase>generate-test-sources</phase>
<goals>
<goal>generate</goal>
</goals>
@ -242,7 +234,7 @@
</executions>
</plugin>
<!-- include osgi scr component descriptors -->
<!-- Include OSGI Declarative Services component descriptors in the bundle. -->
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
@ -261,7 +253,7 @@
</configuration>
</plugin>
<!-- invoke integration tests -->
<!-- Invoke integration tests. -->
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<executions>
@ -275,7 +267,7 @@
</executions>
</plugin>
<!-- do not deploy this artifact -->
<!-- Do not deploy this artifact. -->
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
@ -307,6 +299,19 @@
<execute />
</action>
</pluginExecution>
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<versionRange>[0,)</versionRange>
<goals>
<goal>manifest</goal>
</goals>
</pluginExecutionFilter>
<action>
<execute />
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>

3
testsuite-osgi/testsuite-osgi-exam/src/test/java/io/netty/verify/osgi/UnitHelp.java
View File

@ -50,9 +50,6 @@ public final class UnitHelp {
// mavenBundle().groupId("org.ops4j.pax.logging").artifactId(
// "pax-logging-service"),
/** install scr annotations */
mavenBundle("com.carrotgarden.osgi",
"carrot-osgi-anno-scr-core").versionAsInProject(),
/** install scr runtime provider */
mavenBundle("org.apache.felix", "org.apache.felix.scr")
.versionAsInProject(),

7
testsuite-osgi/testsuite-osgi-split/pom.xml
View File

@ -32,7 +32,7 @@
<dependencies>
<!-- include all osgi bundle release modules -->
<!-- Include all Netty OSGI bundle release modules. -->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>netty-buffer</artifactId>
@ -89,7 +89,7 @@
<build>
<plugins>
<!-- fail build on package split -->
<!-- Fail build on package split. -->
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
@ -103,7 +103,7 @@
</configuration>
</plugin>
<!-- do not deploy this artifact -->
<!-- Do not deploy this artifact. -->
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
@ -113,4 +113,5 @@
</plugins>
</build>
</project>