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 
…1291)

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.

Ensure that skipTests is the default and enable those tests that
are currently running in the builds and also enable many of the other
tests that were not currently running and fix tests failing with the
latest libraries and versions.

#1286
  • Loading branch information
@merks
merks authored May 26, 2023
1 parent 15d8a1e commit 3a05180
Show file tree
Hide file tree
Showing 93 changed files with 1,687 additions and 1,434 deletions.
38 changes: 19 additions & 19 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,33 +32,33 @@ jobs:
access_token: ${{ github.token }}
- name: Checkout
uses: actions/checkout@v1
- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v1
with:
java-version: 11
java-version: 17
- name: Set up Maven
uses: stCarolas/setup-maven@v4.5
with:
maven-version: 3.8.5
- name: Set up Maven 2
run: echo "MAVEN_OPTS='-Xmx2048m'" > ~/.mavenrc
run: echo "MAVEN_OPTS='-Xmx4096m'" > ~/.mavenrc
- name: Build with Maven
run: mvn clean install --no-transfer-progress -U -DskipTests
- name: Data Test
run: mvn -B -pl :org.eclipse.birt.data.tests integration-test
- name: Model Test
run: mvn -Dtest=AllTests -B -pl :org.eclipse.birt.report.model.tests integration-test
- name: Model Regression Test
run: mvn -Dtest=AllTests -B -pl :org.eclipse.birt.report.tests.model integration-test
- name: Report Engine Test
run: mvn -Dtest=AllTests -B -pl :org.eclipse.birt.report.engine.tests integration-test
- name: Charts Core Test
run: mvn -Dtest=AllTests -B -pl :org.eclipse.birt.chart.tests integration-test
- name: Charts Regression Test
run: mvn -Dtest=AllTests -B -pl :org.eclipse.birt.report.tests.chart integration-test
- name: Engine Regression Test
run: mvn -Dtest=AllTests -B -pl :org.eclipse.birt.report.tests.engine integration-test
# - name: Test Core
run: mvn clean verify --fail-at-end --no-transfer-progress -U -DskipTests=false
# - name: Data Test
# run: mvn -B -pl :org.eclipse.birt.data.tests integration-test
# - name: Model Test
# run: mvn -Dtest=AllTests -B -pl :org.eclipse.birt.report.model.tests integration-test
# - name: Model Regression Test
# run: mvn -Dtest=AllTests -B -pl :org.eclipse.birt.report.tests.model integration-test
# - name: Report Engine Test
# run: mvn -Dtest=AllTests -B -pl :org.eclipse.birt.report.engine.tests integration-test
# - name: Charts Core Test
# run: mvn -Dtest=AllTests -B -pl :org.eclipse.birt.chart.tests integration-test
# - name: Charts Regression Test
# run: mvn -Dtest=AllTests -B -pl :org.eclipse.birt.report.tests.chart integration-test
# - name: Engine Regression Test
# run: mvn -Dtest=AllTests -B -pl :org.eclipse.birt.report.tests.engine integration-test
## - name: Test Core
# run: mvn -B -pl :org.eclipse.birt.core.tests integration-test

- name: Archive BIRT Update Site
Expand Down
14 changes: 9 additions & 5 deletions ...rt.report.designer.tests/test/org/eclipse/birt/report/designer/util/ImageManagerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

import java.io.FileInputStream;
import java.io.IOException;
import java.net.URL;
import java.util.Arrays;

import org.eclipse.birt.report.designer.tests.TestsPlugin;
Expand All @@ -35,18 +36,20 @@ public class ImageManagerTest extends BaseTestCase {

private static String iconPath;

private static String iconURL;

private static final String TEST_FILE = "icon/test.jpg"; //$NON-NLS-1$
// Doesn't exist
private static final String TEST_ERROR_FILE = "icon/error.jpg"; //$NON-NLS-1$ //not exists

private static final String TEST_URL = "http://www.eclipse.org/images/Idea.jpg"; //$NON-NLS-1$

// Invalid url
private static final String TEST_ERROR_URL = "http://"; //$NON-NLS-1$

static {
try {
iconPath = Platform.asLocalURL(TestsPlugin.getDefault().getBundle().getEntry("/")).getFile();
URL iconURL = Platform.asLocalURL(TestsPlugin.getDefault().getBundle().getEntry("/"));
ImageManagerTest.iconURL = iconURL.toString();
iconPath = iconURL.getFile();
} catch (IOException e) {
}

Expand Down Expand Up @@ -90,10 +93,11 @@ public void testGetImageByWrongPath() throws Exception {
* Class under test for Image getImage(URL)
*/
public void testGetImageByURL() throws Exception {
Image image = ImageManager.getInstance().getImage(TEST_URL);
String imageURL = iconURL + TEST_FILE;
Image image = ImageManager.getInstance().getImage(imageURL);
assertNotNull(image);
assertTrue(Arrays.equals(image.getImageData().data, localImage.getImageData().data));
assertEquals(image, ImageManager.getInstance().getImage(TEST_URL));
assertEquals(image, ImageManager.getInstance().getImage(imageURL));
}

/*
Expand Down
2 changes: 1 addition & 1 deletion UI/org.eclipse.birt.report.designer.ui.preview.test/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@
<relativePath>../../</relativePath>
</parent>
<artifactId>org.eclipse.birt.report.designer.ui.preview.test</artifactId>
<packaging>eclipse-plugin</packaging>
<packaging>eclipse-test-plugin</packaging>
</project>
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
3 changes: 3 additions & 0 deletions build/birt-packages/birt-runtime-test/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,9 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire-plugin-version}</version>
<configuration>
<skipTests>true</skipTests>
</configuration>
</plugin>
</plugins>
</build>
Expand Down
Loading

0 comments on commit 3a05180

Please sign in to comment.