Skip to content

Commit

Permalink
[Java-11] MT next version requires Java 11
Browse files Browse the repository at this point in the history
  • Loading branch information
@wolfgang-ch
wolfgang-ch committed Dec 6, 2020
1 parent 5cd806c commit 48f5163
Show file tree
Hide file tree
Showing 24 changed files with 30 additions and 24 deletions.
2 changes: 1 addition & 1 deletion build/build.net.tourbook.ant/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ Bundle-Activator: net.tourbook.ant.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.apache.ant
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-RequiredExecutionEnvironment: JavaSE-11

This comment has been minimized.

Sign in to view

Copy link
@FJBDev

FJBDev Dec 7, 2020 •
edited

Collaborator

@wolfgang-ch
Don't you also need to update the classpath file with this line ?

...StandardVMType/JavaSE-11

instead of

....StandardVMType/JavaSE-1.8

This comment has been minimized.

Sign in to view

Copy link
@wolfgang-ch

wolfgang-ch Dec 7, 2020

Author Collaborator

MT testing failed with Java 8 and the updated manifest.mf files, after using Java 11, MT run smoothly. There are so many java settings in this project and I don't have an overview which is important and which not. I will update the classpath files to use also Java 11

This comment has been minimized.

Sign in to view

Copy link
@wolfgang-ch

wolfgang-ch Dec 7, 2020

Author Collaborator

I think when you are not using Java11 features, then the classpash is still working with Java8

This comment has been minimized.

Sign in to view

Copy link
@FJBDev

FJBDev Dec 8, 2020

Collaborator

It's working great now for me too. And actually, switching to Java 11 I think fixed this issue, weird

This comment has been minimized.

Sign in to view

Copy link
@FJBDev

FJBDev Dec 8, 2020

Collaborator

There are so many java settings in this project and I don't have an overview which is important and which not

