Merge branch 'master' into testing
authorMathieu Baudier <mbaudier@argeo.org>
Sat, 13 Nov 2021 08:32:47 +0000 (09:32 +0100)
committerMathieu Baudier <mbaudier@argeo.org>
Sat, 13 Nov 2021 08:32:47 +0000 (09:32 +0100)
85 files changed:
.gitignore
.project
cnf/.gitignore [new file with mode: 0644]
cnf/argeo.bnd [new file with mode: 0644]
cnf/build.bnd
cnf/ext/osgirepo.bnd [new file with mode: 0644]
cnf/maven.bnd [new file with mode: 0644]
cnf/testing.bnd [new file with mode: 0644]
cnf/unstable.bnd [new file with mode: 0644]
demo/.gitignore
demo/pom.xml
dep/.gitignore
dep/cnf/maven.bnd [new file with mode: 0644]
dep/org.argeo.dep.cms.client/.gitignore [deleted file]
dep/org.argeo.dep.cms.client/META-INF/.gitignore [deleted file]
dep/org.argeo.dep.cms.client/pom.xml
dep/org.argeo.dep.cms.e4.rap/.gitignore [deleted file]
dep/org.argeo.dep.cms.e4.rap/META-INF/.gitignore [deleted file]
dep/org.argeo.dep.cms.e4.rap/pom.xml
dep/org.argeo.dep.cms.ext/.gitignore [deleted file]
dep/org.argeo.dep.cms.ext/META-INF/.gitignore [deleted file]
dep/org.argeo.dep.cms.ext/pom.xml
dep/org.argeo.dep.cms.node/.gitignore [deleted file]
dep/org.argeo.dep.cms.node/META-INF/.gitignore [deleted file]
dep/org.argeo.dep.cms.node/pom.xml
dep/org.argeo.dep.cms.sdk/.gitignore [deleted file]
dep/org.argeo.dep.cms.sdk/META-INF/.gitignore [deleted file]
dep/org.argeo.dep.cms.sdk/bnd.bnd [deleted file]
dep/org.argeo.dep.cms.sdk/build.properties [deleted file]
dep/org.argeo.dep.cms.sdk/p2.inf [deleted file]
dep/org.argeo.dep.cms.sdk/pom.xml [deleted file]
dep/org.argeo.dep.cms.ui.rap/.gitignore [deleted file]
dep/org.argeo.dep.cms.ui.rap/META-INF/.gitignore [deleted file]
dep/org.argeo.dep.cms.ui.rap/pom.xml
dep/pom.xml
dist/.gitignore [deleted file]
dist/argeo-cli/.gitignore [deleted file]
dist/argeo-cli/pom.xml
dist/argeo-node/.gitignore [deleted file]
dist/argeo-node/pom.xml
dist/containers/.gitignore [deleted file]
dist/containers/pom.xml
dist/osgi-boot/.gitignore [deleted file]
dist/osgi-boot/pom.xml
dist/pom.xml
org.argeo.api/.gitignore [deleted file]
org.argeo.api/pom.xml
org.argeo.cms.e4.rap/.gitignore [deleted file]
org.argeo.cms.e4.rap/pom.xml
org.argeo.cms.e4/.gitignore [deleted file]
org.argeo.cms.e4/.settings/org.eclipse.jdt.core.prefs [deleted file]
org.argeo.cms.e4/pom.xml
org.argeo.cms.ui.rap/.gitignore [deleted file]
org.argeo.cms.ui.rap/pom.xml
org.argeo.cms.ui.theme/.gitignore [deleted file]
org.argeo.cms.ui.theme/.settings/org.eclipse.jdt.core.prefs [deleted file]
org.argeo.cms.ui.theme/.settings/org.eclipse.pde.core.prefs [deleted file]
org.argeo.cms.ui.theme/pom.xml
org.argeo.cms.ui/.gitignore [deleted file]
org.argeo.cms.ui/pom.xml
org.argeo.cms/.gitignore [deleted file]
org.argeo.cms/pom.xml
org.argeo.core/.gitignore [deleted file]
org.argeo.core/pom.xml
org.argeo.eclipse.ui.rap/.gitignore [deleted file]
org.argeo.eclipse.ui.rap/pom.xml
org.argeo.eclipse.ui/.gitignore [deleted file]
org.argeo.eclipse.ui/pom.xml
org.argeo.enterprise/.gitignore [deleted file]
org.argeo.enterprise/pom.xml
org.argeo.jcr/.gitignore [deleted file]
org.argeo.jcr/pom.xml
org.argeo.maintenance/.gitignore [deleted file]
org.argeo.maintenance/pom.xml
org.argeo.osgi.boot/.gitignore [deleted file]
org.argeo.osgi.boot/pom.xml
pom.xml
sdk/a2/.project [new file with mode: 0644]
sdk/a2/argeo-commons-upstream.target [new file with mode: 0644]
sdk/a2/build/.gitignore [new file with mode: 0644]
sdk/a2/upstream/.gitignore [new file with mode: 0644]
sdk/build.sh [new file with mode: 0644]
sdk/configure.sh [new file with mode: 0644]
sdk/ecj.args [new file with mode: 0644]
sdk/pom.xml [new file with mode: 0644]

index bcf25b2aca450dc41645b798b4fd74f07a421d4e..492e809ea5293775af439187d46c91da46ee80da 100644 (file)
@@ -1,2 +1,4 @@
-/target/
-*/generated
+**/bin/
+**/target/
+**/generated/
+**/MANIFEST.MF
index 2bb4833a36927ad044d4e9ec3cbdaa01664c19a5..c006088ca4ce1000df564ce770c2bd05ecc5f734 100644 (file)
--- a/.project
+++ b/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-       <name>argeo-commons</name>
+       <name>argeo-commons-unstable</name>
        <comment></comment>
        <projects>
        </projects>
