Removing maven warnings to work with maven 3.*

georgeyanev · Feb 17, 2016 · 8d51a73 · 8d51a73
1 parent 712a073
commit 8d51a73
Show file tree

Hide file tree

Showing 94 changed files with 240 additions and 163 deletions.
diff --git a/cap/cap-api/pom.xml b/cap/cap-api/pom.xml
@@ -9,7 +9,7 @@
 
 	<artifactId>cap-api</artifactId>
 
-	<name>Restcomm jSS7 :: CAP :: Api :: ${pom.artifactId}</name>
+	<name>Restcomm jSS7 :: CAP :: Api :: ${project.artifactId}</name>
 
 	<properties>
 		<maven.test.skip>false</maven.test.skip>
@@ -51,6 +51,6 @@
 	</dependencies>
 
 	<build>
-		<finalName>${pom.artifactId}-${project.version}</finalName>
+		<finalName>${project.artifactId}-${project.version}</finalName>
 	</build>
 </project>
diff --git a/cap/cap-impl/pom.xml b/cap/cap-impl/pom.xml
@@ -9,7 +9,7 @@
 
 	<artifactId>cap-impl</artifactId>
 
-	<name>Restcomm jSS7 :: CAP :: Impl :: ${pom.artifactId}</name>
+	<name>Restcomm jSS7 :: CAP :: Impl :: ${project.artifactId}</name>
 	<dependencyManagement>
 		<dependencies>
 		</dependencies>
@@ -45,7 +45,7 @@
 			<artifactId>tcap-api</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>${pom.groupId}</groupId>
+			<groupId>${project.groupId}</groupId>
 			<artifactId>cap-api</artifactId>
 			<version>${project.version}</version>
 		</dependency>
@@ -78,11 +78,14 @@
 	</dependencies>
 
 	<build>
-		<finalName>${pom.artifactId}-${project.version}</finalName>
+		<finalName>${project.artifactId}-${project.version}</finalName>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
+				<version>
+					${maven-surefire-plugin.version}
+				</version>
 
 				<configuration>
 					<suiteXmlFiles>

diff --git a/cap/pom.xml b/cap/pom.xml
@@ -14,7 +14,7 @@
 
 	<packaging>pom</packaging>
 
-	<name>Restcomm jSS7 :: CAP :: Parent :: ${pom.artifactId}</name>
+	<name>Restcomm jSS7 :: CAP :: Parent :: ${project.artifactId}</name>
 	<properties />
 
 	<modules>

diff --git a/cap/release/pom.xml b/cap/release/pom.xml
@@ -11,7 +11,7 @@
 
 
 	<artifactId>cap-release</artifactId>
-	<name>Restcomm jSS7 :: CAP :: Release :: ${pom.artifactId}</name>
+	<name>Restcomm jSS7 :: CAP :: Release :: ${project.artifactId}</name>
 	<profiles>
 		<profile>
 			<id>release</id>

diff --git a/congestion/pom.xml b/congestion/pom.xml
@@ -11,7 +11,7 @@
 
 	<groupId>org.mobicents.protocols.ss7.congestion</groupId>
 	<artifactId>congestion</artifactId>
-	<name>Restcomm jSS7 :: Congestion :: ${pom.artifactId}</name>
+	<name>Restcomm jSS7 :: Congestion :: ${project.artifactId}</name>
 
 	<dependencies>
 		<dependency>

diff --git a/docs/commons/pom.xml b/docs/commons/pom.xml
@@ -11,7 +11,7 @@
 
 	<artifactId>restcomm-ss7-commons-sources</artifactId>
 	<groupId>org.mobicents.protocols.ss7.docs.commons</groupId>
-	<name>Restcomm jSS7 :: Docs :: Commons :: Sources :: ${pom.artifactId}</name>
+	<name>Restcomm jSS7 :: Docs :: Commons :: Sources :: ${project.artifactId}</name>
 	<properties>
 
 	</properties>

diff --git a/docs/installationguide/jdocbook-restcomm/pom.xml b/docs/installationguide/jdocbook-restcomm/pom.xml
@@ -8,7 +8,7 @@
 	</parent>
 
 	<artifactId>restcomm-ss7-installguide-jdocbook-restcomm</artifactId>
-	<name>Restcomm jSS7 :: Docs :: Install Guide :: Sources :: ${pom.artifactId}</name>
+	<name>Restcomm jSS7 :: Docs :: Install Guide :: Sources :: ${project.artifactId}</name>
 	<modelVersion>4.0.0</modelVersion>
 
 	<packaging>jdocbook</packaging>
