simplified IT jnlp files

AdoptOpenJDK · Jun 3, 2019 · 4dc751a · 4dc751a
1 parent f47f855
commit 4dc751a
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 17 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -17,6 +17,3 @@ cache:
 
 script:
   - mvn clean verify -e
-  - cd /home/travis/build/AdoptOpenJDK/IcedTea-Web/integration/target/surefire-reports
-  - ls -la
-  - find * -exec cat {} \;
diff --git a/integration/pom.xml b/integration/pom.xml
@@ -112,6 +112,8 @@
                 <configuration>
                     <forkCount>1.0C</forkCount>
                     <reuseForks>false</reuseForks>
+                    <!-- limiting memory for travis which uses docker to run builds -->
+                    <!-- if memory is not limited the forked JVMs use too much memory and are killed by the OS -->
                     <argLine>-Xmx1024m -XX:MaxPermSize=256m</argLine>
                 </configuration>
             </plugin>

diff --git a/...rc/test/java/net/adoptopenjdk/icedteaweb/integration/testcase1/SimpleJavaApplication.jnlp b/...rc/test/java/net/adoptopenjdk/icedteaweb/integration/testcase1/SimpleJavaApplication.jnlp
@@ -3,22 +3,15 @@
     <information>
         <title>Simple Java Application</title>
         <vendor>IcedTea</vendor>
-        <homepage href="http://icedtea.classpath.org/wiki/IcedTea-Web#Testing_IcedTea-Web"/>
         <description>This is a simple java application</description>
-        <offline/>
     </information>
 
     <update check="always" policy="always"/>
 
     <resources>
         <j2se version="1.8+"/>
         <jar href="resources/App-SimpleJavaApplication.jar" main="true"/>
-        <property name="key1" value="value1"/>
-        <property name="key2" value="value2"/>
     </resources>
 
-    <application-desc main-class="${MAIN_CLASS}">
-        <argument>argument1</argument>
-        <argument>argument2 with spaces</argument>
-    </application-desc>
+    <application-desc main-class="${MAIN_CLASS}"/>
 </jnlp>
diff --git a/...net/adoptopenjdk/icedteaweb/integration/testcase1/SimpleJavaApplicationWithArguments.jnlp b/...net/adoptopenjdk/icedteaweb/integration/testcase1/SimpleJavaApplicationWithArguments.jnlp
@@ -3,9 +3,7 @@
     <information>
         <title>Simple Java Application</title>
         <vendor>IcedTea</vendor>
-        <homepage href="http://icedtea.classpath.org/wiki/IcedTea-Web#Testing_IcedTea-Web"/>
         <description>This is a simple java application with arguments</description>
-        <offline/>
     </information>
 
     <update check="always" policy="always"/>

diff --git a/...et/adoptopenjdk/icedteaweb/integration/testcase1/SimpleJavaApplicationWithProperties.jnlp b/...et/adoptopenjdk/icedteaweb/integration/testcase1/SimpleJavaApplicationWithProperties.jnlp
@@ -3,9 +3,7 @@
     <information>
         <title>Simple Java Application</title>
         <vendor>IcedTea</vendor>
-        <homepage href="http://icedtea.classpath.org/wiki/IcedTea-Web#Testing_IcedTea-Web"/>
         <description>This is a simple java application with properties</description>
-        <offline/>
     </information>
 
     <update check="always" policy="always"/>
@@ -17,6 +15,5 @@
         <property name="key2" value="value2"/>
     </resources>
 
-    <application-desc main-class="${MAIN_CLASS}">
-    </application-desc>
+    <application-desc main-class="${MAIN_CLASS}"/>
 </jnlp>