-
Damian Minkov authored
Conflicts: resources/install/build-debian.xml resources/install/debian/copyright resources/install/debian/patches/sdes4j.patch
Damian Minkov authoredConflicts: resources/install/build-debian.xml resources/install/debian/copyright resources/install/debian/patches/sdes4j.patch
sdes4j.patch 1.43 KiB
Index: libjitsi/lib/src/sdes4j-r1.1.3/pom.xml
Description: Updates pom.xml to be able to build with mvn-debian
===================================================================
--- libjitsi.orig/lib/src/sdes4j-r1.1.3/pom.xml
+++ libjitsi/lib/src/sdes4j-r1.1.3/pom.xml
@@ -37,10 +37,10 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>[1.4,1.6]</version>
+ <version>debian</version>
<scope>compile</scope>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>[2.5,3.0.0)</version>
@@ -57,14 +57,13 @@
<artifactId>junit</artifactId>
<version>[4.9,5.0)</version>
<scope>test</scope>
- </dependency>
+ </dependency-->
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.0</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
@@ -78,7 +77,7 @@
<extensions>true</extensions>
<configuration />
</plugin>
- <plugin>
+ <!--plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.14</version>
<configuration>
@@ -86,7 +85,7 @@
<include>**/*.java</include>
</includes>
</configuration>
- </plugin>
+ </plugin-->
</plugins>
</build>