[pkg-java] r18774 - trunk/jakarta-jmeter/debian

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2015-07-16 10:07:12 +0000 (Thu, 16 Jul 2015)
New Revision: 18774

Modified:
   trunk/jakarta-jmeter/debian/changelog
   trunk/jakarta-jmeter/debian/control
   trunk/jakarta-jmeter/debian/jmeter-mail.classpath
   trunk/jakarta-jmeter/debian/jmeter.classpath
   trunk/jakarta-jmeter/debian/rules
Log:
Depend on libmail-java instead of libgeronimo-javamail-1.4-spec-java



Modified: trunk/jakarta-jmeter/debian/changelog
===================================================================
--- trunk/jakarta-jmeter/debian/changelog	2015-07-12 13:47:23 UTC (rev 18773)
+++ trunk/jakarta-jmeter/debian/changelog	2015-07-16 10:07:12 UTC (rev 18774)
@@ -1,3 +1,10 @@
+jakarta-jmeter (2.11-3) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Depend on libmail-java instead of libgeronimo-javamail-1.4-spec-java
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Thu, 16 Jul 2015 12:02:40 +0200
+
 jakarta-jmeter (2.11-2) unstable; urgency=medium
 
   * debian/copyright: Documented the licenses of the Oxygen, Echo and Tango icon

Modified: trunk/jakarta-jmeter/debian/control
===================================================================
--- trunk/jakarta-jmeter/debian/control	2015-07-12 13:47:23 UTC (rev 18773)
+++ trunk/jakarta-jmeter/debian/control	2015-07-16 10:07:12 UTC (rev 18774)
@@ -22,7 +22,6 @@
                      libcommons-net-java,
                      libexcalibur-logger-java,
                      libexcalibur-logkit-java,
-                     libgeronimo-javamail-1.4-spec-java,
                      libgeronimo-jms-1.1-spec-java,
                      libhtmlparser-java,
                      libhttpclient-java,
@@ -31,6 +30,7 @@
                      libjdom1-java,
                      libjsoup-java,
                      libjtidy-java,
+                     libmail-java,
                      libmongodb-java,
                      liboro-java,
                      librhino-java,

Modified: trunk/jakarta-jmeter/debian/jmeter-mail.classpath
===================================================================
--- trunk/jakarta-jmeter/debian/jmeter-mail.classpath	2015-07-12 13:47:23 UTC (rev 18773)
+++ trunk/jakarta-jmeter/debian/jmeter-mail.classpath	2015-07-16 10:07:12 UTC (rev 18774)
@@ -1 +1 @@
-usr/share/jmeter/lib/ext/ApacheJMeter_mail.jar /usr/share/java/excalibur-logkit.jar /usr/share/java/geronimo-activation_1.1_spec.jar /usr/share/java/geronimo-javamail-1.4-spec.jar /usr/share/java/geronimo-javamail-1.4-provider.jar
+usr/share/jmeter/lib/ext/ApacheJMeter_mail.jar /usr/share/java/excalibur-logkit.jar /usr/share/java/javax.mail.jar

Modified: trunk/jakarta-jmeter/debian/jmeter.classpath
===================================================================
--- trunk/jakarta-jmeter/debian/jmeter.classpath	2015-07-12 13:47:23 UTC (rev 18773)
+++ trunk/jakarta-jmeter/debian/jmeter.classpath	2015-07-16 10:07:12 UTC (rev 18774)
@@ -1,5 +1,5 @@
 usr/share/jmeter/lib/jorphan.jar /usr/share/java/avalon-framework.jar /usr/share/java/bsf.jar /usr/share/java/commons-collections3.jar /usr/share/java/commons-jexl.jar /usr/share/java/commons-jexl2.jar /usr/share/java/commons-lang3.jar /usr/share/java/excalibur-logger.jar /usr/share/java/excalibur-logkit.jar
-usr/share/jmeter/lib/ext/ApacheJMeter_components.jar /usr/share/java/bcmail.jar /usr/share/java/bcprov.jar /usr/share/java/bsf.jar /usr/share/java/commons-io.jar /usr/share/java/commons-lang3.jar /usr/share/java/excalibur-logkit.jar /usr/share/java/geronimo-javamail-1.4-spec.jar /usr/share/java/jcharts.jar /usr/share/java/jdom1.jar /usr/share/jmeter/lib/jorphan.jar /usr/share/java/jtidy.jar /usr/share/java/oro.jar /usr/share/java/xalan2.jar
+usr/share/jmeter/lib/ext/ApacheJMeter_components.jar /usr/share/java/bcmail.jar /usr/share/java/bcprov.jar /usr/share/java/bsf.jar /usr/share/java/commons-io.jar /usr/share/java/commons-lang3.jar /usr/share/java/excalibur-logkit.jar /usr/share/java/javax.mail.jar /usr/share/java/jcharts.jar /usr/share/java/jdom1.jar /usr/share/jmeter/lib/jorphan.jar /usr/share/java/jtidy.jar /usr/share/java/oro.jar /usr/share/java/xalan2.jar
 usr/share/jmeter/lib/ext/ApacheJMeter_core.jar /usr/share/java/bsf.jar /usr/share/java/commons-collections3.jar /usr/share/java/commons-httpclient.jar /usr/share/java/commons-io.jar /usr/share/java/commons-lang3.jar /usr/share/java/excalibur-logkit.jar /usr/share/java/js.jar /usr/share/java/oro.jar /usr/share/java/xmlgraphics-commons.jar /usr/share/java/xstream.jar /usr/share/jmeter/lib/jorphan.jar /usr/share/java/tika-core.jar /usr/share/java/tika-parsers.jar /usr/share/java/rsyntaxtextarea.jar
 usr/share/jmeter/lib/ext/ApacheJMeter_functions.jar /usr/share/java/commons-io.jar /usr/share/java/commons-jexl.jar /usr/share/java/commons-jexl2.jar /usr/share/java/commons-lang3.jar /usr/share/java/excalibur-logkit.jar /usr/share/jmeter/lib/jorphan.jar /usr/share/java/js.jar /usr/share/java/oro.jar /usr/share/java/xalan2.jar
 usr/share/jmeter/lib/ext/ApacheJMeter_monitors.jar /usr/share/java/excalibur-logkit.jar /usr/share/jmeter/lib/jorphan.jar

Modified: trunk/jakarta-jmeter/debian/rules
===================================================================
--- trunk/jakarta-jmeter/debian/rules	2015-07-12 13:47:23 UTC (rev 18773)
+++ trunk/jakarta-jmeter/debian/rules	2015-07-16 10:07:12 UTC (rev 18774)
@@ -7,7 +7,7 @@
 JAVA_HOME_DIRS		:= /usr/lib/jvm/default-java
 DEB_JARS		:= ant-nodeps avalon-framework bcmail bcpkix bcprov bsf commons-collections3 commons-httpclient \
                            commons-io commons-jexl commons-jexl2 commons-lang commons-lang3 commons-net geronimo-jms-1.1-spec \
-                           geronimo-javamail-1.4-spec geronimo-jms_1.1_spec httpclient httpcore httpmime jcharts jdom1 js \
+                           javax.mail geronimo-jms_1.1_spec httpclient httpcore httpmime jcharts jdom1 js \
                            jtidy junit4 libhtmlparser excalibur-logger excalibur-logkit oro xalan2 xmlgraphics-commons \
                            xstream velocity tika-core tika-parsers rsyntaxtextarea jsoup mongo-java-driver
 DEB_ANT_BUILD_TARGET	:= install docs-printable docs-api