aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLyubomir Marinov <lyubomir.marinov@jitsi.org>2015-09-02 15:07:49 -0500
committerLyubomir Marinov <lyubomir.marinov@jitsi.org>2015-09-02 15:07:49 -0500
commit5687215012a21f0e6fca4fcebb2b8aa866f55bf9 (patch)
tree31683d1aec57b174b0bbef3ecb20152f5c7fe38b
parent87f9c72506fe4ac7ed5ad3a738236b9edeb9c641 (diff)
downloadjitsi-5687215012a21f0e6fca4fcebb2b8aa866f55bf9.zip
jitsi-5687215012a21f0e6fca4fcebb2b8aa866f55bf9.tar.gz
jitsi-5687215012a21f0e6fca4fcebb2b8aa866f55bf9.tar.bz2
Removes the Maven artifact jitsi-libjitsi because it has been "merged" into the Maven artifact and library libjitsi (when the latter was turned into a proper OSGi bundle).
-rw-r--r--m2/jitsi-libjitsi/pom.xml56
-rw-r--r--m2/pom.xml1
2 files changed, 0 insertions, 57 deletions
diff --git a/m2/jitsi-libjitsi/pom.xml b/m2/jitsi-libjitsi/pom.xml
deleted file mode 100644
index 38d1e72..0000000
--- a/m2/jitsi-libjitsi/pom.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<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-libjitsi</artifactId>
- <packaging>jar</packaging>
-
- <name>jitsi-libjitsi</name>
-
- <dependencies>
- <!-- org.jitsi -->
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>libjitsi</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/libjitsi/**</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/libjitsi/libjitsi.manifest.mf</manifestFile>
- </archive>
- <includes>
- <include>net/java/sip/communicator/impl/libjitsi/**</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/m2/pom.xml b/m2/pom.xml
index c81fb35..e8fd64d 100644
--- a/m2/pom.xml
+++ b/m2/pom.xml
@@ -24,7 +24,6 @@
<module>jitsi-credentialsstorage</module>
<module>jitsi-dnsservice</module>
<module>jitsi-fileaccess</module>
- <module>jitsi-libjitsi</module>
<module>jitsi-netaddr</module>
<module>jitsi-packetlogging</module>
<module>jitsi-protocol</module>