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

diff --git a/.gitmodules b/.gitmodules
index 07b10cacb00393eff6d61e695fefe2acf9ab0577..3a6302180302c3deb3753de09925c488a4fad945 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "sdk/argeo-build"]
        path = sdk/argeo-build
-       url = http://git.argeo.org/cc0/argeo-build.git
-       branch = unstable
+       url = https://code.argeo.org/git/cc0/argeo-build.git
+       branch = merge-to-testing

diff --git a/.project b/.project
index 73340e7b4b969391285b50670175e578cc207a76..70b4b558936ea6fabe779d892fdf30cc79ebdce8 100644 (file)
--- a/.project
+++ b/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-       <name>argeo-tp-unstable</name>
+       <name>argeo-tp</name>
        <comment></comment>
        <projects>
        </projects>

diff --git a/branch.mk b/branch.mk
index afde0f838e8e39e2e2b5abe863169d7891a97131..dbecaaa4bb30c9a334af654716d6bb4acc1dfbf0 100644 (file)
--- a/branch.mk
+++ b/branch.mk
@@ -1 +1 @@
-BRANCH=unstable
\ No newline at end of file
+BRANCH=testing
\ No newline at end of file

diff --git a/sdk/argeo-build b/sdk/argeo-build
index 011962b1bb63d375622dbe79a50c45f16374b0a1..639ffc61c03f6aebf9cfe5e0f79dd0c4c6aa632a 160000 (submodule)
--- a/sdk/argeo-build
+++ b/sdk/argeo-build
@@ -1 +1 @@
-Subproject commit 011962b1bb63d375622dbe79a50c45f16374b0a1
+Subproject commit 639ffc61c03f6aebf9cfe5e0f79dd0c4c6aa632a

diff --git a/sdk/branches/testing.bnd b/sdk/branches/testing.bnd
new file mode 100644 (file)
index 0000000..9dfd8b2
--- /dev/null
+++ b/sdk/branches/testing.bnd
@@ -0,0 +1,4 @@
+major=2
+minor=1
+micro=31
+qualifier=.next
\ No newline at end of file

diff --git a/sdk/output-argeo-tp-backend.target b/sdk/output-argeo-tp-backend.target
index 68982e58465e7448c0ac456d4a83b2297c3dad35..b78875ab1e56229a1910ea64142ea1553e603bf7 100644 (file)
--- a/sdk/output-argeo-tp-backend.target
+++ b/sdk/output-argeo-tp-backend.target
@@ -2,12 +2,12 @@
 <?pde version="3.8"?>
 <target name="argeo-tp-backend">
        <locations>
-               <location path="${project_loc:argeo-tp-unstable}/../output/a2/org.argeo.tp.jetty" type="Directory"/>
-               <location path="${project_loc:argeo-tp-unstable}/../output/a2/org.argeo.tp.formats" type="Directory"/>
-               <location path="${project_loc:argeo-tp-unstable}/../output/a2/org.argeo.tp.poi" type="Directory"/>
-               <location path="${project_loc:argeo-tp-unstable}/../output/a2/org.argeo.tp.gis" type="Directory"/>
-               <location path="${project_loc:argeo-tp-unstable}/../output/a2/osgi/equinox/org.argeo.tp.eclipse" type="Directory"/>
-               <location path="${project_loc:argeo-tp-unstable}/../output/a2/org.argeo.tp.jcr" type="Directory"/>
-               <location type="Target" uri="file:${project_loc:argeo-tp-unstable}/sdk/output-argeo-tp-minimal.target"/>
+               <location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.jetty" type="Directory"/>
+               <location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.formats" type="Directory"/>
+               <location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.poi" type="Directory"/>
+               <location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.gis" type="Directory"/>
+               <location path="${project_loc:argeo-tp}/../output/a2/osgi/equinox/org.argeo.tp.eclipse" type="Directory"/>
+               <location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.jcr" type="Directory"/>
+               <location type="Target" uri="file:${project_loc:argeo-tp}/sdk/output-argeo-tp-minimal.target"/>
        </locations>
 </target>
\ No newline at end of file

diff --git a/sdk/output-argeo-tp-minimal.target b/sdk/output-argeo-tp-minimal.target
index 4c6530e53f95c674ffcfe18a0e0d9401eed9dbb6..e648937c62ba8c85eba7d2737a23e28520f9035d 100644 (file)
--- a/sdk/output-argeo-tp-minimal.target
+++ b/sdk/output-argeo-tp-minimal.target
@@ -2,10 +2,10 @@
 <?pde version="3.8"?>
 <target name="argeo-tp-minimal">
        <locations>
-               <location path="${project_loc:argeo-tp-unstable}/../output/a2/org.argeo.tp" type="Directory"/>
-               <location path="${project_loc:argeo-tp-unstable}/../output/a2/osgi/equinox/org.argeo.tp.osgi" type="Directory"/>
-               <location path="${project_loc:argeo-tp-unstable}/../output/a2/org.argeo.tp.sdk" type="Directory"/>
-               <location path="${project_loc:argeo-tp-unstable}/../output/a2/org.argeo.tp.apache" type="Directory"/>
+               <location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp" type="Directory"/>
+               <location path="${project_loc:argeo-tp}/../output/a2/osgi/equinox/org.argeo.tp.osgi" type="Directory"/>
+               <location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.sdk" type="Directory"/>
+               <location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.apache" type="Directory"/>
        </locations>
        <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
 </target>
