Merge pull request #796 from b2ihealthcare/improvement/use-mvn-uri-target-definition

Use mvn:uri for b2i hosted p2 dependencies

Author: apeteri

README.md

@@ -105,6 +105,9 @@ Required Eclipse plug-ins (install the listed features via `Help` -> `Install Ne
   * MWE 2 language SDK 2.11.3 (MWE)
 * Groovy Development Tools (https://dist.springsource.org/release/GRECLIPSE/3.9.0/e4.17)
   * Eclipse Groovy Development Tools 3.9.0 (Main Package)
+* M2Eclipse (https://download.eclipse.org/technology/m2e/releases/latest/)
+  * m2e 1.17.2
+  * m2e PDE 1.17.2
 
 ### Eclipse Preferences
 
@@ -118,6 +121,10 @@ Make sure you have the following preferences enabled/disabled.
 
 * Make sure the Git line endings are set to *input* (Preferences->Team->Git->Configuration - add key if missing *core.autocrlf = input*)
 
+### Maven Settings
+
+* Make sure the `settings.xml` in your ~/.m2/settings.xml location is updated with the content from the `settings.xml` from this repository's root folder.
+
 ## First steps
 
 1. Import all projects into your Eclipse workspace and wait for the build to complete

pom.xml

@@ -39,13 +39,6 @@
 		<failsafe.version>2.3.1</failsafe.version>
 		<osgi.versionRange>[3.16.0,3.17.0]</osgi.versionRange>
 
-		<!-- p2 repositories -->
-		<snomed.ecl.version>1.4.1</snomed.ecl.version>
-		<snomed.ecl.site>mvn:com.b2international:com.b2international.snomed.ecl.update:${snomed.ecl.version}:zip</snomed.ecl.site>
-		
-		<snomed.ql.version>0.1.1</snomed.ql.version>
-		<snomed.ql.site>mvn:com.b2international:com.b2international.snomed.ql.update:${snomed.ql.version}:zip</snomed.ql.site>
-		
 		<!-- Build tool/compiler versions -->
 		<tycho.version>2.2.0</tycho.version>
 		<tycho-extras.version>2.2.0</tycho-extras.version>
@@ -130,16 +123,6 @@
 				<enabled>true</enabled>
 			</snapshots>
 		</repository>
-		<repository>
-			<id>snomed-ecl</id>
-			<url>${snomed.ecl.site}</url>
-			<layout>p2</layout>
-		</repository>
-		<repository>
-			<id>snomed-ql</id>
-			<url>${snomed.ql.site}</url>
-			<layout>p2</layout>
-		</repository>
 	</repositories>
 
 	<dependencies>

releng/target-platform/target-platform.target

@@ -60,5 +60,15 @@
 		<unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.11.3.v20200520-0756"/>
 		<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.11.3/"/>
 	</location>
+	<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+		<repository location="mvn:com.b2international:com.b2international.snomed.ecl.update:1.4.1:zip"/>
+		<unit id="com.b2international.snomed.ecl.feature.feature.group" version="1.4.1"/>
+		<unit id="com.b2international.snomed.ecl.ui.feature.feature.group" version="1.4.1"/>
+	</location>
+	<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+		<repository location="mvn:com.b2international:com.b2international.snomed.ql.update:0.1.1:zip"/>
+		<unit id="com.b2international.snomed.ql.feature.feature.group" version="0.1.1"/>
+		<unit id="com.b2international.snomed.ql.ui.feature.feature.group" version="0.1.1"/>
+	</location>
 </locations>
 </target>

settings.xml

@@ -4,16 +4,32 @@
                       http://maven.apache.org/xsd/settings-1.0.0.xsd">
 	<profiles>
 		<profile>
-			<id>repositories</id>
 			<activation>
 				<activeByDefault>true</activeByDefault>
 			</activation>
-			<properties>
-				<!-- Nexus instance URL, example: http://example:8081/nexus -->
-				<nexus.url>url/to/local/nexus/instance</nexus.url>
-				<nexus.snapshots.url>${nexus.url}/content/repositories/snapshots</nexus.snapshots.url>
-				<nexus.releases.url>${nexus.url}/content/repositories/releases</nexus.releases.url>
-			</properties>
+			<repositories>
+				<repository>
+					<id>b2i-releases</id>
+					<url>https://nexus.b2i.sg/repository/maven-releases</url>
+					<releases>
+						<enabled>true</enabled>
+					</releases>
+					<snapshots>
+						<enabled>false</enabled>
+					</snapshots>
+				</repository>
+				<repository>
+					<id>b2i-snapshots</id>
+					<url>https://nexus.b2i.sg/repository/maven-snapshots</url>
+					<releases>
+						<enabled>false</enabled>
+					</releases>
+					<snapshots>
+						<enabled>true</enabled>
+						<updatePolicy>always</updatePolicy>
+					</snapshots>
+				</repository>
+			</repositories>
 		</profile>
 	</profiles>
 	<servers>