You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2018/01/17 16:41:29 UTC
[sling-org-apache-sling-launchpad-testing] branch master updated:
SLING-7397 - Cleanup and generalize testing profiles
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-testing.git
The following commit(s) were added to refs/heads/master by this push:
new 492c2bf SLING-7397 - Cleanup and generalize testing profiles
492c2bf is described below
commit 492c2bf265418d652d00ef861e647aef36cb77cd
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Wed Jan 17 18:39:47 2018 +0200
SLING-7397 - Cleanup and generalize testing profiles
- remove the port-javaX profiles, the problem they were solving should be
removed by using small, quick builds on Jenkins
- use just two profiles to augment the CLI arguments in case we're
running on the JPMS and in case we want debug arguments
- remove the -XX:MaxPermSize flag as we only test on Java 8 or newer
---
pom.xml | 83 +++++++++++------------------------------------------------------
1 file changed, 13 insertions(+), 70 deletions(-)
diff --git a/pom.xml b/pom.xml
index b8a41a2..15c7385 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,7 +46,11 @@
<properties>
<sling.java.version>7</sling.java.version>
- <sling.default.vm.options>-Xmx1024m -XX:MaxPermSize=256m -Djava.awt.headless=true</sling.default.vm.options>
+ <!-- empty by design, will be activated using profiles -->
+ <sling.debug.options/>
+ <sling.jpms.vm.options/>
+
+ <sling.vm.options>-Xmx1024m -Djava.awt.headless=true ${sling.debug.options} ${sling.jpms.vm.options}</sling.vm.options>
<!-- path suffix for HTTP access to Sling -->
<http.base.path />
@@ -153,85 +157,24 @@
<profiles>
<profile>
- <id>port-java6</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- <jdk>1.6</jdk>
- </activation>
- <properties>
- <min.port>41200</min.port>
- <max.port>41399</max.port>
- </properties>
- </profile>
- <profile>
- <id>port-java7</id>
+ <id>jpms</id>
<activation>
- <activeByDefault>false</activeByDefault>
- <jdk>1.7</jdk>
+ <jdk>[9,)</jdk>
</activation>
<properties>
- <min.port>41400</min.port>
- <max.port>41599</max.port>
+ <sling.jpms.vm.options>--add-modules=java.se.ee</sling.jpms.vm.options>
</properties>
</profile>
<profile>
- <id>port-java8</id>
+ <id>debug</id>
<activation>
- <activeByDefault>false</activeByDefault>
- <jdk>1.8</jdk>
- </activation>
- <properties>
- <min.port>41600</min.port>
- <max.port>41799</max.port>
- </properties>
- </profile>
- <profile>
- <id>debug-no-java9</id>
- <activation>
- <property>
- <name>debug</name>
- </property>
- <jdk>!9</jdk>
- </activation>
- <properties>
- <sling.vm.options>${sling.default.vm.options} -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8000</sling.vm.options>
- </properties>
- </profile>
- <profile>
- <id>debug-java9</id>
- <activation>
<property>
<name>debug</name>
</property>
- <jdk>9</jdk>
- </activation>
- <properties>
- <sling.vm.options>${sling.default.vm.options} --add-modules=java.se.ee -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8000</sling.vm.options>
- </properties>
- </profile>
- <profile>
- <id>no-debug-no-java9</id>
- <activation>
- <property>
- <name>!debug</name>
- </property>
- <jdk>!9</jdk>
- </activation>
- <properties>
- <sling.vm.options>${sling.default.vm.options}</sling.vm.options>
- </properties>
- </profile>
- <profile>
- <id>no-debug-java9</id>
- <activation>
- <property>
- <name>!debug</name>
- </property>
- <jdk>9</jdk>
- </activation>
- <properties>
- <sling.vm.options>${sling.default.vm.options} --add-modules=java.se.ee</sling.vm.options>
- </properties>
+ </activation>
+ <properties>
+ <sling.debug.options>-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8000</sling.debug.options>
+ </properties>
</profile>
</profiles>
--
To stop receiving notification emails like this one, please contact
['"commits@sling.apache.org" <co...@sling.apache.org>'].