Skip to content

Commit

Permalink
DDF-4129 Updating netty versions and blacklisting them where needed (…
Browse files Browse the repository at this point in the history
…the karaf decanter bundle cassandra still uses them) (#3763)
  • Loading branch information
Kjames5269 authored and clockard committed Sep 27, 2018
1 parent cec2479 commit f9be0a4
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 1 deletion.
2 changes: 2 additions & 0 deletions distribution/ddf-common/src/main/resources/common-bin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@
<exclude>**/jetty/**/9.4.6.v20170531/*</exclude>
<exclude>**/jetty/**/8.1.14.v20131031/*</exclude>
<exclude>**/pax/web/**/7.0.0/*</exclude>
<exclude>**/netty/**/4.0.33.Final/*</exclude>
<exclude>**/netty/**/4.0.33.Final</exclude>
<!--
Since Karaf v2.2.9, Karaf includes a default user "karaf" with its own authentication key in it, thus
when running client script it logs in as "karaf" user without requiring a password.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,7 @@ pax-war-tomcat;type=feature;range=[7.0.0,7.2.2]
pax-jsf-support;type=feature;range=[7.0.0,7.2.2]
pax-jsf-resources-support;type=feature;range=[7.0.0,7.2.2]
pax-http-undertow;type=feature;range=[7.0.0,7.2.2]

decanter-appender-cassandra;type=feature
decanter-appender-cassandra-core;type=feature

2 changes: 1 addition & 1 deletion features/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@
<cxf.joda.time.version>2.9.4</cxf.joda.time.version>
<cxf.neethi.version>3.1.1</cxf.neethi.version>
<cxf.netty.version>4.0.43.Final</cxf.netty.version>
<cxf.netty3.version>3.9.2.Final</cxf.netty3.version>
<cxf.netty3.version>3.9.9.Final</cxf.netty3.version>
<cxf.opensaml.osgi.version>${opensaml.osgi.version}</cxf.opensaml.osgi.version>
<cxf.reflections.bundle.version>0.9.11_2</cxf.reflections.bundle.version>
<cxf.rhino.bundle.version>1.7R2_3</cxf.rhino.bundle.version>
Expand Down

0 comments on commit f9be0a4

Please sign in to comment.