Skip to content
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

MPLUG-61: Revert #52 to fix feature install issue on OpenNMS #98

Open
wants to merge 1 commit into
base: release-2.x
Choose a base branch
from
Open

MPLUG-61: Revert #52 to fix feature install issue on OpenNMS #98

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
4 changes: 2 additions & 2 deletions karaf-features/src/main/resources/features.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@

<feature name="tss-cortex-okhttp" description="okhttp" version="${okhttp.version}">
<bundle dependency="true">wrap:mvn:com.google.code.findbugs/jsr305/3.0.2</bundle>
<bundle dependency="true">wrap:mvn:com.squareup.okio/okio/${okio.version}$Bundle-SymbolicName=okio&amp;Export-Package=okio;version=${okio.version}&amp;Import-Package=!okio*,kotlin*;resolution:=optional,*</bundle>
<bundle dependency="true">wrap:mvn:com.squareup.okhttp3/okhttp/${okhttp.version}$Bundle-SymbolicName=okhttp3&amp;Bundle-Version=${okhttp.version}&amp;Export-Package=okhttp3;version=${okhttp.version}&amp;Import-Package=!okhttp3*,org.apache.http.*;resolution=optional,org.bouncycastle.*;resolution:=optional,org.openjsse.*;resolution:=optional,android.net.*;resolution:=optional,android.os.*;resolution:=optional,android.security.*;resolution:=optional,android.util.*;resolution:=optional,org.conscrypt.*;resolution:=optional,kotlin*;resolution:=optional,sun.security.ssl;resolution:=optional,dalvik.system;resolution:=optional,*</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.okio/${okio.bundle.version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.okhttp/${okhttp.bundle.version}</bundle>
<bundle dependency="true">wrap:mvn:com.squareup.okhttp3/logging-interceptor/${okhttp.version}</bundle>
</feature>

Expand Down
16 changes: 9 additions & 7 deletions plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@
<Karaf-Commands>*</Karaf-Commands>
<!-- Nothing to export -->
<Export-Package></Export-Package>
<Import-Package>
com.google.common.*;version="33",
*
</Import-Package>
</instructions>
</configuration>
</plugin>
Expand Down Expand Up @@ -95,9 +91,15 @@
<artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
<version>${okhttp.version}</version>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.okhttp</artifactId>
<version>${okhttp.bundle.version}</version>
<exclusions>
<exclusion>
<groupId>com.squareup.okio</groupId>
<artifactId>okio</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
Expand Down
27 changes: 4 additions & 23 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,13 @@
<junit.version>4.13.2</junit.version>
<karaf.version>4.3.10</karaf.version>
<karaf.plugin.version>4.4.6</karaf.plugin.version>
<kotlin.version>1.9.23</kotlin.version>
<kotlin.version>1.9.10</kotlin.version>
<log4j.version>2.23.1</log4j.version>
<metrics.version>4.2.25</metrics.version>
<mockito.version>5.12.0</mockito.version>
<okio.version>3.9.0</okio.version>
<metrics.version>4.2.25</metrics.version>
<okio.bundle.version>1.15.0_1</okio.bundle.version>
<okhttp.version>4.12.0</okhttp.version>
<okhttp.bundle.version>3.13.1_1</okhttp.bundle.version>
<opennms.api.version>1.0.0</opennms.api.version>
<osgi.version>6.0.0</osgi.version>
<osgi.compendium.version>5.0.0</osgi.compendium.version>
Expand Down Expand Up @@ -143,31 +144,11 @@
<version>${metrics.version}</version>
</dependency>
<!-- pulled in by okhttp3 -->
<dependency>
<groupId>com.squareup.okio</groupId>
<artifactId>okio</artifactId>
<version>${okio.version}</version>
</dependency>
<dependency>
<groupId>com.squareup.okio</groupId>
<artifactId>okio-jvm</artifactId>
<version>${okio.version}</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId>
<version>${kotlin.version}</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-common</artifactId>
<version>${kotlin.version}</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-jdk7</artifactId>
<version>${kotlin.version}</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-jdk8</artifactId>
Expand Down