From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 13 Oct 2011 23:23:48 +0000 (+0000)
Subject: Remove static version-commons
X-Git-Tag: argeo-commons-2.1.30~1095
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=bf936223ebdebe9e79cf8c58a06ef7ff44deb15c;p=lgpl%2Fargeo-commons.git

Remove static version-commons

git-svn-id: https://svn.argeo.org/commons/trunk@4839 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/demo/plugins/org.argeo.demo.i18n.rap/pom.xml b/demo/plugins/org.argeo.demo.i18n.rap/pom.xml
index a9d2f2f8d..b631aaf58 100644
--- a/demo/plugins/org.argeo.demo.i18n.rap/pom.xml
+++ b/demo/plugins/org.argeo.demo.i18n.rap/pom.xml
@@ -18,12 +18,12 @@
 		<dependency>
 			<groupId>org.argeo.commons.eclipse</groupId>
 			<artifactId>org.argeo.eclipse.ui.rap</artifactId>
-			<version>${version.argeo-commons}</version>
+			<version>0.3.4-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons.eclipse</groupId>
 			<artifactId>org.argeo.eclipse.dep.rap</artifactId>
-			<version>${version.argeo-commons}</version>
+			<version>0.3.4-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/demo/plugins/org.argeo.demo.i18n.rcp/pom.xml b/demo/plugins/org.argeo.demo.i18n.rcp/pom.xml
index 965c596a6..3088ddaa4 100644
--- a/demo/plugins/org.argeo.demo.i18n.rcp/pom.xml
+++ b/demo/plugins/org.argeo.demo.i18n.rcp/pom.xml
@@ -18,12 +18,12 @@
 		<dependency>
 			<groupId>org.argeo.commons.eclipse</groupId>
 			<artifactId>org.argeo.eclipse.ui.rcp</artifactId>
-			<version>${version.argeo-commons}</version>
+			<version>0.3.4-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons.eclipse</groupId>
 			<artifactId>org.argeo.eclipse.dep.rcp</artifactId>
-			<version>${version.argeo-commons}</version>
+			<version>0.3.4-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file
diff --git a/demo/plugins/org.argeo.demo.i18n/pom.xml b/demo/plugins/org.argeo.demo.i18n/pom.xml
index e9f08e82d..0c0f62a95 100644
--- a/demo/plugins/org.argeo.demo.i18n/pom.xml
+++ b/demo/plugins/org.argeo.demo.i18n/pom.xml
@@ -27,13 +27,13 @@
 		<dependency>
 			<groupId>org.argeo.commons.eclipse</groupId>
 			<artifactId>org.argeo.eclipse.ui.rap</artifactId>
-			<version>${version.argeo-commons}</version>
+			<version>0.3.4-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons.eclipse</groupId>
 			<artifactId>org.argeo.eclipse.dep.rap</artifactId>
-			<version>${version.argeo-commons}</version>
+			<version>0.3.4-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
 
diff --git a/osgi/dist/osgi-boot/pom.xml b/osgi/dist/osgi-boot/pom.xml
index ffb38c60a..82b194ee9 100644
--- a/osgi/dist/osgi-boot/pom.xml
+++ b/osgi/dist/osgi-boot/pom.xml
@@ -30,95 +30,6 @@
 					</execution>
 				</executions>
 			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>rpm-maven-plugin</artifactId>