\ No newline at end of file

diff --git a/sdk/output-argeo-tp-rap.target b/sdk/output-argeo-tp-rap.target
index d5c7289741ccfd22c0666a8e5517af7a35829640..7e4d512c113df9ab6250213c590b17d35e6496e6 100644 (file)
--- a/sdk/output-argeo-tp-rap.target
+++ b/sdk/output-argeo-tp-rap.target
@@ -2,7 +2,7 @@
 <?pde version="3.8"?>
 <target name="argeo-tp-rap">
        <locations>
-               <location path="${project_loc:argeo-tp-unstable}/../output/a2/swt/rap/org.argeo.tp.swt.workbench" type="Directory"/>
-               <location type="Target" uri="file:${project_loc:argeo-tp-unstable}/sdk/output-argeo-tp-rwt.target"/>
+               <location path="${project_loc:argeo-tp}/../output/a2/swt/rap/org.argeo.tp.swt.workbench" type="Directory"/>
+               <location type="Target" uri="file:${project_loc:argeo-tp}/sdk/output-argeo-tp-rwt.target"/>
        </locations>
 </target>
\ No newline at end of file

diff --git a/sdk/output-argeo-tp-rcp.target b/sdk/output-argeo-tp-rcp.target
index 8b198bcd4a8958b82e4eeae0703329368d1324e2..b94512f2f0e6b7a510fd4dfb3f3d55fb84514da8 100644 (file)
--- a/sdk/output-argeo-tp-rcp.target
+++ b/sdk/output-argeo-tp-rcp.target
@@ -2,7 +2,7 @@
 <?pde version="3.8"?>
 <target name="argeo-tp-rcp">
        <locations>
-               <location path="${project_loc:argeo-tp-unstable}/../output/a2/swt/rcp/org.argeo.tp.swt.workbench" type="Directory"/>
-               <location type="Target" uri="file:${project_loc:argeo-tp-unstable}/sdk/output-argeo-tp-swt.target"/>
+               <location path="${project_loc:argeo-tp}/../output/a2/swt/rcp/org.argeo.tp.swt.workbench" type="Directory"/>
+               <location type="Target" uri="file:${project_loc:argeo-tp}/sdk/output-argeo-tp-swt.target"/>
        </locations>
 </target>
\ No newline at end of file

diff --git a/sdk/output-argeo-tp-rwt.target b/sdk/output-argeo-tp-rwt.target
index 0b4753fa8217adbeafb5f174944e86a85a969c62..ee966053d4d745a79bc5c2595c43f087152011c3 100644 (file)
--- a/sdk/output-argeo-tp-rwt.target
+++ b/sdk/output-argeo-tp-rwt.target
@@ -2,7 +2,7 @@
 <?pde version="3.8"?>
 <target name="argeo-tp-rwt">
        <locations>
-               <location path="${project_loc:argeo-tp-unstable}/../output/a2/swt/rap/org.argeo.tp.swt" type="Directory"/>
-               <location type="Target" uri="file:${project_loc:argeo-tp-unstable}/sdk/output-argeo-tp-backend.target"/>
+               <location path="${project_loc:argeo-tp}/../output/a2/swt/rap/org.argeo.tp.swt" type="Directory"/>
+               <location type="Target" uri="file:${project_loc:argeo-tp}/sdk/output-argeo-tp-backend.target"/>
        </locations>
 </target>
\ No newline at end of file

diff --git a/sdk/output-argeo-tp-swt.target b/sdk/output-argeo-tp-swt.target
index 1a306cc37718b865d0b99395a9c8a484cbe47c66..cb459d59b29371c2861f86f55c0de2b2f6f6d977 100644 (file)
--- a/sdk/output-argeo-tp-swt.target
+++ b/sdk/output-argeo-tp-swt.target
@@ -2,9 +2,9 @@
 <?pde version="3.8"?>
 <target name="argeo-tp-swt">
        <locations>
-               <location path="${project_loc:argeo-tp-unstable}/../output/a2/swt/rcp/org.argeo.tp.swt" type="Directory"/>
-               <location path="${project_loc:argeo-tp-unstable}/../output/a2/lib/linux/x86_64/swt/rcp/org.argeo.tp.swt" type="Directory"/>
-               <location path="${project_loc:argeo-tp-unstable}/../output/a2/lib/linux/aarch64/swt/rcp/org.argeo.tp.swt" type="Directory"/>
-               <location type="Target" uri="file:${project_loc:argeo-tp-unstable:argeo-tp-unstable}/sdk/output-argeo-tp-backend.target"/>
+               <location path="${project_loc:argeo-tp}/../output/a2/swt/rcp/org.argeo.tp.swt" type="Directory"/>
+               <location path="${project_loc:argeo-tp}/../output/a2/lib/linux/x86_64/swt/rcp/org.argeo.tp.swt" type="Directory"/>
+               <location path="${project_loc:argeo-tp}/../output/a2/lib/linux/aarch64/swt/rcp/org.argeo.tp.swt" type="Directory"/>
+               <location type="Target" uri="file:${project_loc:argeo-tp}/sdk/output-argeo-tp-backend.target"/>
        </locations>
 </target>
\ No newline at end of file