Skip to content

Commit 0c2fa52

Browse files
sbrannensbrannen
committed
[SPR-5888] Upgrading to TestNG 5.9.
1 parent 58db513 commit 0c2fa52

9 files changed

Lines changed: 31 additions & 31 deletions

File tree

‎org.springframework.integration-tests/.classpath‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
<classpathentry kind="var" path="IVY_CACHE/org.freemarker/com.springsource.freemarker/2.3.15/com.springsource.freemarker-2.3.15.jar" sourcepath="/IVY_CACHE/org.freemarker/com.springsource.freemarker/2.3.15/com.springsource.freemarker-sources-2.3.15.jar"/>
5454
<classpathentry kind="var" path="IVY_CACHE/org.hibernate/com.springsource.org.hibernate/3.3.1.GA/com.springsource.org.hibernate-3.3.1.GA.jar" sourcepath="/IVY_CACHE/org.hibernate/com.springsource.org.hibernate/3.2.6.ga/com.springsource.org.hibernate-sources-3.2.6.ga.jar"/>
5555
<classpathentry kind="var" path="IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
56-
<classpathentry kind="var" path="IVY_CACHE/org.testng/com.springsource.org.testng/5.8.0/com.springsource.org.testng-5.8.0.jar" sourcepath="/IVY_CACHE/org.testng/com.springsource.org.testng/5.8.0/com.springsource.org.testng-sources-5.8.0.jar"/>
56+
<classpathentry kind="var" path="IVY_CACHE/org.testng/com.springsource.org.testng/5.9.0/com.springsource.org.testng-5.9.0.jar" sourcepath="/IVY_CACHE/org.testng/com.springsource.org.testng/5.9.0/com.springsource.org.testng-sources-5.9.0.jar"/>
5757
<classpathentry kind="var" path="IVY_CACHE/com.caucho/com.springsource.com.caucho/3.2.1/com.springsource.com.caucho-3.2.1.jar" sourcepath="/IVY_CACHE/com.caucho/com.springsource.com.caucho/3.2.1/com.springsource.com.caucho-sources-3.2.1.jar"/>
5858
<classpathentry kind="var" path="IVY_CACHE/org.apache.ibatis/com.springsource.com.ibatis/2.3.4.726/com.springsource.com.ibatis-2.3.4.726.jar" sourcepath="/IVY_CACHE/org.apache.ibatis/com.springsource.com.ibatis/2.3.4.726/com.springsource.com.ibatis-sources-2.3.4.726.jar"/>
5959
<classpathentry kind="var" path="IVY_CACHE/com.sun.enterprise/com.springsource.com.sun.enterprise.loader/1.0.0/com.springsource.com.sun.enterprise.loader-1.0.0.jar"/>

‎org.springframework.integration-tests/integration-tests.iml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -434,11 +434,11 @@
434434
<orderEntry type="module-library">
435435
<library>
436436
<CLASSES>
437-
<root url="jar://$IVY_CACHE$/org.testng/com.springsource.org.testng/5.8.0/com.springsource.org.testng-5.8.0.jar!/" />
437+
<root url="jar://$IVY_CACHE$/org.testng/com.springsource.org.testng/5.9.0/com.springsource.org.testng-5.9.0.jar!/" />
438438
</CLASSES>
439439
<JAVADOC />
440440
<SOURCES>
441-
<root url="jar://$IVY_CACHE$/org.testng/com.springsource.org.testng/5.8.0/com.springsource.org.testng-sources-5.8.0.jar!/" />
441+
<root url="jar://$IVY_CACHE$/org.testng/com.springsource.org.testng/5.9.0/com.springsource.org.testng-sources-5.9.0.jar!/" />
442442
</SOURCES>
443443
</library>
444444
</orderEntry>

‎org.springframework.integration-tests/ivy.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
<dependency org="org.custommonkey.xmlunit" name="com.springsource.org.custommonkey.xmlunit" rev="1.2.0" conf="test->compile"/>
9696
<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.3.0" conf="test->compile"/>
9797
<dependency org="org.junit" name="com.springsource.org.junit" rev="4.5.0" conf="test->runtime"/>
98-
<dependency org="org.testng" name="com.springsource.org.testng" rev="5.8.0" conf="test->compile"/>
98+
<dependency org="org.testng" name="com.springsource.org.testng" rev="5.9.0" conf="test->compile"/>
9999
</dependencies>
100100

