X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=dist%2Fslc%2Fpom.xml;h=42647835265e4cff24fae306564a27a4dcad851f;hb=b5659b00d83ced604ab8aba88c05defe08680ac0;hp=43cfa187a404d36dde8861f5914ff1072d344c61;hpb=56ced6edc756061c6451c59ce74a2de7c16ded8d;p=gpl%2Fargeo-slc.git

diff --git a/dist/slc/pom.xml b/dist/slc/pom.xml
index 43cfa187a..426478352 100644
--- a/dist/slc/pom.xml
+++ b/dist/slc/pom.xml
@@ -3,36 +3,11 @@
 	<parent>
 		<groupId>org.argeo.slc</groupId>
 		<artifactId>dist</artifactId>
-		<version>1.1.3-SNAPSHOT</version>
+		<version>1.1.12-SNAPSHOT</version>
 	</parent>
 	<artifactId>slc</artifactId>
 	<packaging>pom</packaging>
 	<name>SLC Node (RPM)</name>
-<!-- 	<build> -->
-<!-- 		<plugins> -->
-<!-- 			<plugin> -->
-<!-- 				<artifactId>maven-resources-plugin</artifactId> -->
-<!-- 				<executions> -->
-<!-- 					<execution> -->
-<!-- 						<id>filter-base</id> -->
-<!-- 						<phase>process-resources</phase> -->
-<!-- 						<goals> -->
-<!-- 							<goal>copy-resources</goal> -->
-<!-- 						</goals> -->
-<!-- 						<configuration> -->
-<!-- 							<outputDirectory>${basedir}/target/base</outputDirectory> -->
-<!-- 							<resources> -->
-<!-- 								<resource> -->
-<!-- 									<directory>src/main/base</directory> -->
-<!-- 									<filtering>true</filtering> -->
-<!-- 								</resource> -->
-<!-- 							</resources> -->
-<!-- 						</configuration> -->
-<!-- 					</execution> -->
-<!-- 				</executions> -->
-<!-- 			</plugin> -->
-<!-- 		</plugins> -->
-<!-- 	</build> -->
 	<profiles>
 		<profile>
 			<id>rpmbuild</id>
@@ -50,7 +25,6 @@
 								</goals>
 								<configuration>
 									<name>slc</name>
-									<copyright>2011 Argeo</copyright>
 									<mappings>
 										<mapping>
 											<directory>/usr/bin</directory>
@@ -127,7 +101,8 @@
 									<requires>
 										<require>slc-libs</require>
 										<require>osgi-boot</require>
-										<require>java-1.6.0-openjdk</require>
+										<!-- do not require java so that it can be installed on Ubuntu -->
+										<!-- <require>java-1.6.0-openjdk</require> -->
 									</requires>
 								</configuration>
 							</execution>