Skip to content

Commit

Permalink
[22.1] Implementing embedded Java runtime
Browse files Browse the repository at this point in the history 
#381

Used hints from  https://kivio.org/blog/entry/2020/07/09/jre-mit-eclipse-rcp-anwendung-bundeln
  • Loading branch information
@wolfgang-ch
wolfgang-ch committed Dec 31, 2021
1 parent 084cd3f commit 22c886b
Show file tree
Hide file tree
Showing 7 changed files with 92 additions and 94 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ repositories/
**/build/**/build/sonar
**/*vtm*/**/build/

**/feature.net.tourbook.jre/*/jre

.apt_generated
.gradle
Expand Down
2 changes: 1 addition & 1 deletion build/build.net.tourbook/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ task mt_20_BuildProduct {

doLast {

//run: mvn verify -P build-release
// run: mvn verify -P build-release

def buildDir = file('../..')

Expand Down
2 changes: 1 addition & 1 deletion features/feature.net.tourbook.jre/feature.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="feature.net.tourbook.jre"
label="OpenJDK 11"
version="11.0.7.qualifier"
version="11.0.13.qualifier"
plugin="net.tourbook.branding">

<description url="https://adoptium.net/">
Expand Down
16 changes: 7 additions & 9 deletions features/feature.net.tourbook.jre/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,16 @@

<modelVersion>4.0.0</modelVersion>

<parent>
<artifactId>mytourbook-app</artifactId> <groupId>net.tourbook</groupId>
<version>22.1.0-SNAPSHOT</version>
<artifactId>feature.net.tourbook.jre</artifactId> <groupId>net.tourbook</groupId>
<version>11.0.13-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>

<relativePath>../../MT/mytourbook/pom.xml</relativePath>
<parent>
<artifactId>mytourbook-app</artifactId> <groupId>net.tourbook</groupId>
<version>22.1.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>

<artifactId>feature.net.tourbook.jre</artifactId>
<packaging>eclipse-feature</packaging>
<version>11.0.13-SNAPSHOT</version>
<name>JRE Bundling Feature</name>

<properties>
<!--
<url.linux.x86_64>https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jre_x64_linux_hotspot_11.0.7_10.tar.gz</url.linux.x86_64>
Expand Down
2 changes: 2 additions & 0 deletions features/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
<module>feature.net.tourbook.ext.rxtx</module>
<module>feature.net.tourbook.ext.vtm</module>
<module>feature.net.tourbook.ext.worldwind</module>

<module>feature.net.tourbook.jre</module>
</modules>

</project>
8 changes: 4 additions & 4 deletions info/release-notes/22.next.0-readme.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
TODO's
======

* Bundle MT with JRE
https://github.com/mytourbook/mytourbook/issues/381#issue-971079239

* Tour Chart - Select color for 2nd graph line instead of compliment color
- Set default graphs in the graph slideout, sorting still needs the pref page
Expand All @@ -32,7 +30,9 @@ Experimental
New
===

*
* MyTourbook for Windows is bundled with a JRE
https://github.com/mytourbook/mytourbook/issues/381


Improvements
============
Expand All @@ -41,7 +41,7 @@ Improvements
- Filter tour pauses
- Stack tour pauses that they don't overlap

https://github.com/mytourbook/mytourbook/issues/428
https://github.com/mytourbook/mytourbook/issues/428

* 2D Map
- Filter tour pauses https://github.com/mytourbook/mytourbook/issues/428
Expand Down
155 changes: 76 additions & 79 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,19 @@

<dependencies>
<dependency>
<groupId>org.eclipse.pde</groupId>
<artifactId>org.eclipse.pde.junit.runtime</artifactId>
<version>3.6.0</version>
<artifactId>org.eclipse.pde.junit.runtime</artifactId> <groupId>org.eclipse.pde</groupId>
<version>3.6.0</version>
</dependency>
<dependency>
<groupId>org.eclipse.core</groupId>
<artifactId>org.eclipse.core.runtime</artifactId>
<version>3.7.0</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>5.8.1</version>
<scope>test</scope>
</dependency>
</dependencies>
<dependency>
<artifactId>org.eclipse.core.runtime</artifactId> <groupId>org.eclipse.core</groupId>
<version>3.7.0</version>
</dependency>
<dependency>
<artifactId>junit-jupiter-engine</artifactId> <groupId>org.junit.jupiter</groupId>
<version>5.8.1</version>
<scope>test</scope>
</dependency>
</dependencies>

<properties>
<tycho.version>2.5.0</tycho.version>
Expand Down Expand Up @@ -192,77 +189,77 @@
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M5</version>
<configuration>
<skipTests>true</skipTests>
</configuration>
<executions>
<execution>
<goals>
<goal>test</goal>
</goals>
</execution>
</executions>
<artifactId>maven-surefire-plugin</artifactId> <groupId>org.apache.maven.plugins</groupId>
<version>3.0.0-M5</version>
<configuration>
<skipTests>true</skipTests>
</configuration>
<executions>
<execution>
<goals>
<goal>test</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<executions>
<execution>
<id>compiletests</id>
<phase>test-compile</phase>
<goals>
<goal>testCompile</goal>
</goals>
</execution>
</executions>
<artifactId>maven-compiler-plugin</artifactId> <groupId>org.apache.maven.plugins</groupId>
<version>3.8.1</version>
<executions>
<execution>
<id>compiletests</id>
<phase>test-compile</phase>
<goals>
<goal>testCompile</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire-plugin</artifactId>
<version>${tycho.version}</version>
<configuration>
<useUIHarness>true</useUIHarness>
<useUIThread>false</useUIThread>
<product>org.eclipse.platform.ide</product>
<skipTests>true</skipTests>
</configuration>
<artifactId>tycho-surefire-plugin</artifactId> <groupId>org.eclipse.tycho</groupId>
<version>${tycho.version}</version>
<configuration>
<useUIHarness>true</useUIHarness>
<useUIThread>false</useUIThread>
<product>org.eclipse.platform.ide</product>
<skipTests>true</skipTests>
</configuration>
</plugin>

<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.7</version>
<executions>
<execution>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>all-tests-report</id>
<phase>verify</phase>
<goals>
<goal>report-aggregate</goal>
</goals>
<configuration>
<skip>true</skip>
</configuration>
</execution>
<execution>
<id>unit-tests-report</id>
<phase>test</phase>
<goals>
<goal>report</goal>
</goals>
<configuration>
<skip>true</skip>
</configuration>
</execution>
</executions>
<artifactId>jacoco-maven-plugin</artifactId> <groupId>org.jacoco</groupId>
<version>0.8.7</version>
<executions>
<execution>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>all-tests-report</id>
<phase>verify</phase>
<goals>
<goal>report-aggregate</goal>
</goals>
<configuration>
<skip>true</skip>
</configuration>
</execution>
<execution>
<id>unit-tests-report</id>
<phase>test</phase>
<goals>
<goal>report</goal>
</goals>
<configuration>
<skip>true</skip>
</configuration>
</execution>
</executions>
</plugin>

</plugins>
</build>

Expand Down

0 comments on commit 22c886b

Please sign in to comment.