[Git][java-team/libproxool-java][master] 4 commits: No longer build the javadoc

[Emmanuel Bourg (@ebourg)]

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / libproxool-java


Commits:
dd708eda by Emmanuel Bourg at 2024-10-10T09:34:18+02:00
No longer build the javadoc

- - - - -
58a0c189 by Emmanuel Bourg at 2024-10-10T09:36:03+02:00
Depend on libservlet-api-java instead of libservlet3.1-java

- - - - -
4c4646d9 by Emmanuel Bourg at 2024-10-10T09:36:08+02:00
Standards-Version updated to 4.7.0

- - - - -
8d25d32d by Emmanuel Bourg at 2024-10-10T09:49:28+02:00
Upload to unstable

- - - - -


6 changed files:

- debian/build.xml
- debian/changelog
- debian/control
- − debian/doc-base
- debian/docs
- debian/rules


Changes:

=====================================
debian/build.xml
=====================================
@@ -2,6 +2,15 @@
 
 <project default="jar" name="${project.name}" basedir="..">
 
+  <path id="classpath">
+    <pathelement path="/usr/share/java/commons-logging.jar"/>
+    <pathelement path="/usr/share/java/cglib.jar"/>
+    <pathelement path="/usr/share/java/servlet-api.jar"/>
+    <pathelement path="/usr/share/java/junit.jar"/>
+    <pathelement path="/usr/share/java/hsqldb1.8.0.jar"/>
+    <pathelement path="/usr/share/java/log4j-1.2.jar"/>
+  </path>
+
   <target name="clean">
     <delete dir="${class.dir}" quiet="true"/>
     <delete file="${jar.name}" quiet="true"/>
@@ -15,6 +24,7 @@
     target="1.5" source="1.5"
     deprecation="true" debug="true" optimize="false">
       <exclude name="**/AvalonConfigurator.java"/>
+      <classpath refid="classpath"/>
     </javac>
   </target>
 
@@ -37,6 +47,7 @@
       <exclude name="**/AvalonConfiguratorTest.java"/>
       <exclude name="**/LogKitTargetAdapter.java"/>
       <exclude name="**/HibernateTest.java"/>
+      <classpath refid="classpath"/>
     </javac>
     <copy todir="${class.dir}">
        <fileset dir="src/java-test" includes="**/*.properties,**/*.xml"/>
@@ -49,14 +60,9 @@
     <java fork="yes" failonerror="true" classpath="${jar.name};${class.dir}" classname="junit.textui.TestRunner" >
       <sysproperty key="log4jPath" value="src/java-test/org/logicalcobwebs/proxool/log4j-test.xml"/>
       <arg value="org.logicalcobwebs.proxool.GlobalTest"/>
+      <classpath refid="classpath"/>
     </java>
     <echo message="Note! These unit tests have probably produced some worrying exceptions. As long as the tests passed then you can ignore these exceptions. They are part of the tests."/>
   </target>
 
-  <target name="javadoc" description="Creates Javadoc documentation">
-    <mkdir dir="${doc.dir}"/>
-    <javadoc packagenames="org.logicalcobwebs.*"
-      sourcepath="${source.dir}" destdir="${doc.dir}"/>
-  </target>
-
 </project>


=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+libproxool-java (0.9.1-12) unstable; urgency=medium
+
+  * No longer build the javadoc (Closes: #1060941)
+  * Fixed the test classpath
+  * Depend on libservlet-api-java instead of libservlet3.1-java
+  * Standards-Version updated to 4.7.0
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Thu, 10 Oct 2024 09:49:17 +0200
+
 libproxool-java (0.9.1-11) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/control
=====================================
@@ -14,8 +14,8 @@ Build-Depends-Indep:
  libcommons-logging-java,
  libhsqldb1.8.0-java,
  liblog4j1.2-java,
- libservlet3.1-java
-Standards-Version: 4.5.1
+ libservlet-api-java
+Standards-Version: 4.7.0
 Vcs-Git: https://salsa.debian.org/java-team/libproxool-java.git
 Vcs-Browser: https://salsa.debian.org/java-team/libproxool-java
 Homepage: http://proxool.sourceforge.net


=====================================
debian/doc-base deleted
=====================================
@@ -1,9 +0,0 @@
-Document: libproxool-java
-Title: API for proxool
-Author: Bill Horsman <billhorsman at users.sourceforge.net>
-Abstract: Java JDBC connection pool
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libproxool-java/doc/api/index.html
-Files: /usr/share/doc/libproxool-java/doc/api/*.html


=====================================
debian/docs
=====================================
@@ -1,2 +1 @@
 README.txt
-doc


=====================================
debian/rules
=====================================
@@ -1,16 +1,14 @@
 #!/usr/bin/make -f
 
-export CLASSPATH=/usr/share/java/commons-logging.jar:/usr/share/java/cglib.jar:/usr/share/java/servlet-api-3.1.jar:/usr/share/java/junit.jar:/usr/share/java/hsqldb1.8.0.jar
-
 %:
 	dh $@ --with maven-repo-helper
 
 override_dh_auto_build:
-	dh_auto_build -- -f debian/build.xml -Dbuild.sysclasspath=last jar javadoc
+	dh_auto_build -- -f debian/build.xml jar
 
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-	dh_auto_build -- -f debian/build.xml -Dbuild.sysclasspath=last test
+	dh_auto_build -- -f debian/build.xml test
 endif
 
 override_dh_auto_clean:



View it on GitLab: https://salsa.debian.org/java-team/libproxool-java/-/compare/cf9a6dbe9b4a736b527bc8bdb4e78216e8883936...8d25d32d2f4de776c7ba3a4ea586f005ea57d115

-- 
View it on GitLab: https://salsa.debian.org/java-team/libproxool-java/-/compare/cf9a6dbe9b4a736b527bc8bdb4e78216e8883936...8d25d32d2f4de776c7ba3a4ea586f005ea57d115
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/20241010/08e1273b/attachment.htm>