Skip to content

Commit

Permalink
Update the setup to use a non-broken WTP repository (eclipse-birt#1411)
Browse files Browse the repository at this point in the history 
Also regenerate the target platform accordingly.
  • Loading branch information
@merks
merks authored Sep 15, 2023
1 parent 5d45070 commit 7024650
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 16 deletions.
10 changes: 9 additions & 1 deletion build/org.eclipse.birt.releng/BIRT.setup
View file
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,15 @@
<repository
url="https://download.eclipse.org/tools/gef/classic/releases/latest"/>
<repository
url="https://download.eclipse.org/webtools/repository/latest"/>
url="https://download.eclipse.org/webtools/downloads/drops/R3.31.0/R-3.31.0-20230903090456/repository">
<annotation
source="justitification">
<detail
key="reason">
<value>The https://download.eclipse.org/webtools/repository/latest composite composes https://download.eclipse.org/webtools/downloads/drops/R3.31.0/R-3.31.0-20230903090456 and not https://download.eclipse.org/webtools/downloads/drops/R3.31.0/R-3.31.0-20230903090456/repository</value>
</detail>
</annotation>
</repository>
<repository
url="https://download.eclipse.org/justj/epp/release/latest/"/>
<repository
Expand Down
25 changes: 10 additions & 15 deletions build/org.eclipse.birt.target/org.eclipse.birt.target.target
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?>
<target name="Generated from BIRT" sequenceNumber="15">
<target name="Generated from BIRT" sequenceNumber="16">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.license.feature.group" version="0.0.0"/>
Expand All @@ -17,7 +17,6 @@
<unit id="com.sun.el.javax.el" version="0.0.0"/>
<unit id="com.sun.jna.platform" version="0.0.0"/>
<unit id="jakarta.el" version="0.0.0"/>
<unit id="jakarta.servlet" version="0.0.0"/>
<unit id="jakarta.servlet-api" version="0.0.0"/>
<unit id="jakarta.servlet.jsp" version="0.0.0"/>
<unit id="javax.activation" version="0.0.0"/>
Expand All @@ -29,6 +28,7 @@
<unit id="javax.wsdl" version="0.0.0"/>
<unit id="javax.xml.bind" version="0.0.0"/>
<unit id="org.apache.ant" version="0.0.0"/>
<unit id="org.apache.aries.spifly.dynamic.bundle" version="0.0.0"/>
<unit id="org.apache.batik.anim" version="0.0.0"/>
<unit id="org.apache.batik.awt.util" version="0.0.0"/>
<unit id="org.apache.batik.bridge" version="0.0.0"/>
Expand All @@ -49,7 +49,6 @@
<unit id="org.apache.commons.codec" version="0.0.0"/>
<unit id="org.apache.commons.collections4" version="0.0.0"/>
<unit id="org.apache.commons.compress" version="0.0.0"/>
<unit id="org.apache.commons.discovery" version="0.0.0"/>
<unit id="org.apache.commons.io" version="0.0.0"/>
<unit id="org.apache.commons.logging" version="0.0.0"/>
<unit id="org.apache.commons.math3" version="0.0.0"/>
Expand All @@ -66,7 +65,6 @@
<unit id="org.apache.poi" version="0.0.0"/>
<unit id="org.apache.poi.ooxml" version="0.0.0"/>
<unit id="org.apache.poi.ooxml.schemas" version="0.0.0"/>
<unit id="org.apache.wsil4j" version="0.0.0"/>
<unit id="org.apache.xerces" version="0.0.0"/>
<unit id="org.apache.xml.resolver" version="0.0.0"/>
<unit id="org.apache.xmlbeans" version="0.0.0"/>
Expand All @@ -80,6 +78,7 @@
<unit id="org.mortbay.jasper.apache-jsp" version="0.0.0"/>
<unit id="org.mozilla.javascript" version="0.0.0"/>
<unit id="org.objectweb.asm" version="0.0.0"/>
<unit id="org.objectweb.asm.commons" version="0.0.0"/>
<unit id="org.objectweb.asm.tree" version="0.0.0"/>
<unit id="org.objectweb.asm.tree.analysis" version="0.0.0"/>
<unit id="org.objectweb.asm.util" version="0.0.0"/>
Expand Down Expand Up @@ -108,7 +107,6 @@
<unit id="org.sat4j.pb" version="0.0.0"/>
<unit id="org.slf4j.api" version="0.0.0"/>
<unit id="org.tukaani.xz" version="0.0.0"/>
<unit id="org.uddi4j" version="0.0.0"/>
<unit id="org.w3c.css.sac" version="0.0.0"/>
<unit id="org.w3c.dom.events" version="0.0.0"/>
<unit id="org.w3c.dom.smil" version="0.0.0"/>
Expand Down Expand Up @@ -136,16 +134,9 @@
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.apache-jsp" version="0.0.0"/>
<unit id="org.eclipse.jetty.deploy" version="0.0.0"/>
<unit id="org.eclipse.jetty.http" version="0.0.0"/>
<unit id="org.eclipse.jetty.io" version="0.0.0"/>
<unit id="org.eclipse.jetty.jndi" version="0.0.0"/>
<unit id="org.eclipse.jetty.osgi.boot" version="0.0.0"/>
<unit id="org.eclipse.jetty.plus" version="0.0.0"/>
<unit id="org.eclipse.jetty.security" version="0.0.0"/>
<unit id="org.eclipse.jetty.server" version="0.0.0"/>
<unit id="org.eclipse.jetty.servlet" version="0.0.0"/>
<unit id="org.eclipse.jetty.util" version="0.0.0"/>
<unit id="org.eclipse.jetty.util.ajax" version="0.0.0"/>
<unit id="org.eclipse.jetty.webapp" version="0.0.0"/>
<unit id="org.eclipse.jetty.xml" version="0.0.0"/>
<repository location="https://download.eclipse.org/oomph/jetty/release/10.0.15"/>
Expand Down Expand Up @@ -201,6 +192,9 @@
<repository location="https://download.eclipse.org/tools/gef/classic/releases/latest"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.apache.axis.ant" version="0.0.0"/>
<unit id="org.apache.commons.discovery" version="0.0.0"/>
<unit id="org.apache.wsil4j" version="0.0.0"/>
<unit id="org.eclipse.jem" version="0.0.0"/>
<unit id="org.eclipse.jem.beaninfo" version="0.0.0"/>
<unit id="org.eclipse.jem.beaninfo.vm" version="0.0.0"/>
Expand Down Expand Up @@ -278,7 +272,6 @@
<unit id="org.eclipse.wst.jsdt.core" version="0.0.0"/>
<unit id="org.eclipse.wst.jsdt.manipulation" version="0.0.0"/>
<unit id="org.eclipse.wst.jsdt.ui" version="0.0.0"/>
<unit id="org.eclipse.wst.server.preview" version="0.0.0"/>
<unit id="org.eclipse.wst.server_core.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.wst.server_ui.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.wst.server_userdoc.feature.feature.group" version="0.0.0"/>
Expand All @@ -293,7 +286,8 @@
<unit id="org.eclipse.wst.wsdl.ui" version="0.0.0"/>
<unit id="org.eclipse.wst.wsi.ui" version="0.0.0"/>
<unit id="org.eclipse.wst.xml_userdoc.feature.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/webtools/repository/latest"/>
<unit id="org.uddi4j" version="0.0.0"/>
<repository location="https://download.eclipse.org/webtools/downloads/drops/R3.31.0/R-3.31.0-20230903090456/repository"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.justj.epp.feature.group" version="0.0.0"/>
Expand Down Expand Up @@ -322,7 +316,8 @@
<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
<unit id="org.eclipse.rcp.configuration.feature.group" version="0.0.0"/>
<unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/eclipse/updates/4.29-I-builds"/>
<unit id="org.eclipse.search.core" version="0.0.0"/>
<repository location="https://download.eclipse.org/eclipse/updates/4.30-I-builds"/>
</location>
</locations>
</target>

0 comments on commit 7024650

Please sign in to comment.