Start using new Maven/bnd approach.

diff --git a/cnf/build.bnd b/cnf/build.bnd
index 150e1d46aac5b4a2f2fdb38748250a3cf9e7e964..d5a7228bf23bdabb7e9c7aab9d175fd720e34a6a 100644 (file)
--- a/cnf/build.bnd
+++ b/cnf/build.bnd
@@ -1,18 +1,18 @@
-category: org.argeo.commons
-version: 2.1.104
-buildId: S
-#buildId: r${tstamp}
-
-Bundle-Version: 2.1.104.S
+SLC-Category: org.argeo.commons
+version.next=2.3.1
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 
-Private-Package: org.argeo.*.internal.*
-Export-Package: !org.argeo.*.internal.*; org.argeo.*
-SLC-Category: ${category}
-#SLC-Build-Timestamp: ${tstamp}
+# Common
+buildId=D${tstamp}
+# for release:
+#buildId: R${tstamp}
+Bundle-Version: ${version.next}.${buildId}
+Private-Package: *.internal.*
+Export-Package: !*.internal.*; *
 -savemanifest = META-INF/MANIFEST.MF
+-compression STORE
+-source true
 -removeheaders = Bnd-LastModified,Build-Jdk,Built-By,Tool,Created-By
--groupId = ${category}
 Automatic-Module-Name: ${bsn}
 
 

diff --git a/dep/cnf/build.bnd b/dep/cnf/build.bnd
new file mode 100644 (file)
index 0000000..dcbfac9
--- /dev/null
+++ b/dep/cnf/build.bnd
@@ -0,0 +1 @@
+-include: ../../cnf/build.bnd
\ No newline at end of file

diff --git a/dep/pom.xml b/dep/pom.xml
index 37e847f05211fee0697bbe68623d0feb506a5444..0f0a97c46cbaf66c09ef602078d0e1c055b92794 100644 (file)
--- a/dep/pom.xml
+++ b/dep/pom.xml
@@ -1,5 +1,7 @@
 <?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.commons</groupId>
@@ -67,6 +69,21 @@
                </dependency>
        </dependencies>
        <profiles>
+               <profile>
+                       <id>a2-target</id>
+                       <build>
+                               <plugins>
+                                       <plugin>
+                                               <artifactId>maven-assembly-plugin</artifactId>
+                                               <configuration>
+                                                       <descriptorRefs>
+                                                               <descriptorRef>a2-target</descriptorRef>
+                                                       </descriptorRefs>
+                                               </configuration>
+                                       </plugin>
+                               </plugins>
+                       </build>
+               </profile>
                <profile>
                        <id>check-osgi</id>
                        <build>

diff --git a/pom.xml b/pom.xml
index 5a1b188c00455f6e50210f826de25a1dc31b11b4..9b835da331a43da5e3eaa9f86264ef89b1bec779 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.maven</groupId>
                <artifactId>argeo-osgi-parent</artifactId>
-               <version>2.1.3</version>
+               <version>2.1.4-SNAPSHOT</version>
        </parent>
        <groupId>org.argeo.commons</groupId>
        <artifactId>argeo-commons</artifactId>
@@ -46,7 +46,6 @@
                <connection>scm:git:http://git.argeo.org/lgpl/argeo-commons.git</connection>
                <url>http://git.argeo.org/?p=lgpl/argeo-commons.git;a=summary</url>
                <developerConnection>scm:git:https://code.argeo.org/git/lgpl/argeo-commons.git</developerConnection>
-               <tag>v2.x</tag>
        </scm>
        <organization>
                <name>Argeo GmbH</name>