Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Fix compatibility issue with Openfire 4.9.0 #19

Merged
merged 1 commit into from
Sep 11, 2024
Merged

Fix compatibility issue with Openfire 4.9.0 #19

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
7 changes: 7 additions & 0 deletions changelog.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,13 @@

<h1>Push Server Plugin Changelog</h1>

<p><b>1.1.0</b> -- (tbd)</p>

<ul>
<li>Now requires Openfire 4.8.0 or later.</li>
<li>[<a href="https://github.com/igniterealtime/openfire-pushserver-plugin/issues/18">#18</a>] - Fix compatibility issue with Openfire 4.9.0.</li>
</ul>

<p><b>1.0.0</b> -- Sep 16, 2022</p>

<ul>
Expand Down
6 changes: 2 additions & 4 deletions plugin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,9 @@
<version>${project.version}</version>

<author>Busoft Teknoloji A.Ş.</author>
<date>09/02/2021</date>
<date>2024-09-11</date>

<minJavaVersion>1.8</minJavaVersion>

<minServerVersion>4.3.0</minServerVersion>
<minServerVersion>4.8.0</minServerVersion>

<databaseKey>pushserver</databaseKey>
<databaseVersion>1</databaseVersion>
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
<parent>
<artifactId>plugins</artifactId>
<groupId>org.igniterealtime.openfire</groupId>
<version>4.3.0</version>
<version>4.8.0</version>
</parent>

<groupId>org.igniterealtime.openfire.plugins</groupId>
<artifactId>pushserver</artifactId>
<version>1.0.1-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>

<properties>
<maven.compiler.source>11</maven.compiler.source>
Expand Down Expand Up @@ -52,7 +52,7 @@
</execution>
</executions>
<configuration>
<jvmTarget>1.8</jvmTarget>
<jvmTarget>11</jvmTarget>
</configuration>
</plugin>
<!-- Compiles the Openfire Admin Console JSP pages. -->
Expand Down
4 changes: 2 additions & 2 deletions src/java/org/igniterealtime/openfire/plugins/pushserver/PushServerProperty.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ class PushServerProperty: PropertyEventListener {
companion object {
val serviceName = JiveGlobals.getProperty("pushserver.name", "push")

val FCM_CREDENTIAL_FILE_PATH = "${JiveGlobals.getHomeDirectory()}${File.separator}conf${File.separator}pushserver-fcm.json"
val APNS_PKCS8_FILE_PATH = "${JiveGlobals.getHomeDirectory()}${File.separator}conf${File.separator}pushserver-apns.p8"
val FCM_CREDENTIAL_FILE_PATH = "${JiveGlobals.getHomePath().resolve("conf").resolve("pushserver-fcm.json")}"
val APNS_PKCS8_FILE_PATH = "${JiveGlobals.getHomePath().resolve("conf").resolve("pushserver-apns.p8")}"

private val properties = Property.values().associateBy({it}) { JiveGlobals.getProperty(it.key, null) }.toMutableMap()
}
Expand Down
Loading