@@ -58,7 +58,7 @@
 						<configuration>
 							<artifactItems>
 								<artifactItem>
-									<groupId>${pom.groupId}</groupId>
+									<groupId>${project.groupId}</groupId>
 									<artifactId>restcomm-ss7-installguide-sources-restcomm</artifactId>
 									<version>${project.version}</version>
 									<type>jar</type>

diff --git a/docs/installationguide/pom.xml b/docs/installationguide/pom.xml
@@ -11,7 +11,7 @@
 
 	<artifactId>restcomm-ss7-installguide</artifactId>
 	<groupId>org.mobicents.protocols.ss7.docs.installguide</groupId>
-	<name>Restcomm jSS7 :: Docs :: Install Guide :: ${pom.artifactId}</name>
+	<name>Restcomm jSS7 :: Docs :: Install Guide :: ${project.artifactId}</name>
 	<packaging>pom</packaging>
 
 	<properties>

diff --git a/docs/installationguide/sources-restcomm/pom.xml b/docs/installationguide/sources-restcomm/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>restcomm-ss7-installguide-sources-restcomm</artifactId>
-	<name>Restcomm jSS7 :: Docs :: Install Guide :: Sources :: ${pom.artifactId}</name>
+	<name>Restcomm jSS7 :: Docs :: Install Guide :: Sources :: ${project.artifactId}</name>
 	<properties>
 		<THIS.PLATFORM>Restcomm</THIS.PLATFORM>
 		<JEE.PLATFORM>JBoss Application Server</JEE.PLATFORM>
@@ -46,7 +46,7 @@
 						<configuration>
 							<artifactItems>
 								<artifactItem>
-									<groupId>${pom.groupId}</groupId>
+									<groupId>${project.groupId}</groupId>
 									<artifactId>restcomm-ss7-installguide-sources</artifactId>
 									<version>${project.version}</version>
 									<type>jar</type>

diff --git a/docs/installationguide/sources/pom.xml b/docs/installationguide/sources/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>restcomm-ss7-installguide-sources</artifactId>
-	<name>Restcomm jSS7 :: Docs :: Install Guide :: Sources :: ${pom.artifactId}</name>
+	<name>Restcomm jSS7 :: Docs :: Install Guide :: Sources :: ${project.artifactId}</name>
 	<properties>
 
 	</properties>

diff --git a/docs/pom.xml b/docs/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>org.mobicents.protocols.ss7.docs</groupId>
 	<artifactId>restcomm-ss7-docs</artifactId>
 
-	<name>Restcomm jSS7 :: Docs :: Parent :: ${pom.artifactId}</name>
+	<name>Restcomm jSS7 :: Docs :: Parent :: ${project.artifactId}</name>
 	<packaging>pom</packaging>
 
 	<properties>

diff --git a/docs/releasenotes/jdocbook-restcomm/pom.xml b/docs/releasenotes/jdocbook-restcomm/pom.xml
@@ -8,7 +8,7 @@
 	</parent>
 
 	<artifactId>restcomm-ss7-releasenotes-jdocbook-restcomm</artifactId>
-	<name>Restcomm jSS7 :: Docs :: Release Notes :: Sources :: ${pom.artifactId}</name>
+	<name>Restcomm jSS7 :: Docs :: Release Notes :: Sources :: ${project.artifactId}</name>
 	<modelVersion>4.0.0</modelVersion>
 
 	<packaging>jdocbook</packaging>
@@ -58,7 +58,7 @@
 						<configuration>
 							<artifactItems>
 								<artifactItem>
-									<groupId>${pom.groupId}</groupId>
+									<groupId>${project.groupId}</groupId>
 									<artifactId>restcomm-ss7-releasenotes-sources-restcomm</artifactId>
 									<version>${project.version}</version>
 									<type>jar</type>

diff --git a/docs/releasenotes/pom.xml b/docs/releasenotes/pom.xml
@@ -11,7 +11,7 @@
 
 	<artifactId>restcomm-ss7-releasenotes</artifactId>
 	<groupId>org.mobicents.protocols.ss7.docs.releasenotes</groupId>
-	<name>Restcomm jSS7 :: Docs :: Release Notes :: ${pom.artifactId}</name>
+	<name>Restcomm jSS7 :: Docs :: Release Notes :: ${project.artifactId}</name>
 	<packaging>pom</packaging>
 
 	<properties>

