[Git][java-team/jabsorb][master] 9 commits: Build-Depends: s/default-jdk/default-jdk-headless/
Andreas Tille (@tille)
gitlab at salsa.debian.org
Thu Feb 13 17:01:02 GMT 2025
Andreas Tille pushed to branch master at Debian Java Maintainers / jabsorb
Commits:
41f7b26f by Andreas Tille at 2025-02-13T17:47:00+01:00
Build-Depends: s/default-jdk/default-jdk-headless/
- - - - -
548fec54 by Andreas Tille at 2025-02-13T17:48:34+01:00
Depends: s/libcommons-httpclient-java/libhttpclient-java/ Closes: #800988
- - - - -
f4db2560 by Andreas Tille at 2025-02-13T17:49:03+01:00
Standards-Version: 4.7.0 (routine-update)
- - - - -
fc174b02 by Andreas Tille at 2025-02-13T17:49:03+01:00
debhelper-compat 13 (routine-update)
- - - - -
8b81e958 by Andreas Tille at 2025-02-13T17:49:06+01:00
Reorder sequence of d/control fields by cme (routine-update)
- - - - -
1b1d62ac by Andreas Tille at 2025-02-13T16:49:06+00:00
Trim trailing whitespace.
Changes-By: lintian-brush
Fixes: lintian: trailing-whitespace
See-also: https://lintian.debian.org/tags/trailing-whitespace.html
- - - - -
f40fa90b by Andreas Tille at 2025-02-13T17:56:32+01:00
Update watch file format version to 4.
Changes-By: lintian-brush
Fixes: lintian: older-debian-watch-file-standard
See-also: https://lintian.debian.org/tags/older-debian-watch-file-standard.html
- - - - -
0b49a91a by Andreas Tille at 2025-02-13T17:57:05+01:00
Unapply patches in Git repository
- - - - -
5155094f by Andreas Tille at 2025-02-13T17:58:33+01:00
Upload to unstable
- - - - -
5 changed files:
- build.xml
- debian/changelog
- − debian/compat
- debian/control
- debian/watch
Changes:
=====================================
build.xml
=====================================
@@ -27,7 +27,7 @@
-->
-<project name="jabsorb" default="dist" basedir=".">
+<project name="jabsorb" default="dist" basedir="." xmlns:artifact="urn:maven-artifact-ant">
<!-- necessary to be called for every other target, even clean! -->
<target name="init">
@@ -46,13 +46,17 @@
<path refid="default-classpath" />
<pathelement path="${app-jar}" />
</path>
+ <taskdef
+ resource="org/apache/maven/artifact/ant/antlib.xml"
+ uri="urn:maven-artifact-ant"
+ classpath="lib-ant/maven-ant-tasks-2.0.7.jar"/>
</target>
<target name="init-build">
<mkdir dir="${build}" />
</target>
- <target name="compile" depends="init,init-build" description="Compiles the source into the build directory">
+ <target name="compile" depends="init,init-build,copy-dependencies" description="Compiles the source into the build directory">
<mkdir dir="${build.classes}"/>
<javac debug="true" source="1.4" srcdir="${src}" destdir="${build.classes}">
<classpath refid="default-classpath" />
@@ -75,6 +79,10 @@
</target>
<target name="setup-dependencies">
+ <path id="maven-ant-tasks.classpath" path="lib-ant/maven-ant-tasks-2.0.7.jar" />
+ <typedef resource="org/apache/maven/artifact/ant/antlib.xml"
+ uri="urn:maven-artifact-ant" classpathref="maven-ant-tasks.classpath" />
+ <artifact:pom id="maven.project" file="pom.xml" />
</target>
<target name="check-dependencies" depends="init"
@@ -86,6 +94,15 @@
<target name="copy-dependencies" depends="init,setup-dependencies,check-dependencies"
unless="dependencies.present"
description="Download and copy test dependencies to the ${lib-ext} directory (only once)">
+ <artifact:dependencies filesetId="dependencies.fileset" pathId="dependencies.path">
+ <pom refid="maven.project"/>
+ </artifact:dependencies>
+ <!-- <delete dir="${lib-ext}" includes="*"/> -->
+ <copy todir="${lib-ext}" flatten="true">
+ <fileset refid="dependencies.fileset"/>
+ </copy>
+ <pathconvert refid="dependencies.path" property="dependencies.string"/>
+ <echo file="${lib-ext}/dependencies"> ${dependencies.string} </echo>
</target>
<!-- this target does not currently work on JDK 1.4 right now due to maven dependancy/repository issues -->
@@ -160,7 +177,7 @@
<war destfile="${app-war}" basedir="${webapp}" excludes="**/*~,WEB-INF/web.xml*" webxml="${webapp}/WEB-INF/web.xml" />
</target>
- <target name="docs" depends="init" description="Creates the javadoc api documentation">
+ <target name="docs" depends="init,copy-dependencies" description="Creates the javadoc api documentation">
<echo message="Making docs to ${webapp}/docs" />
<javadoc source="1.4" sourcepath="${src}"
destdir="${webapp}/docs"
@@ -280,6 +297,16 @@
<!-- create minified and gzipped versions of jsonrpc.js -->
<target name="compress-web-content" depends="init">
+ <!-- Create minimized version with the yui compressor
+ see http://www.julienlecomte.net/yuicompressor/ -->
+
+ <echo>Creating jsonrpc-min.js from jsonrpc.js using the YUI compressor.</echo>
+ <java jar="lib-ant/yuicompressor-2.2.5.jar" fork="true" failonerror="true">
+ <arg value="-o"/>
+ <arg value="${webapp}/jsonrpc-min.js"/>
+ <arg value="${webapp}/jsonrpc.js"/>
+ </java>
+
<!-- create .gz versions - some web/app servers (such as jetty) can
automatically scan for gzipped static content with
a .gz extensions -->
@@ -364,6 +391,11 @@
</target>
<target name="install-locally" depends="dist" description="Install artifacts into local repository">
+ <jar destfile="${build}/${app-prefix}-sources.jar" basedir="${src}" excludes="*~" />
+ <artifact:install file="${app-jar}">
+ <pom file="pom.xml"/>
+ <attach file="${build}/${app-prefix}-sources.jar" classifier="sources"/>
+ </artifact:install>
</target>
<target name="run" depends="copy-dependencies,compile.test" description="Runs the jabsorb webapp using jetty">
=====================================
debian/changelog
=====================================
@@ -1,3 +1,17 @@
+jabsorb (1.3-5) unstable; urgency=medium
+
+ * Team upload.
+ * Build-Depends: s/default-jdk/default-jdk-headless/
+ * Depends: s/libcommons-httpclient-java/libhttpclient-java/
+ Closes: #800988
+ * Standards-Version: 4.7.0 (routine-update)
+ * debhelper-compat 13 (routine-update)
+ * Reorder sequence of d/control fields by cme (routine-update)
+ * Trim trailing whitespace.
+ * Update watch file format version to 4.
+
+ -- Andreas Tille <tille at debian.org> Thu, 13 Feb 2025 17:57:26 +0100
+
jabsorb (1.3-4) unstable; urgency=medium
* Team upload.
@@ -65,4 +79,3 @@ jabsorb (1.3-1) unstable; urgency=low
* No extra jars are downloaded.
-- Kalle Kivimaa <killer at debian.org> Fri, 24 Oct 2008 17:35:01 +0300
-
=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-10
=====================================
debian/control
=====================================
@@ -1,24 +1,25 @@
Source: jabsorb
-Section: non-free/java
-Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: tony mancill <tmancill at debian.org>
+Section: non-free/java
+XS-Autobuild: no
+Priority: optional
Build-Depends: ant,
- debhelper (>= 10),
- default-jdk,
+ debhelper-compat (= 13),
+ default-jdk-headless,
javahelper,
libservlet3.1-java,
libslf4j-java,
libcommons-httpclient-java
-Standards-Version: 4.0.0
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/jabsorb.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/jabsorb.git
+Standards-Version: 4.7.0
+Vcs-Browser: https://salsa.debian.org/java-team/jabsorb
+Vcs-Git: https://salsa.debian.org/java-team/jabsorb.git
Homepage: http://jabsorb.org
Package: libjabsorb-java
Architecture: all
Depends: libslf4j-java,
- libcommons-httpclient-java,
+ libhttpclient-java,
${misc:Depends}
Description: Java to Javascript object request broker
Simple and lightweight Ajax/Web 2.0 framework that allows you to call
=====================================
debian/watch
=====================================
@@ -1,2 +1,2 @@
-version=3
+version=4
https://code.google.com/p/jabsorb/downloads/list .*/jabsorb-([\d\.]+)-src.zip
View it on GitLab: https://salsa.debian.org/java-team/jabsorb/-/compare/7b645c15f615c9608ac37c525cf6df7180266630...5155094f0f523888268cc62b7e3a2f50140616f2
--
View it on GitLab: https://salsa.debian.org/java-team/jabsorb/-/compare/7b645c15f615c9608ac37c525cf6df7180266630...5155094f0f523888268cc62b7e3a2f50140616f2
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/20250213/8580c3c0/attachment.htm>
More information about the pkg-java-commits
mailing list