Merge remote-tracking branch 'origin/unstable' into testing

diff --git a/cnf/.gitignore b/cnf/.gitignore
deleted file mode 100644 (file)
index 12011f0..0000000
--- a/cnf/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/release.bnd

diff --git a/cnf/argeo.bnd b/cnf/argeo.bnd
index 82c8c0801cacb80166f84565764dc675ec4e9912..d1c001a3fef44ea2693407bbc1516ad5122065bc 100644 (file)
--- a/cnf/argeo.bnd
+++ b/cnf/argeo.bnd
@@ -1,6 +1,4 @@
 # Common
-qualifier=.next
-
 Bundle-Version: ${version.released}${qualifier}
 Private-Package: *.internal.*
 Export-Package: !*.internal.*, *

diff --git a/cnf/build.bnd b/cnf/build.bnd
index f39af41a12594bcbdb0e07b1236505549564026b..38f5f286a6df0d08f9ac5298e4ee84bfbf7642ea 100644 (file)
--- a/cnf/build.bnd
+++ b/cnf/build.bnd
@@ -1,4 +1,3 @@
 -include: \
-${workspace}/cnf/testing.bnd, \
 ${workspace}/cnf/argeo.bnd, \
--${workspace}/cnf/release.bnd
+${workspace}/cnf/unstable.bnd

diff --git a/cnf/maven.bnd b/cnf/maven.bnd
index 05b92033aeb4caaf4773e064a224fa0db11292dd..f3a6e83cff694e34f205b57c12ac484b31039798 100644 (file)
--- a/cnf/maven.bnd
+++ b/cnf/maven.bnd
@@ -1,3 +1,3 @@
 -include: \
-../cnf/testing.bnd, \
-../cnf/argeo.bnd
+../cnf/argeo.bnd, \
+../cnf/unstable.bnd

diff --git a/cnf/testing.bnd b/cnf/testing.bnd
index d638826d025887b7d836014c9d59a55019d50f57..0a43c20de19f1e5954bd48898852b45bd55a864f 100644 (file)
--- a/cnf/testing.bnd
+++ b/cnf/testing.bnd
@@ -1,5 +1,7 @@
-category=org.argeo.commons
 version.released=2.1.103
+qualifier=.next
+
+category=org.argeo.commons
 Bundle-RequiredExecutionEnvironment=JavaSE-11
 
 argeo.rpm.stagingRepository=/srv/rpmfactory/testing/argeo-osgi-2/argeo

diff --git a/cnf/unstable.bnd b/cnf/unstable.bnd
index e58775d96682e2a240d47b25dc7d6bbc91bd516e..5d4e39fc3fd0cfaf3fc1236295d2b5ff206f71ae 100644 (file)
--- a/cnf/unstable.bnd
+++ b/cnf/unstable.bnd
@@ -1,5 +1,7 @@
+version.released=2.3.4
+qualifier=.next
+
 category=org.argeo.commons
-version.released=2.3.1
 Bundle-RequiredExecutionEnvironment=JavaSE-11
 
 argeo.rpm.stagingRepository=/srv/rpmfactory/unstable/argeo-osgi-2/argeo

diff --git a/demo/argeo_node.js b/demo/argeo_node.js
deleted file mode 100755 (executable)
index ac8671f..0000000
--- a/demo/argeo_node.js
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/home/mbaudier/dev/git/apache2/argeo-commons/dist/osgi-boot/src/main/rpm/usr/bin/a2jjs
-// demo specific
-var app = "node";
-var demoHome = $ENV.HOME + "/dev/git/apache2/argeo-commons/demo";
-var appHome = demoHome + "/exec/argeo_node.js";
-var appConf = demoHome;
-var policyFile = "all.policy";
-
-load("../dist/argeo-node/rpm/usr/share/node/jjs/cms.js");
-osgi.baseUrl = "http://forge.argeo.org/data/java/argeo-2.1/";
-osgi.install("org.argeo.commons:org.argeo.dep.cms.platform:2.1.71-SNAPSHOT");
-osgi.httpPort = 0;
-//osgi.clean = true;
-osgi.launch();
-openWorkbench();

