[pkg-java] r19134 - trunk/libproxool-java/debian

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2016-09-26 14:38:23 +0000 (Mon, 26 Sep 2016)
New Revision: 19134

Modified:
   trunk/libproxool-java/debian/build.xml
   trunk/libproxool-java/debian/changelog
   trunk/libproxool-java/debian/control
   trunk/libproxool-java/debian/rules
Log:
Removed the dependency on avalon-framework and excalibur-logkit



Modified: trunk/libproxool-java/debian/build.xml
===================================================================
--- trunk/libproxool-java/debian/build.xml	2016-09-26 14:27:25 UTC (rev 19133)
+++ trunk/libproxool-java/debian/build.xml	2016-09-26 14:38:23 UTC (rev 19134)
@@ -13,7 +13,9 @@
     <mkdir dir="${class.dir}"/>
     <javac srcdir="${source.dir}" destdir="${class.dir}"
     target="1.5" source="1.5"
-    deprecation="true" debug="true" optimize="false"/>
+    deprecation="true" debug="true" optimize="false">
+      <exclude name="**/AvalonConfigurator.java"/>
+    </javac>
   </target>
 
   <target name="jar" description="o Create the jar" depends="compile">
@@ -33,6 +35,7 @@
       <exclude name="**/*Spring*.java"/>
       <exclude name="**/ProxoolDataSourceTest.java"/>
       <exclude name="**/AvalonConfiguratorTest.java"/>
+      <exclude name="**/LogKitTargetAdapter.java"/>
       <exclude name="**/HibernateTest.java"/>
     </javac>
     <copy todir="${class.dir}">

Modified: trunk/libproxool-java/debian/changelog
===================================================================
--- trunk/libproxool-java/debian/changelog	2016-09-26 14:27:25 UTC (rev 19133)
+++ trunk/libproxool-java/debian/changelog	2016-09-26 14:38:23 UTC (rev 19134)
@@ -2,6 +2,7 @@
 
   * Team upload.
   * Build depend on libcglib-java instead of libcglib3-java
+  * Removed the dependency on avalon-framework and excalibur-logkit
   * Standards-Version updated to 3.9.8
 
  -- Emmanuel Bourg <ebourg at apache.org>  Mon, 26 Sep 2016 16:13:18 +0200

Modified: trunk/libproxool-java/debian/control
===================================================================
--- trunk/libproxool-java/debian/control	2016-09-26 14:27:25 UTC (rev 19133)
+++ trunk/libproxool-java/debian/control	2016-09-26 14:38:23 UTC (rev 19134)
@@ -11,10 +11,8 @@
  ant,
  default-jdk,
  junit,
- libavalon-framework-java,
  libcglib-java,
  libcommons-logging-java,
- libexcalibur-logkit-java,
  libhsqldb1.8.0-java,
  liblog4j1.2-java,
  libservlet3.1-java

Modified: trunk/libproxool-java/debian/rules
===================================================================
--- trunk/libproxool-java/debian/rules	2016-09-26 14:27:25 UTC (rev 19133)
+++ trunk/libproxool-java/debian/rules	2016-09-26 14:38:23 UTC (rev 19134)
@@ -6,7 +6,7 @@
 JAVA_HOME            := /usr/lib/jvm/default-java
 DEB_ANT_BUILD_TARGET := jar javadoc
 DEB_ANT_BUILDFILE    := debian/build.xml
-DEB_JARS             := commons-logging servlet-api-3.1 jsp-api-2.3 cglib avalon-framework junit log4j-1.2 logkit hsqldb1.8.0
+DEB_JARS             := commons-logging servlet-api-3.1 jsp-api-2.3 cglib junit log4j-1.2 hsqldb1.8.0
 DEB_ANT_ARGS         := -Dbuild.sysclasspath=last
 DEB_ANT_CHECK_TARGET := test