Skip to content

Commit

Permalink
Update the library versions used of dependencies used by the build
Browse files Browse the repository at this point in the history 
Update the setup to provide a functional targlet task that generates the
org.eclipse.birt.target.target to match.

Do not use any repository reference for the build but rather use purely
the *.target.

Use plugin-source's feature-source for feature source generation and
ensure now warnings about plugins/features without sources.

Reduce noise from Javadoc generation.

#1286
  • Loading branch information
@merks
merks committed May 24, 2023
1 parent c2f850a commit 2fad3c9
Show file tree
Hide file tree
Showing 39 changed files with 807 additions and 986 deletions.
6 changes: 0 additions & 6 deletions UI/org.eclipse.birt.report.designer.ui.rcp/BIRT-headless.product
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,10 @@
<plugin id="org.apache.batik.dom"/>
<plugin id="org.apache.batik.dom.svg"/>
<plugin id="org.apache.batik.ext"/>
<plugin id="org.apache.batik.ext.awt"/>
<plugin id="org.apache.batik.parser"/>
<plugin id="org.apache.batik.svggen"/>
<plugin id="org.apache.batik.transcoder"/>
<plugin id="org.apache.batik.util"/>
<plugin id="org.apache.batik.util.gui"/>
<plugin id="org.apache.batik.xml"/>
<plugin id="org.apache.commons.codec"/>
<plugin id="org.apache.commons.discovery"/>
Expand Down Expand Up @@ -175,8 +173,6 @@
<plugin id="org.eclipse.core.resources"/>
<plugin id="org.eclipse.core.resources.win32.x86" fragment="true"/>
<plugin id="org.eclipse.core.runtime"/>
<plugin id="org.eclipse.core.runtime.compatibility"/>
<plugin id="org.eclipse.core.runtime.compatibility.registry" fragment="true"/>
<plugin id="org.eclipse.core.variables"/>
<plugin id="org.eclipse.datatools.connectivity"/>
<plugin id="org.eclipse.datatools.connectivity.db.generic"/>
Expand Down Expand Up @@ -263,13 +259,11 @@
<plugin id="org.eclipse.equinox.security.win32.x86" fragment="true"/>
<plugin id="org.eclipse.equinox.simpleconfigurator"/>
<plugin id="org.eclipse.equinox.simpleconfigurator.manipulator"/>
<plugin id="org.eclipse.equinox.util"/>
<plugin id="org.eclipse.gef"/>
<plugin id="org.eclipse.help"/>
<plugin id="org.eclipse.help.base"/>
<plugin id="org.eclipse.help.ui"/>
<plugin id="org.eclipse.help.webapp"/>
<plugin id="org.eclipse.jetty.continuation"/>
<plugin id="org.eclipse.jetty.http"/>
<plugin id="org.eclipse.jetty.io"/>
<plugin id="org.eclipse.jetty.security"/>
Expand Down
6 changes: 0 additions & 6 deletions UI/org.eclipse.birt.report.designer.ui.rcp/BIRT.product
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,10 @@
<plugin id="org.apache.batik.css"/>
<plugin id="org.apache.batik.dom"/>
<plugin id="org.apache.batik.dom.svg"/>
<plugin id="org.apache.batik.ext.awt"/>
<plugin id="org.apache.batik.parser"/>
<plugin id="org.apache.batik.svggen"/>
<plugin id="org.apache.batik.transcoder"/>
<plugin id="org.apache.batik.util"/>
<plugin id="org.apache.batik.util.gui"/>
<plugin id="org.apache.batik.xml"/>
<plugin id="org.apache.commons.codec"/>
<plugin id="org.apache.commons.discovery"/>
Expand Down Expand Up @@ -179,8 +177,6 @@
<plugin id="org.eclipse.core.resources"/>
<plugin id="org.eclipse.core.resources.win32.x86" fragment="true"/>
<plugin id="org.eclipse.core.runtime"/>
<plugin id="org.eclipse.core.runtime.compatibility"/>
<plugin id="org.eclipse.core.runtime.compatibility.registry" fragment="true"/>
<plugin id="org.eclipse.core.variables"/>
<plugin id="org.eclipse.datatools.connectivity"/>
<plugin id="org.eclipse.datatools.connectivity.db.generic"/>
Expand Down Expand Up @@ -267,13 +263,11 @@
<plugin id="org.eclipse.equinox.security.win32.x86" fragment="true"/>
<plugin id="org.eclipse.equinox.simpleconfigurator"/>
<plugin id="org.eclipse.equinox.simpleconfigurator.manipulator"/>
<plugin id="org.eclipse.equinox.util"/>
<plugin id="org.eclipse.gef"/>
<plugin id="org.eclipse.help"/>
<plugin id="org.eclipse.help.base"/>
<plugin id="org.eclipse.help.ui"/>
<plugin id="org.eclipse.help.webapp"/>
<plugin id="org.eclipse.jetty.continuation"/>
<plugin id="org.eclipse.jetty.http"/>
<plugin id="org.eclipse.jetty.io"/>
<plugin id="org.eclipse.jetty.security"/>
Expand Down
8 changes: 0 additions & 8 deletions build/birt-packages/birt-report-all-in-one/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,6 @@
<artifactId>birt-report-all-in-one</artifactId>
<packaging>eclipse-repository</packaging>