diff --git a/dep/org.argeo.dep.cms.client/pom.xml b/dep/org.argeo.dep.cms.client/pom.xml
index d7354d9ad0020096929130a8ac69851d47a89552..d1eca2f86ae0aa7ce9fc9f1cf44c1aec81594725 100644 (file)
--- a/dep/org.argeo.dep.cms.client/pom.xml
+++ b/dep/org.argeo.dep.cms.client/pom.xml
@@ -273,8 +273,6 @@
                                                                </goals>
                                                                <configuration>
                                                                        <name>argeo-cms-client${argeo.rpm.suffix}</name>
-                                                                       <projversion>${version.released}</projversion>
-                                                                       <release>${maven.build.timestamp}</release>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/usr/share/osgi</directory>
@@ -337,7 +335,7 @@
                                                                <configuration>
                                                                        <name>argeo-cms-client-tp${argeo.rpm.suffix}</name>
                                                                        <projversion>${version.argeo-tp}</projversion>
-                                                                       <release>${maven.build.timestamp}</release>
+                                                                       <release>${argeo.rpm.release.tp}</release>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/usr/share/osgi</directory>

diff --git a/dep/org.argeo.dep.cms.e4.rap/pom.xml b/dep/org.argeo.dep.cms.e4.rap/pom.xml
index df05ac93af6fb955cf2528277f71b433bd9ce124..23e185216caedc4a05d4241cdf34624acdaa74cc 100644 (file)
--- a/dep/org.argeo.dep.cms.e4.rap/pom.xml
+++ b/dep/org.argeo.dep.cms.e4.rap/pom.xml
@@ -297,8 +297,6 @@
                                                                </goals>
                                                                <configuration>
                                                                        <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>
@@ -361,7 +359,7 @@
                                                                <configuration>
                                                                        <name>argeo-cms-e4-rap-tp${argeo.rpm.suffix}</name>
                                                                        <projversion>${version.argeo-tp}</projversion>
-                                                                       <release>${maven.build.timestamp}</release>
+                                                                       <release>${argeo.rpm.release.tp}</release>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/usr/share/osgi</directory>

diff --git a/dep/org.argeo.dep.cms.ext/pom.xml b/dep/org.argeo.dep.cms.ext/pom.xml
index 3749a9f8e839a258818f972ed9d99e47dba7ea7e..904349332edd716b7d1416014c41ff7a8081b3aa 100644 (file)
--- a/dep/org.argeo.dep.cms.ext/pom.xml
+++ b/dep/org.argeo.dep.cms.ext/pom.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons</groupId>
@@ -114,7 +112,7 @@
                                                                <configuration>
                                                                        <name>argeo-cms-ext-tp${argeo.rpm.suffix}</name>
                                                                        <projversion>${version.argeo-tp}</projversion>
-                                                                       <release>${maven.build.timestamp}</release>
+                                                                       <release>${argeo.rpm.release.tp}</release>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/usr/share/osgi</directory>

diff --git a/dep/org.argeo.dep.cms.node/pom.xml b/dep/org.argeo.dep.cms.node/pom.xml
index 656da2955630600d72a3f1e282a2156b5020d440..8dc2dd55abdc9b958857058ac5eb991194e6b56e 100644 (file)
--- a/dep/org.argeo.dep.cms.node/pom.xml
+++ b/dep/org.argeo.dep.cms.node/pom.xml
@@ -241,8 +241,6 @@
                                                                </goals>
                                                                <configuration>
                                                                        <name>argeo-cms-node${argeo.rpm.suffix}</name>
-                                                                       <projversion>${version.released}</projversion>
-                                                                       <release>${maven.build.timestamp}</release>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/usr/share/osgi</directory>
@@ -303,9 +301,9 @@
                                                                        <goal>rpm</goal>
                                                                </goals>
                                                                <configuration>
-                                                                       <name>argeo-cms-node-tp</name>
+                                                                       <name>argeo-cms-node-tp${argeo.rpm.suffix}</name>
                                                                        <projversion>${version.argeo-tp}</projversion>
