Update p2 profile

Ensure that the plain p2 repository is also build without using the p2-release profile.
The p2-release profile is now only used to create the composite updatesite that is used for nightly versions.

Author: tortmayr

pom.xml

@@ -239,6 +239,16 @@
 							<artifactId>tycho-versions-plugin</artifactId>
 							<version>${tycho.version}</version>
 						</plugin>
+						<plugin>
+							<groupId>org.eclipse.tycho</groupId>
+							<artifactId>tycho-p2-repository-plugin</artifactId>
+							<version>${tycho.version}</version>
+						</plugin>
+						<plugin>
+							<groupId>org.eclipse.tycho</groupId>
+							<artifactId>tycho-p2-plugin</artifactId>
+							<version>${tycho.version}</version>
+						</plugin>
 					</plugins>
 				</pluginManagement>
 				<plugins>
@@ -261,23 +271,9 @@
 							<showWarnings>true</showWarnings>
 						</configuration>
 					</plugin>
-					<plugin>
-						<!-- enable source bundle generation -->
-						<groupId>org.eclipse.tycho</groupId>
-						<artifactId>tycho-source-plugin</artifactId>
-						<executions>
-							<execution>
-								<id>plugin-source</id>
-								<goals>
-									<goal>plugin-source</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
 					<plugin>
 						<groupId>org.eclipse.tycho</groupId>
 						<artifactId>tycho-versions-plugin</artifactId>
-						<version>${tycho.version}</version>
 					</plugin>
 					<plugin>
 						<groupId>org.eclipse.tycho</groupId>
@@ -312,38 +308,16 @@
 							</target>
 						</configuration>
 					</plugin>
-				</plugins>
-			</build>
-		</profile>
-
-		<!-- P2-Release Profile: Used to build and Eclipse update site. Should 
-			only be used in conjunction with the P2 Profile -->
-		<profile>
-			<id>p2-release</id>
-			<activation>
-				<activeByDefault>false</activeByDefault>
-			</activation>
-
-			<build>
-				<pluginManagement>
-					<plugins>
-						<plugin>
-							<groupId>org.eclipse.tycho</groupId>
-							<artifactId>tycho-p2-repository-plugin</artifactId>
-							<version>${tycho.version}</version>
-						</plugin>
-						<plugin>
-							<groupId>org.eclipse.tycho</groupId>
-							<artifactId>tycho-p2-plugin</artifactId>
-							<version>${tycho.version}</version>
-						</plugin>
-					</plugins>
-				</pluginManagement>
-				<plugins>
 					<plugin>
 						<groupId>org.eclipse.tycho</groupId>
 						<artifactId>tycho-source-plugin</artifactId>
 						<executions>
+							<execution>
+								<id>plugin-source</id>
+								<goals>
+									<goal>plugin-source</goal>
+								</goals>
+							</execution>
 							<execution>
 								<id>feature-source</id>
 								<phase>package</phase>
@@ -384,6 +358,7 @@
 			</build>
 		</profile>
 
+
 		<!-- M2 Profile: Runs a standard maven build that produces jar artifacts -->
 		<profile>
 			<id>m2</id>
@@ -566,8 +541,9 @@
 			</build>
 		</profile>
 
-	<!--In certain corner cases we only want to use the core modules/plugins e.g. when deploying to maven central.
-        This profile is active by default and can be deactivated by passing the -DpluginsOnly-->		
+		<!--In certain corner cases we only want to use the core modules/plugins 
+			e.g. when deploying to maven central. This profile is active by default and 
+			can be deactivated by passing the -DpluginsOnly -->
 		<profile>
 			<id>non-plugin-modules</id>
 			<activation>

releng/org.eclipse.emfcloud.modelserver.releng.p2/pom.xml

@@ -28,6 +28,7 @@
             <rsync.remote.dir>${remote.p2.root}/${repository.path}</rsync.remote.dir>
             <!-- pass "-n" to perform a trial run with no changes made -->
             <dryrun></dryrun>
+            <p2.site.label>Eclipse EMF.Cloud Model Server Nightly Updatesite</p2.site.label>
          </properties>
 
          <build>
@@ -73,7 +74,7 @@
                   <configuration>
                      <executionEnvironment>JavaSE-11</executionEnvironment>
                      <!-- IMPORTANT: DO NOT split the arg line -->
-                     <appArgLine>-application org.eclipse.ant.core.antRunner -buildfile packaging-p2composite.ant p2.composite.add -Dsite.label="Eclipse EMF.Cloud Model Server Nightly Updatesite" -Dproject.build.directory=${project.build.directory} -DunqualifiedVersion=${unqualifiedVersion} -DbuildQualifier=${buildQualifier} -Dsoftware.download.area=${rsync.local.dir}</appArgLine>
+                     <appArgLine>-application org.eclipse.ant.core.antRunner -buildfile packaging-p2composite.ant p2.composite.add -Dsite.label=${p2.site.label} -Dproject.build.directory=${project.build.directory} -DunqualifiedVersion=${unqualifiedVersion} -DbuildQualifier=${buildQualifier} -Dsoftware.download.area=${rsync.local.dir}</appArgLine>
                      <repositories>
                         <repository>
                            <id>2020-09</id>

releng/pom.xml

@@ -17,7 +17,7 @@
 
    <profiles>
       <profile>
-         <id>p2-release</id>
+         <id>p2</id>
          <modules>
             <module>org.eclipse.emfcloud.modelserver.releng.p2</module>
          </modules>