[Git][java-team/mondrian][master] 9 commits: Standards-Version updated to 4.6.1
Emmanuel Bourg (@ebourg)
gitlab at salsa.debian.org
Tue May 17 12:09:44 BST 2022
Emmanuel Bourg pushed to branch master at Debian Java Maintainers / mondrian
Commits:
b34dcb29 by Emmanuel Bourg at 2022-05-17T11:18:03+02:00
Standards-Version updated to 4.6.1
- - - - -
93be18d4 by Emmanuel Bourg at 2022-05-17T11:18:10+02:00
Switch to debhelper level 13
- - - - -
4ac496e6 by Emmanuel Bourg at 2022-05-17T11:18:18+02:00
Use salsa.debian.org Vcs-* URLs
- - - - -
a6df925a by Emmanuel Bourg at 2022-05-17T11:30:15+02:00
Removed the -java-doc package
- - - - -
f42e5f8c by Emmanuel Bourg at 2022-05-17T11:48:40+02:00
Build with the DH sequencer instead of CDBS
- - - - -
738d6846 by Emmanuel Bourg at 2022-05-17T11:48:40+02:00
Updated the watch file
- - - - -
fad43492 by Emmanuel Bourg at 2022-05-17T12:46:15+02:00
Depend on libservlet-api-java and libjsp-api-java instead of libservlet3.1-java
- - - - -
cca0cfc1 by Emmanuel Bourg at 2022-05-17T12:46:28+02:00
Fixed the build failure with Java 17 (Closes: #1011123)
- - - - -
a9f8b395 by Emmanuel Bourg at 2022-05-17T12:46:28+02:00
Upload to unstable
- - - - -
16 changed files:
- − debian/ant.properties
- debian/changelog
- + debian/clean
- − debian/compat
- debian/control
- − debian/libmondrian-java-doc.doc-base.api
- − debian/libmondrian-java-doc.doc-base.doc
- − debian/libmondrian-java-doc.install
- − debian/libmondrian-java-doc.links
- − debian/patches/07_javadoc_links.diff
- − debian/patches/08_remove_javadoc_footer.diff
- − debian/patches/09_reproducible_javadoc.diff
- + debian/patches/11_java17_compatibility.patch
- debian/patches/series
- debian/rules
- debian/watch
Changes:
=====================================
debian/ant.properties deleted
=====================================
@@ -1,6 +0,0 @@
-# Ensure that source and target are 1.5
-# For backwards compat on Java 7
-ant.build.javac.source=1.5
-ant.build.javac.target=1.5
-
-skip.download=true
=====================================
debian/changelog
=====================================
@@ -1,3 +1,18 @@
+mondrian (1:3.11.0.1-5) unstable; urgency=medium
+
+ * Team upload.
+ * Fixed the build failure with Java 17 (Closes: #1011123)
+ * Removed the -java-doc package
+ * Build with the DH sequencer instead of CDBS
+ * Depend on libservlet-api-java and libjsp-api-java
+ instead of libservlet3.1-java
+ * Standards-Version updated to 4.6.1
+ * Switch to debhelper level 13
+ * Use salsa.debian.org Vcs-* URLs
+ * Updated the watch file
+
+ -- Emmanuel Bourg <ebourg at apache.org> Tue, 17 May 2022 12:31:36 +0200
+
mondrian (1:3.11.0.1-4) unstable; urgency=medium
* Team upload.
=====================================
debian/clean
=====================================
@@ -0,0 +1,8 @@
+lib/*.jar
+src/main/mondrian/olap4j/MondrianOlap4jDriverVersion.java
+src/main/mondrian/parser/MdxParserImplConstants.java
+src/main/mondrian/gui/mondrian_SW.dtd
+src/main/mondrian/olap/mondrian.dtd
+src/main/mondrian/rolap/aggmatcher/DefaultDef.java
+src/main/mondrian/rolap/aggmatcher/aggregates.dtd
+src/main/mondrian/xmla/datasourcesconfig.dtd
=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-9
=====================================
debian/control
=====================================
@@ -5,14 +5,11 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
Uploaders: Damien Raude-Morvan <drazzib at debian.org>
Build-Depends:
ant,
- cdbs,
cup (>= 0.11a+20060608),
- debhelper (>= 9),
+ debhelper-compat (= 13),
default-jdk,
- default-jdk-doc,
javacc,
junit,
- junit-doc,
libcommons-collections3-java,
libcommons-dbcp-java,
libcommons-io-java,
@@ -21,20 +18,18 @@ Build-Depends:
libcommons-vfs-java (>= 2.0),
libeigenbase-farrago-java,
libeigenbase-resgen-java,
- libeigenbase-resgen-java-doc,
libjaxp1.3-java,
+ libjsp-api-java,
liblog4j1.2-java,
libolap4j-java (>= 1.2),
- libolap4j-java-doc,
- libservlet3.1-java,
- libservlet3.1-java-doc,
+ libservlet-api-java,
libxalan2-java,
libxerces2-java,
libxmlunit-java,
maven-repo-helper
-Standards-Version: 3.9.8
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/mondrian.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/mondrian.git
+Standards-Version: 4.6.1
+Vcs-Git: https://salsa.debian.org/java-team/mondrian.git
+Vcs-Browser: https://salsa.debian.org/java-team/mondrian
Homepage: http://mondrian.pentaho.org/
Package: libmondrian-java
@@ -61,30 +56,3 @@ Description: OLAP server written in Java
Language (SQL) to retrieve answers to dimensional queries
* High-speed queries through the use of aggregate tables in the RDBMS
* Advanced calculations using the calculation expressions of the MDX language
-
-Package: libmondrian-java-doc
-Architecture: all
-Section: doc
-Depends: ${misc:Depends}
-Recommends:
- default-jdk-doc,
- junit-doc,
- libeigenbase-resgen-java-doc,
- libolap4j-java-doc,
- libservlet3.1-java-doc
-Suggests: libmondrian-java
-Description: OLAP server written in Java - documentation
- Mondrian is an OLAP server written in Java. It enables to interactively
- analyze very large datasets stored in SQL databases without writing SQL..
- .
- It can be used for :
- * High performance, interactive analysis of large or small volumes of
- information
- * "Dimensional" exploration of data, for example analyzing sales by product
- line, by region, by time period
- * Parsing of Multi-Dimensional eXpression (MDX) language into Structured Query
- Language (SQL) to retrieve answers to dimensional queries
- * High-speed queries through the use of aggregate tables in the RDBMS
- * Advanced calculations using the calculation expressions of the MDX language
- .
- This package contains documentation of libmondrian-java.
=====================================
debian/libmondrian-java-doc.doc-base.api deleted
=====================================
@@ -1,10 +0,0 @@
-Document: libmondrian-java-api
-Title: API Javadoc for Mondrian
-Author: Mondrian developers
-Abstract: This is the API Javadoc provided by the Mondrian library.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libmondrian-java/api/index.html
-Files: /usr/share/doc/libmondrian-java/api/*
-
=====================================
debian/libmondrian-java-doc.doc-base.doc deleted
=====================================
@@ -1,10 +0,0 @@
-Document: libmondrian-java-doc
-Title: Mondrian Documentation
-Author: Mondrian developers
-Abstract: This is the specifications provided by the Mondrian library.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libmondrian-java/doc/index.html
-Files: /usr/share/doc/libmondrian-java/doc/*
-
=====================================
debian/libmondrian-java-doc.install deleted
=====================================
@@ -1,3 +0,0 @@
-doc/*.html /usr/share/doc/libmondrian-java/doc/
-doc/api /usr/share/doc/libmondrian-java/
-doc/images /usr/share/doc/libmondrian-java/doc/
=====================================
debian/libmondrian-java-doc.links deleted
=====================================
@@ -1 +0,0 @@
-/usr/share/doc/libmondrian-java/api /usr/share/doc/libmondrian-java/doc/api
=====================================
debian/patches/07_javadoc_links.diff deleted
=====================================
@@ -1,44 +0,0 @@
-Description: Fix link of Javadoc HTML documentation
- to use local API from /usr/share/doc/
-Author: Damien Raude-Morvan <drazzib at debian.org>
-Last-Update: 2009-12-13
-Forwarded: not-needed
-
---- a/build.xml
-+++ b/build.xml
-@@ -952,12 +952,11 @@
- scope="constructors,methods"/>
- <tag name="testcase" description="Test-case:"
- scope="constructors,methods,types"/>
-- <link href="http://java.sun.com/javase/7/docs/api/"/>
-- <link href="http://www.olap4j.org/api/"/>
-- <link href="http://junit.sourceforge.net/javadoc"/>
-- <link href="http://java.sun.com/products/servlet/2.2/javadoc/"/>
-- <link href="http://eigenbase.sourceforge.net/resgen/api/"/>
-- <link href="http://farrago.sourceforge.net/api/"/>
-+ <link href="/usr/share/doc/default-jdk-doc/api/"/>
-+ <link href="/usr/share/doc/libolap4j-java/api/"/>
-+ <link href="/usr/share/doc/junit-doc/doc/api/"/>
-+ <link href="/usr/share/doc/libservlet3.1-java/api/"/>
-+ <link href="/usr/share/doc/libeigenbase-resgen-java/api/"/>
- </javadoc>
- <copy file="${java.dir}/mondrian/olap/Mondrian.xml"
- todir="${javadoc.dir}/mondrian/olap"/>
-@@ -999,12 +998,11 @@
- scope="constructors,methods"/>
- <tag name="testcase" description="Test-case:"
- scope="constructors,methods,types"/>
-- <link href="http://java.sun.com/javase/7/docs/api/"/>
-- <link href="http://www.olap4j.org/api/"/>
-- <link href="http://junit.sourceforge.net/javadoc"/>
-- <link href="http://java.sun.com/products/servlet/2.2/javadoc/"/>
-- <link href="http://eigenbase.sourceforge.net/resgen/api/"/>
-- <link href="http://farrago.sourceforge.net/api/"/>
-+ <link href="/usr/share/doc/default-jdk-doc/api/"/>
-+ <link href="/usr/share/doc/libolap4j-java/api/"/>
-+ <link href="/usr/share/doc/junit-doc/doc/api/"/>
-+ <link href="/usr/share/doc/libservlet3.1-java/api/"/>
-+ <link href="/usr/share/doc/libeigenbase-resgen-java/api/"/>
- <doclet
- name="ydoc.doclets.YStandard"
- path="${ydoc.home}/lib/ydoc.jar${ps}${ydoc.home}/lib/class2svg.jar${ps}${ydoc.home}/resources${ps}${ydoc.home}/doc">
=====================================
debian/patches/08_remove_javadoc_footer.diff deleted
=====================================
@@ -1,13 +0,0 @@
-Description: Remove the SourceForge logo from the javadoc
-Author: Emmanuel Bourg <ebourg at apache.org>
-Forwarded: not-needed
---- a/build.xml
-+++ b/build.xml
-@@ -939,7 +939,6 @@
- destdir="${javadoc.dir}"
- packagenames="mondrian.*"
- overview="${java.dir}/overview.html"
-- footer="<a href="http://sourceforge.net/projects/mondrian"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=35302&type=15" width="150" height="40" border="0" alt='Get Mondrian at SourceForge.net. Fast, secure and free Open Source software downloads'></a>"
- author="true"
- source="${javac.source}"
- access="${access}"
=====================================
debian/patches/09_reproducible_javadoc.diff deleted
=====================================
@@ -1,15 +0,0 @@
-Description: Set the locale and disable the timestamps when generating the javadoc to make it reproducible
-Author: Emmanuel Bourg <ebourg at apache.org>
-Forwarded: no
---- a/build.xml
-+++ b/build.xml
-@@ -943,7 +943,8 @@
- source="${javac.source}"
- access="${access}"
- Windowtitle="Mondrian OLAP Engine, version ${project.revision}"
-- additionalparam="${additionalparam}"
-+ locale="en"
-+ additionalparam="${additionalparam} -notimestamp"
- >
- <tag name="pre" description="Pre-condition:"
- scope="constructors,methods"/>
=====================================
debian/patches/11_java17_compatibility.patch
=====================================
@@ -0,0 +1,11 @@
+--- a/src/main/mondrian/rolap/MemberCacheHelper.java
++++ b/src/main/mondrian/rolap/MemberCacheHelper.java
+@@ -185,7 +185,7 @@
+ children = mapParentToNamedChildren.get(parent);
+ }
+ return children == null ? Collections.emptyList()
+- : new ArrayList(children);
++ : new ArrayList<>(children);
+ }
+
+
=====================================
debian/patches/series
=====================================
@@ -1,6 +1,4 @@
01_disable_ivy.diff
02_use_debian_cup11a.diff
-07_javadoc_links.diff
-08_remove_javadoc_footer.diff
-09_reproducible_javadoc.diff
10_servlet_api_compatibility.diff
+11_java17_compatibility.patch
=====================================
debian/rules
=====================================
@@ -1,16 +1,9 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+%:
+ dh $@ --with maven-repo-helper
-export JAVA_HOME := /usr/lib/jvm/default-java
-DEB_ANT_ARGS := -Dskip.download=true -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5
-
-DEB_ANT_BUILD_TARGET := jar javadoc
-#DEB_ANT_CHECK_TARGET := test
-DEB_ANT_CLEAN_TARGET := clean
-
-pre-build::
+override_dh_auto_configure:
ln -s -f /usr/share/java/cup.jar lib/cup.jar
ln -s -f /usr/share/java/commons-collections3.jar lib/commons-collections3.jar
ln -s -f /usr/share/java/commons-dbcp.jar lib/commons-dbcp.jar
@@ -24,26 +17,12 @@ pre-build::
ln -s -f /usr/share/java/eigenbase-xom.jar lib/eigenbase-xom.jar
ln -s -f /usr/share/java/javacc.jar lib/javacc.jar
ln -s -f /usr/share/java/jaxp-1.4.jar lib/jaxp.jar
- ln -s -f /usr/share/java/jsp-api-2.3.jar lib/jsp-api.jar
+ ln -s -f /usr/share/java/jsp-api.jar lib/jsp-api.jar
ln -s -f /usr/share/java/log4j-1.2.jar lib/log4j.jar
ln -s -f /usr/share/java/olap4j.jar lib/olap4j.jar
- ln -s -f /usr/share/java/servlet-api-3.1.jar lib/servlet-api.jar
+ ln -s -f /usr/share/java/servlet-api.jar lib/servlet-api.jar
ln -s -f /usr/share/java/xalan2.jar lib/xalan2.jar
ln -s -f /usr/share/java/xercesImpl.jar lib/xerces.jar
-install/libmondrian-java::
- 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
- rm -f src/main/mondrian/gui/mondrian_SW.dtd
- rm -f src/main/mondrian/olap/mondrian.dtd
- rm -f src/main/mondrian/rolap/aggmatcher/DefaultDef.java
- rm -f src/main/mondrian/rolap/aggmatcher/aggregates.dtd
- rm -f src/main/mondrian/xmla/datasourcesconfig.dtd
-
-get-orig-source:
- uscan --force-download
+override_dh_auto_build:
+ dh_auto_build -- jar -Dskip.download=true -Djavac.source=8 -Djavac.target=8
=====================================
debian/watch
=====================================
@@ -1,2 +1,3 @@
-version=3
-https://github.com/pentaho/mondrian/tags .*/([\d\.]+)-R.tar.gz
+version=4
+opts="mode=git" \
+https://github.com/pentaho/mondrian .*/([\d\.]+)-R
View it on GitLab: https://salsa.debian.org/java-team/mondrian/-/compare/80eb9d483dafb68bda074076ad8ffe8261844be3...a9f8b3957a2d6b3c4dcdf1bd28f9ca86026992aa
--
View it on GitLab: https://salsa.debian.org/java-team/mondrian/-/compare/80eb9d483dafb68bda074076ad8ffe8261844be3...a9f8b3957a2d6b3c4dcdf1bd28f9ca86026992aa
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20220517/80db20ec/attachment.htm>
More information about the pkg-java-commits
mailing list