[Git][java-team/jameica][master] 5 commits: New upstream version 2.8.2+dfsg
Jochen Sprickerhof
gitlab at salsa.debian.org
Sat Sep 22 21:01:28 BST 2018
Jochen Sprickerhof pushed to branch master at Debian Java Maintainers / jameica
Commits:
da2e8663 by Jochen Sprickerhof at 2018-09-22T19:15:28Z
New upstream version 2.8.2+dfsg
- - - - -
4e89da1a by Jochen Sprickerhof at 2018-09-22T19:15:37Z
Update upstream source from tag 'upstream/2.8.2+dfsg'
Update to upstream version '2.8.2+dfsg'
with Debian dir 3a8a3f842404fd00713cfd80fe3baadac74d8091
- - - - -
4efd5344 by Jochen Sprickerhof at 2018-09-22T19:43:28Z
Rebase patches
- - - - -
90e2d28c by Jochen Sprickerhof at 2018-09-22T19:44:32Z
Update dependencies
- - - - -
45adf12f by Jochen Sprickerhof at 2018-09-22T19:44:34Z
Update changelog for 2.8.2+dfsg-1 release
- - - - -
24 changed files:
- .classpath
- .settings/org.eclipse.jdt.core.prefs
- .settings/org.eclipse.jdt.ui.prefs
- build/BUILD
- build/ChangeLog
- build/build.properties
- build/jameica-macos.sh
- build/jameica-macos64.sh
- build/jameica-openbsd.sh
- − build/jameica-win32.exe
- − build/jameica-win64.exe
- build/jameica.sh
- build/jameicaserver.sh
- build/launch4j-win32.xml
- build/launch4j-win64.xml
- build/rcjameica
- debian/changelog
- debian/control
- debian/patches/0001-Update-locations-of-Java-libraries.patch
- debian/patches/0002-Adopt-build.xml.patch
- debian/patches/0003-Adopt-jameica-executable.patch
- debian/patches/0004-Add-mysql-connector-java.patch
- plugin.xml
- src/de/willuhn/jameica/gui/internal/buttons/Cancel.java
Changes:
=====================================
.classpath
=====================================
@@ -2,7 +2,11 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" output="test-bin" path="test"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+ <attributes>
+ <attribute name="module" value="true"/>
+ </attributes>
+ </classpathentry>
<classpathentry exported="true" kind="lib" path="lib/nanoxml/nanoxml-2.2.3.jar" sourcepath="lib.src/nanoxml/nanoxml-2.2.3.src.jar"/>
<classpathentry exported="true" kind="lib" path="lib/swt/linux64/swt.jar" sourcepath="lib.src/swt/linux/swt.src.zip"/>
<classpathentry exported="true" kind="lib" path="lib/swt/org.eclipse.core.runtime_3.10.0.v20140318-2214.jar"/>
@@ -22,7 +26,7 @@
<classpathentry kind="lib" path="lib/swt/com.ibm.icu_52.1.0.v201404241930.jar"/>
<classpathentry exported="true" kind="lib" path="lib/bouncycastle/bcpkix-jdk15on-1.56.jar"/>
<classpathentry exported="true" kind="lib" path="lib/bouncycastle/bcprov-jdk15on-1.56.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/h2/h2-1.4.193.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/h2/h2-1.4.197.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jakarta_commons/commons-cli-1.3.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jakarta_commons/commons-collections-3.2.2.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jakarta_commons/commons-logging-1.2.jar"/>
@@ -32,5 +36,11 @@
<classpathentry kind="lib" path="lib/apache_xmlrpc/xml-apis-1.0.b2.jar"/>
<classpathentry exported="true" kind="lib" path="lib/apache_xmlrpc/xmlrpc-client-3.1.3.jar"/>
<classpathentry exported="true" kind="lib" path="lib/apache_xmlrpc/xmlrpc-common-3.1.3.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/java_ee/javax.annotation-api-1.3.2.jar"/>
+ <classpathentry kind="lib" path="lib/java_ee/istack-commons-runtime-3.0.5.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/java_ee/jaxb-api-2.4.0-b180725.0427.jar"/>
+ <classpathentry kind="lib" path="lib/java_ee/jaxb-runtime-2.4.0-b180725.0644.jar"/>
+ <classpathentry kind="lib" path="lib/java_ee/activation-1.1.1.jar"/>
+ <classpathentry kind="lib" path="lib/java_ee/txw2-20110809.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
=====================================
.settings/org.eclipse.jdt.core.prefs
=====================================
@@ -1,6 +1,6 @@
-#Fri Apr 16 13:40:58 CEST 2010
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.5
@@ -9,9 +9,12 @@ org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.release=disabled
org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
@@ -22,15 +25,23 @@ org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_module_statements=16
org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_type_arguments=0
+org.eclipse.jdt.core.formatter.alignment_for_type_parameters=0
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
org.eclipse.jdt.core.formatter.blank_lines_after_package=1
org.eclipse.jdt.core.formatter.blank_lines_before_field=0
@@ -50,11 +61,15 @@ org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line
org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line
org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=next_line
org.eclipse.jdt.core.formatter.brace_position_for_switch=next_line
org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=next_line
+org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped=false
+org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions=false
org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=false
org.eclipse.jdt.core.formatter.comment.format_block_comments=true
org.eclipse.jdt.core.formatter.comment.format_header=false
org.eclipse.jdt.core.formatter.comment.format_html=true
@@ -65,11 +80,17 @@ org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
+org.eclipse.jdt.core.formatter.comment.line_length=160
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
org.eclipse.jdt.core.formatter.compact_else_if=true
org.eclipse.jdt.core.formatter.continuation_indentation=2
org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
@@ -81,10 +102,17 @@ org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
org.eclipse.jdt.core.formatter.indentation.size=2
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
@@ -132,6 +160,7 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
@@ -150,12 +179,14 @@ org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invoca
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
@@ -179,6 +210,7 @@ org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invoc
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
@@ -206,6 +238,7 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
@@ -234,6 +267,7 @@ org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invoc
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
@@ -243,6 +277,7 @@ org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=inser
org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
@@ -258,13 +293,28 @@ org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=80
+org.eclipse.jdt.core.formatter.lineSplit=160
org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines
org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
org.eclipse.jdt.core.formatter.tabulation.char=space
org.eclipse.jdt.core.formatter.tabulation.size=2
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false
org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
=====================================
.settings/org.eclipse.jdt.ui.prefs
=====================================
@@ -53,7 +53,7 @@ cleanup_settings_version=2
eclipse.preferences.version=1
editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
formatter_profile=_meins
-formatter_settings_version=11
+formatter_settings_version=14
internal.default.compliance=default
sp_cleanup.add_default_serial_version_id=true
sp_cleanup.add_generated_serial_version_id=false
=====================================
build/BUILD
=====================================
@@ -1,3 +1,3 @@
#Build Number for ANT. Do not edit!
-#Fri Jul 13 12:02:22 CEST 2018
-build.number=449
+#Fri Jul 13 12:04:31 CEST 2018
+build.number=450
=====================================
build/ChangeLog
=====================================
@@ -1,3 +1,8 @@
+2018-09-17 Version 2.8.2
+
+ * NEW: 0101 Support fr Java 11 (Umgebungsvariable "JDK_JAVA_OPTIONS='--add-modules=java.se.ee'" entfernt, Jameica liefert die ntigen JAR-Dateien in lib/java_ee jetzt selbst mit)
+ * BUG: 0100 Aktualisierte H2-Version h2-1.4.197. Version 1.4.193 konnte beim Update auf Hibiscus 2.8.4 u.U. den Fehler "Concurrent update in table "SYS_ID": another transaction has updated or deleted the same row [90131-193]" auslsen.
+
2018-07-13 Version 2.8.1
* BUG: 0099 BUGZILLA 1856 - nderung in Bug 1852 betraf zu viele Plugins, Interpretation der abhngigen Versionsnummern nochmal so angepasst, dass das neue Verhalten nur gilt, wenn das "+"/"-" in Klammern angegeben ist, ansonsten gilt wieder das vorherige Verhalten
=====================================
build/build.properties
=====================================
@@ -18,6 +18,12 @@ define.srcfilename = ${define.projectname}-${system.version}.src.zi
define.javadocfilename = ${define.projectname}.javadoc.zip
define.commonlibs = lib/bouncycastle/bcpkix-jdk15on-1.56.jar \
lib/bouncycastle/bcprov-jdk15on-1.56.jar \
+ lib/java_ee/activation-1.1.1.jar \
+ lib/java_ee/jaxb-api-2.4.0-b180725.0427.jar \
+ lib/java_ee/jaxb-runtime-2.4.0-b180725.0644.jar \
+ lib/java_ee/javax.annotation-api-1.3.2.jar \
+ lib/java_ee/istack-commons-runtime-3.0.5.jar \
+ lib/java_ee/txw2-20110809.jar \
lib/de_willuhn_ds/de_willuhn_ds.jar \
lib/de_willuhn_util/de_willuhn_util.jar \
lib/jakarta_commons/commons-cli-1.3.1.jar \
=====================================
build/jameica-macos.sh
=====================================
@@ -40,5 +40,4 @@ fi
BASEDIR=$(dirname "$0")
cd "${BASEDIR}"
-export JDK_JAVA_OPTIONS='--add-modules=java.se.ee'
exec "${JAVACMD}" -Xdock:name="Jameica" -Xmx512m -Xss64m -XstartOnFirstThread -jar "${BASEDIR}/jameica-macos.jar" -o "$@" >/dev/null
=====================================
build/jameica-macos64.sh
=====================================
@@ -40,5 +40,4 @@ fi
BASEDIR=$(dirname "$0")
cd "${BASEDIR}"
-export JDK_JAVA_OPTIONS='--add-modules=java.se.ee'
exec "${JAVACMD}" -Xdock:name="Jameica" -Xmx512m -Xss64m -XstartOnFirstThread -jar "${BASEDIR}/jameica-macos64.jar" -o "$@" >/dev/null
=====================================
build/jameica-openbsd.sh
=====================================
@@ -7,5 +7,4 @@ link=$(readlink -f "$0")
dir=$(dirname "$link")
cd "$dir"
-export JDK_JAVA_OPTIONS='--add-modules=java.se.ee'
java -Xmx512m -Xss64m -jar jameica-openbsd.jar $@
=====================================
build/jameica-win32.exe deleted
=====================================
Binary files a/build/jameica-win32.exe and /dev/null differ
=====================================
build/jameica-win64.exe deleted
=====================================
Binary files a/build/jameica-win64.exe and /dev/null differ
=====================================
build/jameica.sh
=====================================
@@ -18,5 +18,4 @@ else
archsuffix=""
fi
-export JDK_JAVA_OPTIONS='--add-modules=java.se.ee'
LIBOVERLAY_SCROLLBAR=0 GDK_NATIVE_WINDOWS=1 SWT_GTK3=0 exec java -Djava.net.preferIPv4Stack=true -Xmx512m -Xss64m $_JCONSOLE -jar jameica-linux${archsuffix}.jar $@
=====================================
build/jameicaserver.sh
=====================================
@@ -11,5 +11,4 @@ cd "$dir"
# https://www.willuhn.de/bugzilla/show_bug.cgi?id=798
-export JDK_JAVA_OPTIONS='--add-modules=java.se.ee'
java -Djava.net.preferIPv4Stack=true -Xmx512m $_JCONSOLE -jar jameica-linux.jar -d $@
=====================================
build/launch4j-win32.xml
=====================================
@@ -14,7 +14,6 @@
<restartOnCrash>false</restartOnCrash>
<manifest></manifest>
<icon>/work/willuhn/git/hibiscus/icons/hibiscus.ico</icon>
- <var>JDK_JAVA_OPTIONS='--add-modules=java.se.ee'</var>
<jre>
<path></path>
<bundledJre64Bit>false</bundledJre64Bit>
=====================================
build/launch4j-win64.xml
=====================================
@@ -14,7 +14,6 @@
<restartOnCrash>false</restartOnCrash>
<manifest></manifest>
<icon>/work/willuhn/git/hibiscus/icons/hibiscus.ico</icon>
- <var>JDK_JAVA_OPTIONS='--add-modules=java.se.ee'</var>
<jre>
<path></path>
<bundledJre64Bit>false</bundledJre64Bit>
=====================================
build/rcjameica
=====================================
@@ -19,8 +19,6 @@ link=${base#*[SK][0-9][0-9]}
JAVA=`which java`
BASEDIR=`dirname $0`
-export JDK_JAVA_OPTIONS='--add-modules=java.se.ee'
-
### Please do not edit anything below this line! ########################
# #
=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+jameica (2.8.2+dfsg-1) unstable; urgency=medium
+
+ * New upstream version 2.8.2+dfsg
+ * Rebase patches
+ * Update dependencies
+
+ -- Jochen Sprickerhof <jspricke at debian.org> Sat, 22 Sep 2018 21:33:43 +0200
+
jameica (2.8.1+dfsg-2) unstable; urgency=medium
* Revert "suggest libmckoisqldb-java as upstream provide it by default"
=====================================
debian/control
=====================================
@@ -12,7 +12,7 @@ Vcs-Browser: https://salsa.debian.org/java-team/jameica
Package: jameica
Architecture: all
-Depends: eclipse-platform-data, eclipse-rcp, libbcpkix-java, libbcprov-java, libcommons-cli-java, libcommons-collections3-java, libcommons-lang-java, libequinox-osgi-java, libicu4j-49-java, libjameica-datasource-java, libjameica-util-java, libnanoxml2-java, libpaperclips-java, velocity, ${misc:Depends}, libcommons-logging-java, libswtcalendar-java, libh2-java, libswt-cairo-gtk-4-jni, libswt-gtk2-4-jni, libmysql-java
+Depends: eclipse-platform-data, eclipse-rcp, libbcpkix-java, libbcprov-java, libcommons-cli-java, libcommons-collections3-java, libcommons-lang-java, libequinox-osgi-java, libicu4j-49-java, libjameica-datasource-java, libjameica-util-java, libnanoxml2-java, libpaperclips-java, velocity, ${misc:Depends}, libcommons-logging-java, libswtcalendar-java, libh2-java, libswt-cairo-gtk-4-jni, libswt-gtk2-4-jni, libmysql-java, libactivation-java, libjaxb-api-java, libjaxb-java, libgeronimo-annotation-1.3-spec-java, libistack-commons-java, libtxw2-java,
Recommends: ${java:Recommends}
Description: Run-time system for Java applications
runtime environment for Java applications, which are implemented as plugins.
=====================================
debian/patches/0001-Update-locations-of-Java-libraries.patch
=====================================
@@ -3,19 +3,25 @@ Date: Thu, 24 May 2018 23:24:12 +0200
Subject: Update locations of Java libraries
---
- build/build.properties | 42 ++++++++++++++++++++----------------------
- 1 file changed, 20 insertions(+), 22 deletions(-)
+ build/build.properties | 54 ++++++++++++++++++++++++--------------------------
+ 1 file changed, 26 insertions(+), 28 deletions(-)
diff --git a/build/build.properties b/build/build.properties
-index 616ba99..f54b337 100644
+index a7b68c1..26a099b 100644
--- a/build/build.properties
+++ b/build/build.properties
-@@ -16,28 +16,26 @@ define.jarfilename.linux64 = ${define.projectname}-linux64.jar
+@@ -16,34 +16,32 @@ define.jarfilename.linux64 = ${define.projectname}-linux64.jar
define.jarfilename.openbsd = ${define.projectname}-openbsd.jar
define.srcfilename = ${define.projectname}-${system.version}.src.zip
define.javadocfilename = ${define.projectname}.javadoc.zip
-define.commonlibs = lib/bouncycastle/bcpkix-jdk15on-1.56.jar \
- lib/bouncycastle/bcprov-jdk15on-1.56.jar \
+- lib/java_ee/activation-1.1.1.jar \
+- lib/java_ee/jaxb-api-2.4.0-b180725.0427.jar \
+- lib/java_ee/jaxb-runtime-2.4.0-b180725.0644.jar \
+- lib/java_ee/javax.annotation-api-1.3.2.jar \
+- lib/java_ee/istack-commons-runtime-3.0.5.jar \
+- lib/java_ee/txw2-20110809.jar \
- lib/de_willuhn_ds/de_willuhn_ds.jar \
- lib/de_willuhn_util/de_willuhn_util.jar \
- lib/jakarta_commons/commons-cli-1.3.1.jar \
@@ -38,6 +44,12 @@ index 616ba99..f54b337 100644
- lib/mckoi/mckoisqldb-1.0.5.jar \
+define.commonlibs = /usr/share/java/bcpkix.jar \
+ /usr/share/java/bcprov.jar \
++ /usr/share/java/javax.activation.jar \
++ /usr/share/java/jaxb-api.jar \
++ /usr/share/java/jaxb-runtime.jar \
++ /usr/share/java/geronimo-annotation-1.3-spec.jar \
++ /usr/share/java/istack-commons-runtime.jar \
++ /usr/share/java/txw2.jar \
+ /usr/share/java/jameica-datasource.jar \
+ /usr/share/java/jameica-util.jar \
+ /usr/share/java/commons-cli.jar \
=====================================
debian/patches/0002-Adopt-build.xml.patch
=====================================
@@ -8,10 +8,10 @@ Subject: Adopt build.xml
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/build/build.properties b/build/build.properties
-index f54b337..7f98659 100644
+index 26a099b..04c9688 100644
--- a/build/build.properties
+++ b/build/build.properties
-@@ -43,7 +43,7 @@ define.commonlibs = /usr/share/java/bcpkix.jar \
+@@ -49,7 +49,7 @@ define.commonlibs = /usr/share/java/bcpkix.jar \
define.package = de.willuhn.jameica
project.nightly = releases/nightly
@@ -20,7 +20,7 @@ index f54b337..7f98659 100644
project.src = ${project.release}/src/classes
project.tmp = ${project.release}/tmp
project.javadoc = ${project.release}/javadoc
-@@ -59,6 +59,7 @@ project.zipfilename.macos = ${define.projectname}-macos-${system.version}.
+@@ -65,6 +65,7 @@ project.zipfilename.macos = ${define.projectname}-macos-${system.version}.
project.zipfilename.macos64 = ${define.projectname}-macos64-${system.version}.zip
project.zipfilename.openbsd = ${define.projectname}-openbsd-${system.version}.zip
=====================================
debian/patches/0003-Adopt-jameica-executable.patch
=====================================
@@ -3,20 +3,20 @@ Date: Fri, 25 May 2018 15:26:57 +0200
Subject: Adopt jameica executable
---
- build/jameica | 23 +++++++++++++++++++++++
- build/jameica.sh | 22 ----------------------
+ build/jameica | 22 ++++++++++++++++++++++
+ build/jameica.sh | 21 ---------------------
plugin.xml | 0
- 3 files changed, 23 insertions(+), 22 deletions(-)
+ 3 files changed, 22 insertions(+), 21 deletions(-)
create mode 100755 build/jameica
delete mode 100755 build/jameica.sh
mode change 100755 => 100644 plugin.xml
diff --git a/build/jameica b/build/jameica
new file mode 100755
-index 0000000..0ef371c
+index 0000000..2fa6d05
--- /dev/null
+++ b/build/jameica
-@@ -0,0 +1,23 @@
+@@ -0,0 +1,22 @@
+#!/bin/sh
+
+# Linux Start-Script fuer regulaeren Standalone-Betrieb.
@@ -37,15 +37,14 @@ index 0000000..0ef371c
+ archsuffix=""
+fi
+
-+export JDK_JAVA_OPTIONS='--add-modules=java.se.ee'
+cd /usr/share/jameica
+LIBOVERLAY_SCROLLBAR=0 GDK_NATIVE_WINDOWS=1 SWT_GTK3=0 exec java -Djava.net.preferIPv4Stack=true -Xmx512m -Xss64m $_JCONSOLE -jar /usr/share/java/jameica.jar $@
diff --git a/build/jameica.sh b/build/jameica.sh
deleted file mode 100755
-index 4b82ae0..0000000
+index 18cbcf8..0000000
--- a/build/jameica.sh
+++ /dev/null
-@@ -1,22 +0,0 @@
+@@ -1,21 +0,0 @@
-#!/bin/sh
-
-# Linux Start-Script fuer regulaeren Standalone-Betrieb.
@@ -66,7 +65,6 @@ index 4b82ae0..0000000
- archsuffix=""
-fi
-
--export JDK_JAVA_OPTIONS='--add-modules=java.se.ee'
-LIBOVERLAY_SCROLLBAR=0 GDK_NATIVE_WINDOWS=1 SWT_GTK3=0 exec java -Djava.net.preferIPv4Stack=true -Xmx512m -Xss64m $_JCONSOLE -jar jameica-linux${archsuffix}.jar $@
diff --git a/plugin.xml b/plugin.xml
old mode 100755
=====================================
debian/patches/0004-Add-mysql-connector-java.patch
=====================================
@@ -7,10 +7,10 @@ Subject: Add mysql-connector-java
1 file changed, 1 insertion(+)
diff --git a/build/build.properties b/build/build.properties
-index 7f98659..57a8092 100644
+index 04c9688..ce9c61e 100644
--- a/build/build.properties
+++ b/build/build.properties
-@@ -36,6 +36,7 @@ define.commonlibs = /usr/share/java/bcpkix.jar \
+@@ -42,6 +42,7 @@ define.commonlibs = /usr/share/java/bcpkix.jar \
/usr/share/java/swtcalendar.jar \
/usr/share/java/velocity.jar \
/usr/share/java/h2.jar \
=====================================
plugin.xml
=====================================
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<system name="Jameica" version="2.8.1">
+<system name="Jameica" version="2.8.2">
<description>Jameica - Java based messages interchange</description>
- <url>https://www.willuhn.de/products/jameica/releases/2.8/jameica/jameica-2.8.1.zip</url>
+ <url>https://www.willuhn.de/products/jameica/releases/2.8/jameica/jameica-2.8.2.zip</url>
<homepage>https://www.willuhn.de/projects/jameica</homepage>
<license>GPL - http://www.gnu.org/copyleft/gpl.html</license>
=====================================
src/de/willuhn/jameica/gui/internal/buttons/Cancel.java
=====================================
@@ -34,17 +34,8 @@ public class Cancel extends Button
*/
public void handleAction(Object context) throws ApplicationException
{
- throw new OperationCanceledException("operation cancelled");
+ throw new OperationCanceledException(Application.getI18n().tr("Vorgang abgebrochen"));
}
},null,false,"process-stop.png");
}
}
-
-
-/**********************************************************************
- * $Log: Cancel.java,v $
- * Revision 1.1 2009/10/15 11:50:13 willuhn
- * @N Neue Icons
- * @N Neue Default-Action "Cancel"
- *
- **********************************************************************/
View it on GitLab: https://salsa.debian.org/java-team/jameica/compare/1503c8aa48238ffb9ee722202b80580e11e8c7b1...45adf12f68f8b6f0cf147aa191077443ed9e0cfe
--
View it on GitLab: https://salsa.debian.org/java-team/jameica/compare/1503c8aa48238ffb9ee722202b80580e11e8c7b1...45adf12f68f8b6f0cf147aa191077443ed9e0cfe
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/20180922/6ca18276/attachment.html>
More information about the pkg-java-commits
mailing list