fix #64

new version 0.9.13
igniterealtime · Jul 13, 2020 · 1b9be90 · 1b9be90
1 parent 4dfe7c6
commit 1b9be90
Show file tree

Hide file tree

Showing 12 changed files with 36 additions and 21 deletions.
diff --git a/build.cmd b/build.cmd
@@ -1,7 +1,7 @@
 call mvn clean package
 
-copy ofmeet\target\ofmeet.jar C:\openfire_4_6_0\plugins\ofmeet.jar
-copy offocus\target\offocus.jar C:\openfire_4_6_0\plugins\offocus.jar
-copy pade\target\pade.jar C:\openfire_4_6_0\plugins\pade.jar
+copy ofmeet\target\ofmeet.jar C:\openfire_4_5_1\plugins\ofmeet.jar
+copy offocus\target\offocus.jar C:\openfire_4_5_1\plugins\offocus.jar
+copy pade\target\pade.jar C:\openfire_4_5_1\plugins\pade.jar
 
 pause
diff --git a/config/pom.xml b/config/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.igniterealtime.openfire.ofmeet</groupId>
         <artifactId>parent</artifactId>
-        <version>0.9.12-SNAPSHOT</version>
+        <version>0.9.13-SNAPSHOT</version>
     </parent>
 
     <artifactId>config</artifactId>

diff --git a/offocus/pom.xml b/offocus/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.igniterealtime.openfire.ofmeet</groupId>
         <artifactId>parent</artifactId>
-        <version>0.9.12-SNAPSHOT</version>
+        <version>0.9.13-SNAPSHOT</version>
     </parent>
 
     <artifactId>offocus</artifactId>
@@ -40,7 +40,7 @@
                     <dependency>
                         <groupId>org.igniterealtime.openfire.plugins</groupId>
                         <artifactId>openfire-plugin-assembly-descriptor</artifactId>
-                        <version>${openfire.version}</version>
+                        <version>4.2.0</version>
                     </dependency>
                 </dependencies>
                 <executions>
@@ -71,6 +71,21 @@
                 <version>3.0.0</version>
                 <extensions>true</extensions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.igniterealtime.openfire.plugins</groupId>
+                        <artifactId>openfire-plugin-assembly-descriptor</artifactId>
+                        <version>${openfire.version}</version>
+                    </dependency>
+                </dependencies>                
+                <configuration>
+                    <source>8</source>
+                    <target>8</target>
+                </configuration>
+            </plugin>             
         </plugins>
     </build>
 

diff --git a/ofgasi/pom.xml b/ofgasi/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.igniterealtime.openfire.ofmeet</groupId>
         <artifactId>parent</artifactId>
-        <version>0.9.12-SNAPSHOT</version>
+        <version>0.9.13-SNAPSHOT</version>
     </parent>
 
     <artifactId>ofgasi</artifactId>

diff --git a/ofmeet/changelog.html b/ofmeet/changelog.html
@@ -49,12 +49,12 @@ <h1>
     Pade VideoBridge Plugin Changelog
 </h1>
 
-<p><b>0.9.13</b> -- <i>July ??, 2020</i></p>
+<p><b>0.9.13</b> -- <i>July 13, 2020</i></p>
 
 <ul>
-    <li>Upgraded to latest Jitsi code build(4265)</li>
     <li>Added party present confetti icon as example of how to use sendCommand</li>
     <li>Added whiteboard (https://wbo.ophir.dev/) as another collaboration app using sendCommand</li>
+    <li>Fixed <a href="https://github.com/igniterealtime/openfire-pade-plugin/issues/64">Issue #64 - Feature: Lobby</li>
     <li>Fixed <a href="https://github.com/igniterealtime/openfire-pade-plugin/issues/58">Issue #58 - Workaround: Prevent disruption of long-muted audio channel</a></li>
 </ul>
 

diff --git a/ofmeet/pom.xml b/ofmeet/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.igniterealtime.openfire.ofmeet</groupId>
         <artifactId>parent</artifactId>
-        <version>0.9.12-SNAPSHOT</version>
+        <version>0.9.13-SNAPSHOT</version>
     </parent>
 
     <artifactId>ofmeet</artifactId>

diff --git a/pade/pom.xml b/pade/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.igniterealtime.openfire.ofmeet</groupId>
         <artifactId>parent</artifactId>
-        <version>0.9.12-SNAPSHOT</version>
+        <version>0.9.13-SNAPSHOT</version>
     </parent>
 
     <artifactId>pade</artifactId>

diff --git a/pade/src/java/nl/martijndwars/webpush/Utils.java b/pade/src/java/nl/martijndwars/webpush/Utils.java
@@ -25,7 +25,7 @@ public class Utils {
      * @return
      */
     public static byte[] savePublicKey(ECPublicKey publicKey) {
-        return publicKey.getQ().getEncoded();
+        return publicKey.getQ().getEncoded(true);
     }
 
     public static byte[] savePrivateKey(ECPrivateKey privateKey) {

diff --git a/pom.xml b/pom.xml
@@ -18,7 +18,7 @@
 
     <groupId>org.igniterealtime.openfire.ofmeet</groupId>
     <artifactId>parent</artifactId>
-    <version>0.9.12-SNAPSHOT</version>
+    <version>0.9.13-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <organization>
@@ -30,7 +30,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <openfire.version>4.5.1</openfire.version>
         <videobridge.version>1.1-20200124.173127-125</videobridge.version>        
-        <jicofo.version>1.1-20200630.220013-177</jicofo.version>
+        <jicofo.version>1.1-20200529.210421-162</jicofo.version>
         <jigasi.version>1.1-20190806.132856-49</jigasi.version>    
         <jicoco.version>1.1-20190509.130302-15</jicoco.version>     
         <pade.url>https://igniterealtime.github.io/pade</pade.url>        
@@ -41,9 +41,9 @@
         <module>config</module>
         <module>videobridge</module>            
         <module>ofmeet</module>        
-        <!--module>offocus</module>        
+        <module>offocus</module>        
         <module>ofgasi</module>           
-        <module>pade</module-->        
+        <module>pade</module>        
     </modules>
 
     <licenses>

diff --git a/rebuild.cmd b/rebuild.cmd
@@ -1,7 +1,7 @@
 call mvn package
 
-copy ofmeet\target\ofmeet.jar C:\openfire_4_6_0\plugins\ofmeet.jar
-copy offocus\target\offocus.jar C:\openfire_4_6_0\plugins\offocus.jar
-copy pade\target\pade.jar C:\openfire_4_6_0\plugins\pade.jar
+copy ofmeet\target\ofmeet.jar C:\openfire_4_5_1\plugins\ofmeet.jar
+copy offocus\target\offocus.jar C:\openfire_4_5_1\plugins\offocus.jar
+copy pade\target\pade.jar C:\openfire_4_5_1\plugins\pade.jar
 
 pause
diff --git a/videobridge/pom.xml b/videobridge/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.igniterealtime.openfire.ofmeet</groupId>
         <artifactId>parent</artifactId>
-        <version>0.9.12-SNAPSHOT</version>
+        <version>0.9.13-SNAPSHOT</version>
     </parent>
 
     <artifactId>videobridge</artifactId>

diff --git a/web/pom.xml b/web/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.igniterealtime.openfire.ofmeet</groupId>
         <artifactId>parent</artifactId>
-        <version>0.9.12-SNAPSHOT</version>
+        <version>0.9.13-SNAPSHOT</version>
     </parent>
 
     <artifactId>web</artifactId>