Skip to content

NMS-19574: Fixing smoke-tests #8367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
christianpape wants to merge 1 commit into
base: foundation-2021
Choose a base branch
from
Open

NMS-19574: Fixing smoke-tests #8367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 21 additions & 3 deletions container/features/src/main/resources/features.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,29 @@
<repository>mvn:org.opennms.integration.api/karaf-features/${opennmsApiVersion}/xml</repository>
<repository>mvn:com.eclipsesource.jaxrs/features/${osgiJaxRsVersion}/xml/features</repository>
<repository>mvn:org.apache.karaf.features/enterprise/${karafVersion}/xml/features</repository>
<feature name="opennms-amqp-event-forwarder" version="${project.version}" description="OpenNMS :: Features :: AMQP :: Event Forwarder">

<feature name="opennms-camel-amqp" version="${project.version}" description="OpenNMS :: Features :: AMQP :: Camel Wrapper">
<!-- start this early so camel-amqp doesn't use its old version -->
<bundle start-level="60">mvn:io.netty/netty-common/${netty4Version}</bundle>
<bundle start-level="60">mvn:io.netty/netty-buffer/${netty4Version}</bundle>
<bundle start-level="60">mvn:io.netty/netty-transport/${netty4Version}</bundle>
<bundle start-level="60">mvn:io.netty/netty-handler/${netty4Version}</bundle>
<bundle start-level="60">mvn:io.netty/netty-codec/${netty4Version}</bundle>
<bundle start-level="60">mvn:io.netty/netty-codec-http/${netty4Version}</bundle>
<bundle start-level="60">mvn:io.netty/netty-transport-native-epoll/${netty4Version}</bundle>
<bundle start-level="60">mvn:io.netty/netty-transport-native-kqueue/${netty4Version}</bundle>

<feature>camel-core</feature>
<feature>camel-blueprint</feature>
<feature>camel-http</feature>
<feature>camel-amqp</feature>
</feature>

<feature name="opennms-amqp-event-forwarder" version="${project.version}" description="OpenNMS :: Features :: AMQP :: Event Forwarder">
<feature>camel-core</feature>
<feature>camel-blueprint</feature>
<feature>camel-http</feature>
<feature>opennms-camel-amqp</feature>
<feature>guava</feature>
<feature>opennms-core-camel</feature>
<feature>opennms-dao-api</feature>
Expand All @@ -23,7 +41,7 @@
<feature>camel-core</feature>
<feature>camel-blueprint</feature>
<feature>camel-http</feature>
<feature>camel-amqp</feature>
<feature>opennms-camel-amqp</feature>
<feature>guava</feature>
<feature>opennms-core-camel</feature>
<feature>opennms-dao-api</feature>
Expand All @@ -34,7 +52,7 @@
<feature>camel-core</feature>
<feature>camel-blueprint</feature>
<feature>camel-http</feature>
<feature>camel-amqp</feature>
<feature>opennms-camel-amqp</feature>
<feature>opennms-core-camel</feature>
<bundle>mvn:org.opennms.features.amqp/org.opennms.features.amqp.common/${project.version}</bundle>
<bundle>mvn:org.opennms.features.amqp/org.opennms.features.amqp.alarm-northbounder/${project.version}</bundle>
Expand Down
7 changes: 4 additions & 3 deletions container/karaf/src/main/filtered-resources/etc/overrides.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@ mvn:io.netty/netty-common/${netty4Version}
mvn:io.netty/netty-buffer/${netty4Version}
mvn:io.netty/netty-transport/${netty4Version}
mvn:io.netty/netty-handler/${netty4Version}
mvn:io.netty/netty-transport/${netty4Version}
mvn:io.netty/netty-codec/${netty4Version}
mvn:io.netty/netty-codec-http/${netty4Version}
mvn:io.netty/netty-transport-classes-epoll/${netty4Version}
mvn:io.netty/netty-transport-native-epoll/${netty4Version}
mvn:io.netty/netty-transport-native-kqueue/${netty4Version}
mvn:io.netty/netty-transport-native-unix-common/${netty4Version}
mvn:io.netty/netty-codec/${netty4Version}
mvn:io.netty/netty-codec-http/${netty4Version}
mvn:io.netty/netty-transport-native-kqueue/${netty4Version}
13 changes: 13 additions & 0 deletions container/shared/src/main/filtered-resources/etc/overrides.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,16 @@ mvn:org.eclipse.jetty.websocket/websocket-client/${jettyVersion};range=[9.4,10)
mvn:org.eclipse.jetty.websocket/websocket-common/${jettyVersion};range=[9.4,10)
mvn:org.eclipse.jetty.websocket/websocket-server/${jettyVersion};range=[9.4,10)
mvn:org.eclipse.jetty.websocket/websocket-servlet/${jettyVersion};range=[9.4,10)

