Skip to content
This repository was archived by the owner on May 21, 2025. It is now read-only.

Commit 2b33565

Browse files
nickboldtnickboldt
committed
JBDS-4669 remove deprecated/commented support for bundling eap with devstudio installer
Signed-off-by: nickboldt <[email protected]>
1 parent 059547b commit 2b33565

File tree

5 files changed

+3
-102
lines changed

5 files changed

+3
-102
lines changed

‎installer/pom.xml‎

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -18,38 +18,6 @@
1818
-->
1919

2020
<profiles>
21-
22-
<!--
23-
Profile to optionally build an installer bundled w/ EAP as well as a Standalone one.
24-
Note: as of devstudio 11, this is no longer required as EAP is bundled downstream in the devsuite installer.
25-
-->
26-
<!-- <profile>
27-
<id>eap</id>
28-
<properties>
29-
<buildEAPBundle>true</buildEAPBundle>
30-
</properties>
31-
<build>
32-
<plugins>
33-
<plugin>
34-
<groupId>com.googlecode.maven-download-plugin</groupId>
35-
<artifactId>maven-download-plugin</artifactId>
36-
<executions>
37-
<execution>
38-
<id>get-EAP</id>
39-
<phase>process-resources</phase>
40-
<goals>
41-
<goal>wget</goal>
42-
</goals>
43-
<configuration>
44-
<url>${eapURL}</url>
45-
<md5>${eapMD5}</md5>
46-
</configuration>
47-
</execution>
48-
</executions>
49-
</plugin>
50-
</plugins>
51-
</build>
52-
</profile> -->
5321
<profile>
5422
<id>hudson</id>
5523
<activation>
@@ -240,11 +208,7 @@
240208
<property name="basedir" value="${basedir}" />
241209
<property name="project.build.directory" value="${project.build.directory}" />
242210
<property name="IzPackVersion" value="${IzPackVersion}"/>
243-
<property name="buildEAPBundle" value="${buildEAPBundle}"/>
244211
<property name="artifacts.p2-director" value="${project.build.directory}/requirements/p2-director.zip" />
245-
<property name="artifacts.jbosseap" location="${project.build.directory}/requirements/${eapFilename}" />
246-
<property name="eapRootFolder" value="${eapRootFolder}"/>
247-
<property name="eapVersion" value="${eapVersion}" />
248212
<property name="destination.dir" value="${project.build.directory}" />
249213
<property name="izpack.home" value="${project.build.directory}/IzPack-${IzPackVersion}" />
250214
<property name="skip.ant.actions" value="true" />

‎installer/src/config/install.xml‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
<variable name="PACK_NAME" value="installer" />
3636
<variable name="INSTALL_GROUP" value="@{install.group}"/>
3737
<variable name="VERSION" value="@{specification.version.presentstring}"/>
38-
<variable name="EAP_VERSION" value="@{eapVersion}"/>
3938
<variable name="jboss.logname" value="devstudio.install-"/>
4039
<variable name="DESKTOP_SHORTCUT_NAME"
4140
value="JBoss-Developer-Studio-@{version.presentstring}@{nightly_build_qualifier}" />
@@ -184,15 +183,8 @@
184183
</listener-->
185184
</listeners>
186185

187-
<conditions>
188-
<condition type="variable" id="jbeap-selected">
189-
<name>INSTALL_GROUP</name>
190-
<value>jbosseap</value>
191-
</condition>
192-
</conditions>
193-
194186
<installerrequirements>
195-
<installerrequirement condition="izpack.windowsinstall|izpack.macinstall|izpack.linuxinstall" message="&lt;html&gt;&lt;p&gt;This installer contains Red Hat JBoss Developer Studio&lt;br&gt;for Winodws, Mac OS X and Linux operating systems.&lt;br&gt;Current operating system is not supported.&lt;/p&gt;&lt;/html&gt;"/>
187+
<installerrequirement condition="izpack.windowsinstall|izpack.macinstall|izpack.linuxinstall" message="&lt;html&gt;&lt;p&gt;This installer contains Red Hat JBoss Developer Studio&lt;br&gt;for Winodws, MacOS and Linux operating systems.&lt;br&gt;Current operating system is not supported.&lt;/p&gt;&lt;/html&gt;"/>
196188
</installerrequirements>
197189

