[Git][java-team/olap4j][master] 9 commits: Building with Maven, adding Maven rules
Pierre Gruet (@pgt)
gitlab at salsa.debian.org
Fri Jan 31 17:02:34 GMT 2025
Pierre Gruet pushed to branch master at Debian Java Maintainers / olap4j
Commits:
a1913bdd by Pierre Gruet at 2025-01-31T16:47:10+01:00
Building with Maven, adding Maven rules
- - - - -
a877cafd by Pierre Gruet at 2025-01-31T16:47:44+01:00
Skipping tests, that are relying on newer mondrian
- - - - -
c2530bdb by Pierre Gruet at 2025-01-31T16:48:15+01:00
Calling javacc and filling in a template Java file from d/rules
- - - - -
9ecff1fb by Pierre Gruet at 2025-01-31T16:48:49+01:00
Using javahelper to fill in the classpath and generate dependencies
- - - - -
22d86085 by Pierre Gruet at 2025-01-31T16:49:17+01:00
Changing the install paht of the Javadoc
- - - - -
b965a8c1 by Pierre Gruet at 2025-01-31T16:49:35+01:00
Adding a Lintian override for embedded JS
- - - - -
43ced7ed by Pierre Gruet at 2025-01-31T16:49:55+01:00
R-R-R: no
- - - - -
f4052103 by Pierre Gruet at 2025-01-31T16:50:10+01:00
Marking the -doc package as Multi-Arch: foreign
- - - - -
1018a2db by Pierre Gruet at 2025-01-31T16:51:00+01:00
Upload to unstable
- - - - -
12 changed files:
- debian/changelog
- debian/control
- debian/libolap4j-java-doc.install
- + debian/libolap4j-java-doc.lintian-overrides
- + debian/libolap4j-java.classpath
- + debian/libolap4j-java.poms
- + debian/maven.ignoreRules
- + debian/maven.properties
- + debian/maven.rules
- + debian/patches/build.patch
- debian/patches/series
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,6 +1,16 @@
-olap4j (1.3.0+dfsg-1) UNRELEASED; urgency=medium
+olap4j (1.3.0+dfsg-1) unstable; urgency=medium
* Team upload.
+ * Building with Maven, adding Maven rules
+ * Skipping tests, that are relying on newer mondrian
+ * Calling javacc and filling in a template Java file from d/rules
+ * Using javahelper to fill in the classpath and generate dependencies
+ * Changing the install path of the Javadoc
+ * Adding a Lintian override for embedded JS
+ * Expliciting Rules-Requires-Root: no
+ * Marking the -doc package as Multi-Arch: foreign
+
+ [ Andreas Tille ]
* Point Homepage to Github
* Fix watch file
* d/copyright: review (thanks to lrc)
@@ -12,8 +22,10 @@ olap4j (1.3.0+dfsg-1) UNRELEASED; urgency=medium
* Standards-Version: 4.7.0 (routine-update)
* Delete debian/README.source
* New upstream version
+ * New upstream version 1.3.0+dfsg
+ * Try building new upstream version but failed
- -- Andreas Tille <tille at debian.org> Mon, 27 Jan 2025 17:30:18 +0100
+ -- Pierre Gruet <pgt at debian.org> Fri, 31 Jan 2025 16:50:16 +0100
olap4j (1.2.0-2) unstable; urgency=medium
=====================================
debian/control
=====================================
@@ -5,27 +5,33 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
Uploaders: Damien Raude-Morvan <drazzib at debian.org>
Build-Depends: debhelper-compat (= 13),
javahelper,
- ant,
- default-jdk-headless,
- maven-repo-helper
-Build-Depends-Indep: ant-contrib,
- ant-optional,
- default-jdk-doc,
- javacc,
- junit,
+ maven-debian-helper
+Build-Depends-Indep: default-jdk-doc,
+ default-jdk-headless,
+ junit <!nocheck>,
junit-doc,
- libcommons-dbcp-java,
- libeigenbase-farrago-java,
- libmondrian-java,
+ libcommons-collections3-java,
+ libcommons-dbcp2-java <!nocheck>,
+ libcommons-logging-java,
+ libcommons-math-java,
+ libcommons-pool-java,
+ libcommons-vfs-java,
+ libh2-java,
+ liblog4j1.2-java <!nocheck>,
+ libjavacc-maven-plugin-java,
+ libmaven-javadoc-plugin-java,
+ libmondrian-java <!nocheck>,
+ libservlet-api-java,
libxerces2-java
Standards-Version: 4.7.0
Vcs-Browser: https://salsa.debian.org/java-team/olap4j
Vcs-Git: https://salsa.debian.org/java-team/olap4j.git
Homepage: https://github.com/olap4j/olap4j
+Rules-Requires-Root: no
Package: libolap4j-java
Architecture: all
-Depends: libxerces2-java,
+Depends: ${java:Depends},
${misc:Depends}
Suggests: libcommons-dbcp-java
Description: unified Java API to access an OLAP server
@@ -42,6 +48,7 @@ Description: unified Java API to access an OLAP server
Package: libolap4j-java-doc
Architecture: all
Section: doc
+Multi-Arch: foreign
Depends: ${misc:Depends}
Recommends: default-jdk-doc, junit-doc
Suggests: libolap4j-java
=====================================
debian/libolap4j-java-doc.install
=====================================
@@ -1 +1 @@
-bin/javadoc/* /usr/share/doc/libolap4j-java/api/
+target/apidocs/apidocs/* /usr/share/doc/libolap4j-java/api/
=====================================
debian/libolap4j-java-doc.lintian-overrides
=====================================
@@ -0,0 +1,4 @@
+# It would be too complicated to remove the javascript that is included in
+# javadocs, see the discussion on Debian Java mailing list starting at
+# https://lists.debian.org/debian-java/2018/06/msg00020.html.
+embedded-javascript-library please use libjs-jquery* [usr/share/doc/libolap4j-java/api/script-dir/jquery-*s]
=====================================
debian/libolap4j-java.classpath
=====================================
@@ -0,0 +1 @@
+usr/share/java/olap4j.jar /usr/share/java/xercesImpl.jar
=====================================
debian/libolap4j-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]
+#
+pom.xml --java-lib
=====================================
debian/maven.ignoreRules
=====================================
@@ -0,0 +1,18 @@
+
+com.github.ekryd.sortpom sortpom-maven-plugin * * * *
+com.google.code.maven-replacer-plugin maven-replacer-plugin * * * *
+com.helger.maven ph-javacc-maven-plugin * * * *
+com.sun rt-jdk1.5 * * * *
+mysql mysql-connector-java * * * *
+net.java.openjdk rt-java6 * * * *
+net.java.openjdk ctsym-java7 * * * *
+org.apache.maven.plugins maven-antrun-plugin * * * *
+org.apache.maven.plugins maven-assembly-plugin * * * *
+org.apache.maven.plugins maven-dependency-plugin * * * *
+org.apache.maven.plugins maven-deploy-plugin * * * *
+org.apache.maven.plugins maven-jar-plugin * * * *
+org.apache.maven.plugins maven-release-plugin * * * *
+org.apache.maven.plugins maven-site-plugin * * * *
+org.apache.maven.plugins maven-source-plugin * * * *
+org.apache.rat apache-rat-plugin * * * *
+pentaho mondrian-data-foodmart * * * *
=====================================
debian/maven.properties
=====================================
@@ -0,0 +1 @@
+maven.test.skip=true
=====================================
debian/maven.rules
=====================================
@@ -0,0 +1,7 @@
+
+commons-collections commons-collections * s/3\..*/3.x/ * *
+s/commons-math/org.apache.commons/ commons-math * s/.*/debian/ * *
+s/commons-vfs/org.apache.commons/ s/commons-vfs/commons-vfs2/ * s/.*/debian/ * *
+javax.servlet s/servlet-api/javax.servlet-api/ * s/.*/debian/ * *
+junit junit * s/3\..*/3.x/ * *
+s/pentaho/mondrian/ mondrian * s/.*/debian/ * *
=====================================
debian/patches/build.patch
=====================================
@@ -0,0 +1,80 @@
+Description: simplifying pom.xml for a Debian build
+Author: Pierre Gruet <pgt at debian.org>
+Forwarded: not-needed
+Last-Update: 2025-01-31
+
+--- a/pom.xml
++++ b/pom.xml
+@@ -378,72 +378,11 @@
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+- <executions>
+- <execution>
+- <id>compile-jdk15</id>
+- <goals>
+- <goal>compile</goal>
+- </goals>
+- <configuration>
+- <excludes>
+- <exclude>org/olap4j/driver/xmla/FactoryJdbc4Impl.java</exclude>
+- <exclude>org/olap4j/driver/xmla/FactoryJdbc4Plus.java</exclude>
+- <exclude>org/olap4j/driver/xmla/FactoryJdbc41Impl.java</exclude>
+- </excludes>
+- <includes>
+- <include>org/olap4j/driver/xmla/FactoryJdbc3Impl.java</include>
+- </includes>
+- <compilerArguments>
+- <verbose />
+- <bootclasspath>${com.sun:rt-jdk1.5:jar}</bootclasspath>
+- </compilerArguments>
+- </configuration>
+- </execution>
+- <execution>
+- <id>compile-jdk16</id>
+- <goals>
+- <goal>compile</goal>
+- </goals>
+- <configuration>
+- <excludes>
+- <exclude>org/olap4j/driver/xmla/FactoryJdbc3Impl.java</exclude>
+- </excludes>
+- <includes>
+- <include>org/olap4j/driver/xmla/FactoryJdbc4Impl.java</include>
+- <include>org/olap4j/driver/xmla/FactoryJdbc4Plus.java</include>
+- <include>org/olap4j/driver/xmla/FactoryJdbc41Impl.java</include>
+- </includes>
+- <compilerArguments>
+- <verbose />
+- <bootclasspath>${net.java.openjdk:rt-java6:jar}</bootclasspath>
+- </compilerArguments>
+- </configuration>
+- </execution>
+- <execution>
+- <id>compile-jdk17</id>
+- <goals>
+- <goal>compile</goal>
+- </goals>
+- <configuration>
+- <includes>
+- <include>org/olap4j/driver/xmla/FactoryJdbc4Impl.java</include>
+- <include>org/olap4j/driver/xmla/FactoryJdbc4Plus.java</include>
+- <include>org/olap4j/driver/xmla/FactoryJdbc41Impl.java</include>
+- </includes>
+- <compilerArguments>
+- <verbose />
+- <bootclasspath>${net.java.openjdk:rt-java7:jar}</bootclasspath>
+- </compilerArguments>
+- </configuration>
+- </execution>
+- </executions>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ <excludes>
+ <exclude>org/olap4j/driver/xmla/FactoryJdbc4Impl.java</exclude>
+- <exclude>org/olap4j/driver/xmla/FactoryJdbc4Plus.java</exclude>
+- <exclude>org/olap4j/driver/xmla/FactoryJdbc41Impl.java</exclude>
+ <exclude>org/olap4j/driver/xmla/FactoryJdbc3Impl.java</exclude>
+ </excludes>
+ </configuration>
=====================================
debian/patches/series
=====================================
@@ -6,3 +6,4 @@
# 11_disable_git_commit_info.diff
# 12_remove_version_txt.diff
# 13_compile_java9.diff
+build.patch
=====================================
debian/rules
=====================================
@@ -1,34 +1,22 @@
#!/usr/bin/make -f
-include /usr/share/dpkg/default.mk
-
-JAVA_HOME := /usr/lib/jvm/default-java
-
-DEB_JARS := xercesImpl commons-dbcp junit ant-junit ant-nodeps ant-trax ant-contrib
-
-DEB_ANT_BUILD_TARGET := version-properties jar xmla-jar tck-jar javadoc
-# olap4j need mondrian for testing.
-# => disable to remove some cycle in Build-Depends
-#DEB_ANT_CHECK_TARGET := test
-DEB_ANT_CLEAN_TARGET := clean
+include /usr/share/dpkg/pkg-info.mk
%:
- dh $@ --with javahelper,maven-repo-helper
-
-override_dh_auto_clean:
- mh_clean
-
-#override_dh_auto_build:
-# #dh_auto_build -- -f $(DEB_ANT_BUILDFILE)
-# ant -propertyfile debian/ant.properties $(DEB_ANT_BUILD_TARGET)
-
-override_dh_install:
- dh_install
- mh_installpom -plibolap4j-java debian/pom-olap4j.xml
- mh_installjar -plibolap4j-java --has-package-version --java-lib debian/pom-olap4j.xml dist/olap4j-$(DEB_VERSION_UPSTREAM).jar
-
- mh_installpom -plibolap4j-java debian/pom-olap4j-xmla.xml
- mh_installjar -plibolap4j-java --has-package-version --java-lib debian/pom-olap4j-xmla.xml dist/olap4j-xmla-$(DEB_VERSION_UPSTREAM).jar
-
- mh_installpom -plibolap4j-java debian/pom-olap4j-tck.xml
- mh_installjar -plibolap4j-java --has-package-version --java-lib debian/pom-olap4j-tck.xml dist/olap4j-tck-$(DEB_VERSION_UPSTREAM).jar
+ dh $@ --with javahelper
+
+# Filling in the DriverVersion java class with Debian build info and calling javacc
+execute_before_dh_auto_configure:
+ mkdir -p target/generated-sources/javacc/org/olap4j/driver/xmla/
+ sed -e "s/^class/public class/" -e "s/@pomversion@/$(DEB_VERSION_UPSTREAM)/" -e "s/@buildtime@/$(SOURCE_DATE_EPOCH)/" src/resources/version/XmlaOlap4jDriverVersion.java.template > src/org/olap4j/driver/xmla/XmlaOlap4jDriverVersion.java
+ cd src/org/olap4j/mdx/parser/impl/ && javacc MdxParser.jj
+
+# Clearing the files we generated by hand
+execute_after_dh_clean:
+ $(RM) src/org/olap4j/driver/xmla/XmlaOlap4jDriverVersion.java
+ cd src/org/olap4j/mdx/parser/impl/ && \
+ for F in *.java; do \
+ if [ $$F != "DefaultMdxParserImpl.java" ]; then \
+ $(RM) $$F; \
+ fi; \
+ done
View it on GitLab: https://salsa.debian.org/java-team/olap4j/-/compare/e927de5776b357d516a9b276a9ee5fa1cc24795c...1018a2db33dd08bc30d97f925fba9244100b9fdf
--
View it on GitLab: https://salsa.debian.org/java-team/olap4j/-/compare/e927de5776b357d516a9b276a9ee5fa1cc24795c...1018a2db33dd08bc30d97f925fba9244100b9fdf
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/20250131/c7506a51/attachment.htm>
More information about the pkg-java-commits
mailing list