diff --git a/cnf/.gitignore b/cnf/.gitignore
new file mode 100644 (file)
index 0000000..12011f0
--- /dev/null
@@ -0,0 +1 @@
+/release.bnd
diff --git a/cnf/argeo.bnd b/cnf/argeo.bnd
new file mode 100644 (file)
index 0000000..f221de0
--- /dev/null
@@ -0,0 +1,14 @@
+# Common
+qualifier=.next
+
+Bundle-Version: ${version.released}${qualifier}
+Private-Package: *.internal.*
+Export-Package: !*.internal.*; *
+-savemanifest : META-INF/MANIFEST.MF
+-includeresource.default : OSGI-INF/=-OSGI-INF/,e4xmi/=-e4xmi/,icons/=-icons/,img/=-img/
+-compression STORE
+-source true
+-removeheaders = Bnd-LastModified,Build-Jdk,Built-By,Tool,Created-By
+Automatic-Module-Name: ${bsn}
+SLC-Category=${category}
+-groupid=${category}
index 150e1d46aac5b4a2f2fdb38748250a3cf9e7e964..f39af41a12594bcbdb0e07b1236505549564026b 100644 (file)
@@ -1,18 +1,4 @@
-category: org.argeo.commons
-version: 2.1.104
-buildId: S
-#buildId: r${tstamp}
-
-Bundle-Version: 2.1.104.S
-Bundle-RequiredExecutionEnvironment: JavaSE-11
-
-Private-Package: org.argeo.*.internal.*
-Export-Package: !org.argeo.*.internal.*; org.argeo.*
-SLC-Category: ${category}
-#SLC-Build-Timestamp: ${tstamp}
--savemanifest = META-INF/MANIFEST.MF
--removeheaders = Bnd-LastModified,Build-Jdk,Built-By,Tool,Created-By
--groupId = ${category}
-Automatic-Module-Name: ${bsn}
-
-
+-include: \
+${workspace}/cnf/testing.bnd, \
+${workspace}/cnf/argeo.bnd, \
+-${workspace}/cnf/release.bnd
diff --git a/cnf/ext/osgirepo.bnd b/cnf/ext/osgirepo.bnd
new file mode 100644 (file)
index 0000000..427e7c5
--- /dev/null
@@ -0,0 +1,12 @@
+-plugin.osgirepo=aQute.bnd.repository.osgi.OSGiRepository;\
+               locations=file://${workspace}/sdk/target/a2/index.xml;\
+               max.stale=-1;\
+               poll.time=86400;\
+               name=local;\
+               cache=${build}/cache/local,\
+               aQute.bnd.repository.osgi.OSGiRepository;\
+               locations=file://${workspace}/sdk/target/sdk-2.3.1-SNAPSHOT-a2-target/index.xml;\
+               max.stale=-1;\
+               poll.time=86400;\
+               name=local;\
+               cache=${build}/cache/local
\ No newline at end of file
diff --git a/cnf/maven.bnd b/cnf/maven.bnd
new file mode 100644 (file)
index 0000000..05b9203
--- /dev/null
@@ -0,0 +1,3 @@
+-include: \
+../cnf/testing.bnd, \
+../cnf/argeo.bnd
diff --git a/cnf/testing.bnd b/cnf/testing.bnd
new file mode 100644 (file)
index 0000000..0f1c92e
--- /dev/null
@@ -0,0 +1,6 @@
+category=org.argeo.commons
+version.released=2.1.104
+Bundle-RequiredExecutionEnvironment=JavaSE-11
+
+argeo.rpm.stagingRepository=/srv/rpmfactory/testing/argeo-osgi-2/argeo
+argeo.rpm.suffix=
diff --git a/cnf/unstable.bnd b/cnf/unstable.bnd
new file mode 100644 (file)
index 0000000..e58775d
--- /dev/null
@@ -0,0 +1,6 @@
+category=org.argeo.commons
+version.released=2.3.1
+Bundle-RequiredExecutionEnvironment=JavaSE-11
+
+argeo.rpm.stagingRepository=/srv/rpmfactory/unstable/argeo-osgi-2/argeo
+argeo.rpm.suffix=-unstable
index 0980598ed076d25987f7a997f46a31add69db589..45dfa56f4afb8ab77dcb0a7f95e3f08b2f714a23 100644 (file)
@@ -1,2 +1 @@
 /exec/
-/target/
index 97a5dcef78b81af6ba326a4ccc65499e57f9081b..22d23f847fffca7b6bcf729faf1c068cc105f1b3 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.commons</groupId>
                <artifactId>argeo-commons</artifactId>
-               <version>2.1.104-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>demo</artifactId>
@@ -20,7 +20,7 @@
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.osgi.boot</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
        </dependencies>
        <profiles>
@@ -42,7 +42,7 @@
                                <dependency>
                                        <groupId>org.argeo.commons</groupId>
                                        <artifactId>org.argeo.dep.cms.e4.rap</artifactId>
-                                       <version>2.1.104-SNAPSHOT</version>
+                                       <version>2.1-SNAPSHOT</version>
                                </dependency>
                        </dependencies>
                </profile>
@@ -64,7 +64,7 @@
                                <dependency>
                                        <groupId>org.argeo.commons</groupId>
                                        <artifactId>org.argeo.dep.cms.e4.rap</artifactId>
-                                       <version>2.1.104-SNAPSHOT</version>
+                                       <version>2.1-SNAPSHOT</version>
                                </dependency>
                        </dependencies>
                </profile>
