Merge pull request #864 from cedricwalter/fix-protobuf-permissions

used ant-exec to fix permissions instead of maven assembly

.travis.yml

@@ -5,16 +5,16 @@ jdk:
 install:
   - git clone -b bisq_0.14.4.1 https://github.com/bitsquare/bitcoinj.git
   - cd bitcoinj
-  - mvn clean install
+  - mvn clean install -DskipTests
   - git clone https://github.com/bitsquare/libdohj.git
   - cd libdohj
-  - mvn clean install
+  - mvn clean install -DskipTests
   - git clone https://github.com/bitsquare/btcd-cli4j.git
   - cd btcd-cli4j
-  - mvn clean install
+  - mvn clean install -DskipTests
   - cd ..
 
-script: mvn clean install
+script: mvn clean install -DskipTests
 
 #notifications:
 #  irc:

common/pom.xml

@@ -33,6 +33,7 @@
             <activation>
                 <os>
                     <family>unix</family>
+                    <name>Linux</name>
                 </os>
             </activation>
             <properties>
@@ -44,7 +45,7 @@
             <id>macos</id>
             <activation>
                 <os>
-                    <family>macos</family>
+                    <family>mac</family>
                 </os>
             </activation>
             <properties>
@@ -85,20 +86,21 @@
                 </executions>
             </plugin>
             <plugin>
-                <!--fix permissions to R_X -->
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>3.0.0</version>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.8</version>
                 <executions>
                     <execution>
-                        <id>set-protobuf-permissions</id>
+                        <id>set-permissions</id>
                         <phase>generate-sources</phase>
                         <goals>
-                            <goal>single</goal>
+                            <goal>run</goal>
                         </goals>
                         <configuration>
-                            <descriptors>
-                                <descriptor>src/assembly/permissions.xml</descriptor>
-                            </descriptors>
+                            <target>
+                                <chmod file="${project.build.directory}/dependency/${protobuf.exe}" perm="u+rx"/>
+                                <echo message="permissions changed for ${project.build.directory}/dependency/${protobuf.exe}"/>
+                            </target>
                         </configuration>
                     </execution>
                 </executions>
@@ -109,7 +111,7 @@
                 <artifactId>protobuf-maven-plugin</artifactId>
                 <version>0.5.0</version>
                 <configuration>
-                    <protocExecutable>${project.build.directory}/${project.artifactId}-${project.version}-bin/${protobuf.exe}</protocExecutable>
+                    <protocExecutable>${project.build.directory}/dependency/${protobuf.exe}</protocExecutable>
                 </configuration>
                 <executions>
                     <execution>

common/src/assembly/permissions.xml

@@ -1,21 +0,0 @@
-<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
-    <id>bin</id>
-    <formats>
-        <format>dir</format>
-    </formats>
-
-    <includeBaseDirectory>false</includeBaseDirectory>
-    <baseDirectory>${basedir}/target/</baseDirectory>
-    <fileSets>
-        <fileSet>
-            <directory>${basedir}/target/dependency</directory>
-            <includes>
-                <include>**/*.*</include>
-            </includes>
-            <outputDirectory></outputDirectory>
-            <fileMode>0500</fileMode> <!-- r_x______ -->
-        </fileSet>
-    </fileSets>
-
-</assembly>