Skip to content

Commit 5229c6f

Browse files
committed
Use Jetty nightly for 12.1.10
- This won't be releases until after SimRel is complete but is needed because 12.1.9 has a bug that breaks the viewer. - Remove unnecessary negative requirements from the setup.
1 parent 691d629 commit 5229c6f

2 files changed

Lines changed: 3 additions & 22 deletions

File tree

build/org.eclipse.birt.releng/BIRT.setup

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -513,25 +513,6 @@
513513
name="org.eclipse.justj.epp.feature.group"/>
514514
<requirement
515515
name="slf4j.simple"/>
516-
<requirement
517-
name="cdi.api"
518-
optional="true"
519-
max="0">
520-
<annotation>
521-
<detail
522-
key="justification">
523-
<value>Avoid resolving this IU into the generated target platform</value>
524-
</detail>
525-
</annotation>
526-
</requirement>
527-
<requirement
528-
name="javax.activation"
529-
optional="true"
530-
max="0"/>
531-
<requirement
532-
name="jakarta.xml.bind"
533-
optional="true"
534-
max="0"/>
535516
<requirement
536517
name="org.apache.logging.log4j.slf4j2.impl"
537518
optional="true"
@@ -556,7 +537,7 @@
556537
<repository
557538
url="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/nightly/latest"/>
558539
<repository
559-
url="https://download.eclipse.org/tools/orbit/simrel/maven-jetty/release/latest"/>
540+
url="https://download.eclipse.org/tools/orbit/simrel/maven-jetty/nightly/latest"/>
560541
<repository
561542
url="https://download.eclipse.org/datatools/updates/milestone/latest"/>
562543
<repository

build/org.eclipse.birt.target/org.eclipse.birt.target.target

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
22
<?pde version="3.8"?>
3-
<target name="Generated from BIRT" sequenceNumber="105">
3+
<target name="Generated from BIRT">
44
<locations>
55
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
66
<unit id="aQute.libg" version="0.0.0"/>
@@ -152,7 +152,7 @@
152152
<repository location="https://download.eclipse.org/eclipse/updates/4.40-I-builds"/>
153153
<repository location="https://download.eclipse.org/cbi/updates/license"/>
154154
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/nightly/latest"/>
155-
<repository location="https://download.eclipse.org/tools/orbit/simrel/maven-jetty/release/latest"/>
155+
<repository location="https://download.eclipse.org/tools/orbit/simrel/maven-jetty/nightly/latest"/>
156156
<repository location="https://download.eclipse.org/datatools/updates/milestone/latest"/>
157157
<repository location="https://download.eclipse.org/modeling/emf/emf/builds/milestone/latest"/>
158158
<repository location="https://download.eclipse.org/tools/gef/classic/nightly/latest"/>

0 commit comments

Comments
 (0)