This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository jericho-html.
commit 90442af670a8fac20011b577cde5545a69978cc8
Author: Emmanuel Bourg <ebo...@apache.org>
Date: Wed Jan 3 13:31:45 2018 +0100
Install the Maven artifacts
---
debian/ant.properties | 2 -
debian/build.xml | 5 --
debian/changelog | 1 +
debian/control | 4 +-
debian/libjericho-html-java.poms | 1 +
debian/pom.xml | 107 +++++++++++++++++++++++++++++++++++++++
debian/rules | 3 +-
7 files changed, 112 insertions(+), 11 deletions(-)
diff --git a/debian/ant.properties b/debian/ant.properties
index c8161f3..a83eccb 100644
--- a/debian/ant.properties
+++ b/debian/ant.properties
@@ -1,6 +1,4 @@
jarfile=jericho-html.jar
-installdir=/usr/share/java
-installdocdir=/usr/share/doc/libjericho-html-java
# Ensure that source and target are 1.5
# For backwards compat on Java 7
ant.build.javac.source=1.5
diff --git a/debian/build.xml b/debian/build.xml
index 9139441..654cd2f 100644
--- a/debian/build.xml
+++ b/debian/build.xml
@@ -29,11 +29,6 @@
classpath="${jarfile}:samples/CommandLine/bin"/>
</target>
- <target name="install" depends="build"
- description="installs the jar file">
- <copy file="${jarfile}" todir="${destdir}${installdir}"/>
- </target>
-
<target name="clean"
description="clean up the build dir">
<delete file="jericho-html.jar"/>
diff --git a/debian/changelog b/debian/changelog
index d9f0a8b..397e6b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ jericho-html (3.2-1) UNRELEASED; urgency=medium
* Team upload.
* New upstream release.
+ * Install the Maven artifacts
* Removed Michael Koch from the uploaders (Closes: #654035)
* Removed the -java-doc package
* Build with the DH sequencer instead of CDBS
diff --git a/debian/control b/debian/control
index f7c873e..a62bb2c 100644
--- a/debian/control
+++ b/debian/control
@@ -9,10 +9,10 @@ Build-Depends:
ant,
debhelper (>= 10),
default-jdk,
- javahelper,
libcommons-logging-java,
liblog4j1.2-java,
- libslf4j-java
+ libslf4j-java,
+ maven-repo-helper
Standards-Version: 4.1.3
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/jericho-html.git
Vcs-Git: https://anonscm.debian.org/git/pkg-java/jericho-html.git
diff --git a/debian/libjericho-html-java.poms b/debian/libjericho-html-java.poms
new file mode 100644
index 0000000..1518dcb
--- /dev/null
+++ b/debian/libjericho-html-java.poms
@@ -0,0 +1 @@
+debian/pom.xml --has-package-version --java-lib --artifact=jericho-html.jar
diff --git a/debian/pom.xml b/debian/pom.xml
new file mode 100644
index 0000000..e77e3b2
--- /dev/null
+++ b/debian/pom.xml
@@ -0,0 +1,107 @@
+<?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/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>net.htmlparser.jericho</groupId>
+ <artifactId>jericho-html</artifactId>
+ <version>3.2</version>
+ <packaging>jar</packaging>
+ <name>Jericho HTML Parser</name>
+ <description>Jericho HTML Parser is a java library allowing analysis and
manipulation of parts of an HTML document, including server-side tags, while
reproducing verbatim any unrecognised or invalid HTML.</description>
+ <inceptionYear>2001</inceptionYear>
+ <url>http://jericho.htmlparser.net</url>
+ <licenses>
+ <license>
+ <name>GNU Lesser General Public License (LGPL)</name>
+ <url>http://www.gnu.org/licenses/lgpl.txt</url>
+ </license>
+ <license>
+ <name>Eclipse Public License (EPL)</name>
+ <url>http://www.eclipse.org/legal/epl-v10.html</url>
+ </license>
+ </licenses>
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <debug>false</debug>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <groups>
+ <group>
+ <title>Core Package</title>
+ <packages>net.htmlparser.jericho</packages>
+ </group>
+ </groups>
+ <windowtitle>Jericho HTML Parser
${project.version}</windowtitle>
+ <noqualifier>net.htmlparser.jericho</noqualifier>
+ <subpackages>net.htmlparser.jericho</subpackages>
+ <!--
+ This should be the correct way, but the javadoc plugin has
a bug
+ http://jira.codehaus.org/browse/MJAVADOC-299
+
+ Using additionalparam instead.
+
+
<excludePackageNames>net.htmlparser.jericho.nodoc</excludePackageNames>
+ -->
+ <additionalparam>-exclude
net.htmlparser.jericho.nodoc</additionalparam>
+
+
+ <!-- TODO: The build.bat file actually appends this to
(not replaces) the default stylesheet -->
+
<stylesheetfile>${basedir}/docs/src/append/stylesheet.css</stylesheetfile>
+ <!-- TODO: copy docs\src\replace\*.* docs\javadoc -->
+ </configuration>
+ </plugin>
+ </plugins>
+
+ </build>
+
+
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.6.1</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ <version>1.1</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.16</version>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
+ <scm>
+ <url>bzr://jerichohtml.bzr.sourceforge.net/bzrroot/jerichohtml</url>
+
<connection>bzr://jerichohtml.bzr.sourceforge.net/bzrroot/jerichohtml</connection>
+ </scm>
+ <developers>
+ <developer>
+ <id>mjericho</id>
+ <name>Martin Jericho</name>
+ <roles>
+ <role>Developer</role>
+ </roles>
+ </developer>
+ </developers>
+</project>
diff --git a/debian/rules b/debian/rules
index c9ed011..0a0dbbb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
%:
- dh $@ --buildsystem=ant
+ dh $@ --buildsystem=ant --with maven-repo-helper
override_dh_auto_build:
dh_auto_build -- -f debian/build.xml build
@@ -9,7 +9,6 @@ override_dh_auto_build:
override_dh_auto_test:
override_dh_auto_install:
- jh_installlibs -plibjericho-html-java jericho-html.jar
override_dh_auto_clean:
dh_auto_build -- -f debian/build.xml clean
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/jericho-html.git
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
