Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

JBIDE-23285 Unify runtimes download #1704

Closed
wants to merge 1 commit into from
Closed

JBIDE-23285 Unify runtimes download #1704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
59 changes: 7 additions & 52 deletions tests/org.jboss.ide.eclipse.as.ui.bot.test/pom.xml
View file
Open in desktop
Expand Up @@ -27,31 +27,11 @@
<reddeer.project.config>${project.build.outputDirectory}/project</reddeer.project.config>
<reddeer.product.config>${project.build.outputDirectory}/product</reddeer.product.config>
<reddeer.config>${reddeer.project.config}</reddeer.config>
<jbosstools.test.jboss-as-3.2.home>${requirementsDirectory}/jboss-3.2.8.SP1</jbosstools.test.jboss-as-3.2.home>
<jbosstools.test.jboss-as-4.0.home>${requirementsDirectory}/jboss-4.0.5.GA</jbosstools.test.jboss-as-4.0.home>
<jbosstools.test.jboss-as-4.2.home>${requirementsDirectory}/jboss-4.2.3.GA</jbosstools.test.jboss-as-4.2.home>
<jbosstools.test.jboss-as-5.0.home>${requirementsDirectory}/jboss-5.0.1.GA</jbosstools.test.jboss-as-5.0.home>
<jbosstools.test.jboss-as-5.1.home>${requirementsDirectory}/jboss-5.1.0.GA</jbosstools.test.jboss-as-5.1.home>
<jbosstools.test.jboss-as-6.x.home>${requirementsDirectory}/jboss-6.1.0.Final</jbosstools.test.jboss-as-6.x.home>
<jbosstools.test.jboss-as-7.0.home>${requirementsDirectory}/jboss-as-7.0.2.Final</jbosstools.test.jboss-as-7.0.home>
<jbosstools.test.jboss-as-7.1.home>${requirementsDirectory}/jboss-as-7.1.1.Final</jbosstools.test.jboss-as-7.1.home>
<jbosstools.test.jboss-wildfly-8.home>${requirementsDirectory}/wildfly-8.2.0.Final</jbosstools.test.jboss-wildfly-8.home>
<jbosstools.test.jboss-wildfly-9.home>${requirementsDirectory}/wildfly-9.0.1.Final</jbosstools.test.jboss-wildfly-9.home>
<jbosstools.test.jboss-wildfly-10.home>${requirementsDirectory}/wildfly-10.0.0.CR2</jbosstools.test.jboss-wildfly-10.home>
<jbosstools.test.jboss-eap-4.home>${requirementsDirectory}/jboss-eap-4.3/jboss-as</jbosstools.test.jboss-eap-4.home>
<jbosstools.test.jboss-eap-5.home>${requirementsDirectory}/jboss-eap-5.2/jboss-as</jbosstools.test.jboss-eap-5.home>
<jbosstools.test.jboss-eap-6.0.home>${requirementsDirectory}/jboss-eap-6.0</jbosstools.test.jboss-eap-6.0.home>
<jbosstools.test.jboss-eap-6.x.home>${requirementsDirectory}/jboss-eap-6.4</jbosstools.test.jboss-eap-6.x.home>
<jbosstools.test.jboss-eap-7.x.home>${requirementsDirectory}/jboss-eap-7.0</jbosstools.test.jboss-eap-7.x.home>
<!-- Requirements JRE properties -->
<req.java.version>1.8</req.java.version>
<req.java.home>${env.JAVA_HOME}</req.java.home>
<!-- Server download URL property files configuration -->
<project-download-properties-file>${project.basedir}/properties/projects-download.properties</project-download-properties-file>
<product-download-properties-file>${project.basedir}/properties/products-download.properties</product-download-properties-file>
<download-properties-file>${project-download-properties-file}</download-properties-file>
<!-- Command line arguments for tycho surefire tests -->
<runtimesProperties>-Drd.config=${reddeer.config} -Dreq.java.version=${req.java.version} -Dreq.java.home=${req.java.home} -Djbosstools.test.jboss-as-3.2.home=${jbosstools.test.jboss-as-3.2.home} -Djbosstools.test.jboss-as-4.0.home=${jbosstools.test.jboss-as-4.0.home} -Djbosstools.test.jboss-as-4.2.home=${jbosstools.test.jboss-as-4.2.home} -Djbosstools.test.jboss-as-5.0.home=${jbosstools.test.jboss-as-5.0.home} -Djbosstools.test.jboss-as-5.1.home=${jbosstools.test.jboss-as-5.1.home} -Djbosstools.test.jboss-as-6.x.home=${jbosstools.test.jboss-as-6.x.home} -Djbosstools.test.jboss-as-7.0.home=${jbosstools.test.jboss-as-7.0.home} -Djbosstools.test.jboss-as-7.1.home=${jbosstools.test.jboss-as-7.1.home} -Djbosstools.test.jboss-wildfly-8.home=${jbosstools.test.jboss-wildfly-8.home} -Djbosstools.test.jboss-wildfly-9.home=${jbosstools.test.jboss-wildfly-9.home} -Djbosstools.test.jboss-wildfly-10.home=${jbosstools.test.jboss-wildfly-10.home} -Djbosstools.test.jboss-eap-4.home=${jbosstools.test.jboss-eap-4.home} -Djbosstools.test.jboss-eap-5.home=${jbosstools.test.jboss-eap-5.home} -Djbosstools.test.jboss-eap-6.0.home=${jbosstools.test.jboss-eap-6.0.home} -Djbosstools.test.jboss-eap-6.x.home=${jbosstools.test.jboss-eap-6.x.home} -Djbosstools.test.jboss-eap-7.x.home=${jbosstools.test.jboss-eap-7.x.home}</runtimesProperties>
<runtimesProperties>-Drd.config=${reddeer.config} -Dreq.java.version=${req.java.version} -Dreq.java.home=${req.java.home}</runtimesProperties>
<systemProperties>${integrationTestsSystemProperties} ${runtimesProperties}</systemProperties>
</properties>

