Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update eclipse / bnd settings for new components. #4149

Merged
merged 1 commit into from
Jun 28, 2018
Merged

Update eclipse / bnd settings for new components. #4149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion dev/com.ibm.ws.cdi.beansxml.implicit_fat/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
<classpathentry kind="src" path="test-applications/ejbArchiveWithNoAnnotations.war/src"/>
<classpathentry kind="src" path="test-applications/explicitBeanArchive.jar/src"/>
<classpathentry kind="src" path="test-applications/implicitBeanAnnotatedMode.jar/src"/>
<classpathentry kind="src" path="test-applications/aroundConstructApp.war/src"/>
<classpathentry kind="src" path="test-applications/implicitBeanNoBeansXml.jar/src"/>
<classpathentry kind="src" path="test-applications/archiveWithNoScanBeansXML.jar/src"/>
<classpathentry kind="src" path="test-applications/archiveWithNoImplicitBeans.jar/src"/>
Expand All @@ -21,6 +20,8 @@
<classpathentry kind="src" path="test-applications/implicitBeanArchiveDisabled.jar/src"/>
<classpathentry kind="src" path="test-applications/implicitBeanArchiveDisabled.war/src"/>
<classpathentry kind="src" path="test-applications/implicitEJBInWar.war/src"/>
<classpathentry kind="src" path="test-applications/implicitWarApp.war/src"/>
<classpathentry kind="src" path="test-applications/utilLib.jar/src"/>
<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="output" path="bin"/>
Expand Down
3 changes: 1 addition & 2 deletions dev/com.ibm.ws.jaxrs.2.0.cdi.1.2_fat/.project
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>com.ibm.ws.jaxrs.2.0.cdi.1.2_fat</name>
Expand All @@ -21,4 +20,4 @@
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>bndtools.core.bndnature</nature>
</natures>
</projectDescription>
</projectDescription>
2 changes: 2 additions & 0 deletions dev/com.ibm.ws.jaxrs.2.0.cdi.1.2_fat/.settings/bndtools.core.prefs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
compileErrorAction=build
eclipse.preferences.version=1
6 changes: 3 additions & 3 deletions dev/com.ibm.ws.jaxrs.2.0.cdi.1.2_fat/.settings/org.eclipse.jdt.core.prefs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invoca
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
Expand Down Expand Up @@ -49,7 +49,7 @@ org.eclipse.jdt.core.codeComplete.argumentSuffixes=
org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=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_after_opening_paren_in_enum_constant=do not insert
Expand Down Expand Up @@ -276,7 +276,7 @@ org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=inser
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
org.eclipse.jdt.core.compiler.source=1.6
org.eclipse.jdt.core.compiler.source=1.7
org.eclipse.jdt.core.formatter.comment.format_source_code=true
org.eclipse.jdt.core.formatter.comment.line_length=180
org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
Expand Down
4 changes: 0 additions & 4 deletions dev/com.ibm.ws.jaxrs.2.0.cdi.1.2_fat/bnd.bnd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@
-include= ~../cnf/resources/bnd/bundle.props
bVersion=1.0

javac.source: 1.8
javac.target: 1.8

src: \
fat/src,\
test-applications/basic/src,\
Expand All @@ -34,4 +31,3 @@ fat.project: true
org.apache.httpcomponents:httpcore;version=4.3.4,\
javax.validation:validation-api;version=2.0.1.Final