Assembly plugin fix (eugenp#1449)

pivovarit · web-flow · commit e71367b3f3f9 · 2017-03-19T20:03:23.000+01:00
* Assembly plugin fix

* Fix java opts

* Fix java opts 2

* Fix java opts 3

* Add sudo: required

* Remove sudo: required

* Enable incremental builder

* Disable incremental builder

* Update

* Update
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,9 @@
 language: java
 
-install: travis_wait 40 mvn -q clean install -Dgib.enabled=true
+install: travis_wait 60 mvn -q clean install
+
+before_script:
+  - echo "MAVEN_OPTS='-Xmx2048M -Xss128M -XX:MaxPermSize=2048M -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -XX:-UseGCOverheadLimit'" > ~/.mavenrc
 
 jdk:
   - oraclejdk8
@@ -14,10 +17,4 @@ cache:
   directories:
   - .autoconf
   - $HOME/.m2
-  
-  sudo: required
-  
-  env:
-    global:
-      JAVA_OPTS="-Xmx2048M -Xss128M -XX:MaxPermSize=2048M -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC"
-      MAVEN_OPTS="-Xmx2048M -Xss128M -XX:MaxPermSize=2048M -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC"
+
diff --git a/apache-poi/temp.xlsx b/apache-poi/temp.xlsx
diff --git a/core-java/pom.xml b/core-java/pom.xml
@@ -250,6 +250,7 @@
                             <goal>single</goal>
                         </goals>
                         <configuration>
+                            <archiveBaseDirectory>${project.basedir}</archiveBaseDirectory>
                             <archive>
                                 <manifest>
                                     <mainClass>org.baeldung.executable.ExecutableMavenJar</mainClass>
diff --git a/disruptor/pom.xml b/disruptor/pom.xml
@@ -145,6 +145,7 @@
                             <goal>single</goal>
                         </goals>
                         <configuration>
+                            <archiveBaseDirectory>${project.basedir}</archiveBaseDirectory>
                             <archive>
                                 <manifest>
                                     <mainClass>org.baeldung.executable.ExecutableMavenJar</mainClass>
diff --git a/jpa-storedprocedure/pom.xml b/jpa-storedprocedure/pom.xml
@@ -30,6 +30,7 @@
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <configuration>
+                    <archiveBaseDirectory>${project.basedir}</archiveBaseDirectory>
                     <!--archive> <manifest> <mainClass>fully.qualified.MainClass</mainClass> </manifest> </archive -->
                     <descriptorRefs>
                         <descriptorRef>jar-with-dependencies</descriptorRef>
diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <gib.referenceBranch>refs/heads/master</gib.referenceBranch>
-        <gib.enabled>false</gib.enabled>
+       <!-- <gib.enabled>false</gib.enabled>-->
     </properties>
 
     <modules>
@@ -211,6 +211,18 @@
     </modules>
 
     <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>1.6.0</version>
+                <configuration>
+                    <executable>maven</executable>
+
+
+                </configuration>
+            </plugin>
+        </plugins>
         <extensions>
             <!--<extension>
                 <groupId>com.vackosar.gitflowincrementalbuilder</groupId>
diff --git a/xml/pom.xml b/xml/pom.xml
@@ -279,6 +279,7 @@
 							is org.apache.maven.plugins ...which is assumed by default. -->
 						<artifactId>maven-assembly-plugin</artifactId>
 						<configuration>
+							<archiveBaseDirectory>${project.basedir}</archiveBaseDirectory>
 							<descriptorRefs>
 								<descriptorRef>
 									jar-with-dependencies
