From: Mathieu Baudier Date: Sat, 13 Nov 2021 08:32:47 +0000 (+0100) Subject: Merge branch 'master' into testing X-Git-Tag: v2.1.104~10 X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=98c795d0ee9295da8e28d6069fe3d06f6bc3f89f;hp=52a45835da8cd816ac2e2b22ee9b84101fe8fb06;p=lgpl%2Fargeo-commons.git Merge branch 'master' into testing --- diff --git a/.gitignore b/.gitignore index bcf25b2ac..492e809ea 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ -/target/ -*/generated +**/bin/ +**/target/ +**/generated/ +**/MANIFEST.MF diff --git a/.project b/.project index 2bb4833a3..c006088ca 100644 --- a/.project +++ b/.project @@ -1,6 +1,6 @@ - argeo-commons + argeo-commons-unstable diff --git a/cnf/.gitignore b/cnf/.gitignore new file mode 100644 index 000000000..12011f0d4 --- /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 000000000..f221de0c2 --- /dev/null +++ b/cnf/argeo.bnd @@ -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} diff --git a/cnf/build.bnd b/cnf/build.bnd index 150e1d46a..f39af41a1 100644 --- a/cnf/build.bnd +++ b/cnf/build.bnd @@ -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 index 000000000..427e7c558 --- /dev/null +++ b/cnf/ext/osgirepo.bnd @@ -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 index 000000000..05b92033a --- /dev/null +++ b/cnf/maven.bnd @@ -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 index 000000000..0f1c92e4d --- /dev/null +++ b/cnf/testing.bnd @@ -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 index 000000000..e58775d96 --- /dev/null +++ b/cnf/unstable.bnd @@ -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 diff --git a/demo/.gitignore b/demo/.gitignore index 0980598ed..45dfa56f4 100644 --- a/demo/.gitignore +++ b/demo/.gitignore @@ -1,2 +1 @@ /exec/ -/target/ diff --git a/demo/pom.xml b/demo/pom.xml index 97a5dcef7..22d23f847 100644 --- a/demo/pom.xml +++ b/demo/pom.xml @@ -4,7 +4,7 @@ org.argeo.commons argeo-commons - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT .. demo @@ -20,7 +20,7 @@ org.argeo.commons org.argeo.osgi.boot - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT @@ -42,7 +42,7 @@ org.argeo.commons org.argeo.dep.cms.e4.rap - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT @@ -64,7 +64,7 @@ org.argeo.commons org.argeo.dep.cms.e4.rap - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT diff --git a/dep/.gitignore b/dep/.gitignore index b83d22266..b5f8bb4b0 100644 --- a/dep/.gitignore +++ b/dep/.gitignore @@ -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 index 000000000..4bd5c0cfe --- /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.dep.cms.client/.gitignore b/dep/org.argeo.dep.cms.client/.gitignore deleted file mode 100644 index e26e09f82..000000000 --- a/dep/org.argeo.dep.cms.client/.gitignore +++ /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 index 4854a41b9..000000000 --- a/dep/org.argeo.dep.cms.client/META-INF/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/MANIFEST.MF diff --git a/dep/org.argeo.dep.cms.client/pom.xml b/dep/org.argeo.dep.cms.client/pom.xml index 81a2fa76e..d7354d9ad 100644 --- a/dep/org.argeo.dep.cms.client/pom.xml +++ b/dep/org.argeo.dep.cms.client/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.argeo.commons - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT dep .. @@ -15,17 +15,17 @@ org.argeo.commons org.argeo.enterprise - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT org.argeo.commons org.argeo.jcr - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT org.argeo.commons org.argeo.core - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT @@ -234,7 +234,7 @@ org.argeo.commons org.argeo.osgi.boot - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT test @@ -272,7 +272,9 @@ rpm - argeo-cms-client + argeo-cms-client${argeo.rpm.suffix} + ${version.released} + ${maven.build.timestamp} /usr/share/osgi @@ -291,8 +293,8 @@ - argeo-cms-client-tp - argeo-osgi-boot + argeo-cms-client-tp${argeo.rpm.suffix} + argeo-osgi-boot${argeo.rpm.suffix} @@ -333,7 +335,7 @@ rpm - argeo-cms-client-tp + argeo-cms-client-tp${argeo.rpm.suffix} ${version.argeo-tp} ${maven.build.timestamp} diff --git a/dep/org.argeo.dep.cms.e4.rap/.gitignore b/dep/org.argeo.dep.cms.e4.rap/.gitignore deleted file mode 100644 index 7bfff59a8..000000000 --- a/dep/org.argeo.dep.cms.e4.rap/.gitignore +++ /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 index 4854a41b9..000000000 --- a/dep/org.argeo.dep.cms.e4.rap/META-INF/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/MANIFEST.MF diff --git a/dep/org.argeo.dep.cms.e4.rap/pom.xml b/dep/org.argeo.dep.cms.e4.rap/pom.xml index ff12645c6..df05ac93a 100644 --- a/dep/org.argeo.dep.cms.e4.rap/pom.xml +++ b/dep/org.argeo.dep.cms.e4.rap/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.argeo.commons - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT dep .. @@ -15,7 +15,7 @@ org.argeo.commons org.argeo.dep.cms.ui.rap - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT pom @@ -23,12 +23,12 @@ org.argeo.commons org.argeo.cms.e4 - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT org.argeo.commons org.argeo.cms.e4.rap - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT @@ -296,7 +296,9 @@ rpm - argeo-cms-e4-rap + argeo-cms-e4-rap${argeo.rpm.suffix} + ${version.released} + ${maven.build.timestamp} /usr/share/osgi @@ -315,8 +317,8 @@ - argeo-cms-ui-rap - argeo-cms-e4-rap-tp + argeo-cms-ui-rap${argeo.rpm.suffix} + argeo-cms-e4-rap-tp${argeo.rpm.suffix} @@ -357,7 +359,7 @@ rpm - argeo-cms-e4-rap-tp + argeo-cms-e4-rap-tp${argeo.rpm.suffix} ${version.argeo-tp} ${maven.build.timestamp} @@ -378,7 +380,7 @@ - argeo-cms-ui-rap-tp + argeo-cms-ui-rap-tp${argeo.rpm.suffix} diff --git a/dep/org.argeo.dep.cms.ext/.gitignore b/dep/org.argeo.dep.cms.ext/.gitignore deleted file mode 100644 index e26e09f82..000000000 --- a/dep/org.argeo.dep.cms.ext/.gitignore +++ /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 index 4854a41b9..000000000 --- a/dep/org.argeo.dep.cms.ext/META-INF/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/MANIFEST.MF diff --git a/dep/org.argeo.dep.cms.ext/pom.xml b/dep/org.argeo.dep.cms.ext/pom.xml index f657231f4..3749a9f8e 100644 --- a/dep/org.argeo.dep.cms.ext/pom.xml +++ b/dep/org.argeo.dep.cms.ext/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.argeo.commons - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT dep .. @@ -112,7 +112,7 @@ rpm - argeo-cms-ext-tp + argeo-cms-ext-tp${argeo.rpm.suffix} ${version.argeo-tp} ${maven.build.timestamp} @@ -133,7 +133,7 @@ - argeo-cms-node-tp + argeo-cms-node-tp${argeo.rpm.suffix} diff --git a/dep/org.argeo.dep.cms.node/.gitignore b/dep/org.argeo.dep.cms.node/.gitignore deleted file mode 100644 index e26e09f82..000000000 --- a/dep/org.argeo.dep.cms.node/.gitignore +++ /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 index 4854a41b9..000000000 --- a/dep/org.argeo.dep.cms.node/META-INF/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/MANIFEST.MF diff --git a/dep/org.argeo.dep.cms.node/pom.xml b/dep/org.argeo.dep.cms.node/pom.xml index 1174ddf97..656da2955 100644 --- a/dep/org.argeo.dep.cms.node/pom.xml +++ b/dep/org.argeo.dep.cms.node/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.argeo.commons - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT dep .. @@ -15,7 +15,7 @@ org.argeo.commons org.argeo.dep.cms.client - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT pom @@ -23,17 +23,17 @@ org.argeo.commons org.argeo.api - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT org.argeo.commons org.argeo.cms - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT org.argeo.commons org.argeo.maintenance - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT @@ -240,7 +240,9 @@ rpm - argeo-cms-node + argeo-cms-node${argeo.rpm.suffix} + ${version.released} + ${maven.build.timestamp} /usr/share/osgi @@ -259,8 +261,8 @@ - argeo-cms-client - argeo-cms-node-tp + argeo-cms-client${argeo.rpm.suffix} + argeo-cms-node-tp${argeo.rpm.suffix} @@ -322,7 +324,7 @@ - argeo-cms-client-tp + argeo-cms-client-tp${argeo.rpm.suffix} diff --git a/dep/org.argeo.dep.cms.sdk/.gitignore b/dep/org.argeo.dep.cms.sdk/.gitignore deleted file mode 100644 index e26e09f82..000000000 --- a/dep/org.argeo.dep.cms.sdk/.gitignore +++ /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 index 4854a41b9..000000000 --- a/dep/org.argeo.dep.cms.sdk/META-INF/.gitignore +++ /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 index e69de29bb..000000000 diff --git a/dep/org.argeo.dep.cms.sdk/build.properties b/dep/org.argeo.dep.cms.sdk/build.properties deleted file mode 100644 index edef3d9d1..000000000 --- a/dep/org.argeo.dep.cms.sdk/build.properties +++ /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 index 0423aa509..000000000 --- a/dep/org.argeo.dep.cms.sdk/p2.inf +++ /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 index 1029790a2..000000000 --- a/dep/org.argeo.dep.cms.sdk/pom.xml +++ /dev/null @@ -1,129 +0,0 @@ - - - 4.0.0 - - org.argeo.commons - 2.1.104-SNAPSHOT - dep - .. - - org.argeo.dep.cms.sdk - CMS SDK - - - - org.argeo.commons - org.argeo.dep.cms.ui.rap - 2.1.104-SNAPSHOT - pom - - - - - org.argeo.commons - org.argeo.osgi.boot - 2.1.104-SNAPSHOT - test - - - - - - - - - - - - - - org.argeo.tp.sdk - biz.aQute.bndlib - - - org.argeo.tp.sdk - org.junit - - - org.argeo.tp.sdk - org.hamcrest - - - org.argeo.tp.sdk - org.redline-rpm - - - org.argeo.tp.misc - com.googlecode.javaewah.JavaEWAH - - - org.argeo.tp.misc - org.eclipse.jgit - - - - - - rpmbuild-tp - - - - maven-assembly-plugin - - - prepare-source-tp - package - - single - - - - a2-source-tp - - - - - - - org.codehaus.mojo - rpm-maven-plugin - - - rpm-tp - package - - rpm - - - argeo-cms-sdk-tp - ${version.argeo-tp} - ${maven.build.timestamp} - - - /usr/share/osgi - root - root - 644 - false - - - ${project.build.directory}/${project.artifactId}-${project.version}-a2-source-tp - - **/*.jar - - - - - - - - - - - - - - - - \ 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 index 7bfff59a8..000000000 --- a/dep/org.argeo.dep.cms.ui.rap/.gitignore +++ /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 index 4854a41b9..000000000 --- a/dep/org.argeo.dep.cms.ui.rap/META-INF/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/MANIFEST.MF diff --git a/dep/org.argeo.dep.cms.ui.rap/pom.xml b/dep/org.argeo.dep.cms.ui.rap/pom.xml index 064ca8703..b00284f4f 100644 --- a/dep/org.argeo.dep.cms.ui.rap/pom.xml +++ b/dep/org.argeo.dep.cms.ui.rap/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.argeo.commons - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT dep .. @@ -15,7 +15,7 @@ org.argeo.commons org.argeo.dep.cms.node - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT pom @@ -49,27 +49,27 @@ org.argeo.commons org.argeo.eclipse.ui - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT org.argeo.commons org.argeo.eclipse.ui.rap - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT org.argeo.commons org.argeo.cms.ui - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT org.argeo.commons org.argeo.cms.ui.rap - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT org.argeo.commons org.argeo.cms.ui.theme - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT @@ -120,7 +120,9 @@ rpm - argeo-cms-ui-rap + argeo-cms-ui-rap${argeo.rpm.suffix} + ${version.released} + ${maven.build.timestamp} /usr/share/osgi @@ -181,7 +183,7 @@ rpm - argeo-cms-ui-rap-tp + argeo-cms-ui-rap-tp${argeo.rpm.suffix} ${version.argeo-tp} ${maven.build.timestamp} @@ -202,7 +204,7 @@ - argeo-cms-node-tp + argeo-cms-node-tp${argeo.rpm.suffix} diff --git a/dep/pom.xml b/dep/pom.xml index 3293a560c..7c3b04cb6 100644 --- a/dep/pom.xml +++ b/dep/pom.xml @@ -1,10 +1,12 @@ - + 4.0.0 org.argeo.commons argeo-commons - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT .. dep @@ -19,6 +21,16 @@ + + org.codehaus.mojo + properties-maven-plugin + + true + + ../../cnf/${version.context}.bnd + + + org.apache.felix maven-bundle-plugin @@ -67,6 +79,21 @@ + + a2-target + + + + maven-assembly-plugin + + + a2-target + + + + + + check-osgi @@ -93,7 +120,7 @@ org.argeo.commons org.argeo.osgi.boot - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT test diff --git a/dist/.gitignore b/dist/.gitignore deleted file mode 100644 index 66cc71077..000000000 --- a/dist/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/target/ - diff --git a/dist/argeo-cli/.gitignore b/dist/argeo-cli/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/dist/argeo-cli/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/dist/argeo-cli/pom.xml b/dist/argeo-cli/pom.xml index 29ec5f575..4d2aa70c0 100644 --- a/dist/argeo-cli/pom.xml +++ b/dist/argeo-cli/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.argeo.commons - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT dist .. @@ -16,12 +16,12 @@ org.argeo.commons org.argeo.dep.cms.client - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT org.argeo.commons org.argeo.dep.cms.node - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT @@ -67,7 +67,9 @@ rpm - argeo-cli + argeo-cli${argeo.rpm.suffix} + ${version.released} + ${maven.build.timestamp} /etc/argeo-cli diff --git a/dist/argeo-node/.gitignore b/dist/argeo-node/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/dist/argeo-node/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/dist/argeo-node/pom.xml b/dist/argeo-node/pom.xml index 452e8379c..10be1edb5 100644 --- a/dist/argeo-node/pom.xml +++ b/dist/argeo-node/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.argeo.commons - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT dist .. @@ -16,23 +16,23 @@ org.argeo.commons org.argeo.dep.cms.client - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT org.argeo.commons org.argeo.dep.cms.node - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT org.argeo.commons org.argeo.dep.cms.e4.rap - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT org.argeo.commons osgi-boot zip - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT @@ -41,7 +41,7 @@ org.apache.maven.plugins maven-assembly-plugin - argeo-node-${project.version} + argeo-node-${version.released}${buildId} false assembly/cms-e4-rap.xml @@ -75,7 +75,9 @@ rpm - argeo-node + argeo-node${argeo.rpm.suffix} + ${version.released} + ${maven.build.timestamp} /etc/argeo @@ -182,8 +184,8 @@ - argeo-cms-node - argeo-osgi-boot + argeo-cms-node${argeo.rpm.suffix} + argeo-osgi-boot${argeo.rpm.suffix} diff --git a/dist/containers/.gitignore b/dist/containers/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/dist/containers/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/dist/containers/pom.xml b/dist/containers/pom.xml index fc92e2c6c..cc3242537 100644 --- a/dist/containers/pom.xml +++ b/dist/containers/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.argeo.commons - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT dist .. diff --git a/dist/osgi-boot/.gitignore b/dist/osgi-boot/.gitignore deleted file mode 100644 index 66cc71077..000000000 --- a/dist/osgi-boot/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/target/ - diff --git a/dist/osgi-boot/pom.xml b/dist/osgi-boot/pom.xml index d339ed5d2..239f3688c 100644 --- a/dist/osgi-boot/pom.xml +++ b/dist/osgi-boot/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.argeo.commons - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT dist .. @@ -23,7 +23,7 @@ org.argeo.commons org.argeo.osgi.boot - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT @@ -69,7 +69,9 @@ rpm - argeo-osgi-boot + argeo-osgi-boot${argeo.rpm.suffix} + ${version.released} + ${maven.build.timestamp} /usr/bin @@ -117,7 +119,7 @@ - argeo-osgi-boot-equinox + argeo-osgi-boot-equinox${argeo.rpm.suffix} @@ -141,7 +143,7 @@ rpm - argeo-osgi-boot-equinox + argeo-osgi-boot-equinox${argeo.rpm.suffix} ${version.argeo-tp} ${maven.build.timestamp} diff --git a/dist/pom.xml b/dist/pom.xml index f6f87860d..52ed45d55 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -1,10 +1,12 @@ - + 4.0.0 org.argeo.commons argeo-commons - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT .. dist @@ -16,4 +18,18 @@ argeo-node containers + + + + org.codehaus.mojo + properties-maven-plugin + + true + + ../../cnf/${version.context}.bnd + + + + + \ No newline at end of file diff --git a/org.argeo.api/.gitignore b/org.argeo.api/.gitignore deleted file mode 100644 index 09e3bc9b2..000000000 --- a/org.argeo.api/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/bin/ -/target/ diff --git a/org.argeo.api/pom.xml b/org.argeo.api/pom.xml index d7f018883..8f3c15c57 100644 --- a/org.argeo.api/pom.xml +++ b/org.argeo.api/pom.xml @@ -4,7 +4,7 @@ org.argeo.commons argeo-commons - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT .. org.argeo.api diff --git a/org.argeo.cms.e4.rap/.gitignore b/org.argeo.cms.e4.rap/.gitignore deleted file mode 100644 index 09e3bc9b2..000000000 --- a/org.argeo.cms.e4.rap/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/bin/ -/target/ diff --git a/org.argeo.cms.e4.rap/pom.xml b/org.argeo.cms.e4.rap/pom.xml index f1ec50191..81f2fcacc 100644 --- a/org.argeo.cms.e4.rap/pom.xml +++ b/org.argeo.cms.e4.rap/pom.xml @@ -4,7 +4,7 @@ org.argeo.commons argeo-commons - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT .. org.argeo.cms.e4.rap @@ -14,18 +14,18 @@ org.argeo.commons org.argeo.cms.ui.rap - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT org.argeo.commons org.argeo.cms.e4 - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT org.argeo.commons org.argeo.eclipse.ui.rap - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT provided diff --git a/org.argeo.cms.e4/.gitignore b/org.argeo.cms.e4/.gitignore deleted file mode 100644 index 09e3bc9b2..000000000 --- a/org.argeo.cms.e4/.gitignore +++ /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 index 0c68a61dc..000000000 --- a/org.argeo.cms.e4/.settings/org.eclipse.jdt.core.prefs +++ /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.e4/pom.xml b/org.argeo.cms.e4/pom.xml index 24a386afe..fd1842afd 100644 --- a/org.argeo.cms.e4/pom.xml +++ b/org.argeo.cms.e4/pom.xml @@ -4,7 +4,7 @@ org.argeo.commons argeo-commons - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT .. org.argeo.cms.e4 @@ -14,14 +14,14 @@ org.argeo.commons org.argeo.cms.ui - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT org.argeo.commons org.argeo.eclipse.ui.rap - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT provided diff --git a/org.argeo.cms.ui.rap/.gitignore b/org.argeo.cms.ui.rap/.gitignore deleted file mode 100644 index 09e3bc9b2..000000000 --- a/org.argeo.cms.ui.rap/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/bin/ -/target/ diff --git a/org.argeo.cms.ui.rap/pom.xml b/org.argeo.cms.ui.rap/pom.xml index 8f5df3373..37fdd9a17 100644 --- a/org.argeo.cms.ui.rap/pom.xml +++ b/org.argeo.cms.ui.rap/pom.xml @@ -4,7 +4,7 @@ org.argeo.commons argeo-commons - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT .. org.argeo.cms.ui.rap @@ -14,13 +14,13 @@ org.argeo.commons org.argeo.cms.ui - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT org.argeo.commons org.argeo.eclipse.ui.rap - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT provided @@ -28,7 +28,7 @@ org.argeo.commons org.argeo.cms.ui.theme - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT diff --git a/org.argeo.cms.ui.theme/.gitignore b/org.argeo.cms.ui.theme/.gitignore deleted file mode 100644 index 09e3bc9b2..000000000 --- a/org.argeo.cms.ui.theme/.gitignore +++ /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 index 0c68a61dc..000000000 --- a/org.argeo.cms.ui.theme/.settings/org.eclipse.jdt.core.prefs +++ /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 index f29e940a0..000000000 --- a/org.argeo.cms.ui.theme/.settings/org.eclipse.pde.core.prefs +++ /dev/null @@ -1,3 +0,0 @@ -eclipse.preferences.version=1 -pluginProject.extensions=false -resolve.requirebundle=false diff --git a/org.argeo.cms.ui.theme/pom.xml b/org.argeo.cms.ui.theme/pom.xml index e11b0655a..b30460a81 100644 --- a/org.argeo.cms.ui.theme/pom.xml +++ b/org.argeo.cms.ui.theme/pom.xml @@ -4,7 +4,7 @@ org.argeo.commons argeo-commons - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT .. org.argeo.cms.ui.theme diff --git a/org.argeo.cms.ui/.gitignore b/org.argeo.cms.ui/.gitignore deleted file mode 100644 index 09e3bc9b2..000000000 --- a/org.argeo.cms.ui/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/bin/ -/target/ diff --git a/org.argeo.cms.ui/pom.xml b/org.argeo.cms.ui/pom.xml index af0ea3e2f..186bb1e5b 100644 --- a/org.argeo.cms.ui/pom.xml +++ b/org.argeo.cms.ui/pom.xml @@ -4,7 +4,7 @@ org.argeo.commons argeo-commons - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT .. org.argeo.cms.ui @@ -14,13 +14,13 @@ org.argeo.commons org.argeo.cms - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT org.argeo.commons org.argeo.eclipse.ui.rap - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT provided @@ -28,7 +28,7 @@ org.argeo.commons org.argeo.cms.ui.theme - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT diff --git a/org.argeo.cms/.gitignore b/org.argeo.cms/.gitignore deleted file mode 100644 index 09e3bc9b2..000000000 --- a/org.argeo.cms/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/bin/ -/target/ diff --git a/org.argeo.cms/pom.xml b/org.argeo.cms/pom.xml index 351ed5391..45aaa917e 100644 --- a/org.argeo.cms/pom.xml +++ b/org.argeo.cms/pom.xml @@ -4,7 +4,7 @@ org.argeo.commons argeo-commons - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT .. org.argeo.cms @@ -14,27 +14,27 @@ org.argeo.commons org.argeo.api - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT org.argeo.commons org.argeo.jcr - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT org.argeo.commons org.argeo.enterprise - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT org.argeo.commons org.argeo.core - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT org.argeo.commons org.argeo.maintenance - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT \ No newline at end of file diff --git a/org.argeo.core/.gitignore b/org.argeo.core/.gitignore deleted file mode 100644 index c1639dd78..000000000 --- a/org.argeo.core/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/bin/ -/target/ -id_rsa -id_rsa.pub diff --git a/org.argeo.core/pom.xml b/org.argeo.core/pom.xml index c5a35ccb7..b1dfe92c6 100644 --- a/org.argeo.core/pom.xml +++ b/org.argeo.core/pom.xml @@ -4,7 +4,7 @@ org.argeo.commons argeo-commons - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT .. org.argeo.core @@ -13,12 +13,12 @@ org.argeo.commons org.argeo.enterprise - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT org.argeo.commons org.argeo.jcr - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT \ 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 index 09e3bc9b2..000000000 --- a/org.argeo.eclipse.ui.rap/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/bin/ -/target/ diff --git a/org.argeo.eclipse.ui.rap/pom.xml b/org.argeo.eclipse.ui.rap/pom.xml index b3c1b75bf..e56d4395b 100644 --- a/org.argeo.eclipse.ui.rap/pom.xml +++ b/org.argeo.eclipse.ui.rap/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.argeo.commons - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT argeo-commons .. @@ -13,7 +13,7 @@ org.argeo.commons org.argeo.eclipse.ui - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT diff --git a/org.argeo.eclipse.ui/.gitignore b/org.argeo.eclipse.ui/.gitignore deleted file mode 100644 index 09e3bc9b2..000000000 --- a/org.argeo.eclipse.ui/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/bin/ -/target/ diff --git a/org.argeo.eclipse.ui/pom.xml b/org.argeo.eclipse.ui/pom.xml index 34639d810..e3069dd37 100644 --- a/org.argeo.eclipse.ui/pom.xml +++ b/org.argeo.eclipse.ui/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.argeo.commons - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT argeo-commons .. @@ -18,7 +18,7 @@ org.argeo.commons org.argeo.jcr - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT diff --git a/org.argeo.enterprise/.gitignore b/org.argeo.enterprise/.gitignore deleted file mode 100644 index 09e3bc9b2..000000000 --- a/org.argeo.enterprise/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/bin/ -/target/ diff --git a/org.argeo.enterprise/pom.xml b/org.argeo.enterprise/pom.xml index 18701b219..fef408449 100644 --- a/org.argeo.enterprise/pom.xml +++ b/org.argeo.enterprise/pom.xml @@ -4,7 +4,7 @@ org.argeo.commons argeo-commons - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT .. org.argeo.enterprise diff --git a/org.argeo.jcr/.gitignore b/org.argeo.jcr/.gitignore deleted file mode 100644 index 09e3bc9b2..000000000 --- a/org.argeo.jcr/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/bin/ -/target/ diff --git a/org.argeo.jcr/pom.xml b/org.argeo.jcr/pom.xml index ae4e0bc04..99becb52e 100644 --- a/org.argeo.jcr/pom.xml +++ b/org.argeo.jcr/pom.xml @@ -3,7 +3,7 @@ org.argeo.commons argeo-commons - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT .. org.argeo.jcr diff --git a/org.argeo.maintenance/.gitignore b/org.argeo.maintenance/.gitignore deleted file mode 100644 index bdd97df6d..000000000 --- a/org.argeo.maintenance/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/bin/ -/target/ -/testBackup/ diff --git a/org.argeo.maintenance/pom.xml b/org.argeo.maintenance/pom.xml index 407855443..b061f87cd 100644 --- a/org.argeo.maintenance/pom.xml +++ b/org.argeo.maintenance/pom.xml @@ -4,7 +4,7 @@ org.argeo.commons argeo-commons - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT .. org.argeo.maintenance @@ -14,22 +14,22 @@ org.argeo.commons org.argeo.jcr - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT org.argeo.commons org.argeo.enterprise - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT org.argeo.commons org.argeo.core - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT org.argeo.commons org.argeo.api - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT \ No newline at end of file diff --git a/org.argeo.osgi.boot/.gitignore b/org.argeo.osgi.boot/.gitignore deleted file mode 100644 index 0d2e1e32e..000000000 --- a/org.argeo.osgi.boot/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -/bin/ -/target/ -/configuration/ -/state/ -/data/ -/log4j.properties diff --git a/org.argeo.osgi.boot/pom.xml b/org.argeo.osgi.boot/pom.xml index 1c870e88c..1bf95002e 100644 --- a/org.argeo.osgi.boot/pom.xml +++ b/org.argeo.osgi.boot/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.argeo.commons - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT argeo-commons .. diff --git a/pom.xml b/pom.xml index 96886f01b..c39b91270 100644 --- a/pom.xml +++ b/pom.xml @@ -4,18 +4,17 @@ org.argeo.maven argeo-osgi-parent - 2.1.3 + 2.1.4-SNAPSHOT org.argeo.commons argeo-commons - 2.1.104-SNAPSHOT + 2.1-SNAPSHOT Argeo Commons pom http://www.argeo.org/ + testing 2.1.27 - - /srv/rpmfactory/testing/argeo-osgi-2/argeo code.argeo.org @@ -41,12 +40,12 @@ dep demo dist + sdk scm:git:http://git.argeo.org/lgpl/argeo-commons.git http://git.argeo.org/?p=lgpl/argeo-commons.git;a=summary scm:git:https://code.argeo.org/git/lgpl/argeo-commons.git - v2.x Argeo GmbH @@ -120,12 +119,12 @@ staging - dav:https://forge.argeo.org/data/java/argeo-2.1/ + dav:https://forge.argeo.org/data/java/argeo-2.3 false staging - file:///srv/docfactory/argeo-2.1/site/argeo-commons/ + file:///srv/docfactory/argeo-2.3/site/argeo-commons/ @@ -141,6 +140,18 @@ false + + argeo-unstable + http://forge.argeo.org/data/java/argeo-2.3/ + + true + never + warn + + + false + + central @@ -226,7 +237,7 @@ argeo - http://localhost:7080/data/java/argeo-2.1 + http://localhost:7080/data/java/argeo-2.3 true daily @@ -237,7 +248,7 @@ staging - dav:http://localhost:7080/data/java/argeo-2.1/ + dav:http://localhost:7080/data/java/argeo-2.3/ false diff --git a/sdk/a2/.project b/sdk/a2/.project new file mode 100644 index 000000000..f6bf2aaab --- /dev/null +++ b/sdk/a2/.project @@ -0,0 +1,11 @@ + + + argeo-commons-a2 + + + + + + + + diff --git a/sdk/a2/argeo-commons-upstream.target b/sdk/a2/argeo-commons-upstream.target new file mode 100644 index 000000000..5539eee3c --- /dev/null +++ b/sdk/a2/argeo-commons-upstream.target @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/sdk/a2/build/.gitignore b/sdk/a2/build/.gitignore new file mode 100644 index 000000000..f09a089f0 --- /dev/null +++ b/sdk/a2/build/.gitignore @@ -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 index 000000000..f09a089f0 --- /dev/null +++ b/sdk/a2/upstream/.gitignore @@ -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 index 000000000..4cfd55d27 --- /dev/null +++ b/sdk/build.sh @@ -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 index 000000000..ed8576d75 --- /dev/null +++ b/sdk/configure.sh @@ -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 index 000000000..306fd825c --- /dev/null +++ b/sdk/ecj.args @@ -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 index 000000000..b7646bbdb --- /dev/null +++ b/sdk/pom.xml @@ -0,0 +1,41 @@ + + + 4.0.0 + + org.argeo.commons + argeo-commons + 2.3.1-SNAPSHOT + .. + + sdk + Commons SDK + pom + + + org.argeo.tp + argeo-tp-rap-e4 + ${version.argeo-tp} + pom + provided + + + + + a2-provided + + + + maven-assembly-plugin + + + a2-provided + + + + + + + + \ No newline at end of file