diff options
| author | paweldomas <pawel.domas@jitsi.org> | 2016-03-14 15:24:44 -0500 |
|---|---|---|
| committer | paweldomas <pawel.domas@jitsi.org> | 2016-03-14 15:24:44 -0500 |
| commit | e1a68d1f8591203f40163b4d78815b9fda122d79 (patch) | |
| tree | b000c0957f9f330f72ac11eca16825ecc52df2a6 /m2 | |
| parent | 092ea03b60e6f74eabad86e34f38a4f7b8043e98 (diff) | |
| parent | 7245b9570e8123aa634c272634bcf840a3dd7330 (diff) | |
| download | jitsi-e1a68d1f8591203f40163b4d78815b9fda122d79.zip jitsi-e1a68d1f8591203f40163b4d78815b9fda122d79.tar.gz jitsi-e1a68d1f8591203f40163b4d78815b9fda122d79.tar.bz2 | |
Merge branch 'jibri'
# Conflicts:
# m2/jitsi-certificate/pom.xml
# src/net/java/sip/communicator/impl/sysactivity/SystemActivityNotifications.java
Diffstat (limited to 'm2')
| -rw-r--r-- | m2/jitsi-certificate/pom.xml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/m2/jitsi-certificate/pom.xml b/m2/jitsi-certificate/pom.xml index 4855162..a14f1ed 100644 --- a/m2/jitsi-certificate/pom.xml +++ b/m2/jitsi-certificate/pom.xml @@ -20,18 +20,26 @@ <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcprov-jdk15on</artifactId> + <!-- + everywhere we use a patched version of ours from the branch + r1rv51-patched of gpolitis/bc-java (at GitHub). + --> + <version>1.51-jitsi-1</version> </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> |