Merge branch '58-fix-maven-build-for-eclipse-2020-06-and-java8' into 'master'

Resolve "Fix maven build for Eclipse 2020-06 and Java8"

Closes #58

See merge request ESProjects/SDE!59

.gitlab-ci.yml

@@ -32,7 +32,7 @@ maven_build_and_test:
 #    - rm -rf $M2_REPO
 #    - mkdir $M2_REPO  
     - cp settings.xml $M2_REPO
-    - "export DISPLAY=:0.0; mvn $MAVEN_CLI_OPTS -P Neon-Java8,DevelopmentUpdateSite clean deploy"
+    - "export DISPLAY=:0.0; mvn $MAVEN_CLI_OPTS -P Neon,Java8,DevelopmentUpdateSite clean deploy"
     only:
     - master
 
@@ -47,10 +47,10 @@ maven_build_and_test:
     script:
     - echo "Deploy to production update site"
     - cd "eu.fbk.tools.aida.sde.repository"
-    - "export DISPLAY=:0.0; mvn $MAVEN_CLI_OPTS -P Neon-Java8,ProductionUpdateSite deploy"
+    - "export DISPLAY=:0.0; mvn $MAVEN_CLI_OPTS -P Neon,Java8,ProductionUpdateSite deploy"
     - cd ".."
     - cd "eu.fbk.tools.sde.repository.neon"
-    - "export DISPLAY=:0.0; mvn $MAVEN_CLI_OPTS -P Neon-Java8,ProductionUpdateSite deploy"
+    - "export DISPLAY=:0.0; mvn $MAVEN_CLI_OPTS -P Neon,Java8,ProductionUpdateSite deploy"
 
     only:
       refs:

README.md

-
 **Project Build instruction:**
 
-Currently we can build SDE for `Eclipse Neon` and `Eclipse 2020-06`, both use `Java 8`.  
-To select the desired Eclipe version, please use the corresponding maven profile, respectively: `Neon-Java8` and `2020-06`
+Currently we can build SDE for Eclipse `Neon`, `2020-06` and `2021-03`.  
+To select the desired Eclipe version, please use the corresponding maven profile, respectively: `Neon`, `2020-06` and `2021-03`.  
+To select the desired Java version, please use the maven profile `Java8` or `Java11`.
 
 - checkout the project
 - from the terminal
-  - from the root of the project run: `mvn clean install -Dhttps.protocols=TLSv1.2 -P <Neon-Java8|2020-06>` (maven 3.x is should be already installed)
+  - in case of `Neon`, from the root of the project run: `mvn clean install -Dhttps.protocols=TLSv1.2 -P Neon,Java8` (maven 3.x must be already installed)
+  - in case of `2020-06`, from the root of the project run: `mvn clean install -Dhttps.protocols=TLSv1.2 -P 2020-06,<Java8|Java11>`
+  - in case of `2021-03`, from the root of the project run: `mvn clean install -Dhttps.protocols=TLSv1.2 -P 2021,Java11` 
   - to update the Eclipse workspace, select all projects (Edit->Select all) and run 'Maven->Update Project' from the context menu of
   - the Package Explorer view.

pom.xml

@@ -340,9 +340,12 @@
 			</properties>
 		</profile>
 	<profile>
-			<id>Neon-Java8</id>
+			<id>Neon</id>
 			<activation>
-					<jdk>1.8</jdk>
+				<property>
+					<name>eclipse.buildId</name>
+					<value>4.6.3.M20170301-0400</value>
+				</property>
 			</activation>
 			<properties>
 				<xtextVersion>2.12.0</xtextVersion>