[ 
https://issues.apache.org/jira/browse/APEXCORE-798?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16296967#comment-16296967
 ] 

ASF GitHub Bot commented on APEXCORE-798:
-----------------------------------------

vrozov closed pull request #590: APEXCORE-798 Exclude log4j.properties from 
engine-test.jar
URL: https://github.com/apache/apex-core/pull/590
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/engine/pom.xml b/engine/pom.xml
index 4294c8abfc..93e7d976e5 100644
--- a/engine/pom.xml
+++ b/engine/pom.xml
@@ -49,7 +49,7 @@
           </execution>
         </executions>
         <configuration>
-          <excludes>
+          <excludes combine.children="append">
             <!-- never include into jar (used in minicluster test) -->
             <exclude>**/yarn-site.xml</exclude>
           </excludes>
diff --git 
a/engine/src/test/java/com/datatorrent/stram/StramMiniClusterTest.java 
b/engine/src/test/java/com/datatorrent/stram/StramMiniClusterTest.java
index bbb7c1c49b..fb02593e98 100644
--- a/engine/src/test/java/com/datatorrent/stram/StramMiniClusterTest.java
+++ b/engine/src/test/java/com/datatorrent/stram/StramMiniClusterTest.java
@@ -129,6 +129,7 @@ public static void setup() throws InterruptedException, 
IOException
     conf.set("yarn.scheduler.capacity.root.queues", "default");
     conf.set("yarn.scheduler.capacity.root.default.capacity", "100");
     conf.setBoolean(YarnConfiguration.NM_DISK_HEALTH_CHECK_ENABLE, false);
+    conf.setFloat(YarnConfiguration.NM_MAX_PER_DISK_UTILIZATION_PERCENTAGE, 
100.0F);
     conf.set(YarnConfiguration.NM_ADMIN_USER_ENV, 
String.format("JAVA_HOME=%s,CLASSPATH=%s", System.getProperty("java.home"), 
getTestRuntimeClasspath()));
     conf.set(YarnConfiguration.NM_ENV_WHITELIST, 
YarnConfiguration.DEFAULT_NM_ENV_WHITELIST.replaceAll("JAVA_HOME,*", ""));
 


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


> Exclude log4j.properties from engine-test.jar
> ---------------------------------------------
>
>                 Key: APEXCORE-798
>                 URL: https://issues.apache.org/jira/browse/APEXCORE-798
>             Project: Apache Apex Core
>          Issue Type: Bug
>            Reporter: Vlad Rozov
>            Assignee: Vlad Rozov
>            Priority: Minor
>
> log4j.properties is supposed to be excluded from the engine test jar based on 
> the 
> {code:xml}
>         <plugin>
>           <groupId>org.apache.maven.plugins</groupId>
>           <artifactId>maven-jar-plugin</artifactId>
>           <version>2.4</version>
>           <configuration>
>             <useDefaultManifestFile>true</useDefaultManifestFile>
>             <archive>
>               <manifest>
>                 <addClasspath>true</addClasspath>
>                 <classpathLayoutType>repository</classpathLayoutType>
>               </manifest>
>             </archive>
>             <excludes>
>               <exclude>log4j.properties</exclude>
>             </excludes>
>           </configuration>
>         </plugin>
> {code}



--
This message was sent by Atlassian JIRA
(v6.4.14#64029)

Reply via email to