Refactor bloated project structure

Author: devopvoid

pom.xml

@@ -60,10 +60,9 @@
 	</properties>
 
 	<modules>
-		<module>webrtc</module>
 		<module>webrtc-jni</module>
+		<module>webrtc</module>
 		<module>webrtc-demo</module>
-		<module>webrtc-native</module>
 	</modules>
 
 	<build>
@@ -92,6 +91,12 @@
 							<goals>
 								<goal>sign</goal>
 							</goals>
+							<configuration>
+								<gpgArguments>
+									<arg>--pinentry-mode</arg>
+									<arg>loopback</arg>
+								</gpgArguments>
+							</configuration>
 						</execution>
 					</executions>
 				</plugin>
@@ -172,15 +177,9 @@
 					<version>3.0.0-M4</version>
 				</plugin>
 				<plugin>
-					<groupId>org.sonatype.plugins</groupId>
-					<artifactId>nexus-staging-maven-plugin</artifactId>
-					<version>1.6.8</version>
-					<extensions>true</extensions>
-					<configuration>
-						<serverId>ossrh</serverId>
-						<nexusUrl>https://oss.sonatype.org/</nexusUrl>
-						<autoReleaseAfterClose>false</autoReleaseAfterClose>
-					</configuration>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-deploy-plugin</artifactId>
+					<version>3.0.0-M1</version>
 				</plugin>
 				<plugin>
 					<groupId>org.codehaus.mojo</groupId>
@@ -221,6 +220,45 @@
 				</plugins>
 			</build>
 		</profile>
+		<profile>
+			<id>windows-x86_64</id>
+			<activation>
+				<os>
+					<family>windows</family>
+					<arch>amd64</arch>
+				</os>
+			</activation>
+			<properties>
+				<platform.classifier>windows-x86_64</platform.classifier>
+				<platform.module>windows.x86_64</platform.module>
+			</properties>
+		</profile>
+		<profile>
+			<id>linux-x86_64</id>
+			<activation>
+				<os>
+					<family>linux</family>
+					<arch>amd64</arch>
+				</os>
+			</activation>
+			<properties>
+				<platform.classifier>linux-x86_64</platform.classifier>
+				<platform.module>linux.x86_64</platform.module>
+			</properties>
+		</profile>
+		<profile>
+			<id>mac-x86_64</id>
+			<activation>
+				<os>
+					<family>mac</family>
+					<arch>x86_64</arch>
+				</os>
+			</activation>
+			<properties>
+				<platform.classifier>macos-x86_64</platform.classifier>
+				<platform.module>macos.x86_64</platform.module>
+			</properties>
+		</profile>
 	</profiles>
 
 	<reporting>
@@ -250,5 +288,4 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
-
 </project>

webrtc-demo/pom.xml

@@ -24,5 +24,4 @@
 			<version>${project.version}</version>
 		</dependency>
 	</dependencies>
-
 </project>

webrtc-jni/pom.xml

@@ -9,28 +9,73 @@
 	</parent>
 
 	<artifactId>webrtc-java-jni</artifactId>
+	<packaging>pom</packaging>
 
 	<properties>
-		<download.cmake>true</download.cmake>
 		<webrtc.branch>branch-heads/3987</webrtc.branch>
 		<webrtc.src>${user.home}/webrtc</webrtc.src>
 	</properties>
 
 	<build>
 		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<executions>