198190
<packs>

‎installer/src/panels/com/jboss/devstudio/core/installer/UpdatePacksPanel.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,8 @@ public String getSummaryBody()
2929
{
3030
String group = idata.getVariable("INSTALL_GROUP");
3131
String version = idata.getVariable("VERSION");
32-
String eapVersion = idata.getVariable("EAP_VERSION");
3332
StringBuffer buffer = new StringBuffer();
3433
buffer.append("Red Hat JBoss Developer Studio "+version+"<br>");
35-
if("jbosseap".equals(group))
36-
buffer.append("Red Hat JBoss Enterprise Application Platform " + eapVersion+ "<br>");
3734

3835
// Summarize any additional features and runtimes.
3936
String additionalSummaryInfo = "";

‎pom.xml‎

Lines changed: 2 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.jboss.tools</groupId>
88
<artifactId>parent</artifactId>
9-
<version>4.5.2.Final-SNAPSHOT</version>
9+
<version>4.5.3.AM1-SNAPSHOT</version>
1010
</parent>
1111
<groupId>com.jboss.devstudio</groupId>
1212
<artifactId>product</artifactId>
@@ -23,34 +23,19 @@
2323
</modules>
2424
<!-- Should you want to build it locally, target platform sources are here: https://github.com/jbosstools/jbosstools-target-platforms/tree/4.60.x/ -->
2525
<properties>
26-
<!-- JBDS-4440 No longer need a different TP to build devstudio - use the default jbosstools one <tpc.group>jbdevstudio</tpc.group> -->
27-
<BUILD_ALIAS>GA</BUILD_ALIAS>
26+
<!-- <BUILD_ALIAS>GA</BUILD_ALIAS> -->
2827
<tpc.version>${TARGET_PLATFORM_VERSION_MAX}</tpc.version>
2928
<tycho.scmUrl>scm:git:https://github.com/jbdevstudio/jbdevstudio-product.git</tycho.scmUrl>
3029
<!-- JBDS-2805 used in results/pom.xml to provide link to Central zip -->
3130
<central.tpc.version>4.70.0.Final-SNAPSHOT</central.tpc.version>
3231
<JBOSS_CENTRAL_ZIP>https://devstudio.redhat.com/${devstudioReleaseVersion}/snapshots/builds/jbosstools-build-sites.aggregate.central-site_${stream_jbt}/latest/all/repository.zip</JBOSS_CENTRAL_ZIP>
3332

34-
<!-- <RHDS_SSH>[email protected]:/home/windup/apache2/www/html/rhd/devstudio</RHDS_SSH> no need to use wonka.mw - no EAP bundles -->
35-
<!-- <RHDS_SSH>[email protected]:/qa/services/http/binaries/devstudio</RHDS_SSH> server is readonly now? -->
36-
3733
<!-- stream_jbt is set in parent pom = 4.4.neon / master -->
3834
<!-- <stream_jbt>master</stream_jbt> -->
3935
<jbosstools-site>http://download.jboss.org/jbosstools/${eclipseReleaseName}/snapshots/updates/core/${stream_jbt}/</jbosstools-site>
4036
<!-- <jbosstools-target-site>http://download.jboss.org/jbosstools/targetplatforms/jbdevstudiotarget/4.40.0.CR1-SNAPSHOT/REPO/</jbosstools-target-site> -->
4137
<stagingBaselineRepository>https://devstudio.redhat.com/11/staging/updates/</stagingBaselineRepository>
4238

43-
<!--
44-
By default, use EAP 6.1.0.Alpha, which is publically available. This allows devstudio to be build locally w/o needing access to devel.redhat.com
45-
To build the EAP bundled installer, use the "eap" profile: `mvn install -Peap`
46-
Note: as of devstudio 11, this is no longer required as EAP is bundled downstream in the devsuite installer.
47-
-->
48-
<eapVersion>6.1.0.Alpha</eapVersion>
49-
<eapFilename>jboss-eap-${eapVersion}.zip</eapFilename>
50-
<eapURL>http://download.jboss.org/jbosseap/6/jboss-eap-${eapVersion}/${eapFilename}</eapURL>
51-
<eapMD5>21ab4c71230ca9fd311c265be24b6505</eapMD5>
52-
<eapRootFolder>jboss-eap-6.1</eapRootFolder>
53-
<buildEAPBundle>false</buildEAPBundle>
5439
<devstudio.version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.${BUILD_ALIAS}</devstudio.version>
5540
<p2StatsUrl>https://devstudio.redhat.com/usage/installs/local/${project.version}/${BUILD_ALIAS}/${buildQualifier}/</p2StatsUrl>
5641
<!-- inherit from JBT parent pom <tychoVersion>0.23.1</tychoVersion> -->
@@ -104,22 +89,6 @@
10489
</build>
10590

10691
<profiles>
107-
<!--
108-
Addendum to "hudson" profile from parent pom. This adds the correct download URL for EAP, from a non-public URL.
109-
-->
110-
<profile>
111-
<id>hudson</id>
112-
<properties>
113-
<eapVersion>7.0.0</eapVersion>
114-
<!-- http://download.eng.rdu2.redhat.com/released/JBEAP-7/7.0.0/jboss-eap-7.0.0.zip -->
115-
<eapFilename>jboss-eap-${eapVersion}.zip</eapFilename>
116-
<eapURL>http://download.devel.redhat.com/released/JBEAP-7/${eapVersion}/${eapFilename}</eapURL>
117-
<eapMD5>cd02482daa0398bf5500e1628d28179a</eapMD5>
118-
<eapRootFolder>jboss-eap-7.0</eapRootFolder>
119-
<p2StatsUrl>https://devstudio.redhat.com/usage/installs/${JOB_NAME}/${project.version}/${BUILD_ALIAS}/${buildQualifier}/</p2StatsUrl>
120-
</properties>
121-
</profile>
122-
12392
<profile>
12493
<id>local-sources</id>
12594
<properties>

‎results/pom.xml‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@
5555
<property name="eclipse.version" value="${targetEclipseVersion}"/>
5656
<property name="devstudioReleaseVersion" value="${devstudioReleaseVersion}"/>
5757
<property name="devstudio.update.site" value="https://devstudio.redhat.com/${devstudioReleaseVersion}/stable/updates/"/>
58-
<property name="eap.version" value="${eapVersion}"/>
5958
<property name="eclipseReleaseName" value="${eclipseReleaseName}"/>
6059
<property name="project.version" value="${project.version}" />
6160
<property name="JBT.version" value="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" />
@@ -141,24 +140,6 @@
141140
<groupId>org.codehaus.mojo</groupId>
142141
<artifactId>exec-maven-plugin</artifactId>
143142
<executions>
144-
<!-- JBDS-4362 disable publishing devstudio internally onto wonka, as we no longer include EAP bundles so don't need an internal server
145-
<execution>
146-
<id>deploy-snapshot-build-internal</id>
147-
<goals>
148-
<goal>exec</goal>
149-
</goals>
150-
<phase>deploy</phase>
151-
<configuration>
152-
<arguments>
153-
<arg>-DESTINATION</arg>
154-
<arg>${RHDS_SSH}</arg>
155-
<arg>-s</arg>
156-
<arg>${project.build.directory}/all</arg>
157-
<arg>-t</arg>
158-
<arg>${devstudioReleaseVersion}/snapshots/builds/${JOB_NAME}/${BUILD_TIMESTAMP}-B${BUILD_NUMBER}/all</arg>
159-
</arguments>
160-
</configuration>
161-
</execution> -->
162143
<execution>
163144
<id>deploy-snapshot-build</id>
164145
<goals>
@@ -173,8 +154,6 @@
173154
<arg>${project.build.directory}/all</arg>
174155
<arg>-t</arg>
175156
<arg>${devstudioReleaseVersion}/snapshots/builds/${JOB_NAME}/${BUILD_TIMESTAMP}-B${BUILD_NUMBER}/all</arg>
176-
<arg>-e</arg>
177-
<arg>*eap.jar*</arg>
178157
</arguments>
179158
<skip>${skipDeployToJBossOrg}</skip>
180159
</configuration>

0 commit comments

Comments
 (0)