Switched to Maven Tycho 1.5.0

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0108068..91f3a84 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -35,12 +35,6 @@ stages:
   - test
   - package_repo
 
-default:
-  before_script:
-    - cd TempMavenTychoSnapshotWorkaround
-    - mvn $MAVEN_CLI_OPTS clean # This is only temporary to resolve TYCHO 1.5.0-SNAPSHOT for the main build
-    - cd ..
-
 validate:
   stage: validate
   script:

diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
index e06fb0e..86e0982 100644 (file)
--- a/.mvn/extensions.xml
+++ b/.mvn/extensions.xml
@@ -4,6 +4,6 @@
   <extension>
     <groupId>org.eclipse.tycho.extras</groupId>
     <artifactId>tycho-pomless</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.0</version>
   </extension>
 </extensions>
\ No newline at end of file

diff --git a/TempMavenTychoSnapshotWorkaround/.project b/TempMavenTychoSnapshotWorkaround/.project
deleted file mode 100644 (file)
index 23af4a3..0000000
--- a/TempMavenTychoSnapshotWorkaround/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-       <name>net.mograsim.tycho-download</name>
-       <comment></comment>
-       <projects>
-       </projects>
-       <buildSpec>
-               <buildCommand>
-                       <name>org.eclipse.m2e.core.maven2Builder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-       </buildSpec>
-       <natures>
-               <nature>org.eclipse.m2e.core.maven2Nature</nature>
-       </natures>
-</projectDescription>

diff --git a/TempMavenTychoSnapshotWorkaround/pom.xml b/TempMavenTychoSnapshotWorkaround/pom.xml
deleted file mode 100644 (file)
index 8c6713f..0000000
--- a/TempMavenTychoSnapshotWorkaround/pom.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-       <modelVersion>4.0.0</modelVersion>
-       <groupId>net.mograsim</groupId>
-       <artifactId>net.mograsim.tycho-download</artifactId>
-       <version>1.0.0</version>
-       <packaging>pom</packaging>
-
-       <!-- THIS IS ONLY TEMPORARY TO RESOLVE AND DOWNLOAD THE TYCHO 1.5.0-SNAPSHOT 
-               FOR THE MAIN BUILD -->
-
-       <pluginRepositories>
-               <!-- currently necessary because we are using a SNAPSHOT build of tycho -->
-               <pluginRepository>
-                       <id>tycho-snapshots</id>
-                       <url>https://repo.eclipse.org/content/repositories/tycho-snapshots/</url>
-                       <releases>
-                               <enabled>true</enabled>
-                       </releases>
-                       <snapshots>
-                               <enabled>true</enabled>
-                               <updatePolicy>always</updatePolicy>
-                       </snapshots>
-               </pluginRepository>
-       </pluginRepositories>
-
-       <build>
-               <extensions>
-                       <extension>
-                               <groupId>org.eclipse.tycho.extras</groupId>
-                               <artifactId>tycho-pomless</artifactId>
-                               <version>1.5.0-SNAPSHOT</version>
-                       </extension>
-               </extensions>
-       </build>
-</project>
\ No newline at end of file

diff --git a/docs/building_mograsim.md b/docs/building_mograsim.md
index 420087b..8ec990e 100644 (file)
--- a/docs/building_mograsim.md
+++ b/docs/building_mograsim.md
@@ -61,18 +61,14 @@ Can be done via Git or via EGit (Eclipse Git).
 Note: After importing the projects, probably an automatic workspace build will start. 
 Wait for it to finish before continuing.
 
-## Do the Maven Tycho workaround:
-
-In the project explorer or package explorer, right-click on "net.mograsim.tycho-download", 
-click on "Run As" -> "Maven clean" and wait for it to finish.
-
 ## Build the Update Site
 
 1. In the project explorer or package explorer, right-click on "net.mograsim", click 
    on "Run As" -> "Maven build...".
-2. Next to "Goals", enter "clean verify"; click on "Run" and wait for it to finish 
+2. Make sure to run Maven with JDK 11
+3. Next to "Goals", enter "clean verify"; click on "Run" and wait for it to finish 
    (this will take a while).
-3. Select all projects, right-click, and click on "Refresh".
+4. Select all projects, right-click, and click on "Refresh".
 
 The update site now should be built and is located in net.mograsim.plugin.updatesite/target/repository. 
 In there you should see, among other files, a folder named "features", a folder named 

diff --git a/docs/development_environment.md b/docs/development_environment.md
index 5e96b92..50d8b4f 100644 (file)
--- a/docs/development_environment.md
+++ b/docs/development_environment.md
@@ -149,14 +149,15 @@ A short guide to the [Maven goals (Maven Lifecycle)](https://maven.apache.org/gu
 - I recommend running `clean verify` or `verify`, this will do everything up to and 
   including the testing.
 
-Please note that Tycho 1.5.0 is not released yet, and thus requires a workaround. 
-More information can be found under [Maven Core Extension Problems](#mceps).
-
 ## Challenges
 
 Not everything is as simple as it seems at first glance.
 
-### Maven Core Extension Problems <a name="mceps"></a>
+### Maven Core Extension Problems
+
+Context: Tycho 1.5.0 was not released, and thus required a workaround.
+This Problem may appear again, maybe with a different core extension, so this section 
+explains the problem, how to diagnose it and a fairly good workaround.
 
 The Tycho extra `tycho-pomless` is a Maven core extension allows for simpler structure 
 and less redundancy. Maven core extensions must be available at [the central maven repository](http://repo.maven.apache.org/maven2/) 

diff --git a/releng/net.mograsim.configuration/pom.xml b/releng/net.mograsim.configuration/pom.xml
index 7a58f17..49ee631 100644 (file)
--- a/releng/net.mograsim.configuration/pom.xml
+++ b/releng/net.mograsim.configuration/pom.xml
@@ -13,24 +13,10 @@
                <changelist>-SNAPSHOT</changelist>
                <!-- Environment -->
                <java.version>11</java.version> <!-- currently unused -->
-               <tycho.version>1.5.0-SNAPSHOT</tycho.version>
+               <tycho.version>1.5.0</tycho.version>
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        </properties>
 
-       <pluginRepositories>
-               <!-- currently necessary because we are using a SNAPSHOT build of tycho -->
-               <pluginRepository>
-                       <id>tycho-snapshots</id>
-                       <url>https://repo.eclipse.org/content/repositories/tycho-snapshots/</url>
-                       <releases>
-                               <enabled>true</enabled>
-                       </releases>
-                       <snapshots>
-                               <enabled>true</enabled>
-                       </snapshots>
-               </pluginRepository>
-       </pluginRepositories>
-
        <!-- Not needed, as an explicit target definition is provided by releng/net.mograsim.target/ 
                This provides a uniform configuration, and we don't get weird errors. -->
        <!-- <repositories> <repository> <id>eclipse-release</id> <url>http://download.eclipse.org/releases/2019-06</url>