diff --git a/docs/releasenotes/sources-restcomm/pom.xml b/docs/releasenotes/sources-restcomm/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>restcomm-ss7-releasenotes-sources-restcomm</artifactId>
-	<name>Restcomm jSS7 :: Docs :: Release Notes :: Sources :: ${pom.artifactId}</name>
+	<name>Restcomm jSS7 :: Docs :: Release Notes :: Sources :: ${project.artifactId}</name>
 	<properties>
 		<THIS.PLATFORM>Restcomm</THIS.PLATFORM>
 		<JEE.PLATFORM>JBoss Application Server</JEE.PLATFORM>
@@ -46,7 +46,7 @@
 						<configuration>
 							<artifactItems>
 								<artifactItem>
-									<groupId>${pom.groupId}</groupId>
+									<groupId>${project.groupId}</groupId>
 									<artifactId>restcomm-ss7-releasenotes-sources</artifactId>
 									<version>${project.version}</version>
 									<type>jar</type>

diff --git a/docs/releasenotes/sources/pom.xml b/docs/releasenotes/sources/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>restcomm-ss7-releasenotes-sources</artifactId>
-	<name>Restcomm jSS7 :: Docs :: Release Notes :: Sources :: ${pom.artifactId}</name>
+	<name>Restcomm jSS7 :: Docs :: Release Notes :: Sources :: ${project.artifactId}</name>
 	<properties>
 
 	</properties>

diff --git a/docs/userguide/jdocbook-restcomm/pom.xml b/docs/userguide/jdocbook-restcomm/pom.xml
@@ -8,7 +8,7 @@
 	</parent>
 
 	<artifactId>restcomm-ss7-userguide-jdocbook-restcomm</artifactId>
-	<name>Restcomm jSS7 :: Docs :: User Guide :: Sources :: ${pom.artifactId}</name>
+	<name>Restcomm jSS7 :: Docs :: User Guide :: Sources :: ${project.artifactId}</name>
 	<modelVersion>4.0.0</modelVersion>
 
 	<packaging>jdocbook</packaging>
@@ -58,7 +58,7 @@
 						<configuration>
 							<artifactItems>
 								<artifactItem>
-									<groupId>${pom.groupId}</groupId>
+									<groupId>${project.groupId}</groupId>
 									<artifactId>restcomm-ss7-userguide-sources-restcomm</artifactId>
 									<version>${project.version}</version>
 									<type>jar</type>

diff --git a/docs/userguide/pom.xml b/docs/userguide/pom.xml
@@ -11,7 +11,7 @@
 
 	<artifactId>restcomm-ss7-userguide</artifactId>
 	<groupId>org.mobicents.protocols.ss7.docs.userguide</groupId>
-	<name>Restcomm jSS7 :: Docs :: User Guide :: ${pom.artifactId}</name>
+	<name>Restcomm jSS7 :: Docs :: User Guide :: ${project.artifactId}</name>
 	<packaging>pom</packaging>
 
 	<properties>

diff --git a/docs/userguide/sources-restcomm/pom.xml b/docs/userguide/sources-restcomm/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>restcomm-ss7-userguide-sources-restcomm</artifactId>
-	<name>Restcomm jSS7 :: Docs :: User Guide :: Sources :: ${pom.artifactId}</name>
+	<name>Restcomm jSS7 :: Docs :: User Guide :: Sources :: ${project.artifactId}</name>
 	<properties>
 		<THIS.PLATFORM>Restcomm</THIS.PLATFORM>
 		<JEE.PLATFORM>JBoss Application Server</JEE.PLATFORM>
@@ -46,7 +46,7 @@
 						<configuration>
 							<artifactItems>
 								<artifactItem>
-									<groupId>${pom.groupId}</groupId>
+									<groupId>${project.groupId}</groupId>
 									<artifactId>restcomm-ss7-userguide-sources</artifactId>
 									<version>${project.version}</version>
 									<type>jar</type>

diff --git a/docs/userguide/sources/pom.xml b/docs/userguide/sources/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>restcomm-ss7-userguide-sources</artifactId>
-	<name>Restcomm jSS7 :: Docs :: User Guide :: Sources :: ${pom.artifactId}</name>
+	<name>Restcomm jSS7 :: Docs :: User Guide :: Sources :: ${project.artifactId}</name>
 	<properties>
 
 	</properties>

diff --git a/hardware/cli/pom.xml b/hardware/cli/pom.xml
@@ -8,7 +8,7 @@
 	</parent>
 
 	<artifactId>linkset-cli</artifactId>
-	<name>Restcomm jSS7 :: Hardware :: ${pom.artifactId}</name>
+	<name>Restcomm jSS7 :: Hardware :: ${project.artifactId}</name>
 
 	<dependencies>
 		<!-- <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> 
@@ -27,7 +27,7 @@
 	</dependencies>
 
 	<build>