mvn:io.netty/netty-resolver/${netty4Version}
mvn:io.netty/netty-common/${netty4Version}
mvn:io.netty/netty-buffer/${netty4Version}
mvn:io.netty/netty-transport/${netty4Version}
mvn:io.netty/netty-handler/${netty4Version}
mvn:io.netty/netty-transport/${netty4Version}
mvn:io.netty/netty-codec/${netty4Version}
mvn:io.netty/netty-codec-http/${netty4Version}
mvn:io.netty/netty-transport-classes-epoll/${netty4Version}
mvn:io.netty/netty-transport-native-epoll/${netty4Version}
mvn:io.netty/netty-transport-native-unix-common/${netty4Version}
mvn:io.netty/netty-transport-native-kqueue/${netty4Version}
76 changes: 76 additions & 0 deletions features/amqp/alarm-northbounder/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,84 @@
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-jms-client</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-jms-client</artifactId>
<version>0.30.0</version>
<exclusions>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-common</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-transport</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-kqueue</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
<version>${netty4Version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-common</artifactId>
<version>${netty4Version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
<version>${netty4Version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport</artifactId>
<version>${netty4Version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http</artifactId>
<version>${netty4Version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
<version>${netty4Version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-kqueue</artifactId>
<version>${netty4Version}</version>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand Down
76 changes: 76 additions & 0 deletions features/amqp/event-forwarder/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,84 @@
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-jms-client</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-jms-client</artifactId>
<version>0.30.0</version>
<exclusions>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-common</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-transport</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-kqueue</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
<version>${netty4Version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-common</artifactId>
<version>${netty4Version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
<version>${netty4Version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport</artifactId>
<version>${netty4Version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http</artifactId>
<version>${netty4Version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
<version>${netty4Version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-kqueue</artifactId>
<version>${netty4Version}</version>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand Down
76 changes: 76 additions & 0 deletions features/amqp/event-receiver/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,84 @@
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-jms-client</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-jms-client</artifactId>
<version>0.30.0</version>
<exclusions>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-common</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-transport</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-kqueue</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
<version>${netty4Version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-common</artifactId>
<version>${netty4Version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
<version>${netty4Version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport</artifactId>
<version>${netty4Version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http</artifactId>
<version>${netty4Version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
<version>${netty4Version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-kqueue</artifactId>
<version>${netty4Version}</version>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand Down
2 changes: 0 additions & 2 deletions opennms-full-assembly/src/assembly/components/osgi.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
<exclude>org/ops4j/pax/logging/pax-logging-log4j2/1.10.2/*</exclude>
<exclude>io/netty/netty-codec-http/4.1.22.Final</exclude>
<exclude>io/netty/netty-codec-http/4.1.22.Final/*</exclude>
<exclude>io/netty/netty-codec/4.1.22.Final</exclude>
<exclude>io/netty/netty-codec/4.1.22.Final/*</exclude>
</excludes>
</fileSet>

Expand Down
Loading