Expand All @@ -67,25 +47,6 @@
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>properties-maven-plugin</artifactId>
<version>1.0-alpha-2</version>
<executions>
<execution>
<phase>initialize</phase>
<goals>
<goal>read-project-properties</goal>
</goals>
</execution>
</executions>
<configuration>
<files>
<file>${download-properties-file}</file>
</files>
</configuration>
</plugin>

<plugin>
<groupId>com.googlecode.maven-download-plugin</groupId>
<artifactId>download-maven-plugin</artifactId>
Expand Down Expand Up @@ -138,7 +99,8 @@
<id>projects</id>
<activation>
<property>
<name>!test.profile</name>
<name>test.profile</name>
<value>projects</value>
</property>
</activation>
<properties>
Expand Down Expand Up @@ -294,8 +256,7 @@
<id>projects-stable</id>
<activation>
<property>
<name>test.profile</name>
<value>projects-stable</value>
<name>!test.profile</name>
</property>
</activation>
<properties>
Expand All @@ -308,7 +269,7 @@
<artifactId>download-maven-plugin</artifactId>
<executions>
<execution>
<id>install-as-6.1.0</id>
<id>install-as-6.1</id>
<phase>pre-integration-test</phase>
<goals>
<goal>wget</goal>
Expand All @@ -320,7 +281,7 @@
</configuration>
</execution>
<execution>
<id>install-as-7.0.2</id>
<id>install-as-7.0</id>
<phase>pre-integration-test</phase>
<goals>
<goal>wget</goal>
Expand All @@ -332,7 +293,7 @@
</configuration>
</execution>
<execution>
<id>install-as-7.1.1</id>
<id>install-as-7.1</id>
<phase>pre-integration-test</phase>
<goals>
<goal>wget</goal>
Expand Down Expand Up @@ -775,7 +736,6 @@
<properties>
<test.class>org.jboss.ide.eclipse.as.ui.bot.test.allsuites.products.ProductsTestsSuite</test.class>
<reddeer.config>${reddeer.product.config}</reddeer.config>
<download-properties-file>${product-download-properties-file}</download-properties-file>
</properties>
<build>
<plugins>
Expand Down Expand Up @@ -859,7 +819,6 @@
<properties>
<test.class>org.jboss.ide.eclipse.as.ui.bot.test.allsuites.products.EAP4TestsSuite</test.class>
<reddeer.config>${reddeer.product.config}/eap-4.3.xml</reddeer.config>
<download-properties-file>${product-download-properties-file}</download-properties-file>
</properties>
<build>
<plugins>
Expand Down Expand Up @@ -895,7 +854,6 @@
<properties>
<test.class>org.jboss.ide.eclipse.as.ui.bot.test.allsuites.products.EAP5TestsSuite</test.class>
<reddeer.config>${reddeer.product.config}/eap-5.x.xml</reddeer.config>
<download-properties-file>${product-download-properties-file}</download-properties-file>
</properties>
<build>
<plugins>
Expand Down Expand Up @@ -931,7 +889,6 @@
<properties>
<test.class>org.jboss.ide.eclipse.as.ui.bot.test.allsuites.products.EAP60TestsSuite</test.class>
<reddeer.config>${reddeer.product.config}/eap-6.0.xml</reddeer.config>
<download-properties-file>${product-download-properties-file}</download-properties-file>
</properties>
<build>
<plugins>
Expand Down Expand Up @@ -967,7 +924,6 @@
<properties>
<test.class>org.jboss.ide.eclipse.as.ui.bot.test.allsuites.products.EAP6xTestsSuite</test.class>
<reddeer.config>${reddeer.product.config}/eap-6.x.xml</reddeer.config>
<download-properties-file>${product-download-properties-file}</download-properties-file>
</properties>
<build>
<plugins>
Expand Down Expand Up @@ -1003,7 +959,6 @@
<properties>
<test.class>org.jboss.ide.eclipse.as.ui.bot.test.allsuites.products.EAP7TestsSuite</test.class>
<reddeer.config>${reddeer.product.config}/eap-7.x.xml</reddeer.config>
<download-properties-file>${product-download-properties-file}</download-properties-file>
</properties>
<build>
<plugins>
Expand Down
1 change: 0 additions & 1 deletion tests/org.jboss.ide.eclipse.as.ui.bot.test/properties/.gitignore
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ...org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/product/eap-4.3.xml
View file
Open in desktop
Expand Up @@ -13,7 +13,7 @@
<server:type>
<server:familyEAP version="4.3"></server:familyEAP>
</server:type>
<server:runtime>${jbosstools.test.jboss-eap-4.home}</server:runtime>
<server:runtime>${requirementsDirectory}/${jbosstools.test.jboss-eap-4.dir}/jboss-as</server:runtime>
</server:jboss-server-requirement>