-                                                                       <release>${maven.build.timestamp}</release>
+                                                                       <release>${argeo.rpm.release.tp}</release>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/usr/share/osgi</directory>

diff --git a/dep/org.argeo.dep.cms.ui.rap/pom.xml b/dep/org.argeo.dep.cms.ui.rap/pom.xml
index b00284f4fc3d26ce034e537f415a6291992f7ff1..93ab967ec5dc603f27476159063ab25fded85b7d 100644 (file)
--- a/dep/org.argeo.dep.cms.ui.rap/pom.xml
+++ b/dep/org.argeo.dep.cms.ui.rap/pom.xml
@@ -121,8 +121,6 @@
                                                                </goals>
                                                                <configuration>
                                                                        <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>
@@ -141,8 +139,8 @@
                                                                                </mapping>
                                                                        </mappings>
                                                                        <requires>
-                                                                               <require>argeo-cms-node</require>
-                                                                               <require>argeo-cms-ui-rap-tp</require>
+                                                                               <require>argeo-cms-node${argeo.rpm.suffix}</require>
+                                                                               <require>argeo-cms-ui-rap-tp${argeo.rpm.suffix}</require>
                                                                        </requires>
                                                                </configuration>
                                                        </execution>
@@ -185,7 +183,7 @@
                                                                <configuration>
                                                                        <name>argeo-cms-ui-rap-tp${argeo.rpm.suffix}</name>
                                                                        <projversion>${version.argeo-tp}</projversion>
-                                                                       <release>${maven.build.timestamp}</release>
+                                                                       <release>${argeo.rpm.release.tp}</release>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/usr/share/osgi</directory>

diff --git a/dep/pom.xml b/dep/pom.xml
index 7c3b04cb64cbe3fab3c1815962067ca02f7b77f1..b83b2886b429a50a57726759c0a61aa36b7e62db 100644 (file)
--- a/dep/pom.xml
+++ b/dep/pom.xml
@@ -1,7 +1,5 @@
 <?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>

diff --git a/dist/argeo-cli/pom.xml b/dist/argeo-cli/pom.xml
index 4d2aa70c0d798bd2fb37f6df8edd667a4a3c42e0..d04ba5696ff96ba81eb022ce8137d2f42d655f71 100644 (file)
--- a/dist/argeo-cli/pom.xml
+++ b/dist/argeo-cli/pom.xml
@@ -33,7 +33,7 @@
                                                <groupId>org.apache.maven.plugins</groupId>
                                                <artifactId>maven-assembly-plugin</artifactId>
                                                <configuration>
-                                                       <finalName>argeo-cli-${project.version}</finalName>
+                                                       <finalName>argeo-cli-${version.released}</finalName>
                                                        <appendAssemblyId>false</appendAssemblyId>
                                                        <descriptors>
                                                                <descriptor>assembly/argeo-cli.xml</descriptor>
@@ -68,8 +68,6 @@
                                                                </goals>
                                                                <configuration>
                                                                        <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/pom.xml b/dist/argeo-node/pom.xml
index 10be1edb58373ecb64e7c7abf390031ca9b65d1c..9a6d616b4dfecd59d431f0b34e404807d159a140 100644 (file)
--- a/dist/argeo-node/pom.xml
+++ b/dist/argeo-node/pom.xml
@@ -41,7 +41,7 @@
                                                <groupId>org.apache.maven.plugins</groupId>
                                                <artifactId>maven-assembly-plugin</artifactId>
                                                <configuration>
-                                                       <finalName>argeo-node-${version.released}${buildId}</finalName>
+                                                       <finalName>argeo-node-${version.released}</finalName>
                                                        <appendAssemblyId>false</appendAssemblyId>
                                                        <descriptors>
                                                                <descriptor>assembly/cms-e4-rap.xml</descriptor>
@@ -76,8 +76,6 @@
                                                                </goals>
                                                                <configuration>
                                                                        <name>argeo-node${argeo.rpm.suffix}</name>
-                                                                       <projversion>${version.released}</projversion>
-                                                                       <release>${maven.build.timestamp}</release>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/etc/argeo</directory>

