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

Upgrade twitter hpack dependency

Browse Source 
Motivation:
Right now the used hpack dependency does not contain a valid osgi manifest.

Modifications:
Upgrade hpack from 0.10.1 to 0.11.0.

Result:
hpack dependency works in osgi containers without wrapping.
This commit is contained in:
Fabian Lange 2015-04-30 20:10:44 +02:00 committed by Scott Mitchell
parent e92c0ae756
commit ea6ba7071d
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pom.xml
View File

@ -581,7 +581,7 @@
<dependency> <dependency>
<groupId>com.twitter</groupId> <groupId>com.twitter</groupId>
<artifactId>hpack</artifactId> <artifactId>hpack</artifactId>
<version>0.10.1</version> <version>0.11.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty.npn</groupId> <groupId>org.eclipse.jetty.npn</groupId>
@ -966,7 +966,7 @@
<!-- SSLSession implementation --> <!-- SSLSession implementation -->
<ignore>javax.net.ssl.SSLEngine</ignore> <ignore>javax.net.ssl.SSLEngine</ignore>
<ignore>javax.net.ssl.X509ExtendedTrustManager</ignore> <ignore>javax.net.ssl.X509ExtendedTrustManager</ignore>
<ignore>java.util.concurrent.ConcurrentLinkedDeque</ignore> <ignore>java.util.concurrent.ConcurrentLinkedDeque</ignore>
</ignores> </ignores>
</configuration> </configuration>
@ -1461,4 +1461,3 @@
</pluginManagement> </pluginManagement>
</build> </build>
</project> </project>

3
testsuite-osgi/src/test/java/io/netty/osgitests/OsgiBundleTest.java
View File

@ -90,7 +90,7 @@ public class OsgiBundleTest {
options.addAll(Arrays.asList(junitBundles())); options.addAll(Arrays.asList(junitBundles()));
options.add(mavenBundle("com.barchart.udt", "barchart-udt-bundle").versionAsInProject()); options.add(mavenBundle("com.barchart.udt", "barchart-udt-bundle").versionAsInProject());
options.add(wrappedBundle(mavenBundle("com.twitter", "hpack").versionAsInProject())); options.add(mavenBundle("com.twitter", "hpack").versionAsInProject());
options.add(wrappedBundle(mavenBundle("org.rxtx", "rxtx").versionAsInProject())); options.add(wrappedBundle(mavenBundle("org.rxtx", "rxtx").versionAsInProject()));
for (String name : BUNDLES) { for (String name : BUNDLES) {
@ -106,4 +106,3 @@ public class OsgiBundleTest {
assertFalse("At least one bundle needs to be tested", BUNDLES.isEmpty()); assertFalse("At least one bundle needs to be tested", BUNDLES.isEmpty());
} }
} }