X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fpom.xml;h=5afd2a6865fe73a51d50ec2a01edd8368de04024;hb=575dfe19b8516b1213b6d56d9f34fc3bcdb62026;hp=96ad206b1b2859720b5a27184929ed0bdd4df66f;hpb=998cdf60d00ffc35d987bdb373a9676b095f16f8;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/pom.xml b/org.argeo.cms/pom.xml
index 96ad206b1..5afd2a686 100644
--- a/org.argeo.cms/pom.xml
+++ b/org.argeo.cms/pom.xml
@@ -1,49 +1,72 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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.connect</groupId>
-		<artifactId>argeo-connect</artifactId>
-		<version>2.1.13-SNAPSHOT</version>
+		<groupId>org.argeo.commons</groupId>
+		<artifactId>argeo-commons</artifactId>
+		<version>2.1.12-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.cms</artifactId>
-	<name>Connect Content Management System</name>
+	<name>Argeo Content Management System</name>
 	<packaging>jar</packaging>
-
-	<!-- TODO move to parent -->
-
-	<!-- <build> -->
-	<!-- <plugins> -->
-	<!-- <plugin> -->
-	<!-- <groupId>org.apache.felix</groupId> -->
-	<!-- <artifactId>maven-bundle-plugin</artifactId> -->
-	<!-- <configuration> -->
-	<!-- <instructions> -->
-	<!-- Different from plugin -->
-	<!-- <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> -->
-	<!-- <Bundle-Activator>org.argeo.connect.files.web.Activator</Bundle-Activator> -->
-	<!-- <Require-Bundle>org.eclipse.rap.rwt;bundle-version="[2.2.0,3.0.0)"</Require-Bundle> -->
-	<!-- <Import-Package> -->
-	<!-- *, -->
-	<!-- org.springframework.core -->
-	<!-- </Import-Package> -->
-	<!-- </instructions> -->
-	<!-- </configuration> -->
-	<!-- </plugin> -->
-	<!-- </plugins> -->
-	<!-- </build> -->
+	<!-- TODO merge in parent -->
+	<build>
+		<sourceDirectory>src</sourceDirectory>
+		<resources>
+			<resource>
+				<directory>src</directory>
+				<includes>
+					<include>**</include>
+				</includes>
+				<excludes>
+					<exclude>**/*.java</exclude>
+				</excludes>
+			</resource>
+			<resource>
+				<directory>.</directory>
+				<includes>
+					<include>**</include>
+				</includes>
+				<excludes>
+					<exclude>.*</exclude>
+					<exclude>.*/**</exclude>
+					<exclude>src/**</exclude>
+					<exclude>target/**</exclude>
+					<exclude>bin/**</exclude>
+					<exclude>pom.xml</exclude>
+					<exclude>build.properties</exclude>
+					<exclude>*.bnd</exclude>
+					<exclude>*.target</exclude>
+				</excludes>
+			</resource>
+		</resources>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<configuration>
+					<instructions>
+						<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+						<_include>bnd.bnd</_include>
+					</instructions>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+	<!-- END -->
 	<dependencies>
 		<dependency>
-			<groupId>org.argeo.commons.server</groupId>
+			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.server.jcr</artifactId>
-			<version>${version.argeo-commons}</version>
+			<version>2.1.12-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
-			<groupId>org.argeo.commons.security</groupId>
+			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.security.core</artifactId>
-			<version>${version.argeo-commons}</version>
+			<version>2.1.12-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Files -->