From: Mathieu Baudier Date: Wed, 17 Nov 2021 08:22:20 +0000 (+0100) Subject: Use new build approach. X-Git-Tag: v2.3.2~15 X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=commitdiff_plain;h=0fb6b00d68fe576d38af9073a431d6afda5f4489 Use new build approach. --- diff --git a/.gitignore b/.gitignore index e3d2422..950facd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,5 @@ -/target/ -/.DS_Store +**/bin/ +**/target/ +**/generated/ +**/MANIFEST.MF +**/.DS_Store diff --git a/cnf/.gitignore b/cnf/.gitignore new file mode 100644 index 0000000..12011f0 --- /dev/null +++ b/cnf/.gitignore @@ -0,0 +1 @@ +/release.bnd diff --git a/cnf/argeo.bnd b/cnf/argeo.bnd new file mode 100644 index 0000000..82c8c08 --- /dev/null +++ b/cnf/argeo.bnd @@ -0,0 +1,15 @@ +# Common +qualifier=.next + +Bundle-Version: ${version.released}${qualifier} +Private-Package: *.internal.* +Export-Package: !*.internal.*, * +-consumer-policy : ${range;[==,=+)} +-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} diff --git a/cnf/build.bnd b/cnf/build.bnd new file mode 100644 index 0000000..af9c91b --- /dev/null +++ b/cnf/build.bnd @@ -0,0 +1,4 @@ +-include: \ +${workspace}/cnf/unstable.bnd, \ +${workspace}/cnf/argeo.bnd, \ +-${workspace}/cnf/release.bnd diff --git a/cnf/maven.bnd b/cnf/maven.bnd new file mode 100644 index 0000000..bbd72ad --- /dev/null +++ b/cnf/maven.bnd @@ -0,0 +1,3 @@ +-include: \ +../cnf/unstable.bnd, \ +../cnf/argeo.bnd diff --git a/cnf/unstable.bnd b/cnf/unstable.bnd new file mode 100644 index 0000000..7bc2312 --- /dev/null +++ b/cnf/unstable.bnd @@ -0,0 +1,6 @@ +category=org.argeo.suite +version.released=2.3.1 +Bundle-RequiredExecutionEnvironment=JavaSE-11 + +argeo.rpm.stagingRepository=/srv/rpmfactory/unstable/argeo-osgi-2/argeo +argeo.rpm.suffix=-unstable diff --git a/core/cnf/maven.bnd b/core/cnf/maven.bnd new file mode 100644 index 0000000..4bd5c0c --- /dev/null +++ b/core/cnf/maven.bnd @@ -0,0 +1 @@ +-include: ../../cnf/maven.bnd \ No newline at end of file diff --git a/core/org.argeo.entity.api/pom.xml b/core/org.argeo.entity.api/pom.xml index f916967..c13a40d 100644 --- a/core/org.argeo.entity.api/pom.xml +++ b/core/org.argeo.entity.api/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite core - 2.3.2-SNAPSHOT + 2.3-SNAPSHOT .. org.argeo.entity.api diff --git a/core/org.argeo.entity.core/pom.xml b/core/org.argeo.entity.core/pom.xml index 8d91447..e3a5b76 100644 --- a/core/org.argeo.entity.core/pom.xml +++ b/core/org.argeo.entity.core/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite core - 2.3.2-SNAPSHOT + 2.3-SNAPSHOT .. org.argeo.entity.core @@ -14,7 +14,7 @@ org.argeo.suite org.argeo.entity.api - 2.3.2-SNAPSHOT + 2.3-SNAPSHOT diff --git a/core/org.argeo.entity.ui/pom.xml b/core/org.argeo.entity.ui/pom.xml index a7b2e81..0ac2270 100644 --- a/core/org.argeo.entity.ui/pom.xml +++ b/core/org.argeo.entity.ui/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite core - 2.3.2-SNAPSHOT + 2.3-SNAPSHOT .. org.argeo.entity.ui @@ -14,7 +14,7 @@ org.argeo.suite org.argeo.entity.core - 2.3.2-SNAPSHOT + 2.3-SNAPSHOT diff --git a/core/org.argeo.suite.core/pom.xml b/core/org.argeo.suite.core/pom.xml index 6008ea1..283dba0 100644 --- a/core/org.argeo.suite.core/pom.xml +++ b/core/org.argeo.suite.core/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite core - 2.3.2-SNAPSHOT + 2.3-SNAPSHOT .. org.argeo.suite.core @@ -14,7 +14,7 @@ org.argeo.suite org.argeo.entity.core - 2.3.2-SNAPSHOT + 2.3-SNAPSHOT diff --git a/core/org.argeo.suite.theme.default/pom.xml b/core/org.argeo.suite.theme.default/pom.xml index 9e10142..1f5398a 100644 --- a/core/org.argeo.suite.theme.default/pom.xml +++ b/core/org.argeo.suite.theme.default/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite core - 2.3.2-SNAPSHOT + 2.3-SNAPSHOT .. org.argeo.suite.theme.default diff --git a/core/org.argeo.suite.ui.rap/pom.xml b/core/org.argeo.suite.ui.rap/pom.xml index c9e2f69..c82e7ce 100644 --- a/core/org.argeo.suite.ui.rap/pom.xml +++ b/core/org.argeo.suite.ui.rap/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite core - 2.3.2-SNAPSHOT + 2.3-SNAPSHOT .. org.argeo.suite.ui.rap @@ -14,7 +14,7 @@ org.argeo.suite org.argeo.suite.ui - 2.3.2-SNAPSHOT + 2.3-SNAPSHOT diff --git a/core/org.argeo.suite.ui/pom.xml b/core/org.argeo.suite.ui/pom.xml index 7089a3c..c0cc002 100644 --- a/core/org.argeo.suite.ui/pom.xml +++ b/core/org.argeo.suite.ui/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite core - 2.3.2-SNAPSHOT + 2.3-SNAPSHOT .. org.argeo.suite.ui @@ -14,12 +14,12 @@ org.argeo.suite org.argeo.suite.core - 2.3.2-SNAPSHOT + 2.3-SNAPSHOT org.argeo.suite org.argeo.entity.ui - 2.3.2-SNAPSHOT + 2.3-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 40fa254..1ddbfc5 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite argeo-suite - 2.3.2-SNAPSHOT + 2.3-SNAPSHOT .. core diff --git a/dep/cnf/maven.bnd b/dep/cnf/maven.bnd new file mode 100644 index 0000000..4bd5c0c --- /dev/null +++ b/dep/cnf/maven.bnd @@ -0,0 +1 @@ +-include: ../../cnf/maven.bnd \ No newline at end of file diff --git a/dep/org.argeo.suite.dep.e4.rap/pom.xml b/dep/org.argeo.suite.dep.e4.rap/pom.xml index e19244a..43ad96f 100644 --- a/dep/org.argeo.suite.dep.e4.rap/pom.xml +++ b/dep/org.argeo.suite.dep.e4.rap/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite dep - 2.3.2-SNAPSHOT + 2.3-SNAPSHOT .. org.argeo.suite.dep.e4.rap @@ -15,7 +15,7 @@ org.argeo.suite org.argeo.suite.dep.ui.rap - 2.3.2-SNAPSHOT + 2.3-SNAPSHOT pom diff --git a/dep/org.argeo.suite.dep.ui.rap/pom.xml b/dep/org.argeo.suite.dep.ui.rap/pom.xml index 99d6f46..802b271 100644 --- a/dep/org.argeo.suite.dep.ui.rap/pom.xml +++ b/dep/org.argeo.suite.dep.ui.rap/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite dep - 2.3.2-SNAPSHOT + 2.3-SNAPSHOT .. org.argeo.suite.dep.ui.rap @@ -15,17 +15,17 @@ org.argeo.suite org.argeo.entity.api - 2.3.2-SNAPSHOT + 2.3-SNAPSHOT org.argeo.suite org.argeo.entity.core - 2.3.2-SNAPSHOT + 2.3-SNAPSHOT org.argeo.suite org.argeo.entity.ui - 2.3.2-SNAPSHOT + 2.3-SNAPSHOT @@ -39,67 +39,67 @@ org.argeo.suite org.argeo.suite.core - 2.3.2-SNAPSHOT + 2.3-SNAPSHOT org.argeo.suite org.argeo.suite.ui - 2.3.2-SNAPSHOT + 2.3-SNAPSHOT org.argeo.suite org.argeo.suite.theme.default - 2.3.2-SNAPSHOT + 2.3-SNAPSHOT org.argeo.suite org.argeo.suite.ui.rap - 2.3.2-SNAPSHOT + 2.3-SNAPSHOT org.argeo.suite org.argeo.people.ui - 2.3.2-SNAPSHOT + 2.3-SNAPSHOT org.argeo.suite org.argeo.library.ui - 2.3.2-SNAPSHOT + 2.3-SNAPSHOT org.argeo.suite org.argeo.geo.ui - 2.3.2-SNAPSHOT + 2.3-SNAPSHOT org.argeo.suite org.argeo.publishing.ui - 2.3.2-SNAPSHOT + 2.3-SNAPSHOT org.argeo.suite org.argeo.support.xforms - 2.3.2-SNAPSHOT + 2.3-SNAPSHOT org.argeo.suite org.argeo.support.odk - 2.3.2-SNAPSHOT + 2.3-SNAPSHOT org.argeo.suite org.argeo.support.geonames - 2.3.2-SNAPSHOT + 2.3-SNAPSHOT diff --git a/dep/pom.xml b/dep/pom.xml index d2ad0bb..8d62610 100644 --- a/dep/pom.xml +++ b/dep/pom.xml @@ -6,7 +6,7 @@ org.argeo.suite argeo-suite - 2.3.2-SNAPSHOT + 2.3-SNAPSHOT .. dep diff --git a/dist/argeo-suite-standard/pom.xml b/dist/argeo-suite-standard/pom.xml index 3eb2907..2f97b48 100644 --- a/dist/argeo-suite-standard/pom.xml +++ b/dist/argeo-suite-standard/pom.xml @@ -3,7 +3,7 @@ org.argeo.suite dist - 2.3.2-SNAPSHOT + 2.3-SNAPSHOT .. argeo-suite-standard diff --git a/dist/pom.xml b/dist/pom.xml index f3d3d98..c43a63e 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite argeo-suite - 2.3.2-SNAPSHOT + 2.3-SNAPSHOT .. dist diff --git a/environment/cnf/maven.bnd b/environment/cnf/maven.bnd new file mode 100644 index 0000000..4bd5c0c --- /dev/null +++ b/environment/cnf/maven.bnd @@ -0,0 +1 @@ +-include: ../../cnf/maven.bnd \ No newline at end of file diff --git a/environment/org.argeo.geo.ui/pom.xml b/environment/org.argeo.geo.ui/pom.xml index bf6c422..f820ca1 100644 --- a/environment/org.argeo.geo.ui/pom.xml +++ b/environment/org.argeo.geo.ui/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite environment - 2.3.2-SNAPSHOT + 2.3-SNAPSHOT .. org.argeo.geo.ui @@ -14,7 +14,7 @@ org.argeo.suite org.argeo.suite.ui - 2.3.2-SNAPSHOT + 2.3-SNAPSHOT diff --git a/environment/pom.xml b/environment/pom.xml index 7968186..e972862 100644 --- a/environment/pom.xml +++ b/environment/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite argeo-suite - 2.3.2-SNAPSHOT + 2.3-SNAPSHOT .. environment diff --git a/knowledge/cnf/maven.bnd b/knowledge/cnf/maven.bnd new file mode 100644 index 0000000..4bd5c0c --- /dev/null +++ b/knowledge/cnf/maven.bnd @@ -0,0 +1 @@ +-include: ../../cnf/maven.bnd \ No newline at end of file diff --git a/knowledge/org.argeo.support.geonames/pom.xml b/knowledge/org.argeo.support.geonames/pom.xml index d4a900b..4352219 100644 --- a/knowledge/org.argeo.support.geonames/pom.xml +++ b/knowledge/org.argeo.support.geonames/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite knowledge - 2.3.2-SNAPSHOT + 2.3-SNAPSHOT .. org.argeo.support.geonames diff --git a/knowledge/org.argeo.support.odk/pom.xml b/knowledge/org.argeo.support.odk/pom.xml index 9156a31..98dfe25 100644 --- a/knowledge/org.argeo.support.odk/pom.xml +++ b/knowledge/org.argeo.support.odk/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite knowledge - 2.3.2-SNAPSHOT + 2.3-SNAPSHOT .. org.argeo.support.odk @@ -14,12 +14,12 @@ org.argeo.suite org.argeo.suite.core - 2.3.2-SNAPSHOT + 2.3-SNAPSHOT org.argeo.suite org.argeo.support.xforms - 2.3.2-SNAPSHOT + 2.3-SNAPSHOT diff --git a/knowledge/org.argeo.support.xforms/pom.xml b/knowledge/org.argeo.support.xforms/pom.xml index e39b9a5..44815ad 100644 --- a/knowledge/org.argeo.support.xforms/pom.xml +++ b/knowledge/org.argeo.support.xforms/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite knowledge - 2.3.2-SNAPSHOT + 2.3-SNAPSHOT .. org.argeo.support.xforms @@ -14,7 +14,7 @@ org.argeo.suite org.argeo.suite.core - 2.3.2-SNAPSHOT + 2.3-SNAPSHOT diff --git a/knowledge/pom.xml b/knowledge/pom.xml index 066ce3b..02d2d14 100644 --- a/knowledge/pom.xml +++ b/knowledge/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite argeo-suite - 2.3.2-SNAPSHOT + 2.3-SNAPSHOT .. knowledge diff --git a/lib/pom.xml b/lib/pom.xml index de0e32b..efa3a02 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -3,19 +3,19 @@ org.argeo.maven argeo-osgi-parent - 2.1.3 + 2.1.4 org.argeo.suite argeo-suite-lib pom Parent POM for Argeo Suite Extensions - 2.3.2-SNAPSHOT + 2.3-SNAPSHOT 2.1.27 2.1.13 - 2.1.103 + 2.3-SNAPSHOT 2.1.1 /srv/rpmfactory/unstable/argeo @@ -30,7 +30,7 @@ org.argeo.suite org.argeo.suite.dep.ui.rap - 2.3.2-SNAPSHOT + 2.3-SNAPSHOT provided diff --git a/library/cnf/maven.bnd b/library/cnf/maven.bnd new file mode 100644 index 0000000..4bd5c0c --- /dev/null +++ b/library/cnf/maven.bnd @@ -0,0 +1 @@ +-include: ../../cnf/maven.bnd \ No newline at end of file diff --git a/library/org.argeo.library.ui/pom.xml b/library/org.argeo.library.ui/pom.xml index 6c50ff5..259e5ee 100644 --- a/library/org.argeo.library.ui/pom.xml +++ b/library/org.argeo.library.ui/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite library - 2.3.2-SNAPSHOT + 2.3-SNAPSHOT .. org.argeo.library.ui @@ -14,7 +14,7 @@ org.argeo.suite org.argeo.suite.ui - 2.3.2-SNAPSHOT + 2.3-SNAPSHOT diff --git a/library/pom.xml b/library/pom.xml index 1472131..6cc06d2 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite argeo-suite - 2.3.2-SNAPSHOT + 2.3-SNAPSHOT .. library diff --git a/people/cnf/maven.bnd b/people/cnf/maven.bnd new file mode 100644 index 0000000..4bd5c0c --- /dev/null +++ b/people/cnf/maven.bnd @@ -0,0 +1 @@ +-include: ../../cnf/maven.bnd \ No newline at end of file diff --git a/people/org.argeo.people.ui/pom.xml b/people/org.argeo.people.ui/pom.xml index ded3d2d..d3f24a8 100644 --- a/people/org.argeo.people.ui/pom.xml +++ b/people/org.argeo.people.ui/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite people - 2.3.2-SNAPSHOT + 2.3-SNAPSHOT .. org.argeo.people.ui @@ -14,7 +14,7 @@ org.argeo.suite org.argeo.suite.ui - 2.3.2-SNAPSHOT + 2.3-SNAPSHOT diff --git a/people/pom.xml b/people/pom.xml index fe0abe0..46bb9a4 100644 --- a/people/pom.xml +++ b/people/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite argeo-suite - 2.3.2-SNAPSHOT + 2.3-SNAPSHOT .. people diff --git a/pom.xml b/pom.xml index 2290b0b..91e7ac7 100644 --- a/pom.xml +++ b/pom.xml @@ -5,11 +5,11 @@ org.argeo.maven argeo-osgi-parent - 2.1.3 + 2.1.4 org.argeo.suite argeo-suite - 2.3.2-SNAPSHOT + 2.3-SNAPSHOT Argeo Suite pom http://www.argeo.org/ @@ -17,11 +17,9 @@ 2.1.27 2.1.13 - 2.1.104-SNAPSHOT + 2.3-SNAPSHOT 2.1.1 - - /srv/rpmfactory/unstable/argeo-osgi-2/argeo diff --git a/publishing/cnf/maven.bnd b/publishing/cnf/maven.bnd new file mode 100644 index 0000000..4bd5c0c --- /dev/null +++ b/publishing/cnf/maven.bnd @@ -0,0 +1 @@ +-include: ../../cnf/maven.bnd \ No newline at end of file diff --git a/publishing/org.argeo.publishing.ui/pom.xml b/publishing/org.argeo.publishing.ui/pom.xml index 6a3ed5e..d7d0ccf 100644 --- a/publishing/org.argeo.publishing.ui/pom.xml +++ b/publishing/org.argeo.publishing.ui/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite publishing - 2.3.2-SNAPSHOT + 2.3-SNAPSHOT .. org.argeo.publishing.ui @@ -14,7 +14,7 @@ org.argeo.suite org.argeo.suite.ui - 2.3.2-SNAPSHOT + 2.3-SNAPSHOT diff --git a/publishing/pom.xml b/publishing/pom.xml index cbfe76a..885fa11 100644 --- a/publishing/pom.xml +++ b/publishing/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite argeo-suite - 2.3.2-SNAPSHOT + 2.3-SNAPSHOT .. publishing