Merge pull request #6 from tmdmaker/justj

Justj

.travis.yml

@@ -3,7 +3,6 @@ dist: xenial
 os: linux
 
 jdk:
-  - openjdk8
   - openjdk11
 
 cache:
@@ -19,7 +18,7 @@ before_install:
   - "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 3840x2160x24 -dpi 240"
 
 script:
-  - mvn -B -P 2020-06 clean install -Dtycho.disableP2Mirrors=true
+  - mvn -B -P 2020-09 clean install -Dtycho.disableP2Mirrors=true
 
 after_success:
-  - mvn -B -P 2020-06 jacoco:report coveralls:report
+  - mvn -B -P 2020-09 jacoco:report coveralls:report

CONTRIBUTING.md

@@ -2,15 +2,15 @@
 
 ## Setting up the development environment (recommended)
 
-1.Install Java8 or Java11 SDK. Latest LTS is recommended.
+1.Install Java11 SDK. Latest LTS is recommended.
 
 2.Install Eclipse. Latest 4.x is recommended.
 
 3.Install Tycho Configurator from Marketplace or Preferences/Maven/Discovery.
 
 4.Change target platform.
 
-  Open tmdmaker.releng.targetplatform/2020-06.target. and Click "Set as Target Platform".
+  Open tmdmaker.releng.targetplatform/2020-09.target. and Click "Set as Target Platform".
 
 5.(Optional) Install plugins. 
 - PropertiesEditor 
@@ -41,4 +41,4 @@
 
 - Xtend
 
-  To edit reStructuredText in tmdmaker.sphinx.
+  To edit xtend files in tmdmaker.sphinx.

README.md

@@ -18,7 +18,7 @@ TMとは、ビジネスを解析しながらデータベース構造も同時に
 ## Requirements
 
 ### Java Application(Eclipse RCP)
-- java8 or later(java 11)
+- Nothing. TMD-Maker includes Java11 JRE.
 
 ### Eclipse Plugin
 - java6 or later(java8 or java11 is recommended).
@@ -39,7 +39,7 @@ git clone https://github.com/tmdmaker/tmdmaker.git
 
 cd tmdmaker
 
-mvn -P 2020-06 clean verify 
+mvn -P 2020-09 clean verify 
 ```
 
 ## Installation

bundles/org.tmdmaker.rcp/tmdmaker_rcp.product

@@ -516,6 +516,7 @@
       <feature id="org.eclipse.ecf.core.ssl.feature"/>
       <feature id="org.eclipse.ecf.filetransfer.ssl.feature"/>
       <feature id="org.tmdmaker.plugin.feature" installMode="root"/>
+      <feature id="org.eclipse.justj.openjdk.hotspot.jre.full" installMode="root"/>
    </features>
 
    <configurations>

releng/org.tmdmaker.configuration/pom.xml

@@ -455,6 +455,7 @@
 							<classifier>${target-file}</classifier>
 						</artifact>
 					</target>
+					<executionEnvironment>org.eclipse.justj.openjdk.hotspot.jre.full-11</executionEnvironment>
 					<environments>
 						<environment>
 							<os>win32</os>

releng/org.tmdmaker.releng.product/tmdmaker_rcp.product

@@ -466,7 +466,7 @@
       <feature id="org.eclipse.ecf.filetransfer.feature"/>
       <feature id="org.eclipse.ecf.core.ssl.feature"/>
       <feature id="org.eclipse.ecf.filetransfer.ssl.feature"/>
-      <feature id="org.tmdmaker.plugin.feature" installMode="root"/>
+      <feature id="org.eclipse.justj.openjdk.hotspot.jre.full" installMode="root"/>
    </features>
 
    <configurations>

releng/org.tmdmaker.releng.targetplatform/2020-09.target

@@ -43,6 +43,10 @@
 			<unit id="org.eclipse.gef.sdk.feature.group" version="3.11.0.201606061308"/>
 			<unit id="org.eclipse.swtbot.eclipse.gef.feature.group" version="3.0.0.202006031738"/>
 		</location>
+		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+			<repository location="https://download.eclipse.org/justj/jres/11/updates/release/11.0.2"/>
+			<unit id="org.eclipse.justj.openjdk.hotspot.jre.full.feature.group" version="11.0.2.v20200815-0835"/>
+		</location>
 	</locations>
 	<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 </target>