X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=cdf98d8bd725df6f206f465b936afb97ec4dea56;hb=1badfc3be2fe98e87ffb1e2dfdcba314294f8a47;hp=8104fc77cfd88ccbdce0cbcbe2fe1aaea49fb276;hpb=b2bfc5cdb8374a7542d49b9fe729fc58558e5fdb;p=lgpl%2Fargeo-commons.git

diff --git a/pom.xml b/pom.xml
index 8104fc77c..cdf98d8bd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,26 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.argeo</groupId>
+		<artifactId>parent</artifactId>
+		<version>1.0.0</version>
+	</parent>
 	<groupId>org.argeo.commons</groupId>
-	<version>0.1.1-SNAPSHOT</version>
 	<artifactId>argeo-commons</artifactId>
+	<version>0.1.2-SNAPSHOT</version>
 	<name>Argeo Commons</name>
 	<packaging>pom</packaging>
 	<properties>
 		<developmentCycle>0.1</developmentCycle>
-		<version.slc>0.12.1-SNAPSHOT</version.slc>
+		<version.argeo-ria>0.12.1</version.argeo-ria>
 		<version.maven-argeo-osgi>0.1.21</version.maven-argeo-osgi>
+		<version.maven-bundle-plugin>2.0.0</version.maven-bundle-plugin>
+		<version.maven-argeo-qooxdoo>0.8.2.1</version.maven-argeo-qooxdoo>
 	</properties>
 	<scm>
 		<connection>scm:svn:https://www.argeo.org/svn/commons/trunk</connection>
 		<developerConnection>scm:svn:https://www.argeo.org/svn/commons/trunk</developerConnection>
 		<url>https://www.argeo.org/svn/commons/trunk</url>
 	</scm>
-	<issueManagement>
-		<system>Bugzilla</system>
-		<url>https://www.argeo.org/bugzilla/</url>
-	</issueManagement>
 	<licenses>
 		<license>
 			<name>Apache 2</name>
@@ -46,10 +48,6 @@ limitations under the License.
 			</comments>
 		</license>
 	</licenses>
-	<organization>
-		<name>Argeo</name>
-		<url>http://www.argeo.org</url>
-	</organization>
 	<developers>
 		<developer>
 			<id>mbaudier</id>
@@ -65,7 +63,10 @@ limitations under the License.
 		</developer>
 	</developers>
 	<modules>
+		<module>basic</module>
+		<module>osgi</module>
 		<module>server</module>
+		<module>security</module>
 	</modules>
 	<build>
 		<pluginManagement>
@@ -96,6 +97,37 @@ limitations under the License.
 					<artifactId>maven-argeo-osgi-plugin</artifactId>
 					<version>${version.maven-argeo-osgi}</version>
 				</plugin>
+				<plugin>
+					<artifactId>maven-jar-plugin</artifactId>
+					<configuration>
+						<archive>
+							<manifestFile>target/classes/META-INF/MANIFEST.MF</manifestFile>
+						</archive>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.felix</groupId>
+					<artifactId>maven-bundle-plugin</artifactId>
+					<version>${version.maven-bundle-plugin}</version>
+					<extensions>true</extensions>
+					<configuration>
+						<manifestLocation>target/classes/META-INF</manifestLocation>
+						<instructions>
+							<Bundle-Version>${project.version}-r${buildNumber}</Bundle-Version>
+							<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+							<_removeheaders>Bnd-LastModified</_removeheaders>
+						</instructions>
+					</configuration>
+					<executions>
+						<execution>
+							<id>bundle-manifest</id>
+							<phase>process-classes</phase>
+							<goals>
+								<goal>manifest</goal>
+							</goals>
+						</execution>
+					</executions>
+				</plugin>
 			</plugins>
 		</pluginManagement>
 		<plugins>
@@ -147,69 +179,15 @@ limitations under the License.
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
-				<groupId>org.argeo.slc</groupId>
-				<artifactId>argeo-slc</artifactId>
-				<version>${version.slc}</version>
+				<groupId>org.argeo.dep</groupId>
+				<artifactId>versions</artifactId>
+				<version>1.0.0</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>
 	<repositories>
-		<repository>
-			<id>central</id>
-			<url>http://repo1.maven.org/maven2</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>daily</updatePolicy>
-				<checksumPolicy>warn</checksumPolicy>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-				<updatePolicy>never</updatePolicy>
-				<checksumPolicy>fail</checksumPolicy>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>com.springsource.repository.bundles.release</id>
-			<name>
-				SpringSource Enterprise Bundle Repository - SpringSource
-				Bundle Releases
-			</name>
-			<url>
-				http://repository.springsource.com/maven/bundles/release
-			</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>daily</updatePolicy>
-				<checksumPolicy>fail</checksumPolicy>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-				<updatePolicy>never</updatePolicy>
-				<checksumPolicy>fail</checksumPolicy>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>com.springsource.repository.bundles.external</id>
-			<name>
-				SpringSource Enterprise Bundle Repository - External
-				Bundle Releases
-			</name>
-			<url>
-				http://repository.springsource.com/maven/bundles/external
-			</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>daily</updatePolicy>
-				<checksumPolicy>fail</checksumPolicy>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-				<updatePolicy>never</updatePolicy>
-				<checksumPolicy>fail</checksumPolicy>
-			</snapshots>
-		</repository>
 		<repository>
 			<id>argeo</id>
 			<url>http://www.argeo.org/maven/argeo</url>
@@ -224,33 +202,5 @@ limitations under the License.
 				<checksumPolicy>fail</checksumPolicy>
 			</snapshots>
 		</repository>
-		<repository>
-			<id>argeo-snapshots</id>
-			<url>http://www.argeo.org/maven/argeo-snapshots</url>
-			<releases>
-				<enabled>false</enabled>
-				<updatePolicy>never</updatePolicy>
-				<checksumPolicy>fail</checksumPolicy>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-				<updatePolicy>always</updatePolicy>
-				<checksumPolicy>fail</checksumPolicy>
-			</snapshots>
-		</repository>
 	</repositories>
-	<distributionManagement>
-		<repository>
-			<uniqueVersion>false</uniqueVersion>
-			<id>argeo-restricted</id>
-			<name>Argeo FOSS Repository</name>
-			<url>file:///var/argeo/maven2/argeo</url>
-		</repository>
-		<snapshotRepository>
-			<uniqueVersion>true</uniqueVersion>
-			<id>argeo-snapshots-restricted</id>
-			<name>Argeo FOSS Snapshots Repository</name>
-			<url>file:///var/argeo/maven2/argeo-snapshots</url>
-		</snapshotRepository>
-	</distributionManagement>
 </project>
\ No newline at end of file