<jre:jre-requirement name="test">
Expand Down
2 changes: 1 addition & 1 deletion ...org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/product/eap-5.x.xml
View file
Open in desktop
Expand Up @@ -13,7 +13,7 @@
<server:type>
<server:familyEAP version="5.x"></server:familyEAP>
</server:type>
<server:runtime>${jbosstools.test.jboss-eap-5.home}</server:runtime>
<server:runtime>${requirementsDirectory}/${jbosstools.test.jboss-eap-5.dir}/jboss-as</server:runtime>
</server:jboss-server-requirement>

<jre:jre-requirement name="test">
Expand Down
2 changes: 1 addition & 1 deletion ...org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/product/eap-6.0.xml
View file
Open in desktop
Expand Up @@ -13,7 +13,7 @@
<server:type>
<server:familyEAP version="6.0"></server:familyEAP>
</server:type>
<server:runtime>${jbosstools.test.jboss-eap-6.0.home}</server:runtime>
<server:runtime>${requirementsDirectory}/${jbosstools.test.jboss-eap-6.0.dir}</server:runtime>
</server:jboss-server-requirement>

<jre:jre-requirement name="test">
Expand Down
2 changes: 1 addition & 1 deletion ...org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/product/eap-6.x.xml
View file
Open in desktop
Expand Up @@ -13,7 +13,7 @@
<server:type>
<server:familyEAP version="6.1+"></server:familyEAP>
</server:type>
<server:runtime>${jbosstools.test.jboss-eap-6.x.home}</server:runtime>
<server:runtime>${requirementsDirectory}/${jbosstools.test.jboss-eap-6.x.dir}</server:runtime>
</server:jboss-server-requirement>