-				<version>2.1-alpha-1</version>
-				<extensions>true</extensions>
-				<configuration>
-					<version>${project.version}</version>
-					<release>r${buildNumber}.argeo</release>
-					<copyright>2011 Argeo</copyright>
-					<distribution>argeo</distribution>
-					<packager>mbaudier@argeo.org</packager>
-					<group>Applications/System</group>
-					<prefix>/usr</prefix>
-				</configuration>
-				<executions>
-					<execution>
-						<id>rpm-sdk</id>
-						<phase>package</phase>
-						<goals>
-							<goal>attached-rpm</goal>
-						</goals>
-						<configuration>
-							<mappings>
-								<mapping>
-									<directory>/etc/osgiboot</directory>
-									<username>root</username>
-									<groupname>root</groupname>
-									<filemode>644</filemode>
-									<configuration>true</configuration>
-									<sources>
-										<source>
-											<location>src/main/rpm/etc/osgiboot</location>
-											<includes>
-												<include>*</include>
-											</includes>
-										</source>
-									</sources>
-								</mapping>
-								<mapping>
-									<directory>/usr/sbin</directory>
-									<username>root</username>
-									<groupname>root</groupname>
-									<filemode>755</filemode>
-									<sources>
-										<source>
-											<location>src/main/rpm/usr/sbin</location>
-											<includes>
-												<include>*</include>
-											</includes>
-										</source>
-									</sources>
-								</mapping>
-								<mapping>
-									<directory>/usr/share/osgiboot/lib</directory>
-									<username>root</username>
-									<groupname>root</groupname>
-									<filemode>644</filemode>
-									<directoryIncluded>false</directoryIncluded>
-									<sources>
-										<source>
-											<location>${project.build.directory}/lib</location>
-											<includes>
-												<include>*.jar</include>
-											</includes>
-										</source>
-									</sources>
-								</mapping>
-							</mappings>
-							<!-- 
-							<postinstallScriptlet>
-								<scriptFile>src/main/scripts/postinstall</scriptFile>
-							</postinstallScriptlet>
-							<preremoveScriptlet>
-								<scriptFile>src/main/scripts/preremove</scriptFile>
-							</preremoveScriptlet>
-							<postremoveScriptlet>
-								<scriptFile>src/main/scripts/postremove</scriptFile>
-							</postremoveScriptlet>
-							 -->
-							<requires>
-										<require>java</require>
-								<!-- For the start/stop scripts 
-								<require>telnet</require>
-								<require>expect</require>-->
-							</requires>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
 		</plugins>
 	</build>
 	<dependencies>
@@ -128,4 +39,93 @@
 			<version>0.3.4-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
+	<profiles>
+		<profile>
+			<id>rpmbuild</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>rpm-maven-plugin</artifactId>
+						<version>2.1-alpha-1</version>
+						<extensions>true</extensions>
+						<configuration>
+							<version>${project.version}</version>
+							<release>r${buildNumber}.argeo</release>
+							<copyright>2011 Argeo</copyright>
+							<distribution>argeo</distribution>
+							<packager>mbaudier@argeo.org</packager>
+							<group>Applications/System</group>
+							<prefix>/usr</prefix>
+						</configuration>
+						<executions>
+							<execution>
+								<id>rpm-sdk</id>
+								<phase>package</phase>
+								<goals>
+									<goal>attached-rpm</goal>
+								</goals>
+								<configuration>
+									<mappings>
+										<mapping>
+											<directory>/etc/osgiboot</directory>
+											<username>root</username>
+											<groupname>root</groupname>
+											<filemode>644</filemode>
+											<configuration>true</configuration>
+											<sources>
+												<source>
+													<location>src/main/rpm/etc/osgiboot</location>
+													<includes>
+														<include>*</include>
+													</includes>
+												</source>
+											</sources>
+										</mapping>
+										<mapping>
+											<directory>/usr/sbin</directory>
+											<username>root</username>
+											<groupname>root</groupname>
+											<filemode>755</filemode>
+											<sources>
+												<source>
+													<location>src/main/rpm/usr/sbin</location>
+													<includes>
+														<include>*</include>
+													</includes>
+												</source>
+											</sources>
+										</mapping>
+										<mapping>
+											<directory>/usr/share/osgiboot/lib</directory>
+											<username>root</username>
+											<groupname>root</groupname>
+											<filemode>644</filemode>
+											<directoryIncluded>false</directoryIncluded>
+											<sources>
+												<source>
+													<location>${project.build.directory}/lib</location>
+													<includes>
+														<include>*.jar</include>
+													</includes>
+												</source>
+											</sources>
+										</mapping>
+									</mappings>
+									<!-- <postinstallScriptlet> <scriptFile>src/main/scripts/postinstall</scriptFile> 
+										</postinstallScriptlet> <preremoveScriptlet> <scriptFile>src/main/scripts/preremove</scriptFile> 
+										</preremoveScriptlet> <postremoveScriptlet> <scriptFile>src/main/scripts/postremove</scriptFile> 
+										</postremoveScriptlet> -->
+									<requires>
+										<require>java</require>
+										<!-- For the start/stop scripts <require>telnet</require> <require>expect</require> -->
+									</requires>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
 </project>