diff --git a/dist/osgi-boot/pom.xml b/dist/osgi-boot/pom.xml
index 239f3688c231866c588d79684a9f817e9c6060af..575b4b4f81709e465ae86987b2801114232ea996 100644 (file)
--- a/dist/osgi-boot/pom.xml
+++ b/dist/osgi-boot/pom.xml
@@ -35,7 +35,7 @@
                                                <groupId>org.apache.maven.plugins</groupId>
                                                <artifactId>maven-assembly-plugin</artifactId>
                                                <configuration>
-                                                       <finalName>osgi-boot-${project.version}</finalName>
+                                                       <finalName>osgi-boot-${version.released}</finalName>
                                                        <appendAssemblyId>false</appendAssemblyId>
                                                        <descriptors>
                                                                <descriptor>assembly/osgi-boot.xml</descriptor>
@@ -70,8 +70,6 @@
                                                                </goals>
                                                                <configuration>
                                                                        <name>argeo-osgi-boot${argeo.rpm.suffix}</name>
-                                                                       <projversion>${version.released}</projversion>
-                                                                       <release>${maven.build.timestamp}</release>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/usr/bin</directory>
@@ -145,7 +143,7 @@
                                                                <configuration>
                                                                        <name>argeo-osgi-boot-equinox${argeo.rpm.suffix}</name>
                                                                        <projversion>${version.argeo-tp}</projversion>
-                                                                       <release>${maven.build.timestamp}</release>
+                                                                       <release>${argeo.rpm.release.tp}</release>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/usr/share/osgi/boot</directory>

diff --git a/dist/pom.xml b/dist/pom.xml
index 52ed45d55b89d15926e692061e0f4c3b5bed1d91..f6b9917e090e3f1e61426c1c681ee12f13b91b1a 100644 (file)
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -1,7 +1,5 @@
 <?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>
@@ -14,7 +12,7 @@
        <packaging>pom</packaging>
        <modules>
                <module>osgi-boot</module>
-               <module>argeo-cli</module>
+               <!-- <module>argeo-cli</module> -->
                <module>argeo-node</module>
                <module>containers</module>
        </modules>

diff --git a/pom.xml b/pom.xml
index c063132e1c5ce6fdf0c780c12e9630ac02cd058d..fb1bedf58c490e66eb7f632c5bcd090146f4d8da 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.4</version>
+               <version>2.1.6</version>
        </parent>
        <groupId>org.argeo.commons</groupId>
        <artifactId>argeo-commons</artifactId>
@@ -15,7 +15,6 @@
        <properties>
                <version.context>testing</version.context>
                <version.argeo-tp>2.1.27</version.argeo-tp>
-               <project.scm.id>code.argeo.org</project.scm.id>
        </properties>
        <modules>
                <!-- Base -->
@@ -46,6 +45,7 @@
                <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>HEAD</tag>
        </scm>
        <organization>
                <name>Argeo GmbH</name>
@@ -219,27 +219,4 @@
                        </plugin>
                </plugins>
        </reporting>
-       <profiles>
-               <profile>
-                       <id>localrepo</id>
-                       <repositories>
-                               <repository>
-                                       <id>argeo</id>
-                                       <url>http://localhost:7080/data/java/argeo-2.1</url>
-                                       <releases>
-                                               <enabled>true</enabled>
-                                               <updatePolicy>daily</updatePolicy>
-                                               <checksumPolicy>warn</checksumPolicy>
-                                       </releases>
-                               </repository>
-                       </repositories>
-                       <distributionManagement>
-                               <repository>
-                                       <id>staging</id>
-                                       <url>dav:http://localhost:7080/data/java/argeo-2.1/</url>
-                                       <uniqueVersion>false</uniqueVersion>
-                               </repository>
-                       </distributionManagement>
-               </profile>
-       </profiles>
 </project>

diff --git a/sdk/pom.xml b/sdk/pom.xml
index 5d0a240fd35086bc2436be5268963f2a7cc3b0a4..9631f6acd6ad84fee638c96e8d4c11b2f07fe53a 100644 (file)
--- a/sdk/pom.xml
+++ b/sdk/pom.xml
@@ -1,7 +1,5 @@
 <?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>