Skip to content

Commit

Permalink
Merge pull request #610 from eclipse/prepare_for_java11
Browse files Browse the repository at this point in the history 
Prepare for Java > 8 #609
  • Loading branch information
@wimjongman
wimjongman authored Apr 15, 2021
2 parents 7cf1add + b82335b commit ddb3ad3
Show file tree
Hide file tree
Showing 128 changed files with 2,546 additions and 3,518 deletions.
13 changes: 9 additions & 4 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v1
- name: Set up JDK 8
- name: Set up JDK 11
uses: actions/setup-java@v1
with:
java-version: 8
java-version: 11
- name: Setup Maven
run: echo "MAVEN_OPTS='-Xmx2048m'" > ~/.mavenrc
- name: Cache maven repo
Expand All @@ -48,7 +48,12 @@ jobs:
${{ runner.os }}-
- name: Build with Maven
run: mvn clean install --no-transfer-progress -U -DskipTests
- name: Test Core
run: mvn -B -pl :org.eclipse.birt.core.tests integration-test
- name: Test Model
run: mvn -B -pl :org.eclipse.birt.report.model.tests integration-test
- name: Test Charts
run: mvn -B -pl :org.eclipse.birt.report.tests.chart integration-test
- name: Test Engine
run: mvn -B -pl :org.eclipse.birt.report.tests.engine integration-test
- name: Test Core
run: mvn -B -pl :org.eclipse.birt.core.tests integration-test

