Fix issue #21 by forcing the 4.2 compatible version of the JSP Compil…

…er (#22) * Fix issue #21 by forcing the 4.2 compatible version of the JSP Compiler * Remember to update the changelog
igniterealtime · Mar 21, 2019 · f4a5d1d · f4a5d1d
1 parent b7dea15
commit f4a5d1d
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 9 deletions.
diff --git a/changelog.html b/changelog.html
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 
-<html>
+<html lang="en">
 <head>
     <title>REST API Plugin Changelog</title>
     <style type="text/css">
@@ -28,12 +28,12 @@
         }
 
         TT {
-            font-family : courier new;
+            font-family: courier new, monospace;
             font-weight : bold;
             color : #060;
         }
         PRE {
-            font-family : courier new;
+            font-family: courier new, monospace;
             font-size : 100%;
         }
     </style>
@@ -44,7 +44,12 @@ <h1>
 REST API Plugin Changelog
 </h1>
 
-<p><b>(undetermined)</b></p>
+<p><b><b>1.3.9</b> -- tbc.</b></p>
+<ul>
+    <li>[<a href='https://github.com/igniterealtime/openfire-restAPI-plugin/issues/21'>#21</a>] - 1.3.8 versions doesn't work with Openfire 4.2.3</li>
+</ul>
+
+<p><b><b>1.3.8</b> -- November 28, 2018</b></p>
 <ul>
     <li>[<a href='https://github.com/igniterealtime/openfire-restAPI-plugin/issues/14'>#14</a>] - Fix Maven build.</li>
     <li>[<a href='https://issues.igniterealtime.org/browse/OF-1641'>OF-1641</a>] - Ensure all JSP pages have the correct contentType.</li>

diff --git a/pom.xml b/pom.xml
@@ -4,11 +4,11 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.3.0-beta</version>
+        <version>4.3.0</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>restAPI</artifactId>
-    <version>1.3.8</version>
+    <version>1.3.9-SNAPSHOT</version>
     <name>Rest API Plugin</name>
     <description>Allows administration over a RESTful API.</description>
 
@@ -17,19 +17,26 @@
 	    	<name>Roman Soldatow</name>
 	    </developer>
     </developers>
-    
+
 
     <build>
         <sourceDirectory>src/java</sourceDirectory>
         <plugins>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
             </plugin>
-            <!-- Compiles the Openfire Admin Console JSP pages. -->
             <plugin>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-jspc-maven-plugin</artifactId>
+                <!-- Force the JSP compiler to an Openfire 4.2 compatible version -->
+                <version>9.2.14.v20151106</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.igniterealtime.openfire</groupId>
+                        <artifactId>xmppserver</artifactId>
+                        <version>${openfire.version}</version>
+                    </dependency>
+                </dependencies>
             </plugin>
         </plugins>
     </build>