--- old/core/org.openjdk.jmc.flightrecorder/pom.xml	2018-08-28 04:07:35.000000000 +0530
+++ new/core/org.openjdk.jmc.flightrecorder/pom.xml	2018-08-28 04:07:35.000000000 +0530
@@ -38,34 +38,51 @@
 		<artifactId>missioncontrol.core</artifactId>
 		<version>7.0.0-SNAPSHOT</version>
 	</parent>
-	<artifactId>org.openjdk.jmc.flightrecorder</artifactId>
-	<packaging>eclipse-plugin</packaging>
+
+	<artifactId>flightrecorder</artifactId>
+	<packaging>bundle</packaging>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.openjdk.jmc</groupId>
+			<artifactId>common</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+	</dependencies>
+
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.plugins</groupId>
-				<artifactId>nexus-staging-maven-plugin</artifactId>
-				<version>1.6.8</version>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				
 				<extensions>true</extensions>
 				<configuration>
-					<serverId>jmc-publish-snapshot</serverId>
-					<autoReleaseAfterClose>true</autoReleaseAfterClose>
+					<instructions>
+						<Manifest-Version>1.0</Manifest-Version>
+						<Bundle-RequiredExecutionEnvironment> JavaSE-1.7</Bundle-RequiredExecutionEnvironment>
+						<Bundle-Name>JMC Flight Recorder Model Plug-in</Bundle-Name>
+						<Bundle-SymbolicName>${project.groupId}.${project.artifactId};singleton:=true</Bundle-SymbolicName>
+						<Bundle-Version>${project.version}</Bundle-Version>
+						<Bundle-Vendor>Oracle Corporation</Bundle-Vendor>
+
+						<Export-Package>
+							org.openjdk.jmc.flightrecorder,
+							org.openjdk.jmc.flightrecorder.internal;x-friends:="org.openjdk.jmc.flightrecorder.ui,org.openjdk.jmc.flightrecorder.configuration",
+							org.openjdk.jmc.flightrecorder.internal.util;x-friends:="org.openjdk.jmc.flightrecorder.test",
+							org.openjdk.jmc.flightrecorder.jdk,
+							org.openjdk.jmc.flightrecorder.memleak,
+							org.openjdk.jmc.flightrecorder.parser,
+							org.openjdk.jmc.flightrecorder.parser.filter,
+							org.openjdk.jmc.flightrecorder.stacktrace
+						</Export-Package>
+						<Require-Bundle>org.openjdk.jmc.common;visibility:=reexport</Require-Bundle>
+						<Eclipse-BuddyPolicy>app</Eclipse-BuddyPolicy>
+						<Eclipse-ExtensibleAPI>true</Eclipse-ExtensibleAPI>
+						<Automatic-Module-Name>org.openjdk.jmc.flightrecorder</Automatic-Module-Name>
+					</instructions>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-gpg-plugin</artifactId>
-				<version>1.6</version>
-				<executions>
-					<execution>
-					<id>gpg-sign</id>
-					<phase>deploy</phase>
-					<goals>
-						<goal>sign</goal>
-					</goals>
-					</execution>
-				</executions>
-			</plugin>
 		</plugins>
 	</build>
 </project>