From: Mathieu Baudier Date: Tue, 18 Feb 2020 12:12:45 +0000 (+0100) Subject: Use parent from Argeo Maven. X-Git-Tag: argeo-commons-2.1.86~14 X-Git-Url: http://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=commitdiff_plain;h=ef37921501125dd54ead43d6bc35c8f31dea62b9 Use parent from Argeo Maven. --- diff --git a/maven/.gitignore b/maven/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/maven/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/maven/assembly-descriptors/.gitignore b/maven/assembly-descriptors/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/maven/assembly-descriptors/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/maven/assembly-descriptors/META-INF/.gitignore b/maven/assembly-descriptors/META-INF/.gitignore deleted file mode 100644 index 4854a41b9..000000000 --- a/maven/assembly-descriptors/META-INF/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/MANIFEST.MF diff --git a/maven/assembly-descriptors/assemblies/a2-source-snapshots.xml b/maven/assembly-descriptors/assemblies/a2-source-snapshots.xml deleted file mode 100644 index bf796ac96..000000000 --- a/maven/assembly-descriptors/assemblies/a2-source-snapshots.xml +++ /dev/null @@ -1,25 +0,0 @@ - - a2-source-snapshots - - - dir - - - - false - ${artifact.groupId}/${artifact.artifactId}-${artifact.version}.${artifact.extension} - - true - runtime - - *:*:jar:*-SNAPSHOT - - - *:*:pom:* - - - - \ No newline at end of file diff --git a/maven/assembly-descriptors/assemblies/a2-source-tp.xml b/maven/assembly-descriptors/assemblies/a2-source-tp.xml deleted file mode 100644 index 0d93a2efb..000000000 --- a/maven/assembly-descriptors/assemblies/a2-source-tp.xml +++ /dev/null @@ -1,25 +0,0 @@ - - a2-source-tp - - - dir - - - - false - ${artifact.groupId}/${artifact.artifactId}-${artifact.version}.${artifact.extension} - - false - runtime - - org.argeo.tp.*:* - - - *:*:pom:* - - - - \ No newline at end of file diff --git a/maven/assembly-descriptors/assemblies/a2-source.xml b/maven/assembly-descriptors/assemblies/a2-source.xml deleted file mode 100644 index 5e8caac6c..000000000 --- a/maven/assembly-descriptors/assemblies/a2-source.xml +++ /dev/null @@ -1,23 +0,0 @@ - - a2-source - - - dir - - - - false - ${artifact.groupId}/${artifact.artifactId}-${artifact.version}.${artifact.extension} - - false - runtime - - org.argeo.tp.*:* - *:*:pom:* - - - - \ No newline at end of file diff --git a/maven/assembly-descriptors/bnd.bnd b/maven/assembly-descriptors/bnd.bnd deleted file mode 100644 index e69de29bb..000000000 diff --git a/maven/assembly-descriptors/pom.xml b/maven/assembly-descriptors/pom.xml deleted file mode 100644 index cc5dd2695..000000000 --- a/maven/assembly-descriptors/pom.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - 4.0.0 - - org.argeo.commons - 2.1.86-SNAPSHOT - maven - .. - - assembly-descriptors - Assembly Descriptors - \ No newline at end of file diff --git a/maven/pom.xml b/maven/pom.xml deleted file mode 100644 index e5b222904..000000000 --- a/maven/pom.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - 4.0.0 - - org.argeo.commons - argeo-commons - 2.1.86-SNAPSHOT - .. - - maven - Maven Helpers and Templates - pom - - assembly-descriptors - - \ No newline at end of file diff --git a/pom.xml b/pom.xml index 09e6d40f9..b12df1f54 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,11 @@ 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"> 4.0.0 - org.argeo.commons + + org.argeo.maven + argeo-osgi-parent + 2.1.2 + argeo-commons 2.1.86-SNAPSHOT Argeo Commons @@ -15,10 +19,6 @@ 7 /srv/rpmfactory/argeo-osgi-2/el7 - - UTF-8 - - yyyyMMddHHmmss code.argeo.org @@ -44,7 +44,6 @@ org.argeo.ext.jackrabbit org.argeo.ext.equinox.jetty - maven dep demo doc @@ -82,257 +81,6 @@ limitations under the License. - - - - org.apache.maven.wagon - wagon-webdav-jackrabbit - 2.10 - - - src - ext/test - - - src - - ** - - - **/*.java - - - - . - - ** - - - .* - .*/** - - META-INF/MANIFEST.MF - src/** - ext/** - target/** - bin/** - pom.xml - build.properties - *.bnd - *.target - **/*.xcf - - - - - - ext/test - - ** - - - **/*.java - - - - - - - - maven-compiler-plugin - 3.8.1 - - 11 - 1.8 - eclipse - - target/classes - target/test-classes - - - - org.codehaus.plexus - plexus-compiler-eclipse - 2.8.5 - - - org.eclipse.jdt - ecj - 3.19.0 - - - - - maven-clean-plugin - 2.6.1 - - - maven-surefire-plugin - 2.18 - - - maven-jar-plugin - 2.5 - - - META-INF/MANIFEST.MF - - - - - maven-source-plugin - 3.1.0 - - - **/*.class - - plugin.xml - META-INF/MANIFEST.MF - - - - - maven-antrun-plugin - 1.8 - - - maven-resources-plugin - 2.7 - - - maven-dependency-plugin - 2.9 - - - maven-site-plugin - 3.7 - - - maven-javadoc-plugin - 3.0.0 - - false - -Xdoclint:none - *.internal.*,org.eclipse.* - UTF-8 - - - - pl.project13.maven - git-commit-id-plugin - 3.0.0 - - - maven-release-plugin - 2.5.1 - - true - - - - org.apache.felix - maven-bundle-plugin - 4.2.1 - true - - META-INF - true - - pom - - - <_include>bnd.bnd - ${project.version}-r${maven.build.timestamp} - ${project.artifactId} - JavaSE-11,JavaSE-1.8 - <_removeheaders>Bnd-LastModified,Build-Jdk,Built-By,Tool,Created-By - ${project.artifactId} - ${project.groupId} - ${maven.build.timestamp} - - - - - - org.codehaus.mojo - rpm-maven-plugin - 2.2.0 - true - - ${project.version} - argeo${argeo.rpm.release} - Applications/System - /usr - 755 - 644 - false - - - - org.codehaus.mojo - exec-maven-plugin - 1.3.2 - - - - org.argeo.maven.plugins - argeo-osgi-plugin - 2.1.1 - - - - - - maven-resources-plugin - - UTF-8 - - - - maven-site-plugin - false - - false - - - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - package - - jar - - - - - - - org.apache.felix - maven-bundle-plugin - - - bundle-manifest - process-classes - - manifest - - - - - - - maven-release-plugin - - deploy - rpmbuild - - - - org.argeo.tp @@ -374,6 +122,22 @@ limitations under the License. + + + staging + dav:https://forge.argeo.org/data/java/argeo-2.1/ + false + + + staging + file:///srv/javafactory/argeo-2.1 + true + + + staging + file:///srv/docfactory/argeo-2.1/site/argeo-commons/ + + argeo @@ -399,173 +163,19 @@ limitations under the License. warn - - - - argeo-maven-plugins - http://repo.argeo.org/data/java/argeo-2.1 - - true - never - warn - - - false - - - - argeo-maven-plugins-snapshots - http://snapshots.argeo.org/data/java/argeo-2.1/ + + + central + http://repo1.maven.org/maven2 false - true - always - warn + false - - - - - staging - dav:https://forge.argeo.org/data/java/argeo-2.1/ - false - - staging - file:///srv/javafactory/argeo-2.1 - true - - - staging - file:///srv/docfactory/argeo-2.1/site/argeo-commons/ - - - - - - maven-project-info-reports-plugin - 2.9 - - - - index - summary - license - scm - - - - - - maven-javadoc-plugin - 3.0.0 - - false - -Xdoclint:none - *.internal.*,org.eclipse.* - UTF-8 - true - - http://docs.oracle.com/javase/8/docs/api - https://osgi.org/javadoc/r5/core - https://osgi.org/javadoc/r5/enterprise - https://docs.adobe.com/docs/en/spec/javax.jcr/javadocs/jcr-2.0 - http://help.eclipse.org/oxygen/topic/org.eclipse.platform.doc.isv/reference/api - http://docs.spring.io/spring/docs/3.2.x/javadoc-api - - - - - aggregate-javadoc - false - - aggregate - - - - javadoc - - - - - - maven-jxr-plugin - 2.5 - - - aggregate-jxr - false - - aggregate - - - - jxr - - - - - - + - - rpmbuild - - - - maven-antrun-plugin - - - install - - run - - - - - - - - - - - - - - - - - rpmbuild-tp - - - - maven-antrun-plugin - - - install - - run - - - - - - - - - - - - - - - localrepo