Skip to content

Commit

Permalink
use newer Mars and WTP mirrors; revert to older BIRT because matches …
Browse files Browse the repository at this point in the history
…version in Mars (and that version doesn't require Jetty 9.2.9); upversion to 4.52.0.Beta2-SNAPSHOT
  • Loading branch information
nickboldt committed Jan 21, 2016
1 parent 04157de commit fa8c5ae
Show file tree
Hide file tree
Showing 9 changed files with 58 additions and 54 deletions.
40 changes: 20 additions & 20 deletions jbdevstudio/multiple/jbdevstudio-multiple.target
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?><?pde version="3.6"?>
<target includeMode="feature" name="jbdevstudiotarget-4.51.2.Beta1-SNAPSHOT">
<target includeMode="feature" name="jbdevstudiotarget-4.52.0.Beta2-SNAPSHOT">
<!-- Pro tip: to convert
from org.eclipse.foo_4.6.0.v201005032111-777K4AkF7B77R7c7N77.jar
to <unit version="4.6.0.v201005032111-777K4AkF7B77R7c7N77" id="org.eclipse.foo.feature.group"/>
Expand Down Expand Up @@ -120,7 +120,7 @@

<!-- SimRel -->
<location includeAllPlatforms="false" includeMode="slicer" type="InstallableUnit" includeSource="true">
<repository location="http://download.jboss.org/jbosstools/updates/requirements/mars/20160119-0751-2.RC1/"/>
<repository location="http://download.jboss.org/jbosstools/updates/requirements/mars/20160120-0945-2.RC1/"/>

<!-- m2e-wtp -->
<unit id="org.eclipse.m2e.wtp.feature.feature.group" version="1.2.1.20150819-2220"/>
Expand Down Expand Up @@ -218,7 +218,7 @@
<unit id="org.eclipse.datatools.sqltools.doc.user.feature.group" version="1.12.0.v201405281819-37D-7733L3D753L7BBF"/>

<!-- Recommenders for Java (and deps) -->
<unit id="org.eclipse.recommenders.rcp.feature.feature.group" version="2.2.4.v20150914-0857"/>
<unit id="org.eclipse.recommenders.rcp.feature.feature.group" version="2.3.0.v20160119-0552"/>
<unit id="org.eclipse.aether.feature.feature.group" version="1.0.1.v20141111"/>
<unit id="org.eclipse.aether.transport.file.feature.feature.group" version="1.0.1.v20141111"/>
<unit id="org.eclipse.aether.transport.http.feature.feature.group" version="1.0.1.v20141111"/>
Expand Down Expand Up @@ -310,7 +310,7 @@
<unit id="org.eclipse.tm.terminal.connector.telnet.feature.feature.group" version="4.0.0.201506040610"/>
<unit id="org.eclipse.tm.terminal.connector.local.feature.feature.group" version="4.0.0.201506040610"/>
<!-- connector.local requires cdt.native -->
<unit id="org.eclipse.cdt.native.feature.group" version="8.8.0.201509131935"/>
<unit id="org.eclipse.cdt.native.feature.group" version="8.8.0.201601171005"/>

<!-- JBIDE-19879 required by new launchbar -->
<unit id="org.eclipse.remote.core" version="2.0.0.201601141453"/>
Expand Down Expand Up @@ -392,7 +392,7 @@
</location>

<location includeAllPlatforms="false" includeMode="slicer" type="InstallableUnit" includeSource="true">
<repository location="http://download.jboss.org/jbosstools/updates/requirements/webtools/S-3.7.1-RC4-20150915020029/"/>
<repository location="http://download.jboss.org/jbosstools/updates/requirements/webtools/M-3.7.2-20160118020043/"/>

<unit id="org.eclipse.jst.jee" version="1.0.700.v201404092004"/>
<unit id="org.eclipse.jst.jee.web" version="1.0.500.v201404021628"/>
Expand All @@ -403,23 +403,23 @@
<unit id="org.eclipse.jpt.common.feature.feature.group" version="1.4.1.v201410241959"/>
<unit id="org.eclipse.jpt.common.eclipselink.feature.feature.group" version="1.3.101.v201410241959"/>
<unit id="org.eclipse.jpt.jpa.eclipselink.feature.feature.group" version="3.4.1.v201409111648"/>
<unit id="org.eclipse.jpt.jpa.feature.feature.group" version="3.4.2.v201505291546"/>
<unit id="org.eclipse.jpt.jpa.feature.feature.group" version="3.4.2.v201512181609"/>
<unit id="org.eclipse.jpt.jaxb.feature.feature.group" version="1.5.2.v201501171820"/>

<unit id="org.eclipse.jsf.feature.feature.group" version="3.8.0.v201505112336"/>
<unit id="org.eclipse.jst.common.fproj.enablement.jdt.feature.group" version="3.6.3.v201501141810"/>
<unit id="org.eclipse.jst.enterprise_core.feature.feature.group" version="3.6.0.v201405070205"/>
<unit id="org.eclipse.jst.enterprise_ui.feature.feature.group" version="3.7.0.v201505131719"/>
<unit id="org.eclipse.jst.enterprise_ui.feature.feature.group" version="3.7.0.v201509222120"/>
<unit id="org.eclipse.jst.enterprise_userdoc.feature.feature.group" version="3.6.0.v201405070205"/>
<unit id="org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature.feature.group" version="2.6.0.v201410101748"/>
<unit id="org.eclipse.jst.server_adapters.ext.feature.feature.group" version="3.3.401.v201508232356"/>
<unit id="org.eclipse.jst.server_adapters.feature.feature.group" version="3.2.400.v201503102136"/>
<unit id="org.eclipse.jst.server_core.feature.feature.group" version="3.4.200.v201503102136"/>
<unit id="org.eclipse.jst.server_ui.feature.feature.group" version="3.4.200.v201503102136"/>
<unit id="org.eclipse.jst.server_core.feature.feature.group" version="3.4.200.v201512031711"/>
<unit id="org.eclipse.jst.server_ui.feature.feature.group" version="3.4.200.v201512031711"/>
<unit id="org.eclipse.jst.server_userdoc.feature.feature.group" version="3.3.300.v201503102136"/>
<unit id="org.eclipse.jst.web_core.feature.feature.group" version="3.7.1.v201509021802"/>
<unit id="org.eclipse.jst.webpageeditor.feature.feature.group" version="2.7.1.v201508270443"/>
<unit id="org.eclipse.jst.web_ui.feature.feature.group" version="3.7.1.v201509021802"/>
<unit id="org.eclipse.jst.web_ui.feature.feature.group" version="3.7.1.v201512021921"/>
<unit id="org.eclipse.jst.web_userdoc.feature.feature.group" version="3.6.0.v201405070205"/>
<unit id="org.eclipse.jst.ws.axis2tools.feature.feature.group" version="1.1.301.v201410160332"/>
<unit id="org.eclipse.jst.ws.cxf.feature.feature.group" version="1.1.203.v201503151903"/>
Expand All @@ -431,24 +431,24 @@
<unit id="org.eclipse.wst.common.project.facet.ui" version="1.4.600.v201505072140"/>
<unit id="org.eclipse.wst.common_core.feature.feature.group" version="3.7.1.v201508262220"/>
<unit id="org.eclipse.wst.common.fproj.feature.group" version="3.7.0.v201505072140"/>
<unit id="org.eclipse.wst.common_ui.feature.feature.group" version="3.7.1.v201508262220"/>
<unit id="org.eclipse.wst.jsdt.feature.feature.group" version="1.6.201.v201508262249"/>
<unit id="org.eclipse.wst.common_ui.feature.feature.group" version="3.7.2.v201510130022"/>
<unit id="org.eclipse.wst.jsdt.feature.feature.group" version="1.6.201.v201512010225"/>
<unit id="org.eclipse.wst.server_adapters.feature.feature.group" version="3.2.402.v201505042029"/>
<unit id="org.eclipse.wst.server_core.feature.feature.group" version="3.3.600.v201508271522"/>
<unit id="org.eclipse.wst.server_ui.feature.feature.group" version="3.3.600.v201509022125"/>
<unit id="org.eclipse.wst.server_core.feature.feature.group" version="3.3.600.v201601132216"/>
<unit id="org.eclipse.wst.server_ui.feature.feature.group" version="3.3.601.v201601132216"/>
<unit id="org.eclipse.wst.server_userdoc.feature.feature.group" version="3.3.300.v201405011426"/>
<unit id="org.eclipse.wst.web_core.feature.feature.group" version="3.7.1.v201508271605"/>
<unit id="org.eclipse.wst.web_ui.feature.feature.group" version="3.7.1.v201509022125"/>
<unit id="org.eclipse.wst.web_core.feature.feature.group" version="3.7.1.v201601132216"/>
<unit id="org.eclipse.wst.web_ui.feature.feature.group" version="3.7.1.v201601132216"/>
<unit id="org.eclipse.wst.web_userdoc.feature.feature.group" version="3.6.0.v201405062147"/>
<unit id="org.eclipse.wst.ws_core.feature.feature.group" version="3.7.0.v201505131719"/>
<unit id="org.eclipse.wst.ws_ui.feature.feature.group" version="3.7.1.v201508271926"/>
<unit id="org.eclipse.wst.ws_ui.feature.feature.group" version="3.7.1.v201512021921"/>
<unit id="org.eclipse.wst.ws_userdoc.feature.feature.group" version="3.1.400.v201405061938"/>
<unit id="org.eclipse.wst.ws_wsdl15.feature.feature.group" version="1.5.400.v201405061938"/>
<unit id="org.eclipse.wst.xml_core.feature.feature.group" version="3.7.0.v201502261749"/>
<unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.7.1.v201508271605"/>
<unit id="org.eclipse.wst.xml_core.feature.feature.group" version="3.7.2.v201510130005"/>
<unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.7.2.v201511240257"/>
<unit id="org.eclipse.wst.xml_userdoc.feature.feature.group" version="3.6.0.v201405062147"/>
<unit id="org.eclipse.wst.xml.xpath2.processor.feature.feature.group" version="2.0.301.v201409111854"/>
<unit id="org.eclipse.wst.xsl.feature.feature.group" version="1.3.401.v201409111855"/>
<unit id="org.eclipse.wst.xsl.feature.feature.group" version="1.3.401.v201509231858"/>
</location>

<!-- JBIDE-19045 move Tern into JST project, so no longer in target platform -->
Expand Down
4 changes: 2 additions & 2 deletions jbdevstudio/multiple/pom.xml
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools.targetplatforms</groupId>
<artifactId>jbdevstudio</artifactId>
<version>4.51.2.Beta1-SNAPSHOT</version>
<version>4.52.0.Beta2-SNAPSHOT</version>
</parent>
<artifactId>jbdevstudio-multiple</artifactId>
<name>JBDS Multiple (Composite) Target Platform</name>
Expand Down Expand Up @@ -92,7 +92,7 @@
<descriptors>
<descriptor>${basedir}/../../publish-assembly.xml</descriptor>
</descriptors>
<!-- JBIDE-19800 zip would be jbdevstudio-multiple-4.50.0.Beta1-SNAPSHOT.zip; want jbdevstudiotarget-4.50.0.Beta1-SNAPSHOT.zip -->
<!-- JBIDE-19800 zip would be jbdevstudio-multiple-4.52.0.Beta2-SNAPSHOT.zip; want jbdevstudiotarget-4.52.0.Beta2-SNAPSHOT.zip -->
<finalName>${project.parent.artifactId}target-${project.version}</finalName>
</configuration>
</plugin>
Expand Down
2 changes: 1 addition & 1 deletion jbdevstudio/pom.xml
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools.targetplatforms</groupId>
<artifactId>root</artifactId>
<version>4.51.2.Beta1-SNAPSHOT</version>
<version>4.52.0.Beta2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.targetplatforms</groupId>
<artifactId>jbdevstudio</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion jbdevstudio/unified/pom.xml
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools.targetplatforms</groupId>
<artifactId>jbdevstudio</artifactId>
<version>4.51.2.Beta1-SNAPSHOT</version>
<version>4.52.0.Beta2-SNAPSHOT</version>
</parent>
<artifactId>jbdevstudio-unified</artifactId>
<name>JBDS Unified (Aggregate) Target Platform</name>
Expand Down

0 comments on commit fa8c5ae

Please sign in to comment.