<jre:jre-requirement name="test">
Expand Down
2 changes: 1 addition & 1 deletion ...org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/product/eap-7.x.xml
View file
Open in desktop
Expand Up @@ -13,7 +13,7 @@
<server:type>
<server:familyEAP version="7.x"></server:familyEAP>
</server:type>
<server:runtime>${jbosstools.test.jboss-eap-7.x.home}</server:runtime>
<server:runtime>${requirementsDirectory}/${jbosstools.test.jboss-eap-7.x.dir}</server:runtime>
</server:jboss-server-requirement>

<jre:jre-requirement name="test">
Expand Down
2 changes: 1 addition & 1 deletion ...jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-3.2.xml
View file
Open in desktop
Expand Up @@ -13,7 +13,7 @@
<server:type>
<server:familyAS version="3.2"></server:familyAS>
</server:type>
<server:runtime>${jbosstools.test.jboss-as-3.2.home}</server:runtime>
<server:runtime>${requirementsDirectory}/${jbosstools.test.jboss-as-3.2.dir}</server:runtime>
</server:jboss-server-requirement>

<jre:jre-requirement name="test">
Expand Down
2 changes: 1 addition & 1 deletion ...jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-4.0.xml
View file
Open in desktop
Expand Up @@ -13,7 +13,7 @@
<server:type>
<server:familyAS version="4.0"></server:familyAS>
</server:type>
<server:runtime>${jbosstools.test.jboss-as-4.0.home}</server:runtime>
<server:runtime>${requirementsDirectory}/${jbosstools.test.jboss-as-4.0.dir}</server:runtime>
</server:jboss-server-requirement>

<jre:jre-requirement name="test">
Expand Down
2 changes: 1 addition & 1 deletion ...jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-4.2.xml
View file
Open in desktop
Expand Up @@ -13,7 +13,7 @@
<server:type>
<server:familyAS version="4.2"></server:familyAS>
</server:type>
<server:runtime>${jbosstools.test.jboss-as-4.2.home}</server:runtime>
<server:runtime>${requirementsDirectory}/${jbosstools.test.jboss-as-4.2.dir}</server:runtime>
</server:jboss-server-requirement>

<jre:jre-requirement name="test">
Expand Down
2 changes: 1 addition & 1 deletion ...jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-5.0.xml
View file
Open in desktop
Expand Up @@ -13,7 +13,7 @@
<server:type>
<server:familyAS version="5.0"></server:familyAS>
</server:type>
<server:runtime>${jbosstools.test.jboss-as-5.0.home}</server:runtime>
<server:runtime>${requirementsDirectory}/${jbosstools.test.jboss-as-5.0.dir}</server:runtime>
</server:jboss-server-requirement>

<jre:jre-requirement name="test">
Expand Down
2 changes: 1 addition & 1 deletion ...jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-5.1.xml
View file
Open in desktop
Expand Up @@ -13,7 +13,7 @@
<server:type>
<server:familyAS version="5.1"></server:familyAS>
</server:type>
<server:runtime>${jbosstools.test.jboss-as-5.1.home}</server:runtime>
<server:runtime>${requirementsDirectory}/${jbosstools.test.jboss-as-5.1.dir}</server:runtime>
</server:jboss-server-requirement>