44 changes: 22 additions & 22 deletions build/birt-packages/birt-charts/ChartRuntime/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,28 +30,28 @@
<includeAllDependencies>false</includeAllDependencies>
</configuration>
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>${antrun.version}</version>
<executions>
<execution>
<id>re-package</id>
<phase>package</phase>
<configuration>
<tasks>
<copy todir="target/eclipse">
<fileset dir="target/repository" includes="*/*" />
<fileset dir="../../../org.eclipse.birt.releng.birtbuilder/extras/root/rootfiles" includes="*.html" />
</copy>
</tasks>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>${antrun.version}</version>
<executions>
<execution>
<id>re-package</id>
<phase>package</phase>
<configuration>
<target>
<copy todir="target/eclipse">
<fileset dir="target/repository" includes="*/*" />
<fileset dir="../../../org.eclipse.birt.releng.birtbuilder/extras/root/rootfiles" includes="*.html" />
</copy>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
44 changes: 22 additions & 22 deletions build/birt-packages/birt-charts/ChartSDK/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,28 +30,28 @@
<includeAllDependencies>false</includeAllDependencies>
</configuration>
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>${antrun.version}</version>
<executions>
<execution>
<id>re-package</id>
<phase>package</phase>
<configuration>
<tasks>
<copy todir="target/eclipse">
<fileset dir="target/repository" includes="*/*" />
<fileset dir="../../../org.eclipse.birt.releng.birtbuilder/extras/root/rootfiles" includes="*.html" />
</copy>
</tasks>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>${antrun.version}</version>
<executions>
<execution>
<id>re-package</id>
<phase>package</phase>
<configuration>
<target>
<copy todir="target/eclipse">
<fileset dir="target/repository" includes="*/*" />
<fileset dir="../../../org.eclipse.birt.releng.birtbuilder/extras/root/rootfiles" includes="*.html" />
</copy>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
72 changes: 36 additions & 36 deletions build/birt-packages/birt-charts/DeploymentRuntime/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,42 +30,42 @@
<includeAllDependencies>false</includeAllDependencies>
</configuration>
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>${antrun.version}</version>
<executions>
<execution>
<id>re-package</id>
<phase>package</phase>
<configuration>
<tasks>
<copy todir="target/DeploymentRuntime/ChartEngine">
<fileset dir="target/repository/plugins" />
<fileset dir="." includes="*.txt"/>
</copy>
<copy todir="target/DeploymentRuntime/ChartEngine/docs">
<fileset dir="." includes="*.doc" />
</copy>
<copy todir="target/DeploymentRuntime/chart-viewer-sample">
<fileset dir="../../../../chart/org.eclipse.birt.chart.viewer/WebContent" />
</copy>
<copy todir="target/DeploymentRuntime/chart-viewer-sample/WEB-INF/lib">
<fileset dir="../../../../chart/org.eclipse.birt.chart.viewer" includes="chart-viewer.jar" />
</copy>
<copy todir="target/DeploymentRuntime/chart-viewer-sample/WEB-INF/lib">
<fileset dir="target/DeploymentRuntime/ChartEngine" includes="*.*" />
</copy>
<war destfile="target/DeploymentRuntime/chart-viewer-sample.war" basedir="target/DeploymentRuntime/chart-viewer-sample" />
<delete dir="target/DeploymentRuntime/chart-viewer-sample" />
</tasks>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>${antrun.version}</version>
<executions>
<execution>
<id>re-package</id>
<phase>package</phase>
<configuration>
<target>
<copy todir="target/DeploymentRuntime/ChartEngine">
<fileset dir="target/repository/plugins" />
<fileset dir="." includes="*.txt" />
</copy>
<copy todir="target/DeploymentRuntime/ChartEngine/docs">
<fileset dir="." includes="*.doc" />
</copy>
<copy todir="target/DeploymentRuntime/chart-viewer-sample">
<fileset dir="../../../../chart/org.eclipse.birt.chart.viewer/WebContent" />
</copy>
<copy todir="target/DeploymentRuntime/chart-viewer-sample/WEB-INF/lib">
<fileset dir="../../../../chart/org.eclipse.birt.chart.viewer" includes="chart-viewer.jar" />
</copy>
<copy todir="target/DeploymentRuntime/chart-viewer-sample/WEB-INF/lib">
<fileset dir="target/DeploymentRuntime/ChartEngine" includes="*.*" />
</copy>
<war destfile="target/DeploymentRuntime/chart-viewer-sample.war" basedir="target/DeploymentRuntime/chart-viewer-sample" />
<delete dir="target/DeploymentRuntime/chart-viewer-sample" />
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
18 changes: 9 additions & 9 deletions build/birt-packages/birt-charts/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,23 +25,23 @@
<id>re-package</id>
<phase>package</phase>
<configuration>
<tasks>
<target>
<copy todir="${project.build.directory}/build/ChartRuntime/eclipse">
<fileset dir="ChartRuntime/target/eclipse"/>
<fileset dir="ChartRuntime/target/eclipse" />
</copy>
<copy todir="${project.build.directory}/build/ChartSDK/eclipse">
<fileset dir="ChartSDK/target/eclipse"/>
<fileset dir="ChartSDK/target/eclipse" />
</copy>
<copy todir="${project.build.directory}/build/DeploymentRuntime">
<fileset dir="DeploymentRuntime/target/DeploymentRuntime"/>
<fileset dir="DeploymentRuntime/target/DeploymentRuntime" />
</copy>
<copy todir="${project.build.directory}/build">
<fileset dir="../../org.eclipse.birt.releng.birtbuilder/extras/root/rootfiles" includes="*.html"/>
<fileset dir="../../org.eclipse.birt.releng.birtbuilder/extras/root/rootfiles" includes="*.html" />
</copy>
<zip destfile="${project.build.directory}/${project.artifactId}-${birt.version}-${maven.build.timestamp}.zip" basedir="${project.build.directory}/build"/>
<delete dir="build"/>
<attachartifact file="./target/${project.artifactId}-${birt.version}-${maven.build.timestamp}.zip" type="zip"/>
</tasks>
<zip destfile="${project.build.directory}/${project.artifactId}-${birt.version}-${maven.build.timestamp}.zip" basedir="${project.build.directory}/build" />
<delete dir="build" />
<attachartifact file="./target/${project.artifactId}-${birt.version}-${maven.build.timestamp}.zip" type="zip" />
</target>
</configuration>
<goals>
<goal>run</goal>
Expand Down
8 changes: 4 additions & 4 deletions build/birt-packages/birt-integration-test/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,8 @@
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>${jetty.version}</version>
<configuration>
<war>${birtpackages.basedir}/birt-runtime-osgi/target/package/birt.war</war>
<configuration>
<war>${birtpackages.basedir}/birt-runtime-osgi/target/package/birt.war</war>
<scanIntervalSeconds>10</scanIntervalSeconds>
<stopKey>foo</stopKey>
<stopPort>8090</stopPort>
Expand Down Expand Up @@ -129,8 +129,8 @@
<phase>post-integration-test</phase>
</execution>
</executions>
<dependencies/>
<dependencies />
</plugin>
</plugins>
</plugins>
</build>
</project>
80 changes: 38 additions & 42 deletions build/birt-packages/birt-nl/birt-charts/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.eclipse.birt.build.package.nl</groupId>
Expand All @@ -17,62 +15,60 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>${antrun.version}</version>
<executions>
<execution>
<id>blah</id>
<phase>package</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<tasks>
<unzip src="..\..\..\org.eclipse.birt.p2updatesite\target\org.eclipse.birt.p2updatesite-${birt.version}-SNAPSHOT.zip"
dest="${project.build.directory}/p2updatesite"/>
<target>
<unzip src="..\..\..\org.eclipse.birt.p2updatesite\target\org.eclipse.birt.p2updatesite-${birt.version}-SNAPSHOT.zip" dest="${project.build.directory}/p2updatesite" />
<copy todir="${project.build.directory}/content/ChartRuntime\eclipse\plugins">
<fileset dir="${project.build.directory}/p2updatesite/plugins">
<include name="org.eclipse.birt.chart.device.extension.nl1_*.jar"/>
<include name="org.eclipse.birt.chart.device.svg.nl1_*.jar"/>
<include name="org.eclipse.birt.chart.device.swt.nl1_*.jar"/>
<include name="org.eclipse.birt.chart.engine.extension.nl1_*.jar"/>
<include name="org.eclipse.birt.chart.engine.nl1_*.jar"/>
<include name="org.eclipse.birt.chart.examples.nl1_*.jar"/>
<include name="org.eclipse.birt.chart.reportitem.nl1_*.jar"/>
<include name="org.eclipse.birt.chart.ui.extension.nl1_*.jar"/>
<include name="org.eclipse.birt.chart.ui.nl1_*.jar"/>
<include name="org.eclipse.birt.core.nl1_*.jar"/>
<include name="org.eclipse.birt.core.ui.nl1_*.jar"/>
<include name="org.eclipse.birt.chart.device.extension.nl1_*.jar" />
<include name="org.eclipse.birt.chart.device.svg.nl1_*.jar" />
<include name="org.eclipse.birt.chart.device.swt.nl1_*.jar" />
<include name="org.eclipse.birt.chart.engine.extension.nl1_*.jar" />
<include name="org.eclipse.birt.chart.engine.nl1_*.jar" />
<include name="org.eclipse.birt.chart.examples.nl1_*.jar" />
<include name="org.eclipse.birt.chart.reportitem.nl1_*.jar" />
<include name="org.eclipse.birt.chart.ui.extension.nl1_*.jar" />
<include name="org.eclipse.birt.chart.ui.nl1_*.jar" />
<include name="org.eclipse.birt.core.nl1_*.jar" />
<include name="org.eclipse.birt.core.ui.nl1_*.jar" />
</fileset>
</copy>
<copy todir="${project.build.directory}/content/ChartSDK\eclipse\plugins">
<fileset dir="${project.build.directory}/p2updatesite/plugins">
<include name="org.eclipse.birt.chart.device.extension.nl1_*.jar"/>
<include name="org.eclipse.birt.chart.device.svg.nl1_*.jar"/>
<include name="org.eclipse.birt.chart.device.swt.nl1_*.jar"/>
<include name="org.eclipse.birt.chart.engine.extension.nl1_*.jar"/>
<include name="org.eclipse.birt.chart.engine.nl1_*.jar"/>
<include name="org.eclipse.birt.chart.examples.nl1_*.jar"/>
<include name="org.eclipse.birt.chart.integration.wtp.ui.nl1_*.jar"/>
<include name="org.eclipse.birt.chart.reportitem.nl1_*.jar"/>
<include name="org.eclipse.birt.chart.ui.extension.nl1_*.jar"/>
<include name="org.eclipse.birt.chart.ui.nl1_*.jar"/>
<include name="org.eclipse.birt.core.nl1_*.jar"/>
<include name="org.eclipse.birt.core.ui.nl1_*.jar"/>
<include name="org.eclipse.birt.chart.device.extension.nl1_*.jar" />
<include name="org.eclipse.birt.chart.device.svg.nl1_*.jar" />
<include name="org.eclipse.birt.chart.device.swt.nl1_*.jar" />
<include name="org.eclipse.birt.chart.engine.extension.nl1_*.jar" />
<include name="org.eclipse.birt.chart.engine.nl1_*.jar" />
<include name="org.eclipse.birt.chart.examples.nl1_*.jar" />
<include name="org.eclipse.birt.chart.integration.wtp.ui.nl1_*.jar" />
<include name="org.eclipse.birt.chart.reportitem.nl1_*.jar" />
<include name="org.eclipse.birt.chart.ui.extension.nl1_*.jar" />
<include name="org.eclipse.birt.chart.ui.nl1_*.jar" />
<include name="org.eclipse.birt.core.nl1_*.jar" />
<include name="org.eclipse.birt.core.ui.nl1_*.jar" />
</fileset>
</copy>
<copy todir="${project.build.directory}/content/DeploymentRuntime\ChartEngine">
<fileset dir="${project.build.directory}/p2updatesite/plugins">
<include name="org.eclipse.birt.chart.device.extension.nl1_*.jar"/>
<include name="org.eclipse.birt.chart.device.svg.nl1_*.jar"/>
<include name="org.eclipse.birt.chart.device.swt.nl1_*.jar"/>
<include name="org.eclipse.birt.chart.engine.extension.nl1_*.jar"/>
<include name="org.eclipse.birt.chart.engine.nl1_*.jar"/>
<include name="org.eclipse.birt.core.nl1_*.jar"/>
<include name="org.eclipse.birt.chart.device.extension.nl1_*.jar" />
<include name="org.eclipse.birt.chart.device.svg.nl1_*.jar" />
<include name="org.eclipse.birt.chart.device.swt.nl1_*.jar" />
<include name="org.eclipse.birt.chart.engine.extension.nl1_*.jar" />
<include name="org.eclipse.birt.chart.engine.nl1_*.jar" />
<include name="org.eclipse.birt.core.nl1_*.jar" />
</fileset>
</copy>
<zip destfile="target/NLpack1-birt-charts.zip"
basedir="target/content"/>
</tasks>
<zip destfile="target/NLpack1-birt-charts.zip" basedir="target/content" />
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
Expand Down
Loading

0 comments on commit ddb3ad3

Please sign in to comment.