]> git.argeo.org Git - lgpl/argeo-commons.git/blobdiff - pom.xml
add org.argeo.security.ui import package to the bnd.
[lgpl/argeo-commons.git] / pom.xml
diff --git a/pom.xml b/pom.xml
index 180e8c1d6044ca69ec1d987fb9747ddbc8eb1d00..15dafcb5cf00d38ecfc2588432ad8129b6c86695 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,19 +1,16 @@
 <?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>
        <groupId>org.argeo.commons</groupId>
        <artifactId>argeo-commons</artifactId>
-       <version>2.1.12-SNAPSHOT</version>
+       <version>2.1.18-SNAPSHOT</version>
        <name>Argeo Commons</name>
        <packaging>pom</packaging>
        <properties>
-               <version.argeo-commons>2.1.12</version.argeo-commons>
+               <version.argeo-commons>2.1.18-SNAPSHOT</version.argeo-commons>
                <developmentCycle.argeo-commons>2.1</developmentCycle.argeo-commons>
                <developmentCycle.argeo-commons.startDate>2012-12-19</developmentCycle.argeo-commons.startDate>
-               <version.argeo-distribution>1.4.0</version.argeo-distribution>
-               <version.rap>2.2.0-R-20131204-0942</version.rap>
-               <version.rap.addons>0.5.0.argeo.20141029</version.rap.addons>
+               <version.argeo-distribution>2.1.7</version.argeo-distribution>
                <!-- RPM -->
                <rpm.release>6</rpm.release>
                <rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2-staging/6/x86_64</rpm.stagingRepository>
                <module>org.argeo.util</module>
                <module>org.argeo.osgi.boot</module>
                <module>org.argeo.server.jcr</module>
-               <!-- Eclipse -->
-               <module>org.argeo.eclipse.ui</module>
-               <module>org.argeo.eclipse.ui.rap</module>
-               <module>org.argeo.eclipse.ui.rcp</module>
                <!-- Security -->
                <module>org.argeo.security.core</module>
                <module>org.argeo.security.jackrabbit</module>
-               <module>org.argeo.security.ldap</module>
-               <module>org.argeo.security.mvc</module>
-               <!-- Security Services -->
-               <module>org.argeo.security.auth.ldap</module>
-               <module>org.argeo.security.dao.ldap</module>
-               <module>org.argeo.security.dao.cli</module>
-               <module>org.argeo.security.dao.os</module>
-               <module>org.argeo.security.dao.jackrabbit</module>
-               <!-- Servers -->
-               <module>org.argeo.server.jcr.mvc</module>
-               <module>org.argeo.server.jackrabbit</module>
-               <module>org.argeo.jackrabbit.webapp</module>
-               <module>org.argeo.server.ads</module>
-               <module>org.argeo.server.ads.server</module>
-               <module>org.argeo.server.rap.webapp</module>
-               <!-- Node -->
-               <module>org.argeo.node.repo.jackrabbit</module>
+               <!-- Eclipse -->
+               <module>org.argeo.eclipse.ui</module>
+               <module>org.argeo.eclipse.ui.rap</module>
+               <!-- CMS -->
                <module>org.argeo.cms</module>
-               <!-- Standard Workbench Perspectives -->
+               <!-- Workbench -->
                <module>org.argeo.eclipse.ui.workbench</module>
-               <module>org.argeo.security.equinox</module>
+               <module>org.argeo.eclipse.ui.workbench.rap</module>
                <module>org.argeo.security.ui</module>
                <module>org.argeo.security.ui.admin</module>
-               <!-- Standard Workbench Products -->
                <module>org.argeo.security.ui.rap</module>
-               <module>org.argeo.security.ui.rcp</module>
-               <!-- Legacy -->
-               <module>org.argeo.server.core</module>
-               <module>org.argeo.ext.jdbm</module>
-               <!-- Dependencies and Distributions -->
+               <!-- Distribution -->
                <module>dep</module>
                <module>dist</module>
        </modules>
@@ -153,9 +128,11 @@ limitations under the License.
                                        <artifactId>maven-compiler-plugin</artifactId>
                                        <version>3.2</version>
                                        <configuration>
-                                               <source>1.6</source>
-                                               <target>1.6</target>
+                                               <source>1.7</source>
+                                               <target>1.7</target>
                                                <compilerId>eclipse</compilerId>
+                                               <!-- Required for compliance level, see http://jira.codehaus.org/browse/PLXCOMP-231 -->
+                                               <optimize>true</optimize>
                                                <!-- Hack to work around issues with generated annotations : -->
                                                <generatedSourcesDirectory>target/classes</generatedSourcesDirectory>
                                                <generatedTestSourcesDirectory>target/test-classes</generatedTestSourcesDirectory>
@@ -250,7 +227,7 @@ limitations under the License.
                                                        <_include>bnd.bnd</_include>
                                                        <Bundle-Version>${project.version}-r${tstamp}</Bundle-Version>
                                                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                                                       <Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment>
