Fix incorrect property

sarxos · Nov 14, 2012 · c569a10 · c569a10
1 parent b2ef540
commit c569a10
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 26 deletions.
diff --git a/pom.xml b/pom.xml
@@ -17,7 +17,7 @@
 	<name>Webcam Capture Parent POM</name>
 	<description>This is Webcam Capture root POM</description>
 	<inceptionYear>2012</inceptionYear>
-	<url>https://github.com/sarxos/${project.id}</url>
+	<url>https://github.com/sarxos/${project.repoid}</url>
 
 	<modules>
 		<module>webcam-capture</module>
@@ -32,7 +32,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<project.id>webcam-capture</project.id>
+		<project.repoid>webcam-capture</project.repoid>
 	</properties>
 
 	<organization>
@@ -56,19 +56,19 @@
 	</distributionManagement>
 
 	<scm>
-		<connection>scm:git:git@github.com:sarxos/${project.id}.git</connection>
-		<developerConnection>scm:git:git@github.com:sarxos/${project.id}.git</developerConnection>
-		<url>git@github.com:sarxos/${project.id}.git</url>
+		<connection>scm:git:git@github.com:sarxos/${project.repoid}.git</connection>
+		<developerConnection>scm:git:git@github.com:sarxos/${project.repoid}.git</developerConnection>
+		<url>git@github.com:sarxos/${project.repoid}.git</url>
 	</scm>
 
 	<issueManagement>
 		<system>GitHub Issues Manager</system>
-		<url>https://github.com/sarxos/${project.id}/issues</url>
+		<url>https://github.com/sarxos/${project.repoid}/issues</url>
 	</issueManagement>
 
 	<ciManagement>
 		<system>Travis CI</system>
-		<url>http://travis-ci.org/#!/sarxos/${project.id}</url>
+		<url>http://travis-ci.org/#!/sarxos/${project.repoid}</url>
 	</ciManagement>
 
 	<developers>
@@ -106,9 +106,6 @@
 		</profile>
 		<profile>
 			<id>snapshot</id>
-			<activation>
-				<activeByDefault>true</activeByDefault>
-			</activation>
 			<properties>
 				<repo-id>sonatype-nexus-staging</repo-id>
 				<repo-url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</repo-url>
@@ -117,6 +114,7 @@
 		<profile>
 			<id>release</id>
 			<activation>
+				<activeByDefault>false</activeByDefault>
 				<property>
 					<name>performRelease</name>
 					<value>true</value>

diff --git a/webcam-capture-driver-ipcam/pom.xml b/webcam-capture-driver-ipcam/pom.xml
@@ -22,25 +22,25 @@
 	<licenses>
 		<license>
 			<name>MIT License</name>
-			<url>http://webcam-capture.sarxos.pl/LICENSE.txt</url>
+			<url>http://${project.repoid}.sarxos.pl/LICENSE.txt</url>
 			<distribution>repo,manual</distribution>
 		</license>
 	</licenses>
 
 	<scm>
-		<connection>scm:git:git@github.com:sarxos/webcam-capture.git</connection>
-		<developerConnection>scm:git:git@github.com:sarxos/webcam-capture.git</developerConnection>
-		<url>git@github.com:sarxos/webcam-capture.git</url>
+		<connection>scm:git:git@github.com:sarxos/${project.repoid}.git</connection>
+		<developerConnection>scm:git:git@github.com:sarxos/${project.repoid}.git</developerConnection>
+		<url>git@github.com:sarxos/${project.repoid}.git</url>
 	</scm>
 
 	<issueManagement>
 		<system>GitHub Issues Manager</system>
-		<url>https://github.com/sarxos/webcam-capture/issues</url>
+		<url>https://github.com/sarxos/${project.repoid}/issues</url>
 	</issueManagement>
 
 	<ciManagement>
 		<system>Travis CI</system>
-		<url>http://travis-ci.org/#!/sarxos/webcam-capture</url>
+		<url>http://travis-ci.org/#!/sarxos/${project.repoid}</url>
 	</ciManagement>
 
 	<developers>

diff --git a/webcam-capture-driver-jmf/pom.xml b/webcam-capture-driver-jmf/pom.xml
@@ -28,19 +28,19 @@
 	</licenses>
 
 	<scm>
-		<connection>scm:git:git@github.com:sarxos/${project.id}.git</connection>
-		<developerConnection>scm:git:git@github.com:sarxos/${project.id}.git</developerConnection>
-		<url>git@github.com:sarxos/${project.id}.git</url>
+		<connection>scm:git:git@github.com:sarxos/${project.repoid}.git</connection>
+		<developerConnection>scm:git:git@github.com:sarxos/${project.repoid}.git</developerConnection>
+		<url>git@github.com:sarxos/${project.repoid}.git</url>
 	</scm>
 
 	<issueManagement>
 		<system>GitHub Issues Manager</system>
-		<url>https://github.com/sarxos/${project.id}/issues</url>
+		<url>https://github.com/sarxos/${project.repoid}/issues</url>
 	</issueManagement>
 
 	<ciManagement>
 		<system>Travis CI</system>
-		<url>http://travis-ci.org/#!/sarxos/${project.id}</url>
+		<url>http://travis-ci.org/#!/sarxos/${project.repoid}</url>
 	</ciManagement>
 
 	<developers>

diff --git a/webcam-capture/pom.xml b/webcam-capture/pom.xml
@@ -36,19 +36,19 @@
 	</distributionManagement>
 
 	<scm>
-		<connection>scm:git:git@github.com:sarxos/${project.id}.git</connection>
-		<developerConnection>scm:git:git@github.com:sarxos/${project.id}.git</developerConnection>
-		<url>git@github.com:sarxos/${project.id}.git</url>
+		<connection>scm:git:git@github.com:sarxos/${project.repoid}.git</connection>
+		<developerConnection>scm:git:git@github.com:sarxos/${project.repoid}.git</developerConnection>
+		<url>git@github.com:sarxos/${project.repoid}.git</url>
 	</scm>
 
 	<issueManagement>
 		<system>GitHub Issues Manager</system>
-		<url>https://github.com/sarxos/${project.id}/issues</url>
+		<url>https://github.com/sarxos/${project.repoid}/issues</url>
 	</issueManagement>
 
 	<ciManagement>
 		<system>Travis CI</system>
-		<url>http://travis-ci.org/#!/sarxos/${project.id}</url>
+		<url>http://travis-ci.org/#!/sarxos/${project.repoid}</url>
 	</ciManagement>
 
 	<developers>