X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=a2a45b821b7746b812a39fc4bae2071e59a178cc;hb=fdf3964f82d1ae9035fda5f5600433befd8508ac;hp=d9fa8f68be36b4694371e8bafa7e4480cdd63514;hpb=2f1133fc56e10b23d7ac83bcb93e324486ad0fd9;p=lgpl%2Fargeo-commons.git

diff --git a/pom.xml b/pom.xml
index d9fa8f68b..a2a45b821 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,13 +3,13 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.argeo.commons</groupId>
 	<artifactId>argeo-commons</artifactId>
-	<version>2.1.77-SNAPSHOT</version>
+	<version>2.1.79-SNAPSHOT</version>
 	<name>Argeo Commons</name>
 	<packaging>pom</packaging>
 	<!-- <url>http://repo.argeo.org/data/docs/argeo-2.1/site/argeo-commons/</url> -->
 	<properties>
-		<version.argeo-commons>2.1.77-SNAPSHOT</version.argeo-commons>
-		<version.argeo-tp>2.1.21</version.argeo-tp>
+		<version.argeo-commons>2.1.79-SNAPSHOT</version.argeo-commons>
+		<version.argeo-tp>2.1.24</version.argeo-tp>
 		<!-- RPM -->
 		<argeo.rpm.release>7</argeo.rpm.release>
 		<argeo.rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2/el7</argeo.rpm.stagingRepository>
@@ -23,6 +23,7 @@
 		<module>org.argeo.enterprise</module>
 		<module>org.argeo.jcr</module>
 		<module>org.argeo.osgi.boot</module>
+		<module>org.argeo.core</module>
 		<!-- Eclipse -->
 		<module>org.argeo.eclipse.ui</module>
 		<module>org.argeo.eclipse.ui.rap</module>
@@ -40,6 +41,7 @@
 		<module>org.argeo.cms.ui.workbench.rap</module>
 		<!-- Third Parties Extensions -->
 		<module>org.argeo.ext.jackrabbit</module>
+		<module>org.argeo.ext.equinox.jetty</module>
 		<module>org.argeo.ext.rap.ui.workbench</module>
 		<!-- Distribution -->
 		<module>maven</module>
@@ -229,6 +231,11 @@ limitations under the License.
 						<encoding>UTF-8</encoding>
 					</configuration>
 				</plugin>
+				<plugin>
+					<groupId>pl.project13.maven</groupId>
+					<artifactId>git-commit-id-plugin</artifactId>
+					<version>3.0.0</version>
+				</plugin>
 				<plugin>
 					<artifactId>maven-release-plugin</artifactId>
 					<version>2.5.1</version>
@@ -251,6 +258,10 @@ limitations under the License.
 							<_removeheaders>Bnd-LastModified,Build-Jdk,Built-By,Tool,Created-By</_removeheaders>
 							<Automatic-Module-Name>${project.artifactId}</Automatic-Module-Name>
 							<SLC-Category>${project.groupId}</SLC-Category>
+							<!-- Git metadata -->
+							<!-- <SLC-Git-Commit-Id>${git.commit.id}</SLC-Git-Commit-Id> -->
+							<!-- <SLC-Git-Commit-Describe>${git.commit.id.describe}</SLC-Git-Commit-Describe> -->
+							<!-- <SLC-Git-Commit-Count>${git.closest.tag.commit.count}</SLC-Git-Commit-Count> -->
 						</instructions>
 					</configuration>
 					<executions>
@@ -287,8 +298,8 @@ limitations under the License.
 				<!-- Argeo -->
 				<plugin>
 					<groupId>org.argeo.maven.plugins</groupId>
-					<artifactId>maven-argeo-osgi-plugin</artifactId>
-					<version>1.1.6</version>
+					<artifactId>argeo-osgi-plugin</artifactId>
+					<version>2.1.1</version>
 				</plugin>
 			</plugins>
 		</pluginManagement>
@@ -306,6 +317,19 @@ limitations under the License.
 					</filesets>
 				</configuration>
 			</plugin>
+			<!-- <plugin> -->
+			<!-- <groupId>pl.project13.maven</groupId> -->
+			<!-- <artifactId>git-commit-id-plugin</artifactId> -->
+			<!-- <executions> -->
+			<!-- <execution> -->
+			<!-- <id>get-the-git-infos</id> -->
+			<!-- <goals> -->
+			<!-- <goal>revision</goal> -->
+			<!-- </goals> -->
+			<!-- <phase>initialize</phase> -->
+			<!-- </execution> -->
+			<!-- </executions> -->
+			<!-- </plugin> -->
 			<plugin>
 				<artifactId>maven-resources-plugin</artifactId>
 				<configuration>