+                                                       <Bundle-RequiredExecutionEnvironment>JavaSE-1.7</Bundle-RequiredExecutionEnvironment>
                                                        <_removeheaders>Bnd-LastModified,Build-Jdk,Built-By,Tool,Created-By</_removeheaders>
                                                        <!-- SLC specific instructions -->
                                                        <SLC-Category>${project.groupId}</SLC-Category>
@@ -270,10 +247,12 @@ limitations under the License.
                                <plugin>
                                        <groupId>org.codehaus.mojo</groupId>
                                        <artifactId>rpm-maven-plugin</artifactId>
-                                       <version>2.1</version>
+                                       <version>2.1-alpha-1</version>
                                        <extensions>true</extensions>
                                        <configuration>
                                                <version>${project.version}</version>
+                                               <release>1.el${rpm.release}</release>
+                                               <distribution>argeo${rpm.release}</distribution>
                                                <group>Applications/System</group>
                                                <prefix>/usr</prefix>
                                        </configuration>
@@ -287,7 +266,7 @@ limitations under the License.
                                <plugin>
                                        <groupId>org.argeo.maven.plugins</groupId>
                                        <artifactId>maven-argeo-osgi-plugin</artifactId>
-                                       <version>1.1.3</version>
+                                       <version>1.1.4</version>
                                </plugin>
                                <!-- Site -->
                                <plugin>
@@ -413,61 +392,18 @@ limitations under the License.
                        </plugin>
                </plugins>
        </build>
-       <!-- <dependencies> -->
-       <!-- <dependency> -->
-       <!-- <groupId>org.argeo.tp</groupId> -->
-       <!-- <artifactId>binaries</artifactId> -->
-       <!-- <type>pom</type> -->
-       <!-- <version>${version.argeo-distribution}</version> -->
-       <!-- <scope>compile</scope> -->
-       <!-- </dependency> -->
-       <!-- </dependencies> -->
-       <dependencyManagement>
-               <dependencies>
-                       <dependency>
-                               <groupId>org.argeo.tp</groupId>
-                               <artifactId>binaries</artifactId>
-                               <version>${version.argeo-distribution}</version>
-                               <type>pom</type>
-                               <scope>import</scope>
-                       </dependency>
-                       <!-- Eclipse RAP -->
-                       <dependency>
-                               <groupId>org.argeo.tp.rap</groupId>
-                               <artifactId>binaries</artifactId>
-                               <version>${version.argeo-distribution}</version>
-                               <type>pom</type>
-                               <scope>import</scope>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.argeo.tp.rap.addons</groupId>
-                               <artifactId>binaries</artifactId>
-                               <version>${version.rap.addons}</version>
-                               <type>pom</type>
-                               <scope>import</scope>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.argeo.tp.rap.platform</groupId>
-                               <artifactId>binaries</artifactId>
-                               <version>${version.rap}</version>
-                               <type>pom</type>
-                               <scope>import</scope>
-                       </dependency>
-               </dependencies>
-       </dependencyManagement>
+       <dependencies>
+               <dependency>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>argeo-tp</artifactId>
+                       <version>${version.argeo-distribution}</version>
+                       <scope>provided</scope>
+               </dependency>
+       </dependencies>
        <repositories>
                <repository>
                        <id>argeo-tp</id>
-                       <url>http://repo.argeo.org/data/public/java/argeo-tp-1.4</url>
-                       <releases>
-                               <enabled>true</enabled>
-                               <updatePolicy>daily</updatePolicy>
-                               <checksumPolicy>warn</checksumPolicy>
-                       </releases>
-               </repository>
-               <repository>
-                       <id>argeo-tp-rap</id>
-                       <url>http://repo.argeo.org/data/public/java/eclipse-rap-2.2</url>
+                       <url>https://forge.argeo.org/data/public/java/argeo-tp-2.1/</url>
                        <releases>
                                <enabled>true</enabled>
                                <updatePolicy>daily</updatePolicy>
@@ -501,9 +437,28 @@ limitations under the License.
                        <url>dav:https://repo.argeo.org/data/files/java/argeo-commons-${developmentCycle.argeo-commons}</url>
                        <uniqueVersion>false</uniqueVersion>
                </repository>
-               <site>
-                       <id>site</id>
-                       <url>dav:https://repo.argeo.org/data/files/docs/argeo-commons-${developmentCycle.argeo-commons}</url>
-               </site>
        </distributionManagement>
+       <profiles>
+               <profile>
+                       <id>localrepo</id>
+                       <repositories>
+                               <repository>
+                                       <id>argeo-tp</id>
+                                       <url>http://localhost:7080/data/public/java/argeo-tp-${developmentCycle.argeo-commons}/</url>
+                                       <releases>
+                                               <enabled>true</enabled>
+                                               <updatePolicy>daily</updatePolicy>
+                                               <checksumPolicy>warn</checksumPolicy>
+                                       </releases>
+                               </repository>
+                       </repositories>
+                       <distributionManagement>
+                               <repository>
+                                       <id>staging</id>
+                                       <name>Internal Release Repository</name>
+                                       <url>dav:http://localhost:7080/data/files/java/argeo-commons-${developmentCycle.argeo-commons}</url>
+                               </repository>
+                       </distributionManagement>
+               </profile>
+       </profiles>
 </project>