This is an automated email from the git hooks/post-receive script. rene pushed a commit to branch master in repository libreoffice.
commit 8be32247bb06cb46b19a8dccaddd4eb48e03a93a Author: Rene Engelhard <[email protected]> Date: Tue Dec 1 10:03:14 2015 +0100 use official upstream poms --- changelog | 10 +- patches/poms.diff | 322 ++++++++++++++++++++++++++++++++++++++++++++++++++ patches/series | 1 + pom.juh.xml.in | 33 ------ pom.jurt.xml.in | 33 ------ pom.officebean.xml.in | 33 ------ pom.ridl.xml.in | 33 ------ pom.unoil.xml.in | 33 ------ pom.unoloader.xml.in | 33 ------ rules | 17 ++- 10 files changed, 340 insertions(+), 208 deletions(-) diff --git a/changelog b/changelog index 1f3f74d..51d13d3 100644 --- a/changelog +++ b/changelog @@ -9,6 +9,7 @@ libreoffice (1:5.0.4~rc1-1) unstable; urgency=medium (but lloconv works) with merged libs - remove checkBookmarks disabling, should work now according to upstream + * debian/patches/poms.diff: add "official" upstream poms * debian/rules: add sparc64 to OOO_ARCHS @@ -20,10 +21,11 @@ libreoffice (1:5.0.4~rc1-1) unstable; urgency=medium - fix tests with libetonyek 0.1.4; mv writerperfect/qa/unit/data/impress/libetonyek/fail/v6.zip to pass - * debian/pom.unoloader.xml.in, debian/ure.poms, debian/rules: also - install ures unoloader.jar into maven - * debian/pom.officebean.xml.in, debian/libreoffice-officebean.poms, - debian/rules: also install officebean.jar into maven + * debian/ure.poms, debian/rules: also install ures unoloader.jar into maven + * debian/libreoffice-officebean.poms, debian/rules: also install + officebean.jar into maven + * debian/*.pom.in, debian/rules: remove own poms and create final poms + with version from upstreams one -- Rene Engelhard <[email protected]> Tue, 01 Dec 2015 07:38:27 +0100 diff --git a/patches/poms.diff b/patches/poms.diff new file mode 100644 index 0000000..3b6c6ba --- /dev/null +++ b/patches/poms.diff @@ -0,0 +1,322 @@ +From 9ca2de8c5995657973665189903aa2eebe0ef69a Mon Sep 17 00:00:00 2001 +From: David Ostrovsky <[email protected]> +Date: Tue, 1 Dec 2015 00:20:09 +0100 +Subject: Expose metadata to deploy LibreOffice artifacts on Maven Central + +As outlined in the requirements to deploy the artifacts on Maven +Central, the metdata must be provided: + +* Project Name, Description and URL +* License Information +* Developer Information +* SCM Information + +[1] http://central.sonatype.org/pages/requirements.html + +Change-Id: I0bcd19a22d0e1a48f0faec0b414f816f7da5b318 +Reviewed-on: https://gerrit.libreoffice.org/20315 +Tested-by: Jenkins <[email protected]> +Reviewed-by: Thorsten Behrens <[email protected]> + +diff --git a/bean/pom.officebean.xml b/bean/pom.officebean.xml +new file mode 100644 +index 0000000..8d366d2 +--- /dev/null ++++ b/bean/pom.officebean.xml +@@ -0,0 +1,44 @@ ++<project> ++ <modelVersion>4.0.0</modelVersion> ++ <groupId>org.libreoffice</groupId> ++ <artifactId>officebean</artifactId> ++ <version>@version@</version> ++ <packaging>jar</packaging> ++ <name>LibreOffice - LOKit4Java</name> ++ <description>LOKit4Java</description> ++ <url>https://www.libreoffice.org</url> ++ ++ <licenses> ++ <license> ++ <name>Mozilla Public License, Version 2.0</name> ++ <url>https://www.mozilla.org/en-US/MPL/2.0</url> ++ <distribution>repo</distribution> ++ </license> ++ </licenses> ++ ++ <scm> ++ <url>http://cgit.freedesktop.org/libreoffice/core</url> ++ <connection>https://gerrit.libreoffice.org/#/admin/projects/core</connection> ++ </scm> ++ ++ <developers> ++ <developer> ++ <name>The Document Foundation</name> ++ </developer> ++ </developers> ++ ++ <mailingLists> ++ <mailingList> ++ <name>LibreOffice Development Mailing List</name> ++ <post>[email protected]</post> ++ <subscribe>http://lists.freedesktop.org/mailman/listinfo/libreoffice</subscribe> ++ <unsubscribe>http://lists.freedesktop.org/mailman/listinfo/libreoffice</unsubscribe> ++ <archive>http://lists.freedesktop.org/archives/libreoffice</archive> ++ </mailingList> ++ </mailingLists> ++ ++ <issueManagement> ++ <url>https://bugs.documentfoundation.org</url> ++ <system>LibreOffice Issue Tracker</system> ++ </issueManagement> ++</project> +diff --git a/javaunohelper/pom.juh.xml b/javaunohelper/pom.juh.xml +new file mode 100644 +index 0000000..f132ead +--- /dev/null ++++ b/javaunohelper/pom.juh.xml +@@ -0,0 +1,44 @@ ++<project> ++ <modelVersion>4.0.0</modelVersion> ++ <groupId>org.libreoffice</groupId> ++ <artifactId>juh</artifactId> ++ <version>@version@</version> ++ <packaging>jar</packaging> ++ <name>LibreOffice - Java UNO helper</name> ++ <description>Java UNO helper</description> ++ <url>https://www.libreoffice.org</url> ++ ++ <licenses> ++ <license> ++ <name>Mozilla Public License, Version 2.0</name> ++ <url>https://www.mozilla.org/en-US/MPL/2.0</url> ++ <distribution>repo</distribution> ++ </license> ++ </licenses> ++ ++ <scm> ++ <url>http://cgit.freedesktop.org/libreoffice/core</url> ++ <connection>https://gerrit.libreoffice.org/#/admin/projects/core</connection> ++ </scm> ++ ++ <developers> ++ <developer> ++ <name>The Document Foundation</name> ++ </developer> ++ </developers> ++ ++ <mailingLists> ++ <mailingList> ++ <name>LibreOffice Development Mailing List</name> ++ <post>[email protected]</post> ++ <subscribe>http://lists.freedesktop.org/mailman/listinfo/libreoffice</subscribe> ++ <unsubscribe>http://lists.freedesktop.org/mailman/listinfo/libreoffice</unsubscribe> ++ <archive>http://lists.freedesktop.org/archives/libreoffice</archive> ++ </mailingList> ++ </mailingLists> ++ ++ <issueManagement> ++ <url>https://bugs.documentfoundation.org</url> ++ <system>LibreOffice Issue Tracker</system> ++ </issueManagement> ++</project> +diff --git a/jurt/pom.jurt.xml b/jurt/pom.jurt.xml +new file mode 100644 +index 0000000..25e3403 +--- /dev/null ++++ b/jurt/pom.jurt.xml +@@ -0,0 +1,44 @@ ++<project> ++ <modelVersion>4.0.0</modelVersion> ++ <groupId>org.libreoffice</groupId> ++ <artifactId>jurt</artifactId> ++ <version>@version@</version> ++ <packaging>jar</packaging> ++ <name>LibreOffice - Java Uno Runtime</name> ++ <description>Java Uno Runtime</description> ++ <url>https://www.libreoffice.org</url> ++ ++ <licenses> ++ <license> ++ <name>Mozilla Public License, Version 2.0</name> ++ <url>https://www.mozilla.org/en-US/MPL/2.0</url> ++ <distribution>repo</distribution> ++ </license> ++ </licenses> ++ ++ <scm> ++ <url>http://cgit.freedesktop.org/libreoffice/core</url> ++ <connection>https://gerrit.libreoffice.org/#/admin/projects/core</connection> ++ </scm> ++ ++ <developers> ++ <developer> ++ <name>The Document Foundation</name> ++ </developer> ++ </developers> ++ ++ <mailingLists> ++ <mailingList> ++ <name>LibreOffice Development Mailing List</name> ++ <post>[email protected]</post> ++ <subscribe>http://lists.freedesktop.org/mailman/listinfo/libreoffice</subscribe> ++ <unsubscribe>http://lists.freedesktop.org/mailman/listinfo/libreoffice</unsubscribe> ++ <archive>http://lists.freedesktop.org/archives/libreoffice</archive> ++ </mailingList> ++ </mailingLists> ++ ++ <issueManagement> ++ <url>https://bugs.documentfoundation.org</url> ++ <system>LibreOffice Issue Tracker</system> ++ </issueManagement> ++</project> +diff --git a/ridljar/pom.ridl.xml b/ridljar/pom.ridl.xml +new file mode 100644 +index 0000000..96b862a0 +--- /dev/null ++++ b/ridljar/pom.ridl.xml +@@ -0,0 +1,44 @@ ++<project> ++ <modelVersion>4.0.0</modelVersion> ++ <groupId>org.libreoffice</groupId> ++ <artifactId>ridl</artifactId> ++ <version>@version@</version> ++ <packaging>jar</packaging> ++ <name>LibreOffice - Types for the Java Uno typesystem</name> ++ <description>Types for the Java Uno typesystem</description> ++ <url>https://www.libreoffice.org</url> ++ ++ <licenses> ++ <license> ++ <name>Mozilla Public License, Version 2.0</name> ++ <url>https://www.mozilla.org/en-US/MPL/2.0</url> ++ <distribution>repo</distribution> ++ </license> ++ </licenses> ++ ++ <scm> ++ <url>http://cgit.freedesktop.org/libreoffice/core</url> ++ <connection>https://gerrit.libreoffice.org/#/admin/projects/core</connection> ++ </scm> ++ ++ <developers> ++ <developer> ++ <name>The Document Foundation</name> ++ </developer> ++ </developers> ++ ++ <mailingLists> ++ <mailingList> ++ <name>LibreOffice Development Mailing List</name> ++ <post>[email protected]</post> ++ <subscribe>http://lists.freedesktop.org/mailman/listinfo/libreoffice</subscribe> ++ <unsubscribe>http://lists.freedesktop.org/mailman/listinfo/libreoffice</unsubscribe> ++ <archive>http://lists.freedesktop.org/archives/libreoffice</archive> ++ </mailingList> ++ </mailingLists> ++ ++ <issueManagement> ++ <url>https://bugs.documentfoundation.org</url> ++ <system>LibreOffice Issue Tracker</system> ++ </issueManagement> ++</project> +diff --git a/ridljar/pom.unoloader.xml b/ridljar/pom.unoloader.xml +new file mode 100644 +index 0000000..188a041 +--- /dev/null ++++ b/ridljar/pom.unoloader.xml +@@ -0,0 +1,44 @@ ++<project> ++ <modelVersion>4.0.0</modelVersion> ++ <groupId>org.libreoffice</groupId> ++ <artifactId>unoloader</artifactId> ++ <version>@version@</version> ++ <packaging>jar</packaging> ++ <name>LibreOffice - UNO loader</name> ++ <description>UNO loader</description> ++ <url>https://www.libreoffice.org</url> ++ ++ <licenses> ++ <license> ++ <name>Mozilla Public License, Version 2.0</name> ++ <url>https://www.mozilla.org/en-US/MPL/2.0</url> ++ <distribution>repo</distribution> ++ </license> ++ </licenses> ++ ++ <scm> ++ <url>http://cgit.freedesktop.org/libreoffice/core</url> ++ <connection>https://gerrit.libreoffice.org/#/admin/projects/core</connection> ++ </scm> ++ ++ <developers> ++ <developer> ++ <name>The Document Foundation</name> ++ </developer> ++ </developers> ++ ++ <mailingLists> ++ <mailingList> ++ <name>LibreOffice Development Mailing List</name> ++ <post>[email protected]</post> ++ <subscribe>http://lists.freedesktop.org/mailman/listinfo/libreoffice</subscribe> ++ <unsubscribe>http://lists.freedesktop.org/mailman/listinfo/libreoffice</unsubscribe> ++ <archive>http://lists.freedesktop.org/archives/libreoffice</archive> ++ </mailingList> ++ </mailingLists> ++ ++ <issueManagement> ++ <url>https://bugs.documentfoundation.org</url> ++ <system>LibreOffice Issue Tracker</system> ++ </issueManagement> ++</project> +diff --git a/unoil/pom.unoil.xml b/unoil/pom.unoil.xml +new file mode 100644 +index 0000000..356d25d +--- /dev/null ++++ b/unoil/pom.unoil.xml +@@ -0,0 +1,44 @@ ++<project> ++ <modelVersion>4.0.0</modelVersion> ++ <groupId>org.libreoffice</groupId> ++ <artifactId>unoil</artifactId> ++ <version>@version@</version> ++ <packaging>jar</packaging> ++ <name>LibreOffice - Maps IDL into java classes definitions</name> ++ <description>Maps IDL into java classes definitions</description> ++ <url>https://www.libreoffice.org</url> ++ ++ <licenses> ++ <license> ++ <name>Mozilla Public License, Version 2.0</name> ++ <url>https://www.mozilla.org/en-US/MPL/2.0</url> ++ <distribution>repo</distribution> ++ </license> ++ </licenses> ++ ++ <scm> ++ <url>http://cgit.freedesktop.org/libreoffice/core</url> ++ <connection>https://gerrit.libreoffice.org/#/admin/projects/core</connection> ++ </scm> ++ ++ <developers> ++ <developer> ++ <name>The Document Foundation</name> ++ </developer> ++ </developers> ++ ++ <mailingLists> ++ <mailingList> ++ <name>LibreOffice Development Mailing List</name> ++ <post>[email protected]</post> ++ <subscribe>http://lists.freedesktop.org/mailman/listinfo/libreoffice</subscribe> ++ <unsubscribe>http://lists.freedesktop.org/mailman/listinfo/libreoffice</unsubscribe> ++ <archive>http://lists.freedesktop.org/archives/libreoffice</archive> ++ </mailingList> ++ </mailingLists> ++ ++ <issueManagement> ++ <url>https://bugs.documentfoundation.org</url> ++ <system>LibreOffice Issue Tracker</system> ++ </issueManagement> ++</project> +-- +cgit v0.10.2 diff --git a/patches/series b/patches/series index 5c53ede..d4d3c14 100644 --- a/patches/series +++ b/patches/series @@ -31,3 +31,4 @@ rsc-no-error-about-unknown-switch.diff liborcus-0.9.1.diff debian-branding.diff icu-56.diff +poms.diff diff --git a/pom.juh.xml.in b/pom.juh.xml.in deleted file mode 100644 index bec8297..0000000 --- a/pom.juh.xml.in +++ /dev/null @@ -1,33 +0,0 @@ -<?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/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - <groupId>org.libreoffice</groupId> - <artifactId>juh</artifactId> - <version>@version@</version> - <packaging>pom</packaging> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>1.7</version> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>attach-artifact</goal> - </goals> - <configuration> - <artifacts> - <artifact> - <file>${artifactId}.jar</file> - <type>jar</type> - </artifact> - </artifacts> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> diff --git a/pom.jurt.xml.in b/pom.jurt.xml.in deleted file mode 100644 index 2b0529b..0000000 --- a/pom.jurt.xml.in +++ /dev/null @@ -1,33 +0,0 @@ -<?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/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - <groupId>org.libreoffice</groupId> - <artifactId>jurt</artifactId> - <version>@version@</version> - <packaging>pom</packaging> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>1.7</version> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>attach-artifact</goal> - </goals> - <configuration> - <artifacts> - <artifact> - <file>${artifactId}.jar</file> - <type>jar</type> - </artifact> - </artifacts> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> diff --git a/pom.officebean.xml.in b/pom.officebean.xml.in deleted file mode 100644 index 195b73d..0000000 --- a/pom.officebean.xml.in +++ /dev/null @@ -1,33 +0,0 @@ -<?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/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - <groupId>org.libreoffice</groupId> - <artifactId>officebean</artifactId> - <version>@version@</version> - <packaging>pom</packaging> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>1.7</version> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>attach-artifact</goal> - </goals> - <configuration> - <artifacts> - <artifact> - <file>${artifactId}.jar</file> - <type>jar</type> - </artifact> - </artifacts> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> diff --git a/pom.ridl.xml.in b/pom.ridl.xml.in deleted file mode 100644 index d890e02..0000000 --- a/pom.ridl.xml.in +++ /dev/null @@ -1,33 +0,0 @@ -<?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/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - <groupId>org.libreoffice</groupId> - <artifactId>ridl</artifactId> - <version>@version@</version> - <packaging>pom</packaging> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>1.7</version> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>attach-artifact</goal> - </goals> - <configuration> - <artifacts> - <artifact> - <file>${artifactId}.jar</file> - <type>jar</type> - </artifact> - </artifacts> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> diff --git a/pom.unoil.xml.in b/pom.unoil.xml.in deleted file mode 100644 index 506f0db..0000000 --- a/pom.unoil.xml.in +++ /dev/null @@ -1,33 +0,0 @@ -<?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/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - <groupId>org.libreoffice</groupId> - <artifactId>unoil</artifactId> - <version>@version@</version> - <packaging>pom</packaging> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>1.7</version> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>attach-artifact</goal> - </goals> - <configuration> - <artifacts> - <artifact> - <file>${artifactId}.jar</file> - <type>jar</type> - </artifact> - </artifacts> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> diff --git a/pom.unoloader.xml.in b/pom.unoloader.xml.in deleted file mode 100644 index 053958c..0000000 --- a/pom.unoloader.xml.in +++ /dev/null @@ -1,33 +0,0 @@ -<?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/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - <groupId>org.libreoffice</groupId> - <artifactId>unoloader</artifactId> - <version>@version@</version> - <packaging>pom</packaging> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>1.7</version> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>attach-artifact</goal> - </goals> - <configuration> - <artifacts> - <artifact> - <file>${artifactId}.jar</file> - <type>jar</type> - </artifact> - </artifacts> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> diff --git a/rules b/rules index 38a6d7e..b148b0a 100755 --- a/rules +++ b/rules @@ -2758,10 +2758,15 @@ endif ifeq "$(ENABLE_JAVA)" "y" # somehow --has-package-version doesn't overwrite version and without <version>...</version> # we get a NullPointerException when calling mh_installjar - for i in juh jurt ridl unoloader; do \ + for i in ridl unoloader; do \ sed -e s/@version@/$(shell echo $(DEB_VERSION_UPSTREAM) | cut -d~ -f1)/ \ - < debian/pom.$$i.xml.in > debian/pom.$$i.xml; \ + < $(SOURCE_TREE)/ridljar/pom.$$i.xml > debian/pom.$$i.xml; \ done + sed -e s/@version@/$(shell echo $(DEB_VERSION_UPSTREAM) | cut -d~ -f1)/ \ + < $(SOURCE_TREE)/jurt/pom.jurt.xml > debian/pom.jurt.xml + sed -e s/@version@/$(shell echo $(DEB_VERSION_UPSTREAM) | cut -d~ -f1)/ \ + < $(SOURCE_TREE)/javaunohelper/pom.juh.xml > debian/pom.juh.xml + mh_installpoms -pure for i in juh jurt ridl unoloader; do \ mh_installjar -pure -l debian/pom.$$i.xml instdir/program/classes/$$i.jar; \ @@ -3087,10 +3092,10 @@ endif ifeq "$(ENABLE_JAVA)" "y" # somehow --has-package-version doesn't overwrite version and without <version>...</version> # we get a NullPointerException when calling mh_installjar - for i in unoil officebean; do \ - sed -e s/@version@/$(shell echo $(DEB_VERSION_UPSTREAM) | cut -d~ -f1)/ \ - < debian/pom.$$i.xml.in > debian/pom.$$i.xml; \ - done + sed -e s/@version@/$(shell echo $(DEB_VERSION_UPSTREAM) | cut -d~ -f1)/ \ + < $(SOURCE_TREE)/unoil/pom.unoil.xml > debian/pom.unoil.xml + sed -e s/@version@/$(shell echo $(DEB_VERSION_UPSTREAM) | cut -d~ -f1)/ \ + < $(SOURCE_TREE)/bean/pom.officebean.xml > debian/pom.officebean.xml mh_installpoms -plibreoffice-java-common mh_installjar -plibreoffice-java-common -l debian/pom.unoil.xml instdir/program/classes/unoil.jar mh_installpoms -plibreoffice-officebean -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
