From afad63ac66af1ff7b5556adce04e99e475eca913 Mon Sep 17 00:00:00 2001
From: Romain Bioteau <romain.bioteau@bonitasoft.com>
Date: Thu, 5 Sep 2019 11:20:27 +0200
Subject: [PATCH] fix(build) use public p2 repo (#1866)

Closes BST-463
---
 README.md                |  34 +++---
 platform/platform.target |   2 +-
 platform/pom.xml         | 224 ++++++++++++++-------------------------
 pom.xml                  |   2 +-
 4 files changed, 95 insertions(+), 167 deletions(-)

diff --git a/README.md b/README.md
index 226c133523..f46e01c9e3 100644
--- a/README.md
+++ b/README.md
@@ -3,33 +3,27 @@
 This repository contains the source code of the Bonita Studio component from Bonita Platform.  
 In order to build this repository it is required to build its dependencies. To help you achieve this there is a dedicated repository [here](https://github.com/Bonitasoft-Community/Build-Bonita).
 
-## Run build
+## Prerequisites
+
+* Java 8
 
-Bonita Studio is an Eclipse RCP. It relies on a custom Eclipse **target platform**.  
-Those target platforms are available here [http://update-site.bonitasoft.com/p2](http://update-site.bonitasoft.com/p2).
-To setup the target platform properly you need to add the following mirror in the `settings.xml` of your maven instance (`<USER_HOME>/.m2/settings.xml` by default):
-
-```xml
-<mirrors>
-        <mirror>
-             <id>mirrored-studio-p2-repo</id>
-			  <mirrorOf>http://repositories.rd.lan/p2/4.10.1</mirrorOf>
-			  <url>http://update-site.bonitasoft.com/p2/4.10/</url>
-			  <layout>p2</layout>
-			  <mirrorOfLayouts>p2</mirrorOfLayouts>
-		  </mirror>
-		  ...
-   </mirrors>
-```
-
-Then you can run:
+## Run build
 
 `./mvnw package -DskipTests`
 
+### Build profiles
+
+* _default_
+* _all-in-one_ : bundle a .zip archive
+* _it_ : run integration tests
+* _jdk11-tests_ : run tests against jdk 11 (using [maven toolchain](https://maven.apache.org/guides/mini/guide-using-toolchains.html))
+
+By default active profiles are: _default_ and _all-in-one_
+
 ### Built artifacts
 
 * Windows and Linux all-in-one archive is located here `all-in-one/target/BonitaStudioCommunity-*.zip`
-* MacOs app is located here `products/org.bonitasoft.studio.product/macosx/cocoa/x86_64`
+* MacOs app is located here `all-in-one/target/products/org.bonitasoft.studio.product/macosx/cocoa/x86_64`
 
 ## Report issues
 
diff --git a/platform/platform.target b/platform/platform.target
index 1cb55ab903..876505fe6c 100644
--- a/platform/platform.target
+++ b/platform/platform.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target includeMode="feature" name="mirrored">
 <locations>
 	<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-		<repository location="http://repositories.rd.lan/p2/4.10.1"/>
+		<repository location="http://update-site.bonitasoft.com/p2/4.10"/>
 		<unit id="com.google.inject" version="3.0.0.v201605172100"/>
 		<unit id="com.google.protobuf" version="2.4.0.v201105131100"/>
 		<unit id="com.google.guava" version="15.0.0.v201403281430"/>
diff --git a/platform/pom.xml b/platform/pom.xml
index b49c1e2d4e..dc9ccd7ab9 100644
--- a/platform/pom.xml
+++ b/platform/pom.xml
@@ -1,154 +1,88 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <modelVersion>4.0.0</modelVersion>
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
 
-    <parent>
-        <groupId>org.bonitasoft.studio</groupId>
-        <artifactId>studio</artifactId>
-        <version>7.10.0-SNAPSHOT</version>
-    </parent>
+	<parent>
+		<groupId>org.bonitasoft.studio</groupId>
+		<artifactId>studio</artifactId>
+		<version>7.10.0-SNAPSHOT</version>
+	</parent>
 
-    <groupId>org.bonitasoft.studio</groupId>
-    <artifactId>platform</artifactId>
-    <packaging>eclipse-target-definition</packaging>
+	<groupId>org.bonitasoft.studio</groupId>
+	<artifactId>platform</artifactId>
+	<packaging>eclipse-target-definition</packaging>
 
-    <pluginRepositories>
-        <pluginRepository>
-            <id>jboss-public-repository-group</id>
-            <name>JBoss Public Repository Group</name>
-            <url>http://repository.jboss.org/nexus/content/groups/public/</url>
-        </pluginRepository>
-        <pluginRepository>
-            <id>jboss-snapshots-repository</id>
-            <name>JBoss Snapshots Repository</name>
-            <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
-        </pluginRepository>
-    </pluginRepositories>
+	<pluginRepositories>
+		<pluginRepository>
+			<id>jboss-public-repository-group</id>
+			<name>JBoss Public Repository Group</name>
+			<url>http://repository.jboss.org/nexus/content/groups/public/</url>
+		</pluginRepository>
+		<pluginRepository>
+			<id>jboss-snapshots-repository</id>
+			<name>JBoss Snapshots Repository</name>
+			<url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
+		</pluginRepository>
+	</pluginRepositories>
 
-    <profiles>
-        <profile>
-            <id>remote</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-antrun-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>Generate target file</id>
-                                <phase>initialize</phase>
-                                <configuration>
-                                    <tasks>
-                                        <copy file="${basedir}/original_platform.target" tofile="${basedir}/platform.target"
-                                            overwrite="true" />
-                                    </tasks>
-                                </configuration>
-                                <goals>
-                                    <goal>run</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.eclipse.tycho.extras</groupId>
-                        <artifactId>target-platform-validation-plugin</artifactId>
-                        <version>${tychoExtrasVersion}</version>
-                        <executions>
-                            <execution>
-                                <phase>verify</phase>
-                                <goals>
-                                    <goal>validate-target-platform</goal>
-                                </goals>
-                                <configuration>
-                                    <targetFiles>
-                                        <param>platform.target</param>
-                                    </targetFiles>
-                                    <failOnError>true</failOnError>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>mirrored</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-antrun-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>Generate target file</id>
-                                <phase>initialize</phase>
-                                <configuration>
-                                    <tasks>
-                                        <echo>P2 Mirror Repository = ${p2MirrorUrl}</echo>
-                                        <copy file="${basedir}/mirrored.target.template" tofile="${basedir}/platform.target"
-                                            overwrite="true" />
-                                        <replace token="XXX_REPOSITORY_URL_XXX" value="${p2MirrorUrl}" file="${basedir}/platform.target" />
-                                    </tasks>
-                                </configuration>
-                                <goals>
-                                    <goal>run</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.eclipse.tycho.extras</groupId>
-                        <artifactId>target-platform-validation-plugin</artifactId>
-                        <version>${tychoExtrasVersion}</version>
-                        <executions>
-                            <execution>
-                                <phase>verify</phase>
-                                <goals>
-                                    <goal>validate-target-platform</goal>
-                                </goals>
-                                <configuration>
-                                    <targetFiles>
-                                        <param>platform.target</param>
-                                    </targetFiles>
-                                    <failOnError>true</failOnError>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>mirror-tp</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.jboss.tools.tycho-plugins</groupId>
-                        <artifactId>target-platform-utils</artifactId>
-                        <version>1.3.0</version>
-                        <executions>
-                            <execution>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>mirror-target-to-repo</goal>
-                                </goals>
-                                <configuration>
-                                    <executionEnvironment>JavaSE-1.8</executionEnvironment>
-<!--                                     <includeSources>true</includeSources>  -->
-                                    <outputRepository>/home/romain/target-platform-4.10-mirror</outputRepository>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <configuration>
-                            <sourceTargetFile>original_platform.target</sourceTargetFile>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho.extras</groupId>
+				<artifactId>target-platform-validation-plugin</artifactId>
+				<version>${tychoExtrasVersion}</version>
+				<executions>
+					<execution>
+						<phase>verify</phase>
+						<goals>
+							<goal>validate-target-platform</goal>
+						</goals>
+						<configuration>
+							<targetFiles>
+								<param>platform.target</param>
+							</targetFiles>
+							<failOnError>true</failOnError>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
 
-        </profile>
-    </profiles>
+	<profiles>
+		<profile>
+			<id>mirror-tp</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.jboss.tools.tycho-plugins</groupId>
+						<artifactId>target-platform-utils</artifactId>
+						<version>1.3.0</version>
+						<executions>
+							<execution>
+								<phase>package</phase>
+								<goals>
+									<goal>mirror-target-to-repo</goal>
+								</goals>
+								<configuration>
+									<executionEnvironment>JavaSE-1.8</executionEnvironment>
+									<!-- <includeSources>true</includeSources> -->
+									<outputRepository>/home/romain/target-platform-4.10-mirror</outputRepository>
+								</configuration>
+							</execution>
+						</executions>
+						<configuration>
+							<sourceTargetFile>original_platform.target</sourceTargetFile>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+
+		</profile>
+	</profiles>
 
 
 </project>
diff --git a/pom.xml b/pom.xml
index 7a38e67599..50d073f66e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
 		<platform.version>${project.parent.version}</platform.version>
 		<watchdog.version>7.2.0</watchdog.version>
 		<image-overlay-plugin.version>1.0.8</image-overlay-plugin.version>
-		<p2MirrorUrl>http://repositories.rd.lan/p2/4.10.1</p2MirrorUrl>
+		<p2MirrorUrl>http://update-site.bonitasoft.com/p2/4.10</p2MirrorUrl>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<sonar.exclusions>
 			**/org/w3/**/*,
-- 
GitLab