-		<finalName>${pom.artifactId}</finalName>
+		<finalName>${project.artifactId}</finalName>
 		<resources>
 			<resource>
 				<directory>src/main/resources/archive-files</directory>
@@ -56,7 +56,7 @@
 								</goals>
 								<configuration>
 									<tasks>
-										<copy todir="${jboss.home}/lib" file="${project.build.directory}/${build.finalName}.jar" />
+										<copy todir="${jboss.home}/lib" file="${project.build.directory}/${project.build.finalName}.jar" />
 									</tasks>
 								</configuration>
 							</execution>
@@ -68,7 +68,7 @@
 								</goals>
 								<configuration>
 									<tasks>
-										<delete failonerror="fals" file="${jboss.home}/lib/${build.finalName}.jar" />
+										<delete failonerror="fals" file="${jboss.home}/lib/${project.build.finalName}.jar" />
 									</tasks>
 								</configuration>
 							</execution>

diff --git a/hardware/dahdi/java/pom.xml b/hardware/dahdi/java/pom.xml
@@ -12,7 +12,7 @@
 	<artifactId>restcomm-dahdi</artifactId>
 
 	<name>
-		Restcomm jSS7 :: Hardware :: ${pom.artifactId}
+		Restcomm jSS7 :: Hardware :: ${project.artifactId}
 	</name>
 
 	<dependencies>
@@ -46,7 +46,9 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>2.4.2</version>
+				<version>
+					${maven-surefire-plugin.version}
+				</version>
 				<configuration>
 					<forkMode>pertest</forkMode>
 					<!-- So we dont have to juse xxxTest.java.bak "_" -->

diff --git a/hardware/dahdi/native/linux/pom.xml b/hardware/dahdi/native/linux/pom.xml
@@ -10,7 +10,7 @@
 	<artifactId>librestcomm-dahdi-linux</artifactId>
 
 	<name>
-		Restcomm jSS7 :: Hardware :: ${pom.artifactId}
+		Restcomm jSS7 :: Hardware :: ${project.artifactId}
 	</name>
 
 	<properties>
@@ -113,6 +113,9 @@
 
 			<plugin>
 				<artifactId>maven-surefire-plugin</artifactId>
+				<version>
+					${maven-surefire-plugin.version}
+				</version>
 				<configuration>
 					<forkMode>once</forkMode>
 					<environmentVariables>

diff --git a/hardware/dahdi/native/pom.xml b/hardware/dahdi/native/pom.xml
@@ -11,7 +11,7 @@
 
 	<packaging>pom</packaging>
 
-	<name>Restcomm jSS7 :: Hardware :: ${pom.artifactId}</name>
+	<name>Restcomm jSS7 :: Hardware :: ${project.artifactId}</name>
 
 	<dependencies>
 		<dependency>

diff --git a/hardware/dahdi/pom.xml b/hardware/dahdi/pom.xml
@@ -12,7 +12,7 @@
 	<packaging>pom</packaging>
 
 	<name>
-		Restcomm jSS7 :: Hardware :: ${pom.artifactId}
+		Restcomm jSS7 :: Hardware :: ${project.artifactId}
 	</name>
 
 	<modules>

diff --git a/hardware/dialogic/java/pom.xml b/hardware/dialogic/java/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>restcomm-dialogic</artifactId>
-	<name>Restcomm jSS7 :: Hardware :: ${pom.artifactId}</name>
+	<name>Restcomm jSS7 :: Hardware :: ${project.artifactId}</name>
 
 	<dependencies>
 		<dependency>
@@ -47,7 +47,9 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>2.4.2</version>
+				<version>
+					${maven-surefire-plugin.version}
+				</version>
 				<configuration>
 					<forkMode>pertest</forkMode>
 					<!-- So we dont have to juse xxxTest.java.bak "_" -->

diff --git a/hardware/dialogic/pom.xml b/hardware/dialogic/pom.xml
@@ -12,7 +12,7 @@
 	<packaging>pom</packaging>
 
 	<name>
-		Restcomm jSS7 :: Hardware :: ${pom.artifactId}
+		Restcomm jSS7 :: Hardware :: ${project.artifactId}
 	</name>
 
 	<modules>

diff --git a/hardware/linkset/pom.xml b/hardware/linkset/pom.xml
@@ -8,7 +8,7 @@
 	</parent>
 
 	<artifactId>linkset</artifactId>
-	<name>Restcomm jSS7 :: Hardware :: ${pom.artifactId}</name>
+	<name>Restcomm jSS7 :: Hardware :: ${project.artifactId}</name>
 
 	<dependencies>
 		<!-- shell -->