index b83d22266ac8aa2f8df2edef68082c789727841d..b5f8bb4b08800ddd64a7a8acf608d0395934bc09 100644 (file)
@@ -1 +1,3 @@
-/target/
+*/feature.xml
+*/modularDistribution.csv
+*/*-maven.target
diff --git a/dep/cnf/maven.bnd b/dep/cnf/maven.bnd
new file mode 100644 (file)
index 0000000..4bd5c0c
--- /dev/null
@@ -0,0 +1 @@
+-include: ../../cnf/maven.bnd
\ No newline at end of file
diff --git a/dep/org.argeo.dep.cms.client/.gitignore b/dep/org.argeo.dep.cms.client/.gitignore
deleted file mode 100644 (file)
index e26e09f..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-/target/
-/feature.xml
-/modularDistribution.csv
-/*-maven.target
diff --git a/dep/org.argeo.dep.cms.client/META-INF/.gitignore b/dep/org.argeo.dep.cms.client/META-INF/.gitignore
deleted file mode 100644 (file)
index 4854a41..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/MANIFEST.MF
index 81a2fa76ed73a7a38dae0238c586e48b368ec184..d7354d9ad0020096929130a8ac69851d47a89552 100644 (file)
@@ -3,7 +3,7 @@
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons</groupId>
-               <version>2.1.104-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <artifactId>dep</artifactId>
                <relativePath>..</relativePath>
        </parent>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.enterprise</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.jcr</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.core</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
 
                <!-- Third Parties -->
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.osgi.boot</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                        <scope>test</scope>
                </dependency>
        </dependencies>
                                                                        <goal>rpm</goal>
                                                                </goals>
                                                                <configuration>
-                                                                       <name>argeo-cms-client</name>
+                                                                       <name>argeo-cms-client${argeo.rpm.suffix}</name>
+                                                                       <projversion>${version.released}</projversion>
+                                                                       <release>${maven.build.timestamp}</release>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/usr/share/osgi</directory>
                                                                                </mapping>
                                                                        </mappings>
                                                                        <requires>
-                                                                               <require>argeo-cms-client-tp</require>
-                                                                               <require>argeo-osgi-boot</require>
+                                                                               <require>argeo-cms-client-tp${argeo.rpm.suffix}</require>
+                                                                               <require>argeo-osgi-boot${argeo.rpm.suffix}</require>
                                                                        </requires>
                                                                </configuration>
                                                        </execution>
                                                                        <goal>rpm</goal>
                                                                </goals>
                                                                <configuration>
-                                                                       <name>argeo-cms-client-tp</name>
+                                                                       <name>argeo-cms-client-tp${argeo.rpm.suffix}</name>
                                                                        <projversion>${version.argeo-tp}</projversion>
                                                                        <release>${maven.build.timestamp}</release>
                                                                        <mappings>
diff --git a/dep/org.argeo.dep.cms.e4.rap/.gitignore b/dep/org.argeo.dep.cms.e4.rap/.gitignore
deleted file mode 100644 (file)
index 7bfff59..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-/target/
-/feature.xml
-/modularDistribution.csv
-/*.target
diff --git a/dep/org.argeo.dep.cms.e4.rap/META-INF/.gitignore b/dep/org.argeo.dep.cms.e4.rap/META-INF/.gitignore
deleted file mode 100644 (file)
index 4854a41..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/MANIFEST.MF
index ff12645c65ca21b1a872aacc16c42f27a18aa4bd..df05ac93af6fb955cf2528277f71b433bd9ce124 100644 (file)
@@ -3,7 +3,7 @@
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons</groupId>
-               <version>2.1.104-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <artifactId>dep</artifactId>
                <relativePath>..</relativePath>
        </parent>
@@ -15,7 +15,7 @@
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.dep.cms.ui.rap</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                        <type>pom</type>
                </dependency>
 
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.cms.e4</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.cms.e4.rap</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
 
                <!-- SVG and CSS -->
                                                                        <goal>rpm</goal>
                                                                </goals>
                                                                <configuration>
-                                                                       <name>argeo-cms-e4-rap</name>
+                                                                       <name>argeo-cms-e4-rap${argeo.rpm.suffix}</name>
+                                                                       <projversion>${version.released}</projversion>
+                                                                       <release>${maven.build.timestamp}</release>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/usr/share/osgi</directory>
                                                                                </mapping>
                                                                        </mappings>
                                                                        <requires>
-                                                                               <require>argeo-cms-ui-rap</require>
-                                                                               <require>argeo-cms-e4-rap-tp</require>
+                                                                               <require>argeo-cms-ui-rap${argeo.rpm.suffix}</require>
+                                                                               <require>argeo-cms-e4-rap-tp${argeo.rpm.suffix}</require>
                                                                        </requires>
                                                                </configuration>
                                                        </execution>
                                                                        <goal>rpm</goal>
                                                                </goals>
                                                                <configuration>
-                                                                       <name>argeo-cms-e4-rap-tp</name>
+                                                                       <name>argeo-cms-e4-rap-tp${argeo.rpm.suffix}</name>
                                                                        <projversion>${version.argeo-tp}</projversion>
                                                                        <release>${maven.build.timestamp}</release>
                                                                        <mappings>
                                                                                </mapping>
                                                                        </mappings>
                                                                        <requires>
-                                                                               <require>argeo-cms-ui-rap-tp</require>
+                                                                               <require>argeo-cms-ui-rap-tp${argeo.rpm.suffix}</require>
                                                                        </requires>
                                                                </configuration>
                                                        </execution>
diff --git a/dep/org.argeo.dep.cms.ext/.gitignore b/dep/org.argeo.dep.cms.ext/.gitignore
deleted file mode 100644 (file)
index e26e09f..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-/target/
-/feature.xml
-/modularDistribution.csv
-/*-maven.target
diff --git a/dep/org.argeo.dep.cms.ext/META-INF/.gitignore b/dep/org.argeo.dep.cms.ext/META-INF/.gitignore
deleted file mode 100644 (file)
index 4854a41..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/MANIFEST.MF
index f657231f454b4f668e753be05aa6a69f7ee07d57..3749a9f8e839a258818f972ed9d99e47dba7ea7e 100644 (file)
@@ -5,7 +5,7 @@
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons</groupId>
-               <version>2.1.104-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <artifactId>dep</artifactId>
                <relativePath>..</relativePath>
        </parent>
                                                                        <goal>rpm</goal>
                                                                </goals>
                                                                <configuration>
-                                                                       <name>argeo-cms-ext-tp</name>
+                                                                       <name>argeo-cms-ext-tp${argeo.rpm.suffix}</name>
                                                                        <projversion>${version.argeo-tp}</projversion>
                                                                        <release>${maven.build.timestamp}</release>
                                                                        <mappings>
                                                                                </mapping>
                                                                        </mappings>
                                                                        <requires>
-                                                                               <require>argeo-cms-node-tp</require>
+                                                                               <require>argeo-cms-node-tp${argeo.rpm.suffix}</require>
                                                                        </requires>
                                                                </configuration>
                                                        </execution>
diff --git a/dep/org.argeo.dep.cms.node/.gitignore b/dep/org.argeo.dep.cms.node/.gitignore
deleted file mode 100644 (file)
index e26e09f..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-/target/
-/feature.xml
-/modularDistribution.csv
-/*-maven.target
diff --git a/dep/org.argeo.dep.cms.node/META-INF/.gitignore b/dep/org.argeo.dep.cms.node/META-INF/.gitignore
deleted file mode 100644 (file)
index 4854a41..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/MANIFEST.MF
index 1174ddf97377d29348387d3c8e52b71ace3914d6..656da2955630600d72a3f1e282a2156b5020d440 100644 (file)
@@ -3,7 +3,7 @@
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons</groupId>
-               <version>2.1.104-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <artifactId>dep</artifactId>
                <relativePath>..</relativePath>
        </parent>
@@ -15,7 +15,7 @@
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.dep.cms.client</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                        <type>pom</type>
                </dependency>
 
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.api</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.cms</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.maintenance</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
 
                <!-- CMS Dependencies -->
                                                                        <goal>rpm</goal>
                                                                </goals>
                                                                <configuration>
-                                                                       <name>argeo-cms-node</name>
+                                                                       <name>argeo-cms-node${argeo.rpm.suffix}</name>
+                                                                       <projversion>${version.released}</projversion>
+                                                                       <release>${maven.build.timestamp}</release>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/usr/share/osgi</directory>
                                                                                </mapping>
                                                                        </mappings>
                                                                        <requires>
-                                                                               <require>argeo-cms-client</require>
-                                                                               <require>argeo-cms-node-tp</require>
+                                                                               <require>argeo-cms-client${argeo.rpm.suffix}</require>
+                                                                               <require>argeo-cms-node-tp${argeo.rpm.suffix}</require>
                                                                        </requires>
                                                                </configuration>
                                                        </execution>
                                                                                </mapping>
                                                                        </mappings>
                                                                        <requires>
-                                                                               <require>argeo-cms-client-tp</require>
+                                                                               <require>argeo-cms-client-tp${argeo.rpm.suffix}</require>
                                                                        </requires>
                                                                </configuration>
                                                        </execution>
diff --git a/dep/org.argeo.dep.cms.sdk/.gitignore b/dep/org.argeo.dep.cms.sdk/.gitignore
deleted file mode 100644 (file)
index e26e09f..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-/target/
-/feature.xml
-/modularDistribution.csv
-/*-maven.target
diff --git a/dep/org.argeo.dep.cms.sdk/META-INF/.gitignore b/dep/org.argeo.dep.cms.sdk/META-INF/.gitignore
deleted file mode 100644 (file)
index 4854a41..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/MANIFEST.MF
diff --git a/dep/org.argeo.dep.cms.sdk/bnd.bnd b/dep/org.argeo.dep.cms.sdk/bnd.bnd
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/dep/org.argeo.dep.cms.sdk/build.properties b/dep/org.argeo.dep.cms.sdk/build.properties
deleted file mode 100644 (file)
index edef3d9..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-bin.includes = feature.xml,\
-               modularDistribution.csv
diff --git a/dep/org.argeo.dep.cms.sdk/p2.inf b/dep/org.argeo.dep.cms.sdk/p2.inf
deleted file mode 100644 (file)
index 0423aa5..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-properties.1.name=org.eclipse.equinox.p2.type.category
-properties.1.value=true
\ No newline at end of file
diff --git a/dep/org.argeo.dep.cms.sdk/pom.xml b/dep/org.argeo.dep.cms.sdk/pom.xml
deleted file mode 100644 (file)
index 1029790..0000000
+++ /dev/null
@@ -1,129 +0,0 @@
-<?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">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>org.argeo.commons</groupId>
-               <version>2.1.104-SNAPSHOT</version>
-               <artifactId>dep</artifactId>
-               <relativePath>..</relativePath>
-       </parent>
-       <artifactId>org.argeo.dep.cms.sdk</artifactId>
-       <name>CMS SDK</name>
-       <dependencies>
-               <!-- Parent dependencies -->
-               <dependency>
-                       <groupId>org.argeo.commons</groupId>
-                       <artifactId>org.argeo.dep.cms.ui.rap</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
-                       <type>pom</type>
-               </dependency>
-
-               <!-- OSGi Boot for platform generation only, as it could be used by regular 
-                       Java applications to launch an OSGi runtime. -->
-               <dependency>
-                       <groupId>org.argeo.commons</groupId>
-                       <artifactId>org.argeo.osgi.boot</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
-                       <scope>test</scope>
-               </dependency>
-
-               <!-- ALM Third Parties -->
-               <!-- <dependency> -->
-               <!-- <groupId>org.argeo.tp.apache.ant</groupId> -->
-               <!-- <artifactId>org.apache.ant</artifactId> -->
-               <!-- </dependency> -->
-               <!-- <dependency> -->
-               <!-- <groupId>org.argeo.tp.apache.ant</groupId> -->
-               <!-- <artifactId>org.apache.ant.launch</artifactId> -->
-               <!-- </dependency> -->
-
-               <dependency>
-                       <groupId>org.argeo.tp.sdk</groupId>
-                       <artifactId>biz.aQute.bndlib</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.sdk</groupId>
-                       <artifactId>org.junit</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.sdk</groupId>
-                       <artifactId>org.hamcrest</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.sdk</groupId>
-                       <artifactId>org.redline-rpm</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.misc</groupId>
-                       <artifactId>com.googlecode.javaewah.JavaEWAH</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.misc</groupId>
-                       <artifactId>org.eclipse.jgit</artifactId>
-               </dependency>
-       </dependencies>
-
-       <profiles>
-               <profile>
-                       <id>rpmbuild-tp</id>
-                       <build>
-                               <plugins>
-                                       <plugin>
-                                               <artifactId>maven-assembly-plugin</artifactId>
-                                               <executions>
-                                                       <execution>
-                                                               <id>prepare-source-tp</id>
-                                                               <phase>package</phase>
-                                                               <goals>
-                                                                       <goal>single</goal>
-                                                               </goals>
-                                                               <configuration>
-                                                                       <descriptorRefs>
-                                                                               <descriptorRef>a2-source-tp</descriptorRef>
-                                                                       </descriptorRefs>
-                                                               </configuration>
-                                                       </execution>
-                                               </executions>
-                                       </plugin>
-                                       <plugin>
-                                               <groupId>org.codehaus.mojo</groupId>
-                                               <artifactId>rpm-maven-plugin</artifactId>
-                                               <executions>
-                                                       <execution>
-                                                               <id>rpm-tp</id>
-                                                               <phase>package</phase>
-                                                               <goals>
-                                                                       <goal>rpm</goal>
-                                                               </goals>
-                                                               <configuration>
-                                                                       <name>argeo-cms-sdk-tp</name>
-                                                                       <projversion>${version.argeo-tp}</projversion>
-                                                                       <release>${maven.build.timestamp}</release>
-                                                                       <mappings>
-                                                                               <mapping>
-                                                                                       <directory>/usr/share/osgi</directory>
-                                                                                       <username>root</username>
-                                                                                       <groupname>root</groupname>
-                                                                                       <filemode>644</filemode>
-                                                                                       <directoryIncluded>false</directoryIncluded>
-                                                                                       <sources>
-                                                                                               <source>
-                                                                                                       <location>${project.build.directory}/${project.artifactId}-${project.version}-a2-source-tp</location>
-                                                                                                       <includes>
-                                                                                                               <include>**/*.jar</include>
-                                                                                                       </includes>
-                                                                                               </source>
-                                                                                       </sources>
-                                                                               </mapping>
-                                                                       </mappings>
-                                                                       <requires>
-                                                                       </requires>
-                                                               </configuration>
-                                                       </execution>
-                                               </executions>
-                                       </plugin>
-                               </plugins>
-                       </build>
-               </profile>
-       </profiles>
-</project>
\ No newline at end of file
diff --git a/dep/org.argeo.dep.cms.ui.rap/.gitignore b/dep/org.argeo.dep.cms.ui.rap/.gitignore
deleted file mode 100644 (file)
index 7bfff59..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-/target/
-/feature.xml
-/modularDistribution.csv
-/*.target
diff --git a/dep/org.argeo.dep.cms.ui.rap/META-INF/.gitignore b/dep/org.argeo.dep.cms.ui.rap/META-INF/.gitignore
deleted file mode 100644 (file)
index 4854a41..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/MANIFEST.MF
index 064ca8703ffc111f02f43a48579894cee96dbab1..b00284f4fc3d26ce034e537f415a6291992f7ff1 100644 (file)
@@ -3,7 +3,7 @@
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons</groupId>
-               <version>2.1.104-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <artifactId>dep</artifactId>
                <relativePath>..</relativePath>
        </parent>
@@ -15,7 +15,7 @@
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.dep.cms.node</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                        <type>pom</type>
                </dependency>
 
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.eclipse.ui</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.eclipse.ui.rap</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.cms.ui</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.cms.ui.rap</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.cms.ui.theme</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
 
                <!-- SDK -->
                                                                        <goal>rpm</goal>
                                                                </goals>
                                                                <configuration>
-                                                                       <name>argeo-cms-ui-rap</name>
+                                                                       <name>argeo-cms-ui-rap${argeo.rpm.suffix}</name>
+                                                                       <projversion>${version.released}</projversion>
+                                                                       <release>${maven.build.timestamp}</release>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/usr/share/osgi</directory>
                                                                        <goal>rpm</goal>
                                                                </goals>
                                                                <configuration>
-                                                                       <name>argeo-cms-ui-rap-tp</name>
+                                                                       <name>argeo-cms-ui-rap-tp${argeo.rpm.suffix}</name>
                                                                        <projversion>${version.argeo-tp}</projversion>
                                                                        <release>${maven.build.timestamp}</release>
                                                                        <mappings>
                                                                                </mapping>
                                                                        </mappings>
                                                                        <requires>
-                                                                               <require>argeo-cms-node-tp</require>
+                                                                               <require>argeo-cms-node-tp${argeo.rpm.suffix}</require>
                                                                        </requires>
                                                                </configuration>
                                                        </execution>
index 3293a560c91b7665e9bb838e08188521f0261b00..7c3b04cb64cbe3fab3c1815962067ca02f7b77f1 100644 (file)
@@ -1,10 +1,12 @@
 <?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>
                <artifactId>argeo-commons</artifactId>
-               <version>2.1.104-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>dep</artifactId>
        </modules>
        <build>
                <plugins>
+                       <plugin>
+                               <groupId>org.codehaus.mojo</groupId>
+                               <artifactId>properties-maven-plugin</artifactId>
+                               <configuration>
+                                       <quiet>true</quiet>
+                                       <files>
+                                               <file>../../cnf/${version.context}.bnd</file>
+                                       </files>
+                               </configuration>
+                       </plugin>
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
                </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>
                                <dependency>
                                        <groupId>org.argeo.commons</groupId>
                                        <artifactId>org.argeo.osgi.boot</artifactId>
-                                       <version>2.1.104-SNAPSHOT</version>
+                                       <version>2.1-SNAPSHOT</version>
                                        <scope>test</scope>
                                </dependency>
                        </dependencies>
diff --git a/dist/.gitignore b/dist/.gitignore
deleted file mode 100644 (file)
index 66cc710..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-/target/
-
diff --git a/dist/argeo-cli/.gitignore b/dist/argeo-cli/.gitignore
deleted file mode 100644 (file)
index b83d222..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/target/
index 29ec5f5759372e90bdbc8e2d65385d7e88f6de07..4d2aa70c0d798bd2fb37f6df8edd667a4a3c42e0 100644 (file)
@@ -2,7 +2,7 @@
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons</groupId>
-               <version>2.1.104-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <artifactId>dist</artifactId>
                <relativePath>..</relativePath>
        </parent>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.dep.cms.client</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.dep.cms.node</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
        </dependencies>
        <profiles>
@@ -67,7 +67,9 @@
                                                                        <goal>rpm</goal>
                                                                </goals>
                                                                <configuration>
-                                                                       <name>argeo-cli</name>
+                                                                       <name>argeo-cli${argeo.rpm.suffix}</name>
+                                                                       <projversion>${version.released}</projversion>
+                                                                       <release>${maven.build.timestamp}</release>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/etc/argeo-cli</directory>
diff --git a/dist/argeo-node/.gitignore b/dist/argeo-node/.gitignore
deleted file mode 100644 (file)
index b83d222..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/target/
index 452e8379c63a014ed2d7513a48473a056ba554b9..10be1edb58373ecb64e7c7abf390031ca9b65d1c 100644 (file)
@@ -2,7 +2,7 @@
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons</groupId>
-               <version>2.1.104-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <artifactId>dist</artifactId>
                <relativePath>..</relativePath>
        </parent>
                                <dependency>
                                        <groupId>org.argeo.commons</groupId>
                                        <artifactId>org.argeo.dep.cms.client</artifactId>
-                                       <version>2.1.104-SNAPSHOT</version>
+                                       <version>2.1-SNAPSHOT</version>
                                </dependency>
                                <dependency>
                                        <groupId>org.argeo.commons</groupId>
                                        <artifactId>org.argeo.dep.cms.node</artifactId>
-                                       <version>2.1.104-SNAPSHOT</version>
+                                       <version>2.1-SNAPSHOT</version>
                                </dependency>
                                <dependency>
                                        <groupId>org.argeo.commons</groupId>
                                        <artifactId>org.argeo.dep.cms.e4.rap</artifactId>
-                                       <version>2.1.104-SNAPSHOT</version>
+                                       <version>2.1-SNAPSHOT</version>
                                </dependency>
                                <dependency>
                                        <groupId>org.argeo.commons</groupId>
                                        <artifactId>osgi-boot</artifactId>
                                        <type>zip</type>
-                                       <version>2.1.104-SNAPSHOT</version>
+                                       <version>2.1-SNAPSHOT</version>
                                </dependency>
                        </dependencies>
                        <build>
@@ -41,7 +41,7 @@
                                                <groupId>org.apache.maven.plugins</groupId>
                                                <artifactId>maven-assembly-plugin</artifactId>
                                                <configuration>
-                                                       <finalName>argeo-node-${project.version}</finalName>
+                                                       <finalName>argeo-node-${version.released}${buildId}</finalName>
                                                        <appendAssemblyId>false</appendAssemblyId>
                                                        <descriptors>
                                                                <descriptor>assembly/cms-e4-rap.xml</descriptor>
@@ -75,7 +75,9 @@
                                                                        <goal>rpm</goal>
                                                                </goals>
                                                                <configuration>
-                                                                       <name>argeo-node</name>
+                                                                       <name>argeo-node${argeo.rpm.suffix}</name>
+                                                                       <projversion>${version.released}</projversion>
+                                                                       <release>${maven.build.timestamp}</release>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/etc/argeo</directory>
                                                                                </mapping>
                                                                        </mappings>
                                                                        <requires>
-                                                                               <require>argeo-cms-node</require>
-                                                                               <require>argeo-osgi-boot</require>
+                                                                               <require>argeo-cms-node${argeo.rpm.suffix}</require>
+                                                                               <require>argeo-osgi-boot${argeo.rpm.suffix}</require>
                                                                                <!-- do not explicitely require java -->
                                                                        </requires>
                                                                </configuration>
diff --git a/dist/containers/.gitignore b/dist/containers/.gitignore
deleted file mode 100644 (file)
index b83d222..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/target/
index fc92e2c6cad4a1b994af72c2ba48f991a4c15f5c..cc3242537032469469397fbaac2a5aa44afa81f9 100644 (file)
@@ -2,7 +2,7 @@
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons</groupId>
-               <version>2.1.104-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <artifactId>dist</artifactId>
                <relativePath>..</relativePath>
        </parent>
diff --git a/dist/osgi-boot/.gitignore b/dist/osgi-boot/.gitignore
deleted file mode 100644 (file)
index 66cc710..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-/target/
-
index d339ed5d204f3f275cebee79ed8643b04e417186..239f3688c231866c588d79684a9f817e9c6060af 100644 (file)
@@ -2,7 +2,7 @@
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons</groupId>
-               <version>2.1.104-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <artifactId>dist</artifactId>
                <relativePath>..</relativePath>
        </parent>
@@ -23,7 +23,7 @@
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.osgi.boot</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
        </dependencies>
        <profiles>
@@ -69,7 +69,9 @@
                                                                        <goal>rpm</goal>
                                                                </goals>
                                                                <configuration>
-                                                                       <name>argeo-osgi-boot</name>
+                                                                       <name>argeo-osgi-boot${argeo.rpm.suffix}</name>
+                                                                       <projversion>${version.released}</projversion>
+                                                                       <release>${maven.build.timestamp}</release>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/usr/bin</directory>
                                                                                </mapping>
                                                                        </mappings>
                                                                        <requires>
-                                                                               <require>argeo-osgi-boot-equinox</require>
+                                                                               <require>argeo-osgi-boot-equinox${argeo.rpm.suffix}</require>
                                                                        </requires>
                                                                </configuration>
                                                        </execution>
                                                                        <goal>rpm</goal>
                                                                </goals>
                                                                <configuration>
-                                                                       <name>argeo-osgi-boot-equinox</name>
+                                                                       <name>argeo-osgi-boot-equinox${argeo.rpm.suffix}</name>
                                                                        <projversion>${version.argeo-tp}</projversion>
                                                                        <release>${maven.build.timestamp}</release>
                                                                        <mappings>
index f6f87860d48a50da112007a3d740348ffba7462a..52ed45d55b89d15926e692061e0f4c3b5bed1d91 100644 (file)
@@ -1,10 +1,12 @@
 <?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>
                <artifactId>argeo-commons</artifactId>
-               <version>2.1.104-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>dist</artifactId>
                <module>argeo-node</module>
                <module>containers</module>
        </modules>
+       <build>
+               <plugins>
+                       <plugin>
+                               <groupId>org.codehaus.mojo</groupId>
+                               <artifactId>properties-maven-plugin</artifactId>
+                               <configuration>
+                                       <quiet>true</quiet>
+                                       <files>
+                                               <file>../../cnf/${version.context}.bnd</file>
+                                       </files>
+                               </configuration>
+                       </plugin>
+               </plugins>
+       </build>
 </project>
\ No newline at end of file
diff --git a/org.argeo.api/.gitignore b/org.argeo.api/.gitignore
deleted file mode 100644 (file)
index 09e3bc9..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-/bin/
-/target/
index d7f018883b5019f43cff7a07fed5b09d610e3969..8f3c15c572306754a0eea712d5fd850363516fe3 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.commons</groupId>
                <artifactId>argeo-commons</artifactId>
-               <version>2.1.104-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.api</artifactId>
diff --git a/org.argeo.cms.e4.rap/.gitignore b/org.argeo.cms.e4.rap/.gitignore
deleted file mode 100644 (file)
index 09e3bc9..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-/bin/
-/target/
index f1ec50191646ebafe14ca88b2f7f5acfe36faccb..81f2fcacc470be9fefedd7a37659f60728a814b8 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.commons</groupId>
                <artifactId>argeo-commons</artifactId>
-               <version>2.1.104-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.cms.e4.rap</artifactId>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.cms.ui.rap</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.cms.e4</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <!-- Specific -->
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.eclipse.ui.rap</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                        <scope>provided</scope>
                </dependency>
 
diff --git a/org.argeo.cms.e4/.gitignore b/org.argeo.cms.e4/.gitignore
deleted file mode 100644 (file)
index 09e3bc9..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-/bin/
-/target/
diff --git a/org.argeo.cms.e4/.settings/org.eclipse.jdt.core.prefs b/org.argeo.cms.e4/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644 (file)
index 0c68a61..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
index 24a386afee57c6c3ea0270f737aa57f7f54f09ad..fd1842afd33420104cb604d04ffebe49225ab969 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.commons</groupId>
                <artifactId>argeo-commons</artifactId>
-               <version>2.1.104-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.cms.e4</artifactId>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.cms.ui</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
 
                <!-- UI -->
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.eclipse.ui.rap</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                        <scope>provided</scope>
                </dependency>
                <dependency>
diff --git a/org.argeo.cms.ui.rap/.gitignore b/org.argeo.cms.ui.rap/.gitignore
deleted file mode 100644 (file)
index 09e3bc9..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-/bin/
-/target/
index 8f5df3373c23b6a8fadc6a5c9b8846a553e54588..37fdd9a174206488bdd9b6c06f5c2ef2d0e207d4 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.commons</groupId>
                <artifactId>argeo-commons</artifactId>
-               <version>2.1.104-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.cms.ui.rap</artifactId>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.cms.ui</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <!-- Specific -->
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.eclipse.ui.rap</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                        <scope>provided</scope>
                </dependency>
 
@@ -28,7 +28,7 @@
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.cms.ui.theme</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
 
                <!-- UI -->
diff --git a/org.argeo.cms.ui.theme/.gitignore b/org.argeo.cms.ui.theme/.gitignore
deleted file mode 100644 (file)
index 09e3bc9..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-/bin/
-/target/
diff --git a/org.argeo.cms.ui.theme/.settings/org.eclipse.jdt.core.prefs b/org.argeo.cms.ui.theme/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644 (file)
index 0c68a61..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
diff --git a/org.argeo.cms.ui.theme/.settings/org.eclipse.pde.core.prefs b/org.argeo.cms.ui.theme/.settings/org.eclipse.pde.core.prefs
deleted file mode 100644 (file)
index f29e940..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-eclipse.preferences.version=1
-pluginProject.extensions=false
-resolve.requirebundle=false
index e11b0655a63a512500ef07e6429bc6140791640a..b30460a81a0f79b01dfd8f6fd789366d33c68035 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.commons</groupId>
                <artifactId>argeo-commons</artifactId>
-               <version>2.1.104-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.cms.ui.theme</artifactId>
diff --git a/org.argeo.cms.ui/.gitignore b/org.argeo.cms.ui/.gitignore
deleted file mode 100644 (file)
index 09e3bc9..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-/bin/
-/target/
index af0ea3e2fb0ecf110741881ae1924918d2682583..186bb1e5b3c6b9e56f7742d1a65c449a44035068 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.commons</groupId>
                <artifactId>argeo-commons</artifactId>
-               <version>2.1.104-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.cms.ui</artifactId>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.cms</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <!-- Specific -->
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.eclipse.ui.rap</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                        <scope>provided</scope>
                </dependency>
 
@@ -28,7 +28,7 @@
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.cms.ui.theme</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
 
                <!-- UI -->
diff --git a/org.argeo.cms/.gitignore b/org.argeo.cms/.gitignore
deleted file mode 100644 (file)
index 09e3bc9..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-/bin/
-/target/
index 351ed53918f1965bdd821c031f2d1d60caaf7e8d..45aaa917ef8dbed92845eddd1386abfd486e8638 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.commons</groupId>
                <artifactId>argeo-commons</artifactId>
-               <version>2.1.104-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.cms</artifactId>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.api</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.jcr</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.enterprise</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.core</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.maintenance</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
        </dependencies>
 </project>
\ No newline at end of file
diff --git a/org.argeo.core/.gitignore b/org.argeo.core/.gitignore
deleted file mode 100644 (file)
index c1639dd..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-/bin/
-/target/
-id_rsa
-id_rsa.pub
index c5a35ccb7fc8998688d88f94ecf1b8872600b8ab..b1dfe92c6d6072eac280f73fe11404fd8fef7e0b 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.commons</groupId>
                <artifactId>argeo-commons</artifactId>
-               <version>2.1.104-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.core</artifactId>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.enterprise</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.jcr</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
        </dependencies>
 </project>
\ No newline at end of file
diff --git a/org.argeo.eclipse.ui.rap/.gitignore b/org.argeo.eclipse.ui.rap/.gitignore
deleted file mode 100644 (file)
index 09e3bc9..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-/bin/
-/target/
index b3c1b75bf94020bc67b4262fc4fe9aac7d713915..e56d4395bfea8e9cdfa0214624e4cc1f645bc1d6 100644 (file)
@@ -3,7 +3,7 @@
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons</groupId>
-               <version>2.1.104-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <artifactId>argeo-commons</artifactId>
                <relativePath>..</relativePath>
        </parent>
@@ -13,7 +13,7 @@
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.eclipse.ui</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
 
                <!-- UI -->
diff --git a/org.argeo.eclipse.ui/.gitignore b/org.argeo.eclipse.ui/.gitignore
deleted file mode 100644 (file)
index 09e3bc9..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-/bin/
-/target/
index 34639d81053aba62f81e1809e5e7d79ce643e392..e3069dd374f7f6ac6618d4144f859f69d3175dd4 100644 (file)
@@ -3,7 +3,7 @@
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons</groupId>
-               <version>2.1.104-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <artifactId>argeo-commons</artifactId>
                <relativePath>..</relativePath>
        </parent>
@@ -18,7 +18,7 @@
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.jcr</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
 
                <!-- UI -->
diff --git a/org.argeo.enterprise/.gitignore b/org.argeo.enterprise/.gitignore
deleted file mode 100644 (file)
index 09e3bc9..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-/bin/
-/target/
index 18701b219556e345cb719123da5cfad172bd2147..fef408449f533085cf6cf13de394f9cebb6070b4 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.commons</groupId>
                <artifactId>argeo-commons</artifactId>
-               <version>2.1.104-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.enterprise</artifactId>
diff --git a/org.argeo.jcr/.gitignore b/org.argeo.jcr/.gitignore
deleted file mode 100644 (file)
index 09e3bc9..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-/bin/
-/target/
index ae4e0bc043268d20772d3cef78d9f9b1c105b9be..99becb52ea352f39bd3134682c200b4a96e67c6a 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <groupId>org.argeo.commons</groupId>
                <artifactId>argeo-commons</artifactId>
-               <version>2.1.104-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.jcr</artifactId>
diff --git a/org.argeo.maintenance/.gitignore b/org.argeo.maintenance/.gitignore
deleted file mode 100644 (file)
index bdd97df..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-/bin/
-/target/
-/testBackup/
index 4078554430df83dae8d8ed4f2ae7d673a87ea514..b061f87cdaed55e12f343bc068a5d4dfd810f285 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.commons</groupId>
                <artifactId>argeo-commons</artifactId>
-               <version>2.1.104-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.maintenance</artifactId>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.jcr</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.enterprise</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.core</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.api</artifactId>
-                       <version>2.1.104-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
        </dependencies>
 </project>
\ No newline at end of file
diff --git a/org.argeo.osgi.boot/.gitignore b/org.argeo.osgi.boot/.gitignore
deleted file mode 100644 (file)
index 0d2e1e3..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-/bin/
-/target/
-/configuration/
-/state/
-/data/
-/log4j.properties
index 1c870e88c70ea3d02d8296d6924d3e033041e86d..1bf95002e90ca582be34b0c0bf1c6fde34353e89 100644 (file)
@@ -3,7 +3,7 @@
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons</groupId>
-               <version>2.1.104-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <artifactId>argeo-commons</artifactId>
                <relativePath>..</relativePath>
        </parent>
diff --git a/pom.xml b/pom.xml
index 96886f01b4ed2173d60ae8954c6c42a0170ae03e..c39b9127073967253c0f1d46156cf4e1a354e29d 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -4,18 +4,17 @@
        <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>
-       <version>2.1.104-SNAPSHOT</version>
+       <version>2.1-SNAPSHOT</version>
        <name>Argeo Commons</name>
        <packaging>pom</packaging>
        <url>http://www.argeo.org/</url>
        <properties>
+               <version.context>testing</version.context>
                <version.argeo-tp>2.1.27</version.argeo-tp>
-               <!-- RPM -->
-               <argeo.rpm.stagingRepository>/srv/rpmfactory/testing/argeo-osgi-2/argeo</argeo.rpm.stagingRepository>
                <project.scm.id>code.argeo.org</project.scm.id>
        </properties>
        <modules>
                <module>dep</module>
                <module>demo</module>
                <module>dist</module>
+               <module>sdk</module>
        </modules>
        <scm>
                <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>
        <distributionManagement>
                <repository>
                        <id>staging</id>
-                       <url>dav:https://forge.argeo.org/data/java/argeo-2.1/</url>
+                       <url>dav:https://forge.argeo.org/data/java/argeo-2.3</url>
                        <uniqueVersion>false</uniqueVersion>
                </repository>
                <site>
                        <id>staging</id>
-                       <url>file:///srv/docfactory/argeo-2.1/site/argeo-commons/</url>
+                       <url>file:///srv/docfactory/argeo-2.3/site/argeo-commons/</url>
                </site>
        </distributionManagement>
        <repositories>
                                <enabled>false</enabled>
                        </snapshots>
                </repository>
+               <repository>
+                       <id>argeo-unstable</id>
+                       <url>http://forge.argeo.org/data/java/argeo-2.3/</url>
+                       <releases>
+                               <enabled>true</enabled>
+                               <updatePolicy>never</updatePolicy>
+                               <checksumPolicy>warn</checksumPolicy>
+                       </releases>
+                       <snapshots>
+                               <enabled>false</enabled>
+                       </snapshots>
+               </repository>
                <!-- Disable Maven default repository -->
                <repository>
                        <id>central</id>
                        <repositories>
                                <repository>
                                        <id>argeo</id>
-                                       <url>http://localhost:7080/data/java/argeo-2.1</url>
+                                       <url>http://localhost:7080/data/java/argeo-2.3</url>
                                        <releases>
                                                <enabled>true</enabled>
                                                <updatePolicy>daily</updatePolicy>
                        <distributionManagement>
                                <repository>
                                        <id>staging</id>
-                                       <url>dav:http://localhost:7080/data/java/argeo-2.1/</url>
+                                       <url>dav:http://localhost:7080/data/java/argeo-2.3/</url>
                                        <uniqueVersion>false</uniqueVersion>
                                </repository>
                        </distributionManagement>
diff --git a/sdk/a2/.project b/sdk/a2/.project
new file mode 100644 (file)
index 0000000..f6bf2aa
--- /dev/null
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+       <name>argeo-commons-a2</name>
+       <comment></comment>
+       <projects>
+       </projects>
+       <buildSpec>
+       </buildSpec>
+       <natures>
+       </natures>
+</projectDescription>
diff --git a/sdk/a2/argeo-commons-upstream.target b/sdk/a2/argeo-commons-upstream.target
new file mode 100644 (file)
index 0000000..5539eee
--- /dev/null
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?>
+<target name="argeo-commons-upstream">
+       <locations>
+               <location path="${project_loc:argeo-commons-unstable}/sdk/a2/upstream/org.argeo.tp" type="Directory"/>
+               <location path="${project_loc:argeo-commons-unstable}/sdk/a2/upstream/org.argeo.tp.apache" type="Directory"/>
+               <location path="${project_loc:argeo-commons-unstable}/sdk/a2/upstream/org.argeo.tp.apache.commons" type="Directory"/>
+               <location path="${project_loc:argeo-commons-unstable}/sdk/a2/upstream/org.argeo.tp.apache.felix" type="Directory"/>
+               <location path="${project_loc:argeo-commons-unstable}/sdk/a2/upstream/org.argeo.tp.apache.jackrabbit" type="Directory"/>
+               <location path="${project_loc:argeo-commons-unstable}/sdk/a2/upstream/org.argeo.tp.bouncycastle" type="Directory"/>
+               <location path="${project_loc:argeo-commons-unstable}/sdk/a2/upstream/org.argeo.tp.equinox" type="Directory"/>
+               <location path="${project_loc:argeo-commons-unstable}/sdk/a2/upstream/org.argeo.tp.jackson" type="Directory"/>
+               <location path="${project_loc:argeo-commons-unstable}/sdk/a2/upstream/org.argeo.tp.javax" type="Directory"/>
+               <location path="${project_loc:argeo-commons-unstable}/sdk/a2/upstream/org.argeo.tp.jetty" type="Directory"/>
+               <location path="${project_loc:argeo-commons-unstable}/sdk/a2/upstream/org.argeo.tp.misc" type="Directory"/>
+               <location path="${project_loc:argeo-commons-unstable}/sdk/a2/upstream/org.argeo.tp.rap.e4" type="Directory"/>
+               <location path="${project_loc:argeo-commons-unstable}/sdk/a2/upstream/org.argeo.tp.sdk" type="Directory"/>
+       </locations>
+</target>
\ No newline at end of file
diff --git a/sdk/a2/build/.gitignore b/sdk/a2/build/.gitignore
new file mode 100644 (file)
index 0000000..f09a089
--- /dev/null
@@ -0,0 +1,2 @@
+*.*/
+index.xml
\ No newline at end of file
diff --git a/sdk/a2/upstream/.gitignore b/sdk/a2/upstream/.gitignore
new file mode 100644 (file)
index 0000000..f09a089
--- /dev/null
@@ -0,0 +1,2 @@
+*.*/
+index.xml
\ No newline at end of file
diff --git a/sdk/build.sh b/sdk/build.sh
new file mode 100644 (file)
index 0000000..4cfd55d
--- /dev/null
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+# TODO source files and allow to override
+A2_CATEGORY=org.argeo.commons
+
+# Works on Fedora 34
+JVM=/usr/lib/jvm/jre-11/bin/java
+ECJ_JAR=/usr/share/java/ecj/ecj.jar
+OSGI_JAR=/usr/share/java/eclipse/osgi.jar
+
+SDK_DIR="$(cd "$(dirname "$0")"; pwd -P)"
+echo SDK: $SDK_DIR
+BUNDLES_BASEDIR="$(cd "$SDK_DIR/.."; pwd -P)"
+A2_UPSTREAM="$(cd "$SDK_DIR/a2/upstream"; pwd -P)"
+A2_BUILD="$(cd "$SDK_DIR/a2/build"; pwd -P)"
+
+echo PREPARING
+SOURCE_PATH=
+for bundle in $BUNDLES_BASEDIR/*.*.*/ ; do
+echo $bundle
+# clean
+rm -rf $bundle/generated/*
+rm -rf $bundle/bin/*
+# copy resources
+rsync -r --exclude "*.java" $bundle/src/ $bundle/bin
+SOURCE_PATH="$SOURCE_PATH $bundle/src[-d $bundle/bin]"
+done
+
+echo COMPILING
+$JVM -jar $ECJ_JAR @$SDK_DIR/ecj.args -time -cp $OSGI_JAR:"$(printf %s: $A2_UPSTREAM/*/*.jar)" $SOURCE_PATH 
+
+echo PACKAGING
+bnd -b $SDK_DIR build
+
+mkdir -p $A2_BUILD/$A2_CATEGORY
+mv $BUNDLES_BASEDIR/*/generated/*.jar $A2_BUILD/$A2_CATEGORY
+bnd index -d $A2_BUILD/ */*.jar
+
+echo DONE
diff --git a/sdk/configure.sh b/sdk/configure.sh
new file mode 100644 (file)
index 0000000..ed8576d
--- /dev/null
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+SDK_DIR="$(cd "$(dirname "$0")"; pwd -P)"
+A2_UPSTREAM="$(cd "$SDK_DIR/a2/upstream"; pwd -P)"
+
+
+mvn -f $SDK_DIR clean assembly:single -Pa2-provided
+rsync -rv $SDK_DIR/target/sdk-*-a2-provided/ $A2_UPSTREAM
+bnd index -d $A2_UPSTREAM/ */*.jar
+
diff --git a/sdk/ecj.args b/sdk/ecj.args
new file mode 100644 (file)
index 0000000..306fd82
--- /dev/null
@@ -0,0 +1,2 @@
+-11
+-nowarn
\ No newline at end of file
diff --git a/sdk/pom.xml b/sdk/pom.xml
new file mode 100644 (file)
index 0000000..b7646bb
--- /dev/null
@@ -0,0 +1,41 @@
+<?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">
+       <modelVersion>4.0.0</modelVersion>
+       <parent>
+               <groupId>org.argeo.commons</groupId>
+               <artifactId>argeo-commons</artifactId>
+               <version>2.3.1-SNAPSHOT</version>
+               <relativePath>..</relativePath>
+       </parent>
+       <artifactId>sdk</artifactId>
+       <name>Commons SDK</name>
+       <packaging>pom</packaging>
+       <dependencies>
+               <dependency>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>argeo-tp-rap-e4</artifactId>
+                       <version>${version.argeo-tp}</version>
+                       <type>pom</type>
+                       <scope>provided</scope>
+               </dependency>
+       </dependencies>
+       <profiles>
+               <profile>
+                       <id>a2-provided</id>
+                       <build>
+                               <plugins>
+                                       <plugin>
+                                               <artifactId>maven-assembly-plugin</artifactId>
+                                               <configuration>
+                                                       <descriptorRefs>
+                                                               <descriptorRef>a2-provided</descriptorRef>
+                                                       </descriptorRefs>
+                                               </configuration>
+                                       </plugin>
+                               </plugins>
+                       </build>
+               </profile>
+       </profiles>
+</project>
\ No newline at end of file