<jre:jre-requirement name="test">
Expand Down
2 changes: 1 addition & 1 deletion ...jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-6.x.xml
View file
Open in desktop
Expand Up @@ -13,7 +13,7 @@
<server:type>
<server:familyAS version="6.x"></server:familyAS>
</server:type>
<server:runtime>${jbosstools.test.jboss-as-6.x.home}</server:runtime>
<server:runtime>${requirementsDirectory}/${jbosstools.test.jboss-as-6.x.dir}</server:runtime>
</server:jboss-server-requirement>

<jre:jre-requirement name="test">
Expand Down
2 changes: 1 addition & 1 deletion ...jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-7.0.xml
View file
Open in desktop
Expand Up @@ -13,7 +13,7 @@
<server:type>
<server:familyAS version="7.0"></server:familyAS>
</server:type>
<server:runtime>${jbosstools.test.jboss-as-7.0.home}</server:runtime>
<server:runtime>${requirementsDirectory}/${jbosstools.test.jboss-as-7.0.dir}</server:runtime>
</server:jboss-server-requirement>

<jre:jre-requirement name="test">
Expand Down
2 changes: 1 addition & 1 deletion ...jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-7.1.xml
View file
Open in desktop
Expand Up @@ -13,7 +13,7 @@
<server:type>
<server:familyAS version="7.1"></server:familyAS>
</server:type>
<server:runtime>${jbosstools.test.jboss-as-7.1.home}</server:runtime>
<server:runtime>${requirementsDirectory}/${jbosstools.test.jboss-as-7.1.dir}</server:runtime>
</server:jboss-server-requirement>

<jre:jre-requirement name="test">
Expand Down
2 changes: 1 addition & 1 deletion ....jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/wildfly-10.xml
View file
Open in desktop
Expand Up @@ -13,7 +13,7 @@
<server:type>
<server:familyWildFly version="10.x"></server:familyWildFly>
</server:type>
<server:runtime>${jbosstools.test.jboss-wildfly-10.home}</server:runtime>
<server:runtime>${requirementsDirectory}/${jbosstools.test.wildfly-10.dir}</server:runtime>
</server:jboss-server-requirement>

<jre:jre-requirement name="test">
Expand Down
2 changes: 1 addition & 1 deletion ...g.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/wildfly-8.xml
View file
Open in desktop
Expand Up @@ -13,7 +13,7 @@
<server:type>
<server:familyWildFly version="8.x"></server:familyWildFly>
</server:type>
<server:runtime>${jbosstools.test.jboss-wildfly-8.home}</server:runtime>
<server:runtime>${requirementsDirectory}/${jbosstools.test.wildfly-8.dir}</server:runtime>
</server:jboss-server-requirement>

<jre:jre-requirement name="test">
Expand Down
2 changes: 1 addition & 1 deletion ...g.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/wildfly-9.xml
View file
Open in desktop
Expand Up @@ -13,7 +13,7 @@
<server:type>
<server:familyWildFly version="9.x"></server:familyWildFly>
</server:type>
<server:runtime>${jbosstools.test.jboss-wildfly-9.home}</server:runtime>
<server:runtime>${requirementsDirectory}/${jbosstools.test.wildfly-9.dir}</server:runtime>
</server:jboss-server-requirement>