101101
</ivy-module>

‎org.springframework.test/.classpath‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<classpathentry kind="var" path="IVY_CACHE/javax.servlet/com.springsource.javax.servlet.jsp/2.1.0/com.springsource.javax.servlet.jsp-2.1.0.jar" sourcepath="/IVY_CACHE/javax.servlet/com.springsource.javax.servlet.jsp/2.1.0/com.springsource.javax.servlet.jsp-sources-2.1.0.jar"/>
2222
<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.junit/3.8.2/com.springsource.junit-3.8.2.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.junit/3.8.2/com.springsource.junit-sources-3.8.2.jar"/>
2323
<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.5.0/com.springsource.org.junit-4.5.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.5.0/com.springsource.org.junit-sources-4.5.0.jar"/>
24-
<classpathentry kind="var" path="IVY_CACHE/org.testng/com.springsource.org.testng/5.8.0/com.springsource.org.testng-5.8.0.jar" sourcepath="/IVY_CACHE/org.testng/com.springsource.org.testng/5.8.0/com.springsource.org.testng-sources-5.8.0.jar"/>
24+
<classpathentry kind="var" path="IVY_CACHE/org.testng/com.springsource.org.testng/5.9.0/com.springsource.org.testng-5.9.0.jar" sourcepath="/IVY_CACHE/org.testng/com.springsource.org.testng/5.9.0/com.springsource.org.testng-sources-5.9.0.jar"/>
2525
<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-1.1.1.jar" sourcepath="/IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-sources-1.1.1.jar"/>
2626
<classpathentry kind="var" path="IVY_CACHE/org.apache.taglibs/com.springsource.org.apache.taglibs.standard/1.1.2/com.springsource.org.apache.taglibs.standard-1.1.2.jar" sourcepath="/IVY_CACHE/org.apache.taglibs/com.springsource.org.apache.taglibs.standard/1.1.2/com.springsource.org.apache.taglibs.standard-sources-1.1.2.jar"/>
2727
<classpathentry kind="var" path="IVY_CACHE/org.aspectj/com.springsource.org.aspectj.weaver/1.6.2.RELEASE/com.springsource.org.aspectj.weaver-1.6.2.RELEASE.jar"/>

‎org.springframework.test/.settings/org.eclipse.jdt.core.prefs‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#Thu Dec 18 06:36:09 PST 2008
1+
#Wed May 06 18:48:38 EDT 2009
22
eclipse.preferences.version=1
33
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
44
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
@@ -11,21 +11,21 @@ org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
1111
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
1212
org.eclipse.jdt.core.compiler.source=1.6
1313
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
14-
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
14+
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=20
1515
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
16-
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
17-
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
18-
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
19-
org.eclipse.jdt.core.formatter.alignment_for_assignment=0
16+
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=20
17+
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=20
18+
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=20
19+
org.eclipse.jdt.core.formatter.alignment_for_assignment=4
2020
org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
2121
org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
2222
org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
23-
org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
23+
org.eclipse.jdt.core.formatter.alignment_for_enum_constants=48
2424
org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
2525
org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
2626
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
2727
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
28-
org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
28+
org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=0
2929
org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
3030
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
3131
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
@@ -34,12 +34,12 @@ org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration
3434
org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
3535
org.eclipse.jdt.core.formatter.blank_lines_after_package=1
3636
org.eclipse.jdt.core.formatter.blank_lines_before_field=0
37-
org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
37+
org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=1
3838
org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
3939
org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
4040
org.eclipse.jdt.core.formatter.blank_lines_before_method=1
41-
org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
42-
org.eclipse.jdt.core.formatter.blank_lines_before_package=0
41+
org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=2
42+
org.eclipse.jdt.core.formatter.blank_lines_before_package=1
4343
org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
4444
org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
4545
org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
@@ -54,21 +54,21 @@ org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
5454
org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
5555
org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
5656
org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
57-
org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
57+
org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=true
5858
org.eclipse.jdt.core.formatter.comment.format_block_comments=true
5959
org.eclipse.jdt.core.formatter.comment.format_header=false
6060
org.eclipse.jdt.core.formatter.comment.format_html=true
6161
org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
6262
org.eclipse.jdt.core.formatter.comment.format_line_comments=true
6363
org.eclipse.jdt.core.formatter.comment.format_source_code=true
6464
org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
65-
org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
65+
org.eclipse.jdt.core.formatter.comment.indent_root_tags=false
6666
org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
67-
org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
67+
org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
6868
org.eclipse.jdt.core.formatter.comment.line_length=80
6969
org.eclipse.jdt.core.formatter.compact_else_if=true
7070
org.eclipse.jdt.core.formatter.continuation_indentation=2
71-
org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
71+
org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1
7272
org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
7373
org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
7474
org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
@@ -79,17 +79,17 @@ org.eclipse.jdt.core.formatter.indent_empty_lines=false
7979
org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
8080
org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
8181
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
82-
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
82+
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
8383
org.eclipse.jdt.core.formatter.indentation.size=4
8484
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
8585
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
8686
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
8787
org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
8888
org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
89-
org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
89+
org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=insert
9090
org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
91-
org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
92-
org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
91+
org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=insert
92+
org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=insert
9393
org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
9494
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
9595
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
@@ -256,7 +256,7 @@ org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
256256
org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
257257
org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
258258
org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
259-
org.eclipse.jdt.core.formatter.lineSplit=80
259+
org.eclipse.jdt.core.formatter.lineSplit=120
260260
org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
261261
org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
262262
org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

