maven cleanups in repositories

Author: ilg-ul

.travis.yml

@@ -36,6 +36,6 @@ branches:
 # -----------------------------------------------------------------------------
 
 script:
-  - mvn clean install
+  - mvn clean verify
 
 # -----------------------------------------------------------------------------

README.md

@@ -24,7 +24,7 @@ For manual installs, the stable version update site is:
 ```
 $ git clone --branch=master https://github.com/gnuarmeclipse/plug-ins.git gnuarmeclipse/plug-ins.git
 $ cd gnuarmeclipse/plug-ins.git
-$ mvn -Dtycho.localArtifacts=ignore clean install
+$ mvn -Dtycho.localArtifacts=ignore clean verify
 ```
 
 The result is a p2 repository, in `ilg.gnumcueclipse-repository/target/repository`.
@@ -37,13 +37,13 @@ The Eclipse build is described in the [project web](http://gnuarmeclipse.github.
 
 The minimum requirements for running the GNU MCU Eclipse plug-ins are:
 
-- JavaSE-1.8
-- CDT 8.6.0 (Luna SR2)
+- JavaSE-1.8-111 or later
+- CDT 9.2.1 (Neon.3)
 
 Recommended:
 
 - JavaSE-1.8-111 or later
-- Eclipse Mars.2
+- Eclipse Neon.3
 
 ## Developer
 

packages/pom.xml

@@ -23,11 +23,9 @@
 
 		<!-- Silence a Maven warning -->
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    
-    	<!-- Upstream p2 repository, used as a source for pre-compiled build artifacts -->
-		<eclipse.simultaneous.release.repository>http://download.eclipse.org/staging/neon/</eclipse.simultaneous.release.repository>
 
-		<gnumcueclipse.version>4.1.1</gnumcueclipse.version>
+		<!-- The usual Eclipse timestamp, down to minutes. -->
+		<maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format>
 	</properties>
 
 	<licenses>
@@ -57,13 +55,30 @@
 	<build>
 		<plugins>
 			<plugin>
-				<!-- Used by eclipse-plugin & eclipse-feature packagings. -->
+				<!-- Enable Tycho. -->
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-maven-plugin</artifactId>
 				<version>${tycho.version}</version>
-				<extensions>true</extensions>
+				<!-- Mandatory, without it eclipse-* POMs are not accepted. -->
+				<extensions>true</extensions> 
 			</plugin>
-			
+
+			<!-- 
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>build-helper-maven-plugin</artifactId>
+				<version>3.0.0</version>
+				<executions>
+					<execution>
+						<id>gme-parse-version</id>
+						<goals>
+							<goal>parse-version</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			-->
+ 
 			<plugin>
 				<!-- Used by eclipse-repository packagings.  -->
 				<groupId>org.eclipse.tycho</groupId>
@@ -72,6 +87,8 @@
 				<configuration>
 					<resolver>p2</resolver>
 					<pomDependencies>consider</pomDependencies>
+					
+					<!-- Mandatory, without it Build is platform dependent. -->
 					<environments>
 						<environment>
 							<os>linux</os>
@@ -83,11 +100,6 @@
 							<ws>gtk</ws>
 							<arch>x86_64</arch>
 						</environment>
-						<environment>
-							<os>linux</os>
-							<ws>gtk</ws>
-							<arch>ppc64</arch>
-						</environment>
 						<environment>
 							<os>win32</os>
 							<ws>win32</ws>
@@ -103,41 +115,37 @@
 							<ws>cocoa</ws>
 							<arch>x86_64</arch>
 						</environment>
-						<environment>
-							<os>aix</os>
-							<ws>gtk</ws>
-							<arch>ppc</arch>
-						</environment>
 					</environments>
 				</configuration>
 			</plugin>
+
 		</plugins>
 
 		<pluginManagement>
-			<!-- Default plugin information. -->
+			<!-- Defaults, applied when plug-ins are actually used. -->
 			<plugins>
+
 				<plugin>
 					<groupId>org.eclipse.tycho</groupId>
 					<artifactId>tycho-compiler-plugin</artifactId>
 					<version>${tycho.version}</version>
 					<configuration>
 						<encoding>UTF-8</encoding>
-						<useProjectSettings>true</useProjectSettings>
+						<!-- <useProjectSettings>true</useProjectSettings> -->
+						<!-- <showDeprecation>true</showDeprecation> -->
 					</configuration>
 				</plugin>
 
 				<plugin>
 					<groupId>org.eclipse.tycho</groupId>
-					<artifactId>tycho-source-plugin</artifactId>
-					<version>${tycho-version}</version>
-					<executions>
-						<execution>
-							<id>plugin-source</id>
-							<goals>
-								<goal>plugin-source</goal>
-							</goals>
-						</execution>
-					</executions>
+					<artifactId>tycho-p2-repository-plugin</artifactId>
+					<version>${tycho.version}</version>
+					<configuration>
+						<compress>true</compress>
+						<!-- Nope, it brings all 3rd party plug-ins.
+						<includeAllDependencies>true</includeAllDependencies>
+						-->
+					</configuration>
 				</plugin>
 
 			</plugins>

parent/pom.xml

@@ -91,6 +91,6 @@
 		<module>repos/ilg.gnumcueclipse.riscv-repository</module>
 	</modules>
 
-	<name>GNU MCU Eclipse plug-ins</name>
+	<name>GNU MCU Eclipse plug-ins root</name>
 	<url>http://gnuarmeclipse.github.io</url>
 </project>

pom.xml

@@ -0,0 +1,12 @@
+Projects to generate the p2 repositories.
+
+Since the archives are not deployed, the SNAPSHOT qualifier in the 
+archive name is not substituted,
+and must be processed externally by the publish script. (using 
+`${maven.build.timestamp}` is not ok, since it is captured when
+the entire build starts, which is before the moment when plug-ins
+are internally deployed to the repository).
+
+The main repository contains all (ARM & RISC-V) plug-ins.
+
+The RISC-V repository contains only the RISC-V plug-ins.

repos/README.md

@@ -28,29 +28,6 @@
 		<relativePath>../../parent/pom.xml</relativePath>
 	</parent>
 
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-p2-repository-plugin</artifactId>
-				<version>${tycho.version}</version>
-				<configuration>
-					<compress>true</compress>
-					<!-- Nope, it brings all 3rd party plug-ins.
-					<includeAllDependencies>true</includeAllDependencies>
-					-->
-				</configuration>
-				<executions>
-					<execution>
-						<goals>
-							<goal>archive-repository</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-
 	<name>GNU MCU Eclipse repository</name>
 	<url>http://gnuarmeclipse.github.io</url>
 </project>

repos/ilg.gnumcueclipse-repository/pom.xml

@@ -28,29 +28,6 @@
 		<relativePath>../../parent/pom.xml</relativePath>
 	</parent>
 
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-p2-repository-plugin</artifactId>
-				<version>${tycho.version}</version>
-				<configuration>
-					<compress>true</compress>
-					<!-- Nope, it brings all 3rd party plug-ins.
-					<includeAllDependencies>true</includeAllDependencies>
-					-->
-				</configuration>
-				<executions>
-					<execution>
-						<goals>
-							<goal>archive-repository</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-
 	<name>GNU MCU Eclipse RISC-V repository</name>
 	<url>http://gnuarmeclipse.github.io</url>
 </project>