A good example is here, I would think it would need to be changed to 11 but I am not sure
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: build.net.tourbook.ant
2 changes: 1 addition & 1 deletion bundles/net.tourbook.branding/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ Bundle-Version: 20.11.1.qualifier
Bundle-Vendor: MyTourbook
Bundle-ActivationPolicy: lazy
Bundle-Name: Branding plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-RequiredExecutionEnvironment: JavaSE-11
2 changes: 1 addition & 1 deletion bundles/net.tourbook.chart/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.ui,
net.tourbook.common
Bundle-ActivationPolicy: lazy
Export-Package: net.tourbook.chart
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-RequiredExecutionEnvironment: JavaSE-11
Import-Package: gnu.trove.list.array,
net.tourbook.common,
net.tourbook.common.form,
Expand Down
2 changes: 1 addition & 1 deletion bundles/net.tourbook.cloud/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.core.runtime,
net.tourbook.ext.jars
Bundle-ActivationPolicy: lazy
Bundle-Vendor: MyTourbook
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ClassPath: .,
dropbox-core-sdk-3.1.4.jar,
java7-fs-dropbox-0.0.3.jar,
Expand Down
2 changes: 1 addition & 1 deletion bundles/net.tourbook.common/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.nebula.widgets.nattable.core,
net.tourbook.ext.jars,
net.tourbook.ext.worldwind
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ActivationPolicy: lazy
Import-Package: com.skedgo.converter,
javax.inject;version="1.0.0",
Expand Down
2 changes: 1 addition & 1 deletion bundles/net.tourbook.device.garmin.fit/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.core.runtime,
net.tourbook.ext.jars.printing
Bundle-ActivationPolicy: lazy
Bundle-Vendor: MyTourbook
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ClassPath: .,
fit-21.40.00.jar
Import-Package: net.tourbook.common,
Expand Down
2 changes: 1 addition & 1 deletion bundles/net.tourbook.device.garmin/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.core.runtime,
net.tourbook.ext.velocity
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %Bundle-Vendor.0
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-RequiredExecutionEnvironment: JavaSE-11
Import-Package: net.tourbook.common,
net.tourbook.common.preferences,
net.tourbook.common.time,
Expand Down
2 changes: 1 addition & 1 deletion bundles/net.tourbook.device.nmea/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.ui,
net.tourbook
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-Vendor: MyTourbook
Import-Package: net.tourbook.common.util,
net.tourbook.data,
Expand Down
2 changes: 1 addition & 1 deletion bundles/net.tourbook.device/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Export-Package: net.tourbook.device,
net.tourbook.device.sporttracks,
net.tourbook.device.suunto
Bundle-Vendor: MyTourbook
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-RequiredExecutionEnvironment: JavaSE-11
Import-Package: de.byteholder.geoclipse.map,
net.tourbook,
net.tourbook.application,
Expand Down
2 changes: 1 addition & 1 deletion bundles/net.tourbook.export/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.core.runtime,
net.tourbook.ext.jars,
net.tourbook.common,
net.tourbook.ext.velocity
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ActivationPolicy: lazy
Import-Package: net.tourbook,
net.tourbook.application,
Expand Down
2 changes: 1 addition & 1 deletion bundles/net.tourbook.ext.apache/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Bundle-SymbolicName: net.tourbook.ext.apache
Automatic-Module-Name: net.tourbook.ext.apache
Bundle-Version: 1.0.0.v10_14__7_5
Bundle-Vendor: The Apache Software Foundation
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ClassPath: derby-10.14.2.jar,
derbyclient-10.14.2.jar,
derbynet-10.14.2.jar,
Expand Down
2 changes: 1 addition & 1 deletion bundles/net.tourbook.ext.jars.printing/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Bundle-Name: External jar's for printing
Bundle-SymbolicName: net.tourbook.ext.jars.printing;singleton:=true
Bundle-Version: 20.11.1.qualifier
Bundle-Vendor: MyTourbook
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ClassPath:
batik-all-1.12.jar,
commons-io-2.6.jar,
Expand Down
2 changes: 1 addition & 1 deletion bundles/net.tourbook.ext.jars/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -204,5 +204,5 @@ Export-Package: com.enterprisedt,
org.joda.time.tz.data.Indian,
org.joda.time.tz.data.Pacific,
org.json
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-RequiredExecutionEnvironment: JavaSE-11
Automatic-Module-Name: net.tourbook.ext.jars
2 changes: 1 addition & 1 deletion bundles/net.tourbook.ext.vtm.windows/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Bundle-Name: VTM natives for Windows
Bundle-SymbolicName: net.tourbook.ext.vtm.windows
Bundle-Version: 18.2.0.qualifier
Fragment-Host: net.tourbook.ext.vtm;bundle-version="18.2.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ClassPath: natives/
Bundle-Vendor: MyTourbook
Automatic-Module-Name: net.tourbook.ext.vtm.windows
2 changes: 1 addition & 1 deletion bundles/net.tourbook.ext.worldwind.win64/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ Bundle-Name: World Wind Resources
Bundle-SymbolicName: net.tourbook.ext.worldwind.win64;singleton:=true
Bundle-Version: 2.1.20170207
Bundle-Vendor: NASA World Wind
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-RequiredExecutionEnvironment: JavaSE-11
Fragment-Host: net.tourbook.ext.worldwind;bundle-version="2.1.20170207"
Automatic-Module-Name: net.tourbook.ext.worldwind.win64
2 changes: 1 addition & 1 deletion bundles/net.tourbook.ext.worldwind/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Bundle-Name: World Wind Resources
Bundle-SymbolicName: net.tourbook.ext.worldwind;singleton:=true
Bundle-Version: 2.1.20170207.3938883
Bundle-Vendor: NASA World Wind
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .,
gdal.jar,
Expand Down
2 changes: 1 addition & 1 deletion bundles/net.tourbook.p2/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.equinox.p2.ui
Service-Component: OSGI-INF/policy_component.xml, OSGI-INF/licenseManager_component.xml
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-RequiredExecutionEnvironment: JavaSE-11
Export-Package: org.eclipse.equinox.internal.p2.ui.sdk,
org.eclipse.equinox.internal.p2.ui.sdk.prefs
Automatic-Module-Name: net.tourbook.p2
2 changes: 1 addition & 1 deletion bundles/net.tourbook.photo/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.ui,
net.tourbook.common,
net.tourbook.ext.jars,
org.eclipse.e4.ui.di
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ActivationPolicy: lazy
Export-Package: net.tourbook.photo
Import-Package: net.tourbook.common,
Expand Down
2 changes: 1 addition & 1 deletion bundles/net.tourbook.printing/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.ui,
net.tourbook.common,
net.tourbook.ext.jars,
net.tourbook.ext.jars.printing
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ActivationPolicy: lazy
Import-Package: net.tourbook.application,
net.tourbook.common,
Expand Down
2 changes: 1 addition & 1 deletion bundles/net.tourbook.statistics/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.ui,
net.tourbook.common
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %Bundle-Vendor
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-RequiredExecutionEnvironment: JavaSE-11
Import-Package: gnu.trove.list.array,
net.tourbook,
net.tourbook.application,
Expand Down
2 changes: 1 addition & 1 deletion bundles/net.tourbook.tests/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Require-Bundle: org.junit.jupiter.api;resolution:=optional,
net.tourbook
Bundle-ActivationPolicy: lazy
Bundle-Vendor: MyTourbook
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-RequiredExecutionEnvironment: JavaSE-11
Import-Package: net.tourbook.common,
net.tourbook.common.util,
net.tourbook.data,
Expand Down
2 changes: 1 addition & 1 deletion bundles/net.tourbook.web/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Bundle-Name: Web Resources
Bundle-SymbolicName: net.tourbook.web;singleton:=true
Bundle-Version: 20.11.1.qualifier
Bundle-Activator: net.tourbook.web.Activator
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ActivationPolicy: lazy
Bundle-Vendor: MyTourbook
Bundle-Localization: plugin
Expand Down
2 changes: 1 addition & 1 deletion bundles/net.tourbook/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Bundle-SymbolicName: net.tourbook;singleton:=true
Bundle-Version: 20.11.1.qualifier
Bundle-Activator: net.tourbook.application.TourbookPlugin
Bundle-Vendor: %Bundle-Vendor
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-RequiredExecutionEnvironment: JavaSE-11

This comment has been minimized.

Sign in to view

Copy link
@FJBDev

FJBDev Dec 10, 2020

Collaborator

Should those ones also be updated ?
ejb3
geoclipse
rxtx2.2
velocity
vtm

This comment has been minimized.

Sign in to view

Copy link
@wolfgang-ch

wolfgang-ch Dec 11, 2020

Author Collaborator

I updated all plugins that all have the same level, it was not necessary but I think it was also not a failure. When these plugins should work in other apps then it could cause problems but this is not the case.
Bundle-Localization: plugin
Bundle-ActivationPolicy: lazy
Eclipse-RegisterBuddy: net.tourbook.ext.ejb3,
Expand Down
8 changes: 7 additions & 1 deletion info/release-notes/20.11post.0-readme.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,14 @@

TODO's
======



MT website updates
==================

* At MT homepage, replace SQL Explorer with DBeaver https://sourceforge.net/p/mytourbook/discussion/622811/thread/9ae30efd93/?limit=25#57b3
* MT requires Java 11, recommend AdoptOpenJDK
* Replace SQL Explorer with DBeaver https://sourceforge.net/p/mytourbook/discussion/622811/thread/9ae30efd93/?limit=25#57b3


Issues
Expand Down

0 comments on commit 48f5163

Please sign in to comment.