<jre:jre-requirement name="test">
Expand Down
33 changes: 5 additions & 28 deletions tests/org.jboss.tools.runtime.as.ui.bot.test/pom.xml
View file
Open in desktop
Expand Up @@ -28,9 +28,7 @@
<activeByDefault>true</activeByDefault>
</activation>
<properties>
<wildfly-10.0>${requirementsDirectory}/wildfly-10.0.0.Final/</wildfly-10.0>
<wildfly-web-10.0>${requirementsDirectory}/wildfly-servlet-10.0.0.Final/</wildfly-web-10.0>
<wildfly-9.0>${requirementsDirectory}/wildfly-9.0.0.Final/</wildfly-9.0>
<wildfly-web-9.0>${requirementsDirectory}/wildfly-servlet-9.0.0.Final/</wildfly-web-9.0>
<wildfly-8.1>${requirementsDirectory}/wildfly-8.1.0.Final/</wildfly-8.1>
<wildfly-8.0>${requirementsDirectory}/wildfly-8.0.0.Final/</wildfly-8.0>
Expand Down Expand Up @@ -119,7 +117,7 @@
</configuration>
</execution>
<execution>
<id>install-widlfly-9.0.0</id>
<id>install-widlfly-9</id>
<phase>pre-integration-test</phase>
<goals>
<goal>unpack</goal>
Expand All @@ -130,7 +128,7 @@
<artifactItem>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-dist</artifactId>
<version>9.0.0.Final</version>
<version>${jbosstools.test.wildfly-9.version}</version>
<type>zip</type>
</artifactItem>
</artifactItems>
Expand All @@ -157,7 +155,7 @@
</configuration>
</execution>
<execution>
<id>install-widlfly-10.0.0</id>
<id>install-widlfly-10</id>
<phase>pre-integration-test</phase>
<goals>
<goal>unpack</goal>
Expand All @@ -168,7 +166,7 @@
<artifactItem>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-dist</artifactId>
<version>10.0.0.Final</version>
<version>${jbosstools.test.wildfly-10.version}</version>
<type>zip</type>
</artifactItem>
</artifactItems>
Expand Down Expand Up @@ -226,8 +224,6 @@
<properties>
<test.class>org.jboss.tools.runtime.as.ui.bot.test.StableTestsSuite</test.class>

<jboss-eap-7.0>${requirementsDirectory}/jboss-eap-7.0/</jboss-eap-7.0>
<jboss-eap-6.4>${requirementsDirectory}/jboss-eap-6.4/</jboss-eap-6.4>
<jboss-eap-6.3>${requirementsDirectory}/jboss-eap-6.3/</jboss-eap-6.3>
<jboss-eap-6.2.x>${requirementsDirectory}/jboss-eap-6.2.x/jboss-eap-6.2</jboss-eap-6.2.x>
<jboss-eap-6.2>${requirementsDirectory}/jboss-eap-6.2/</jboss-eap-6.2>
Expand All @@ -243,24 +239,6 @@
</properties>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>properties-maven-plugin</artifactId>
<version>1.0-alpha-2</version>
<executions>
<execution>
<phase>initialize</phase>
<goals>
<goal>read-project-properties</goal>
</goals>
</execution>
</executions>
<configuration>
<files>
<file>${product-download-properties-file}</file>
</files>
</configuration>
</plugin>
<plugin>
<groupId>com.googlecode.maven-download-plugin</groupId>
<artifactId>download-maven-plugin</artifactId>
Expand Down Expand Up @@ -393,7 +371,6 @@
<id>smoke</id>
<properties>
<test.class>org.jboss.tools.runtime.as.ui.bot.test.SmokeSuite</test.class>
<wildfly-10.0>${requirementsDirectory}/wildfly-10.0.0.Final/</wildfly-10.0>
<req.java8.home>${java.home}</req.java8.home>
<reddeer.config>${project.build.directory}/../resources/generated_resources/java8.xml</reddeer.config>
</properties>
Expand All @@ -415,7 +392,7 @@
<artifactItem>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-dist</artifactId>
<version>10.0.0.Final</version>
<version>${jbosstools.test.wildfly-10.version}</version>
<type>zip</type>
</artifactItem>
</artifactItems>
Expand Down