diff --git a/security/dep/org.argeo.security.dep.ads/pom.xml b/security/dep/org.argeo.security.dep.ads/pom.xml
index 96539080c..c2691c115 100644
--- a/security/dep/org.argeo.security.dep.ads/pom.xml
+++ b/security/dep/org.argeo.security.dep.ads/pom.xml
@@ -21,7 +21,7 @@
 		<dependency>
 			<groupId>org.argeo.commons.server</groupId>
 			<artifactId>org.argeo.server.ads.server</artifactId>
-			<version>${version.argeo-commons}</version>
+			<version>0.3.4-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons.server</groupId>
diff --git a/security/dep/org.argeo.security.dep.node/pom.xml b/security/dep/org.argeo.security.dep.node/pom.xml
index 1c0217cc9..2c8ea735d 100644
--- a/security/dep/org.argeo.security.dep.node/pom.xml
+++ b/security/dep/org.argeo.security.dep.node/pom.xml
@@ -82,12 +82,12 @@
 		<dependency>
 			<groupId>org.argeo.commons.server</groupId>
 			<artifactId>org.argeo.node.repo.jackrabbit</artifactId>
-			<version>${version.argeo-commons}</version>
+			<version>0.3.4-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons.server</groupId>
 			<artifactId>org.argeo.node.repofactory.jackrabbit</artifactId>
-			<version>${version.argeo-commons}</version>
+			<version>0.3.4-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Active MQ -->
@@ -105,7 +105,7 @@
 		<dependency>
 			<groupId>org.argeo.commons.server</groupId>
 			<artifactId>org.argeo.server.activemq.broker</artifactId>
-			<version>${version.argeo-commons}</version>
+			<version>0.3.4-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Javax -->
@@ -134,7 +134,7 @@
 		<dependency>
 			<groupId>org.argeo.commons.security</groupId>
 			<artifactId>org.argeo.security.dao.ldap</artifactId>
-			<version>${version.argeo-commons}</version>
+			<version>0.3.4-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons.security</groupId>
@@ -144,14 +144,14 @@
 		<dependency>
 			<groupId>org.argeo.commons.security</groupId>
 			<artifactId>org.argeo.security.services</artifactId>
-			<version>${version.argeo-commons}</version>
+			<version>0.3.4-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Security (Jackrabbit) -->
 		<dependency>
 			<groupId>org.argeo.commons.security</groupId>
 			<artifactId>org.argeo.security.dao.jackrabbit</artifactId>
-			<version>${version.argeo-commons}</version>
+			<version>0.3.4-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Web -->
@@ -182,14 +182,14 @@
 		<dependency>
 			<groupId>org.argeo.commons.server</groupId>
 			<artifactId>org.argeo.jackrabbit.webapp</artifactId>
-			<version>${version.argeo-commons}</version>
+			<version>0.3.4-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Default Tomcat conf -->
 		<dependency>
 			<groupId>org.argeo.commons.server</groupId>
 			<artifactId>org.argeo.server.tomcat</artifactId>
-			<version>${version.argeo-commons}</version>
+			<version>0.3.4-SNAPSHOT</version>
 		</dependency>
 
 		<!-- LDAP server -->
diff --git a/security/features/org.argeo.security.dep.node.rap/pom.xml b/security/features/org.argeo.security.dep.node.rap/pom.xml
index 20503e9d3..01b1ca5d3 100644
--- a/security/features/org.argeo.security.dep.node.rap/pom.xml
+++ b/security/features/org.argeo.security.dep.node.rap/pom.xml
@@ -53,7 +53,7 @@
 		<dependency>
 			<groupId>org.argeo.commons.server</groupId>
 			<artifactId>org.argeo.server.rap.webapp</artifactId>
-			<version>${version.argeo-commons}</version>
+			<version>0.3.4-SNAPSHOT</version>
 		</dependency>
 
 	</dependencies>
diff --git a/server/dep/org.argeo.server.dep.tomcat/pom.xml b/server/dep/org.argeo.server.dep.tomcat/pom.xml
index 58199c1d0..ff70e10ae 100644
--- a/server/dep/org.argeo.server.dep.tomcat/pom.xml
+++ b/server/dep/org.argeo.server.dep.tomcat/pom.xml
@@ -22,7 +22,7 @@
 		<dependency>
 			<groupId>org.argeo.commons.server</groupId>
 			<artifactId>org.argeo.server.catalina</artifactId>
-			<version>${version.argeo-commons}</version>
+			<version>0.3.4-SNAPSHOT</version>
 		</dependency>
 <!-- 		<dependency> -->
 <!-- 			<groupId>org.argeo.commons.server</groupId> -->