‎org.springframework.test/.settings/org.eclipse.jdt.ui.prefs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#Thu Dec 18 06:36:09 PST 2008
1+
#Wed May 06 18:46:10 EDT 2009
22
eclipse.preferences.version=1
3-
formatter_profile=org.eclipse.jdt.ui.default.eclipse_profile
3+
formatter_profile=_Spring
44
formatter_settings_version=11

‎org.springframework.test/ivy.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile->compile"/>
3131
<dependency org="org.apache.taglibs" name="com.springsource.org.apache.taglibs.standard" rev="1.1.2" conf="optional->compile"/>
3232
<dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="1.6.3.RELEASE" conf="optional->compile"/>
33-
<dependency org="org.testng" name="com.springsource.org.testng" rev="5.8.0" conf="optional->compile"/>
33+
<dependency org="org.testng" name="com.springsource.org.testng" rev="5.9.0" conf="optional->compile"/>
3434
<dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="optional->compile"/>
3535
<dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" conf="optional->compile"/>
3636
<dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="optional->compile"/>

‎org.springframework.test/template.mf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Import-Template:
1919
org.aspectj.weaver.*;version="[1.5.4, 2.0.0)";resolution:=optional,
2020
org.junit.*;version="[4.5.0, 5.0.0)";resolution:=optional,
2121
org.springframework.*;version="[3.0.0, 3.0.1)";resolution:=optional,
22-
org.testng.*;version="[5.8.0, 6.0.0)";resolution:=optional,
22+
org.testng.*;version="[5.9.0, 6.0.0)";resolution:=optional,
2323
org.w3c.dom.*;version="0";resolution:=optional
2424
Ignored-Existing-Headers:
2525
Bnd-LastModified,

‎org.springframework.test/test.iml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,11 @@
8989
<orderEntry type="module-library">
9090
<library>
9191
<CLASSES>
92-
<root url="jar://$IVY_CACHE$/org.testng/com.springsource.org.testng/5.8.0/com.springsource.org.testng-5.8.0.jar!/" />
92+
<root url="jar://$IVY_CACHE$/org.testng/com.springsource.org.testng/5.9.0/com.springsource.org.testng-5.9.0.jar!/" />
9393
</CLASSES>
9494
<JAVADOC />
9595
<SOURCES>
96-
<root url="jar://$IVY_CACHE$/org.testng/com.springsource.org.testng/5.8.0/com.springsource.org.testng-sources-5.8.0.jar!/" />
96+
<root url="jar://$IVY_CACHE$/org.testng/com.springsource.org.testng/5.9.0/com.springsource.org.testng-sources-5.9.0.jar!/" />
9797
</SOURCES>
9898
</library>
9999
</orderEntry>

0 commit comments

Comments
 (0)