This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository mondrian.
commit 5f6aef4195e89a9c9e9e661baf45dfb88be3f6c5 Author: Emmanuel Bourg <[email protected]> Date: Thu Jul 28 12:42:51 2016 +0200 Install the Maven artifacts --- debian/changelog | 7 +++ debian/control | 12 ++++- debian/libmondrian-java.poms | 28 ++++++++++ debian/pom.xml | 126 +++++++++++++++++++++++++++++++++++++++++++ debian/rules | 5 +- 5 files changed, 173 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4acd210..2995021 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +mondrian (1:3.11.0.1-3) UNRELEASED; urgency=medium + + * Team upload. + * Install the Maven artifacts + + -- Emmanuel Bourg <[email protected]> Mon, 25 Jul 2016 14:19:27 +0200 + mondrian (1:3.11.0.1-2) unstable; urgency=medium * Team upload. diff --git a/debian/control b/debian/control index ff46cc4..960e201 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Damien Raude-Morvan <[email protected]> -Build-Depends: ant, cdbs, debhelper (>= 9), default-jdk +Build-Depends: ant, cdbs, debhelper (>= 9), default-jdk, maven-repo-helper Build-Depends-Indep: cup (>= 0.11a+20060608), default-jdk-doc, javacc, @@ -34,7 +34,15 @@ Homepage: http://mondrian.pentaho.org/ Package: libmondrian-java Architecture: all -Depends: ${misc:Depends} +Depends: + cup, + libcommons-dbcp-java, + libcommons-math-java, + libcommons-vfs-java, + libeigenbase-farrago-java (>= 0.9.0-2~), + libeigenbase-resgen-java (>= 1.3.0.13768-4~), + libolap4j-java, + ${misc:Depends} Description: OLAP server written in Java Mondrian is an OLAP server written in Java. It enables to interactively analyze very large datasets stored in SQL databases without writing SQL. diff --git a/debian/libmondrian-java.poms b/debian/libmondrian-java.poms new file mode 100644 index 0000000..4439646 --- /dev/null +++ b/debian/libmondrian-java.poms @@ -0,0 +1,28 @@ +# List of POM files for the package +# Format of this file is: +# <path to pom file> [option]* +# where option can be: +# --ignore: ignore this POM and its artifact if any +# --ignore-pom: don't install the POM. To use on POM files that are created +# temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms] +# --no-parent: remove the <parent> tag from the POM +# --package=<package>: an alternative package to use when installing this POM +# and its artifact +# --has-package-version: to indicate that the original version of the POM is the same as the upstream part +# of the version for the package. +# --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM +# during a clean operation with mh_cleanpom or mh_installpom +# --artifact=<path>: path to the build artifact associated with this POM, +# it will be installed when using the command mh_install. [mh_install] +# --java-lib: install the jar into /usr/share/java to comply with Debian +# packaging guidelines +# --usj-name=<name>: name to use when installing the library in /usr/share/java +# --usj-version=<version>: version to use when installing the library in /usr/share/java +# --no-usj-versionless: don't install the versionless link in /usr/share/java +# --dest-jar=<path>: the destination for the real jar. +# It will be installed with mh_install. [mh_install] +# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default. +# --site-xml=<location>: Optional, the location for site.xml if it needs to be installed. +# Empty by default. [mh_install] +# +debian/pom.xml --has-package-version --java-lib --artifact=lib/mondrian.jar diff --git a/debian/pom.xml b/debian/pom.xml new file mode 100644 index 0000000..238d7c4 --- /dev/null +++ b/debian/pom.xml @@ -0,0 +1,126 @@ +<?xml version="1.0"?> +<project> + <modelVersion>4.0.0</modelVersion> + <groupId>mondrian</groupId> + <artifactId>mondrian</artifactId> + <name>Mondrian</name> + <version>3.11.0.1</version> + <url>http://mondrian.sourceforge.net</url> + + <!-- + + Ivy dependencies from Mondrian + + org="commons-dbcp" name="commons-dbcp" rev="1.2" + org="commons-math" name="commons-math" rev="1.0" + org="commons-pool" name="commons-pool" rev="1.3" + + version in commons-vfs.jar is 1.1-SNAPSHOT + org="commons-vfs" name="commons-vfs" rev="1.0" + + org="javacup" name="javacup" rev="10k" + + org="eigenbase" name="eigenbase-xom" rev="1.3.0.11999" + org="eigenbase" name="eigenbase-properties" rev="1.1.0.10924" + org="eigenbase" name="eigenbase-resgen" rev="1.3.0.11873" + + org="org.olap4j" name="olap4j" rev="0.9.7.145" + + Included throught other dependencies? + + org="commons-lang" name="commons-lang" rev="2.0" + org="commons-io" name="commons-io" rev="1.3.1" + org="commons-logging" name="commons-logging" rev="1.0.4" + org="commons-collections" name="commons-collections" rev="2.1" + + try xalan 2.6.0? + + org="xalan" name="xalan" rev="2.4.1" + org="xerces" name="xercesImpl" rev="2.5.0" + + org="dom4j" name="dom4j" rev="1.6.1" + org="log4j" name="log4j" rev="1.2.9" + + Only needed for JDK 1.4 ? + + org="backport-util-concurrent" name="backport-util-concurrent" rev="3.0" + org="retroweaver" name="asm" rev="2.2.3" + org="retroweaver" name="asm-commons" rev="2.2.3" + org="retroweaver" name="retroweaver" rev="1.2.4" + org="retroweaver" name="retroweaver-rt" rev="1.2.4" + + For Mondrian war + + org="sun" name="jlfgr" rev="1.0" + org="junit" name="junit" rev="3.8.1" + org="javax.servlet" name="jsp-api" rev="2.0" + org="javax.servlet" name="servlet-api" rev="2.4" + --> + <dependencies> + <dependency> + <groupId>commons-dbcp</groupId> + <artifactId>commons-dbcp</artifactId> + <version>1.2</version> + <exclusions> + <exclusion> + <groupId>javax.sql</groupId> + <artifactId>jdbc-stdext</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>commons-pool</groupId> + <artifactId>commons-pool</artifactId> + <version>1.3</version> + </dependency> + <dependency> + <groupId>commons-math</groupId> + <artifactId>commons-math</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>commons-vfs</groupId> + <artifactId>commons-vfs</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>net.sf.squirrel-sql.thirdparty-non-maven</groupId> + <artifactId>java-cup</artifactId> + <version>0.10k</version> + </dependency> + <dependency> + <groupId>eigenbase</groupId> + <artifactId>eigenbase-properties</artifactId> + <version>1.1.0.10924</version> + </dependency> + <dependency> + <groupId>eigenbase</groupId> + <artifactId>eigenbase-resgen</artifactId> + <version>1.3.0.11873</version> + </dependency> + <dependency> + <groupId>eigenbase</groupId> + <artifactId>eigenbase-xom</artifactId> + <version>1.3.0.11999</version> + </dependency> + <dependency> + <groupId>org.olap4j</groupId> + <artifactId>olap4j</artifactId> + <version>0.9.7.145</version> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.9</version> + <scope>provided</scope> + <optional>true</optional> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.4</version> + <scope>provided</scope> + <optional>true</optional> + </dependency> + </dependencies> +</project> diff --git a/debian/rules b/debian/rules index 23bcb5f..ba368cc 100755 --- a/debian/rules +++ b/debian/rules @@ -32,11 +32,10 @@ pre-build:: ln -s -f /usr/share/java/xercesImpl.jar lib/xerces.jar install/libmondrian-java:: - mv lib/$(DEB_SOURCE_PACKAGE).jar lib/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).jar - dh_install -plibmondrian-java lib/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).jar usr/share/java - dh_link -plibmondrian-java usr/share/java/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).jar usr/share/java/$(DEB_SOURCE_PACKAGE).jar + mh_install clean:: + mh_clean rm -f lib/*.jar rm -f src/main/mondrian/olap4j/MondrianOlap4jDriverVersion.java rm -f src/main/mondrian/parser/MdxParserImplConstants.java -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/mondrian.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
