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

NMS-16943: Fix jceks dependency issues on sentinel #7603

Closed
wants to merge 4 commits into from
Closed

NMS-16943: Fix jceks dependency issues on sentinel #7603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a084228
NMS-16943: Try importing org.opennms.core.network
cgorantla Jan 24, 2025
0b16eb1
NMS-16943: Add *.core.network to custom properties
cgorantla Jan 27, 2025
74404e8
NMS-16943: Sentinel custom properties is wired differently
cgorantla Jan 27, 2025
12b1dd3
NMS-16943: Fix few more dependencies
cgorantla Jan 27, 2025
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
13 changes: 12 additions & 1 deletion container/features/src/main/resources/features-core.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,11 +347,22 @@ org.jolokia.authMode=jaas
<bundle>mvn:org.opennms.features.scv/org.opennms.features.scv.shell/${project.version}</bundle>
</feature>

<feature name="owasp-encoder" version="${owaspEncoderVersion}" description="OWASP :: Encoder">
<bundle>wrap:mvn:org.owasp.encoder/encoder/${owaspEncoderVersion}$Bundle-SymbolicName=org.owasp.encoder&amp;Bundle-Version=${owaspEncoderVersion}&amp;Export-Package=org.owasp.encoder</bundle>
</feature>
<feature name="owasp-html-sanitizer" version="${owaspHtmlSanitizerVersion}" description="OWASP :: HTML Sanitizer">
<feature version="${guavaOsgiVersion}">guava</feature>
<bundle>wrap:mvn:com.googlecode.owasp-java-html-sanitizer/owasp-java-html-sanitizer/${owaspHtmlSanitizerVersion}$Bundle-SymbolicName=com.googlecode.owasp-java.html-sanitizer&amp;Bundle-Version=${owaspHtmlSanitizerVersion}&amp;Export-Package=org.owasp.html</bundle>
</feature>

<feature name="scv-jceks-impl" version="${project.version}" description="Secure Credentials Vault JCEKS Impl">
<feature>commons-codec</feature>
<feature version="${guavaOsgiVersion}" prerequisite="true">guava</feature>
<feature>scv-api</feature>
<bundle>mvn:org.opennms.core/org.opennms.core.lib/${project.version}</bundle>
<feature>owasp-encoder</feature>
<feature>owasp-html-sanitizer</feature>
<bundle dependency="true">mvn:org.opennms.core/org.opennms.core.lib/${project.version}</bundle>
<bundle>mvn:org.opennms.core/org.opennms.core.sysprops/${project.version}</bundle>
<bundle>mvn:org.opennms.features.scv/org.opennms.features.scv.jceks-impl/${project.version}</bundle>
</feature>

Expand Down
7 changes: 0 additions & 7 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 @@ -187,13 +187,6 @@
<feature name="json-simple" version="1.1.1" description="json-simple">
<bundle>wrap:mvn:com.googlecode.json-simple/json-simple/1.1.1$Bundle-SymbolicName=com.googlecode.json-simple&amp;Bundle-Version=1.1.1</bundle>
</feature>
<feature name="owasp-encoder" version="${owaspEncoderVersion}" description="OWASP :: Encoder">
<bundle>wrap:mvn:org.owasp.encoder/encoder/${owaspEncoderVersion}$Bundle-SymbolicName=org.owasp.encoder&amp;Bundle-Version=${owaspEncoderVersion}&amp;Export-Package=org.owasp.encoder</bundle>
</feature>
<feature name="owasp-html-sanitizer" version="${owaspHtmlSanitizerVersion}" description="OWASP :: HTML Sanitizer">
<feature version="${guavaOsgiVersion}">guava</feature>
<bundle>wrap:mvn:com.googlecode.owasp-java-html-sanitizer/owasp-java-html-sanitizer/${owaspHtmlSanitizerVersion}$Bundle-SymbolicName=com.googlecode.owasp-java.html-sanitizer&amp;Bundle-Version=${owaspHtmlSanitizerVersion}&amp;Export-Package=org.owasp.html</bundle>
</feature>
<feature name="postgresql" version="${postgresqlVersion}" description="PostgreSQL :: JDBC Driver">
<feature>pax-jdbc-spec</feature>
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimoVersion}</bundle>
Expand Down
3 changes: 2 additions & 1 deletion container/shared/src/main/filtered-resources/etc/custom.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,5 @@ org.osgi.framework.system.packages.extra=sun.nio.ch, \
sun.net.dns, \
sun.reflect, \
sun.security.ssl, \
sun.security.x509
sun.security.x509, \
org.opennms.core.network;version=${opennms.osgi.version}
1 change: 1 addition & 0 deletions core/lib/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
<Import-Package>
<!-- Declare the Attach API as an optional dependency -->
com.sun.tools.attach;resolution:=optional,
org.opennms.core.network,
*
</Import-Package>
</instructions>
Expand Down
3 changes: 2 additions & 1 deletion features/container/sentinel/src/main/internal/assembly-property-edits.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
<file>custom.properties</file>
<operation>put</operation>
<key>org.osgi.framework.system.packages.extra</key>
<value>sun.nio.ch, sun.misc, sun.net.dns, sun.reflect, sun.security.ssl, sun.security.x509</value>
<value>sun.nio.ch, sun.misc, sun.net.dns, sun.reflect, sun.security.ssl, sun.security.x509,
org.opennms.core.network;version=34.0.0.SNAPSHOT</value>
</edit>

<!-- see container/shared/src/main/filtered-resources/etc/startup.properties for details -->
Expand Down
Loading