<repositories>
<repository>
<id>mylyn</id>
<url>http://download.eclipse.org/mylyn/releases/latest</url>
<layout>p2</layout>
</repository>
</repositories>

<profiles>
<profile>
<id>build-server</id>
Expand Down
229 changes: 106 additions & 123 deletions build/org.eclipse.birt.releng/BIRT.setup
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,19 @@
<value>https://www.eclipse.org/birt/</value>
</detail>
</annotation>
<setupTask
xsi:type="setup:EclipseIniTask"
option="-Xmx"
value="4048m"
vm="true">
<description>Set the heap space needed to work with the projects of ${scope.project.label}</description>
</setupTask>
<setupTask
xsi:type="jdt:JRETask"
version="JavaSE-17"
location="${jre.location-17}">
<description>Define the JRE needed to compile and run the Java projects of ${scope.project.label}</description>
</setupTask>
<setupTask
xsi:type="setup:CompoundTask"
name="User Preferences">
Expand All @@ -57,10 +70,6 @@
key="/instance/org.eclipse.epp.mpc.ui/org.eclipse.epp.mpc.naturelookup">
<value>record</value>
</detail>
<detail
key="/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.forbiddenReference">
<value>record</value>
</detail>
</annotation>
<setupTask
xsi:type="setup:CompoundTask"
Expand All @@ -78,14 +87,6 @@
key="/instance/org.eclipse.epp.mpc.ui/org.eclipse.epp.mpc.naturelookup"
value="false"/>
</setupTask>
<setupTask
xsi:type="setup:CompoundTask"
name="org.eclipse.jdt.core">
<setupTask
xsi:type="setup:PreferenceTask"
key="/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.forbiddenReference"
value="warning"/>
</setupTask>
<setupTask
xsi:type="setup:CompoundTask"
name="org.eclipse.m2e.core">
Expand All @@ -111,13 +112,6 @@
value="Warning"/>
</setupTask>
</setupTask>
<setupTask
xsi:type="setup:EclipseIniTask"
option="-Xmx"
value="2048m"
vm="true">
<description>Set the heap space needed to work with the projects of ${scope.project.label}</description>
</setupTask>
<setupTask
xsi:type="setup:ResourceCreationTask"
excludedTriggers="STARTUP MANUAL"
Expand Down Expand Up @@ -155,7 +149,7 @@
<setupTask
xsi:type="git:GitCloneTask"
id="git.clone.birt"
remoteURI="eclipse/birt">
remoteURI="eclipse-birt/birt">
<annotation
source="http://www.eclipse.org/oomph/setup/InducedChoices">
<detail
Expand All @@ -174,13 +168,15 @@
<description>${scope.project.label}</description>
</setupTask>
<setupTask
xsi:type="projects:ProjectsImportTask">
xsi:type="projects:ProjectsImportTask"
disabled="true">
<sourceLocator
rootFolder="${git.clone.birt.location}"
locateNestedProjects="true"/>
</setupTask>
<setupTask
xsi:type="pde:TargetPlatformTask"
disabled="true"
name="BIRT Target"/>
<setupTask
xsi:type="setup.workingsets:WorkingSetTask"
Expand Down Expand Up @@ -301,121 +297,108 @@
project="org.eclipse.birt"/>
<operand
xsi:type="predicates:NamePredicate"
pattern="pptx_project|org\.eclipse\.birt\.site|.*birt.ext"/>
pattern="pptx_project|org\.eclipse\.birt\.site"/>
</predicate>
</workingSet>
<description>The dynamic working sets for BIRT</description>
</setupTask>
<setupTask
xsi:type="setup.targlets:TargletTask">
<targlet
name="BIRT">
<annotation
source="http:/www.eclipse.org/oomph/targlets/TargetDefinitionGenerator">
<detail
key="location">
<value>${git.clone.birt.location/build/org.eclipse.birt.target/org.eclipse.birt.target.target}</value>
</detail>
<detail
key="extraUnits">
<value>org.eclipse.equinox.executable.feature.group</value>
</detail>
<detail
key="singleLocation">
<value>false</value>
</detail>
<detail
key="sortLocations">
<value>false</value>
</detail>
<detail
key="includeAllPlatforms">
<value>false</value>
</detail>
<detail
key="includeSource">
<value>true</value>
</detail>
<detail
key="ignoreJavaRequirements">
<value>false</value>
</detail>
<detail
key="generateVersions">
<value>false</value>
</detail>
<detail
key="minimizeImplicitUnits">
<value>true</value>
</detail>
<detail
key="generateImplicitUnits">
<value>true</value>
</detail>
</annotation>
<requirement
name="org.eclipse.sdk.feature.group"/>
<requirement
name="*"/>
<sourceLocator
rootFolder="${git.clone.birt.location}"
locateNestedProjects="true"/>
<repositoryList>
<repository
url="https://download.eclipse.org/cbi/updates/license"/>
<repository
url="https://download.eclipse.org/oomph/simrel-orbit/2023-06"/>
<repository
url="https://download.eclipse.org/datatools/updates/1.14.300-SNAPSHOT/repository"/>
<repository
url="https://download.eclipse.org/modeling/emf/emf/builds/milestone/latest"/>
<repository
url="https://download.eclipse.org/tools/gef/classic/releases/latest"/>
<repository
url="https://download.eclipse.org/mylyn/updates/milestone/latest"/>
<repository
url="https://download.eclipse.org/webtools/repository/latest"/>
<repository
url="https://download.eclipse.org/tools/orbit/downloads/drops/R20201118194144/repository"/>
<repository
url="https://download.eclipse.org/oomph/jetty/release/10.0.15"/>
<repository
url="https://download.eclipse.org/oomph/simrel-maven/nightly/latest"/>
<repository
url="https://download.eclipse.org/justj/epp/release/latest/"/>
<repository
url="https://download.eclipse.org/justj/jres/17/updates/release/latest"/>
</repositoryList>
</targlet>
</setupTask>
<stream name="master"
label="Workspace setup for branch master">
<setupTask
xsi:type="setup:EclipseIniTask"
option="-Doomph.redirection.birt"
option="-Doomph.redirection.birt.old"
value="=https://raw.githubusercontent.com/eclipse/birt/master/build/org.eclipse.birt.releng/BIRT.setup->${git.clone.birt.location|uri}/build/org.eclipse.birt.releng/BIRT.setup"
vm="true">
<description>Set an Oomph redirection system property to redirect the logical location of this setup to its physical location in the Git clone.</description>
</setupTask>
<setupTask
xsi:type="jdt:JRETask"
version="JavaSE-11"
location="${jre.location-11}"
name="JRE for JavaSE-11">
<description>Define the JRE needed to compile and run the Java projects of ${scope.project.label}</description>
</setupTask>
</stream>
<stream name="disabled until we can add maven locations to modular target">
<setupTask
xsi:type="setup.targlets:TargletTask"
activateTarget="false">
<targlet
name="${scope.project.label}">
<requirement
name="a.jre.javase"
versionRange="11.0.0"/>
<requirement
name="org.eclipse.datatools.common.doc.user.feature.group"/>
<requirement
name="org.eclipse.datatools.connectivity.feature.feature.group"/>
<requirement
name="org.eclipse.datatools.connectivity.oda.designer.core.feature.feature.group"/>
<requirement
name="org.eclipse.datatools.connectivity.oda.designer.feature.feature.group"/>
<requirement
name="org.eclipse.datatools.connectivity.oda.feature.feature.group"/>
<requirement
name="org.eclipse.datatools.enablement.apache.derby.feature.feature.group"/>
<requirement
name="org.eclipse.datatools.enablement.feature.feature.group"/>
<requirement
name="org.eclipse.datatools.enablement.hsqldb.feature.feature.group"/>
<requirement
name="org.eclipse.datatools.enablement.ibm.feature.feature.group"/>
<requirement
name="org.eclipse.datatools.enablement.ingres.feature.feature.group"/>
<requirement
name="org.eclipse.datatools.enablement.jdbc.feature.feature.group"/>
<requirement
name="org.eclipse.datatools.enablement.jdt.feature.feature.group"/>
<requirement
name="org.eclipse.datatools.enablement.msft.feature.feature.group"/>
<requirement
name="org.eclipse.datatools.enablement.mysql.feature.feature.group"/>
<requirement
name="org.eclipse.datatools.enablement.oda.designer.feature.feature.group"/>
<requirement
name="org.eclipse.datatools.enablement.oda.feature.feature.group"/>
<requirement
name="org.eclipse.datatools.enablement.oracle.feature.feature.group"/>
<requirement
name="org.eclipse.datatools.enablement.postgresql.feature.feature.group"/>
<requirement
name="org.eclipse.datatools.enablement.sap.feature.feature.group"/>
<requirement
name="org.eclipse.datatools.enablement.sqlite.feature.feature.group"/>
<requirement
name="org.eclipse.datatools.enablement.sybase.feature.feature.group"/>
<requirement
name="org.eclipse.datatools.intro.feature.group"/>
<requirement
name="org.eclipse.datatools.sqldevtools.data.feature.feature.group"/>
<requirement
name="org.eclipse.datatools.sqldevtools.ddl.feature.feature.group"/>
<requirement
name="org.eclipse.datatools.sqldevtools.schemaobjecteditor.feature.feature.group"/>
<requirement
name="org.eclipse.datatools.sqldevtools.sqlbuilder.feature.feature.group"/>
<requirement
name="org.eclipse.datatools.sqltools.doc.user.feature.group"/>
<requirement
name="org.eclipse.equinox.executable.feature.group"/>
<requirement
name="org.eclipse.platform.sdk"/>
<requirement
name="org.eclipse.rcp.configuration.feature.group"/>
<requirement
name="jakarta.servlet"/>
<requirement
name="*"/>
<sourceLocator
rootFolder="${git.clone.birt.location}"
locateNestedProjects="true"/>
<repositoryList>
<repository
url="https://download.eclipse.org/cbi/updates/license"/>
<repository
url="https://download.eclipse.org/datatools/updates/1.14.200-SNAPSHOT/repository/"/>
<repository
url="https://download.eclipse.org/eclipse/updates/4.24-I-builds/"/>
<repository
url="https://download.eclipse.org/modeling/emf/emf/builds/milestone/latest/"/>
<repository
url="https://download.eclipse.org/tools/gef/updates/legacy/releases/4.0.0_gef-master_1952/"/>
<repository
url="https://download.eclipse.org/tools/orbit/downloads/latest-R/"/>
<repository
url="https://download.eclipse.org/webtools/repository/latest/"/>
</repositoryList>
</targlet>
xsi:type="setup:EclipseIniTask"
option="-Doomph.redirection.birt"
value="=https://raw.githubusercontent.com/eclipse-birt/birt/master/build/org.eclipse.birt.releng/BIRT.setup->${git.clone.birt.location|uri}/build/org.eclipse.birt.releng/BIRT.setup"
vm="true">
<description>Set an Oomph redirection system property to redirect the logical location of this setup to its physical location in the Git clone.</description>
</setupTask>
</stream>
<logicalProjectContainer
Expand Down
Loading

0 comments on commit 2fad3c9

Please sign in to comment.