Merge commit 'cf5da99'HEADmaster

Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>

18 files changed, 946 insertions, 6 deletions

diff --git a/m2/jitsi-argdelegation/pom.xml b/m2/jitsi-argdelegation/pom.xml
new file mode 100644
index 0000000..7dfb648
--- /dev/null
+++ b/m2/jitsi-argdelegation/pom.xml
@@ -0,0 +1,57 @@
+<project
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.jitsi</groupId>
+    <artifactId>jitsi</artifactId>
+    <version>2.9-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <artifactId>jitsi-argdelegation</artifactId>
+  <packaging>jar</packaging>
+
+  <name>jitsi-argdelegation</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>jitsi-util</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.core</artifactId>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <includes>
+            <include>net/java/sip/communicator/impl/argdelegation/**</include>
+            <include>net/java/sip/communicator/service/argdelegation/**</include>
+          </includes>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestFile>${project.build.sourceDirectory}/net/java/sip/communicator/impl/argdelegation/argdelegation.manifest.mf</manifestFile>
+          </archive>
+          <includes>
+            <include>net/java/sip/communicator/impl/argdelegation/**</include>
+            <include>net/java/sip/communicator/service/argdelegation/**</include>
+          </includes>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/m2/jitsi-certificate/pom.xml b/m2/jitsi-certificate/pom.xml
new file mode 100644
index 0000000..a486b92
--- /dev/null
+++ b/m2/jitsi-certificate/pom.xml
@@ -0,0 +1,73 @@
+<project
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.jitsi</groupId>
+    <artifactId>jitsi</artifactId>
+    <version>2.9-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <artifactId>jitsi-certificate</artifactId>
+  <packaging>jar</packaging>
+
+  <name>jitsi-certificate</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcprov-jdk15on</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpclient</artifactId>
+      <version>4.4</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpcore</artifactId>
+      <version>4.4</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpmime</artifactId>
+      <version>4.4</version>
+    </dependency>
+    <!-- org.jitsi -->
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>jitsi-configuration</artifactId>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <includes>
+            <include>net/java/sip/communicator/service/certificate/**</include>
+            <include>net/java/sip/communicator/impl/certificate/**</include>
+          </includes>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestFile>${project.build.sourceDirectory}/net/java/sip/communicator/impl/certificate/certificate.manifest.mf</manifestFile>
+          </archive>
+          <includes>
+            <include>net/java/sip/communicator/service/certificate/**</include>
+            <include>net/java/sip/communicator/impl/certificate/**</include>
+          </includes>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/m2/jitsi-desktoputil/pom.xml b/m2/jitsi-desktoputil/pom.xml
new file mode 100644
index 0000000..701559c
--- /dev/null
+++ b/m2/jitsi-desktoputil/pom.xml
@@ -0,0 +1,57 @@
+<project
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.jitsi</groupId>
+    <artifactId>jitsi</artifactId>
+    <version>2.9-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <artifactId>jitsi-desktoputil</artifactId>
+  <packaging>jar</packaging>
+
+  <name>jitsi-desktoputil</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>net.java.dev.laf-widget</groupId>
+      <artifactId>laf-widget</artifactId>
+      <version>4.0</version>
+    </dependency>
+    <!-- org.jitsi -->
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>jitsi-configuration</artifactId>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <includes>
+            <include>net/java/sip/communicator/plugin/desktoputil/**</include>
+          </includes>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestFile>${project.build.sourceDirectory}/net/java/sip/communicator/plugin/desktoputil/desktoputil.manifest.mf</manifestFile>
+          </archive>
+          <includes>
+            <include>net/java/sip/communicator/plugin/desktoputil/**</include>
+          </includes>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/m2/jitsi-dns/pom.xml b/m2/jitsi-dns/pom.xml
new file mode 100644
index 0000000..bbedef9
--- /dev/null
+++ b/m2/jitsi-dns/pom.xml
@@ -0,0 +1,61 @@
+<project
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.jitsi</groupId>
+    <artifactId>jitsi</artifactId>
+    <version>2.9-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <artifactId>jitsi-dns</artifactId>
+  <packaging>jar</packaging>
+
+  <name>jitsi-dns</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>dnsjava</groupId>
+      <artifactId>dnsjava</artifactId>
+    </dependency>
+    <!-- org.jitsi -->
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>dnssecjava</artifactId>
+      <version>1.1</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>jitsi-protocol</artifactId>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <includes>
+            <include>net/java/sip/communicator/impl/dns/**</include>
+          </includes>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestFile>${project.build.sourceDirectory}/net/java/sip/communicator/impl/dns/dns.manifest.mf</manifestFile>
+          </archive>
+          <includes>
+            <include>net/java/sip/communicator/impl/dns/**</include>
+          </includes>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/m2/jitsi-globaldisplaydetails/pom.xml b/m2/jitsi-globaldisplaydetails/pom.xml
new file mode 100644
index 0000000..0e3a828
--- /dev/null
+++ b/m2/jitsi-globaldisplaydetails/pom.xml
@@ -0,0 +1,54 @@
+<project
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.jitsi</groupId>
+    <artifactId>jitsi</artifactId>
+    <version>2.9-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <artifactId>jitsi-globaldisplaydetails</artifactId>
+  <packaging>jar</packaging>
+
+  <name>jitsi-globaldisplaydetails</name>
+
+  <dependencies>
+    <!-- org.jitsi -->
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>jitsi-configuration</artifactId>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <includes>
+            <include>net/java/sip/communicator/service/globaldisplaydetails/**</include>
+            <include>net/java/sip/communicator/impl/globaldisplaydetails/**</include>
+          </includes>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestFile>${project.build.sourceDirectory}/net/java/sip/communicator/impl/globaldisplaydetails/globaldisplaydetails.manifest.mf</manifestFile>
+          </archive>
+          <includes>
+            <include>net/java/sip/communicator/service/globaldisplaydetails/**</include>
+            <include>net/java/sip/communicator/impl/globaldisplaydetails/**</include>
+          </includes>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/m2/jitsi-hid/pom.xml b/m2/jitsi-hid/pom.xml
new file mode 100644
index 0000000..7b0da97
--- /dev/null
+++ b/m2/jitsi-hid/pom.xml
@@ -0,0 +1,51 @@
+<project
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.jitsi</groupId>
+    <artifactId>jitsi</artifactId>
+    <version>2.9-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <artifactId>jitsi-hid</artifactId>
+  <packaging>jar</packaging>
+
+  <name>jitsi-hid</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.core</artifactId>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <includes>
+            <include>net/java/sip/communicator/service/hid/**</include>
+          </includes>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestFile>${project.build.sourceDirectory}/net/java/sip/communicator/service/hid/hid.manifest.mf</manifestFile>
+          </archive>
+          <includes>
+            <include>net/java/sip/communicator/service/hid/**</include>
+          </includes>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/m2/jitsi-muc/pom.xml b/m2/jitsi-muc/pom.xml
new file mode 100644
index 0000000..952ddd8
--- /dev/null
+++ b/m2/jitsi-muc/pom.xml
@@ -0,0 +1,52 @@
+<project
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.jitsi</groupId>
+    <artifactId>jitsi</artifactId>
+    <version>2.9-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <artifactId>jitsi-muc</artifactId>
+  <packaging>jar</packaging>
+
+  <name>jitsi-muc</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>jitsi-protocol</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <includes>
+            <include>net/java/sip/communicator/service/muc/**</include>
+          </includes>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestFile>${project.build.sourceDirectory}/net/java/sip/communicator/impl/muc/muc.manifest.mf</manifestFile>
+          </archive>
+          <includes>
+            <include>net/java/sip/communicator/service/muc/**</include>
+          </includes>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/m2/jitsi-neomedia/pom.xml b/m2/jitsi-neomedia/pom.xml
new file mode 100644
index 0000000..e63f8e0
--- /dev/null
+++ b/m2/jitsi-neomedia/pom.xml
@@ -0,0 +1,52 @@
+<project
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.jitsi</groupId>
+    <artifactId>jitsi</artifactId>
+    <version>2.9-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <artifactId>jitsi-neomedia</artifactId>
+  <packaging>jar</packaging>
+
+  <name>jitsi-neomedia</name>
+
+  <dependencies>
+    <!-- org.jitsi -->
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>jitsi-util</artifactId>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <includes>
+            <include>net/java/sip/communicator/impl/neomedia/**</include>
+          </includes>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestFile>${project.build.sourceDirectory}/net/java/sip/communicator/impl/neomedia/neomedia.manifest.mf</manifestFile>
+          </archive>
+          <includes>
+            <include>net/java/sip/communicator/impl/neomedia/**</include>
+          </includes>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/m2/jitsi-notification-service/pom.xml b/m2/jitsi-notification-service/pom.xml
new file mode 100644
index 0000000..7ad123e
--- /dev/null
+++ b/m2/jitsi-notification-service/pom.xml
@@ -0,0 +1,52 @@
+<project
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.jitsi</groupId>
+    <artifactId>jitsi</artifactId>
+    <version>2.9-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <artifactId>jitsi-notification-service</artifactId>
+  <packaging>jar</packaging>
+
+  <name>jitsi-notification-service</name>
+
+  <dependencies>
+    <!-- org.jitsi -->
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>jitsi-configuration</artifactId>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <includes>
+            <include>net/java/sip/communicator/service/notification/**</include>
+          </includes>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestFile>${project.build.sourceDirectory}/net/java/sip/communicator/service/notification/notification.manifest.mf</manifestFile>
+          </archive>
+          <includes>
+            <include>net/java/sip/communicator/service/notification/**</include>
+          </includes>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/m2/jitsi-packetlogging/pom.xml b/m2/jitsi-packetlogging/pom.xml
index 5f0ce33..bcd42f1 100644
--- a/m2/jitsi-packetlogging/pom.xml
+++ b/m2/jitsi-packetlogging/pom.xml
@@ -23,6 +23,14 @@
       <artifactId>libjitsi</artifactId>
     </dependency>
     <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>jitsi-util</artifactId>
+    </dependency>
+   <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.core</artifactId>
     </dependency>
diff --git a/m2/jitsi-protocol-sip/pom.xml b/m2/jitsi-protocol-sip/pom.xml
new file mode 100644
index 0000000..4f1ec6e
--- /dev/null
+++ b/m2/jitsi-protocol-sip/pom.xml
@@ -0,0 +1,92 @@
+<project
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.jitsi</groupId>
+    <artifactId>jitsi</artifactId>
+    <version>2.9-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <artifactId>jitsi-protocol-sip</artifactId>
+  <packaging>jar</packaging>
+
+  <name>jitsi-protocol-sip</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.opentelecoms.sip</groupId>
+      <artifactId>sip-api-1.2</artifactId>
+      <version>1.2</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opentelecoms.sdp</groupId>
+      <artifactId>java-sdp-nist-bridge</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jitsi</groupId>
+      <artifactId>jain-sip-ri-ossonly</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>dnsjava</groupId>
+      <artifactId>dnsjava</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpclient</artifactId>
+      <version>4.4</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpcore</artifactId>
+      <version>4.4</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpmime</artifactId>
+      <version>4.4</version>
+    </dependency>
+    <dependency>
+      <groupId>org.igniterealtime.smack</groupId>
+      <artifactId>smack</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>jitsi-version</artifactId>
+      <version>2.9-20160511.122033-1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.core</artifactId>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <includes>
+            <include>net/java/sip/communicator/impl/protocol/sip/**.java</include>
+          </includes>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestFile>${project.build.sourceDirectory}/net/java/sip/communicator/impl/protocol/sip/sip.provider.manifest.mf</manifestFile>
+          </archive>
+          <includes>
+            <include>net/java/sip/communicator/impl/protocol/sip/**</include>
+          </includes>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/m2/jitsi-protocol/pom.xml b/m2/jitsi-protocol/pom.xml
index e045b56..d97e083 100644
--- a/m2/jitsi-protocol/pom.xml
+++ b/m2/jitsi-protocol/pom.xml
@@ -61,11 +61,9 @@
           </excludes>
           <includes>
             <include>net/java/sip/communicator/service/protocol/**</include>
-            <include>resources/images/protocol/facebook/**</include>
             <include>resources/images/protocol/googletalk/**</include>
             <include>resources/images/protocol/icq/**</include>
             <include>resources/images/protocol/jabber/**</include>
-            <include>resources/images/protocol/yahoo/**</include>
           </includes>
         </configuration>
       </plugin>
@@ -77,11 +75,9 @@
           <exclude>resources/images/protocol/media/**</exclude>
         </excludes>
         <includes>
-          <include>resources/images/protocol/facebook/**</include>
           <include>resources/images/protocol/googletalk/**</include>
           <include>resources/images/protocol/icq/**</include>
           <include>resources/images/protocol/jabber/**</include>
-          <include>resources/images/protocol/yahoo/**</include>
         </includes>
       </resource>
     </resources>
diff --git a/m2/jitsi-reconnect/pom.xml b/m2/jitsi-reconnect/pom.xml
new file mode 100644
index 0000000..8eaf4f1
--- /dev/null
+++ b/m2/jitsi-reconnect/pom.xml
@@ -0,0 +1,52 @@
+<project
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.jitsi</groupId>
+    <artifactId>jitsi</artifactId>
+    <version>2.9-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <artifactId>jitsi-reconnect</artifactId>
+  <packaging>jar</packaging>
+
+  <name>jitsi-reconnect</name>
+
+  <dependencies>
+    <!-- org.jitsi -->
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>jitsi-configuration</artifactId>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <includes>
+            <include>net/java/sip/communicator/plugin/reconnectplugin/**</include>
+          </includes>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestFile>${project.build.sourceDirectory}/net/java/sip/communicator/plugin/reconnectplugin/reconnectplugin.manifest.mf</manifestFile>
+          </archive>
+          <includes>
+            <include>net/java/sip/communicator/plugin/reconnectplugin/**</include>
+          </includes>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/m2/jitsi-sysactivity/pom.xml b/m2/jitsi-sysactivity/pom.xml
new file mode 100644
index 0000000..0f45f4d
--- /dev/null
+++ b/m2/jitsi-sysactivity/pom.xml
@@ -0,0 +1,128 @@
+<project
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.jitsi</groupId>
+    <artifactId>jitsi</artifactId>
+    <version>2.9-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <artifactId>jitsi-sysactivity</artifactId>
+  <packaging>bundle</packaging>
+
+  <name>jitsi-sysactivity</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.freedesktop.dbus</groupId>
+      <artifactId>dbus-java</artifactId>
+      <version>2.7</version>
+    </dependency>
+    <dependency>
+      <groupId>org.abstractj.libmatthew</groupId>
+      <artifactId>hexdump</artifactId>
+      <version>0.2.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.abstractj.libmatthew</groupId>
+      <artifactId>unix</artifactId>
+      <version>0.5.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.abstractj.libmatthew</groupId>
+      <artifactId>libunix</artifactId>
+      <version>0.5.1</version>
+      <type>so</type>
+    </dependency>
+    <!-- org.jitsi -->
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>jitsi-util</artifactId>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <includes>
+            <include>net/java/sip/communicator/service/sysactivity/**</include>
+            <include>net/java/sip/communicator/impl/sysactivity/**</include>
+          </includes>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <configuration>
+          <instructions>
+            <Import-Package>org.osgi.framework,
+              org.jitsi.service.version,
+              org.jitsi.service.configuration,
+              org.jitsi.util,
+              org.jitsi.service.resources, net.java.sip.communicator.service.resources,
+              net.java.sip.communicator.util
+            </Import-Package>
+            <Export-Package>net.java.sip.communicator.service.sysactivity,
+              net.java.sip.communicator.service.sysactivity.event
+            </Export-Package>
+            <Private-Package>net.java.sip.communicator.impl.sysactivity.*</Private-Package>
+            <Bundle-Activator>net.java.sip.communicator.impl.sysactivity.SysActivityActivator</Bundle-Activator>
+            <Bundle-NativeCode>
+              darwin/libsysactivitynotifications.jnilib;osname=Mac OS X;processor=x86-64,
+              linux-x86/libsysactivitynotifications.so;osname=Linux;processor=x86,
+              linux-x86-64/libsysactivitynotifications.so;osname=Linux;processor=x86-64,
+              win32-x86/sysactivitynotifications.dll;osname=Win32;processor=x86,
+              win32-x86-64/sysactivitynotifications.dll;osname=Win32;processor=x86-64
+            </Bundle-NativeCode>
+          </instructions>
+        </configuration>
+      </plugin>
+    </plugins>
+
+    <resources>
+      <resource>
+        <targetPath>darwin</targetPath>
+        <directory>../../lib/native/mac</directory>
+        <includes>
+          <include>**/*sysactivitynotifications.*</include>
+        </includes>
+      </resource>
+      <resource>
+        <targetPath>linux-x86</targetPath>
+        <directory>../../lib/native/linux</directory>
+        <includes>
+          <include>**/*sysactivitynotifications.*</include>
+        </includes>
+      </resource>
+      <resource>
+        <targetPath>linux-x86-64</targetPath>
+        <directory>../../lib/native/linux-64</directory>
+        <includes>
+          <include>**/*sysactivitynotifications.*</include>
+        </includes>
+      </resource>
+      <resource>
+        <targetPath>win32-x86-64</targetPath>
+        <directory>../../lib/native/windows-64</directory>
+        <includes>
+          <include>**/*sysactivitynotifications.*</include>
+        </includes>
+      </resource>
+      <resource>
+        <targetPath>win32-x86</targetPath>
+        <directory>../../lib/native/windows</directory>
+        <includes>
+          <include>**/*sysactivitynotifications.*</include>
+        </includes>
+      </resource>
+    </resources>
+
+  </build>
+</project>
diff --git a/m2/jitsi-systray-service/pom.xml b/m2/jitsi-systray-service/pom.xml
new file mode 100644
index 0000000..3965173
--- /dev/null
+++ b/m2/jitsi-systray-service/pom.xml
@@ -0,0 +1,52 @@
+<project
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.jitsi</groupId>
+    <artifactId>jitsi</artifactId>
+    <version>2.9-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <artifactId>jitsi-systray-service</artifactId>
+  <packaging>jar</packaging>
+
+  <name>jitsi-systray-service</name>
+
+  <dependencies>
+    <!-- org.jitsi -->
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>jitsi-configuration</artifactId>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <includes>
+            <include>net/java/sip/communicator/service/systray/**</include>
+          </includes>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestFile>${project.build.sourceDirectory}/net/java/sip/communicator/service/systray/systray.manifest.mf</manifestFile>
+          </archive>
+          <includes>
+            <include>net/java/sip/communicator/service/systray/**</include>
+          </includes>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/m2/jitsi-util/pom.xml b/m2/jitsi-util/pom.xml
index a17620f..1a01006 100644
--- a/m2/jitsi-util/pom.xml
+++ b/m2/jitsi-util/pom.xml
@@ -60,9 +60,27 @@
           </archive>
           <includes>
             <include>net/java/sip/communicator/util/**</include>
+            <include>META-INF/services/**</include>
           </includes>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>eu.somatik.serviceloader-maven-plugin</groupId>
+        <artifactId>serviceloader-maven-plugin</artifactId>
+        <version>1.0.7</version>
+        <configuration>
+          <services>
+            <param>sun.net.spi.nameservice.NameServiceDescriptor</param>
+          </services>
+        </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>generate</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/m2/jitsi-version/pom.xml b/m2/jitsi-version/pom.xml
new file mode 100644
index 0000000..6531000
--- /dev/null
+++ b/m2/jitsi-version/pom.xml
@@ -0,0 +1,57 @@
+<project
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.jitsi</groupId>
+    <artifactId>jitsi</artifactId>
+    <version>2.9-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <artifactId>jitsi-version</artifactId>
+  <packaging>jar</packaging>
+
+  <name>jitsi-version</name>
+
+  <dependencies>
+    <!-- org.jitsi -->
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>jitsi-configuration</artifactId>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <includes>
+            <include>net/java/sip/communicator/impl/version/**</include>
+          </includes>
+          <excludes>
+            <exclude>**/*.tmpl</exclude>
+            <exclude>**/version.impl.manifest.mf</exclude>
+            <exclude>**/SipCommunicatorVersionTask.java</exclude>
+          </excludes>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestFile>${project.build.sourceDirectory}/net/java/sip/communicator/impl/version/version.impl.manifest.mf</manifestFile>
+          </archive>
+          <includes>
+            <include>net/java/sip/communicator/impl/version/**</include>
+          </includes>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/m2/pom.xml b/m2/pom.xml
index e8fd64d..931a7eb 100644
--- a/m2/pom.xml
+++ b/m2/pom.xml
@@ -7,8 +7,7 @@
   <parent>
     <groupId>org.jitsi</groupId>
     <artifactId>jitsi-universe</artifactId>
-    <version>1.0-SNAPSHOT</version>
-    <relativePath>../../jitsi-universe/pom.xml</relativePath>
+    <version>1.0-20161228.135522-20</version>
   </parent>
 
   <artifactId>jitsi</artifactId>
@@ -19,21 +18,50 @@
   <url>https://jitsi.org</url>
 
   <modules>
+    <module>jitsi-argdelegation</module>
+    <module>jitsi-certificate</module>
     <module>jitsi-configuration</module>
     <module>jitsi-contactlist</module>
     <module>jitsi-credentialsstorage</module>
+    <module>jitsi-desktoputil</module>
+    <module>jitsi-dns</module>
     <module>jitsi-dnsservice</module>
     <module>jitsi-fileaccess</module>
+    <module>jitsi-globaldisplaydetails</module>
+    <module>jitsi-hid</module>
+    <module>jitsi-muc</module>
+    <module>jitsi-neomedia</module>
     <module>jitsi-netaddr</module>
+    <module>jitsi-notification-service</module>
     <module>jitsi-packetlogging</module>
     <module>jitsi-protocol</module>
     <module>jitsi-protocol-jabber</module>
+    <module>jitsi-protocol-sip</module>
     <module>jitsi-protocol-media</module>
+    <module>jitsi-reconnect</module>
     <module>jitsi-resourcemanager</module>
+    <module>jitsi-sysactivity</module>
+    <module>jitsi-systray-service</module>
     <module>jitsi-ui-service</module>
     <module>jitsi-util</module>
+    <module>jitsi-version</module>
   </modules>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>libjitsi</artifactId>
+        <version>1.0-20170207.194207-242</version>
+      </dependency>
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>ice4j</artifactId>
+        <version>2.0-20170111.193659-7</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <build>
     <sourceDirectory>../../src</sourceDirectory>
     <pluginManagement>