+					<execution>
+						<phase>install</phase>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+						<configuration>
+							<classifier>${platform.classifier}</classifier>
+							<classesDirectory>${project.build.directory}/lib</classesDirectory>
+							<archive>
+								<addMavenDescriptor>false</addMavenDescriptor>
+								<manifestEntries>
+									<Automatic-Module-Name>${platform.module}</Automatic-Module-Name>
+								</manifestEntries>
+							</archive>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-install-plugin</artifactId>
+				<version>2.5.2</version>
+				<executions>
+					<execution>
+						<id>install-classifier</id>
+						<phase>install</phase>
+						<goals>
+							<goal>install-file</goal>
+						</goals>
+						<configuration>
+							<file>${project.build.directory}/${project.artifactId}-${project.version}-${platform.classifier}.jar</file>
+							<classifier>${platform.classifier}</classifier>
+							<groupId>${project.groupId}</groupId>
+							<artifactId>webrtc-java</artifactId>
+							<version>${project.version}</version>
+							<packaging>jar</packaging>
+							<generatePom>false</generatePom>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 			<plugin>
 				<groupId>com.googlecode.cmake-maven-project</groupId>
 				<artifactId>cmake-maven-plugin</artifactId>
 				<version>3.14.5-b1</version>
 				<executions>
 					<execution>
 						<id>cmake-generate</id>
-						<phase>process-resources</phase>
+						<phase>generate-resources</phase>
 						<goals>
 							<goal>generate</goal>
 						</goals>
 						<configuration>
-							<sourcePath>.</sourcePath>
+							<sourcePath>src/main/cpp</sourcePath>
 							<targetPath>${project.build.directory}/${platform}-${build.type}</targetPath>
 							<classifier>${cmake.classifier}</classifier>
 							<options>
@@ -44,15 +89,14 @@
 									-DWEBRTC_SRC_DIR=${webrtc.src}
 								</option>
 								<option>
-									-DCMAKE_INSTALL_PREFIX=${project.parent.basedir}/webrtc-native/${platform}/src/main/resources/lib
+									-DCMAKE_INSTALL_PREFIX=${project.build.directory}/lib
 								</option>
 							</options>
-							<downloadBinaries>${download.cmake}</downloadBinaries>
 						</configuration>
 					</execution>
 					<execution>
 						<id>cmake-compile</id>
-						<phase>process-resources</phase>
+						<phase>generate-resources</phase>
 						<goals>
 							<goal>compile</goal>
 						</goals>

webrtc-jni/CMakeLists.txt renamed to webrtc-jni/src/main/cpp/CMakeLists.txt

@@ -28,58 +28,12 @@
 		</plugins>
 	</build>
 
-	<profiles>
-		<profile>
-			<id>linux-x86_64</id>
-			<activation>
-				<os>
-					<family>unix</family>
-					<name>Linux</name>
-					<arch>amd64</arch>
-				</os>
-			</activation>
-			<dependencies>
-				<dependency>
-					<groupId>dev.onvoid.webrtc</groupId>
-					<artifactId>webrtc-java-linux-x86_64</artifactId>
-					<version>${project.version}</version>
-					<scope>compile</scope>
-				</dependency>
-			</dependencies>
-		</profile>
-		<profile>
-			<id>mac-x86_64</id>
-			<activation>
-				<os>
-					<family>mac</family>
-					<arch>x86_64</arch>
-				</os>
-			</activation>
-			<dependencies>
-				<dependency>
-					<groupId>dev.onvoid.webrtc</groupId>
-					<artifactId>webrtc-java-macos-x86_64</artifactId>
-					<version>${project.version}</version>
-					<scope>compile</scope>
-				</dependency>
-			</dependencies>
-		</profile>
-		<profile>
-			<id>windows-x86_64</id>
-			<activation>
-				<os>
-					<family>windows</family>
-					<arch>amd64</arch>
-				</os>
-			</activation>
-			<dependencies>
-				<dependency>
-					<groupId>dev.onvoid.webrtc</groupId>
-					<artifactId>webrtc-java-windows-x86_64</artifactId>
-					<version>${project.version}</version>
-					<scope>compile</scope>
-				</dependency>
-			</dependencies>
-		</profile>
-	</profiles>
+	<dependencies>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>${project.artifactId}</artifactId>
+			<version>${project.version}</version>
+			<classifier>${platform.classifier}</classifier>
+		</dependency>
+	</dependencies>
 </project>