Merge pull request #60 from jitsi/publish-central
Prepare releasing on Maven Central
This commit is contained in:
commit
ce897fd796
BIN
lib/jain-sdp.jar
BIN
lib/jain-sdp.jar
Binary file not shown.
39
pom.xml
39
pom.xml
@ -6,8 +6,8 @@
|
||||
|
||||
<parent>
|
||||
<groupId>org.jitsi</groupId>
|
||||
<artifactId>jitsi-universe</artifactId>
|
||||
<version>1.0-20160202.203332-11</version>
|
||||
<artifactId>jitsi-universe-public</artifactId>
|
||||
<version>1.0</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>ice4j</artifactId>
|
||||
@ -19,8 +19,12 @@
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>javax.sdp</groupId>
|
||||
<artifactId>jain-sdp</artifactId>
|
||||
<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>org.bitlet</groupId>
|
||||
@ -72,31 +76,4 @@
|
||||
</build>
|
||||
</profile>
|
||||
</profiles>
|
||||
|
||||
<repositories>
|
||||
<repository>
|
||||
<id>jitsi-maven-repository-releases</id>
|
||||
<layout>default</layout>
|
||||
<name>Jitsi Maven Repository (Releases)</name>
|
||||
<releases>
|
||||
<enabled>true</enabled>
|
||||
</releases>
|
||||
<snapshots>
|
||||
<enabled>false</enabled>
|
||||
</snapshots>
|
||||
<url>https://github.com/jitsi/jitsi-maven-repository/raw/master/releases/</url>
|
||||
</repository>
|
||||
<repository>
|
||||
<id>jitsi-maven-repository-snapshots</id>
|
||||
<layout>default</layout>
|
||||
<name>Jitsi Maven Repository (Snapshots)</name>
|
||||
<releases>
|
||||
<enabled>false</enabled>
|
||||
</releases>
|
||||
<snapshots>
|
||||
<enabled>true</enabled>
|
||||
</snapshots>
|
||||
<url>https://github.com/jitsi/jitsi-maven-repository/raw/master/snapshots/</url>
|
||||
</repository>
|
||||
</repositories>
|
||||
</project>
|
||||
|
||||
@ -19,6 +19,7 @@ package org.ice4j.ice.sdp;
|
||||
|
||||
import org.ice4j.*;
|
||||
import org.ice4j.ice.*;
|
||||
import org.opentelecoms.javax.sdp.*;
|
||||
|
||||
import javax.sdp.*;
|
||||
import java.util.*;
|
||||
@ -71,7 +72,7 @@ public class IceSdpUtils
|
||||
/**
|
||||
* A reference to the currently valid SDP factory instance.
|
||||
*/
|
||||
private static final SdpFactory sdpFactory = SdpFactory.getInstance();
|
||||
private static final SdpFactory sdpFactory = new NistSdpFactory();
|
||||
|
||||
/**
|
||||
* The <tt>Logger</tt> used by the <tt>IceSdpUtils</tt>
|
||||
@ -138,6 +139,7 @@ public class IceSdpUtils
|
||||
* @param iceMediaStream the media stream where we should extract candidates
|
||||
* from.
|
||||
*/
|
||||
@SuppressWarnings({ "rawtypes", "unchecked" })
|
||||
public static void initMediaDescription(MediaDescription mediaDescription,
|
||||
IceMediaStream iceMediaStream)
|
||||
{
|
||||
@ -156,10 +158,10 @@ public class IceSdpUtils
|
||||
if(firstComponent == null)
|
||||
firstComponent = component;
|
||||
|
||||
Vector attributes = mediaDescription.getAttributes(true);
|
||||
for(Candidate<?> candidate : component.getLocalCandidates())
|
||||
{
|
||||
mediaDescription.addAttribute(
|
||||
new CandidateAttribute(candidate));
|
||||
attributes.add(new CandidateAttribute(candidate));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -24,6 +24,7 @@ import javax.sdp.*;
|
||||
import org.ice4j.*;
|
||||
import org.ice4j.ice.*;
|
||||
import org.ice4j.ice.sdp.*;
|
||||
import org.opentelecoms.javax.sdp.*;
|
||||
|
||||
/**
|
||||
* Utilities for manipulating SDP. Some of the utilities in this method <b>do
|
||||
@ -53,7 +54,7 @@ public class SdpUtils
|
||||
*/
|
||||
public static String createSDPDescription(Agent agent) throws Throwable
|
||||
{
|
||||
SdpFactory factory = SdpFactory.getInstance();
|
||||
SdpFactory factory = new NistSdpFactory();
|
||||
SessionDescription sdess = factory.createSessionDescription();
|
||||
|
||||
IceSdpUtils.initSessionDescription(sdess, agent);
|
||||
@ -75,7 +76,7 @@ public class SdpUtils
|
||||
public static void parseSDP(Agent localAgent, String sdp)
|
||||
throws Exception
|
||||
{
|
||||
SdpFactory factory = SdpFactory.getInstance();
|
||||
SdpFactory factory = new NistSdpFactory();
|
||||
SessionDescription sdess = factory.createSessionDescription(sdp);
|
||||
|
||||
for(IceMediaStream stream : localAgent.getStreams())
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user