Repository: wicket Updated Branches: refs/heads/master 0d86da5b4 -> 7a15297e0
Fixes Eclipse java 8 settings for import When importing the Maven projects in Eclipse the source compliance is set to 1.7. With this commit that is no longer the case and is the source compliance configured correctly for master/wicket 8.x and Java 8. You are currently required to install the wicket eclipse settings project due to its SNAPSHOT nature. When the settings are verified they can be properly released. Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/7a15297e Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/7a15297e Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/7a15297e Branch: refs/heads/master Commit: 7a15297e032c0c8375a8909b891fb6c79529496b Parents: 0d86da5 Author: Martijn Dashorst <[email protected]> Authored: Tue Nov 8 22:22:10 2016 +0100 Committer: Martijn Dashorst <[email protected]> Committed: Tue Nov 8 22:22:10 2016 +0100 ---------------------------------------------------------------------- pom.xml | 4 +- wicket-core/EclipseCodeFormat.xml | 6 +- .../files/org.eclipse.jdt.core.prefs | 4 +- wicket-eclipse-settings/pom.xml | 124 +++++++++---------- 4 files changed, 69 insertions(+), 69 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/7a15297e/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 8d94c90..c2f8ea6 100644 --- a/pom.xml +++ b/pom.xml @@ -336,7 +336,7 @@ <dependency> <groupId>org.apache.wicket</groupId> <artifactId>wicket-eclipse-settings</artifactId> - <version>3</version> + <version>4-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.wicket</groupId> @@ -790,7 +790,7 @@ <dependency> <groupId>org.apache.wicket</groupId> <artifactId>wicket-eclipse-settings</artifactId> - <version>3</version> + <version>4-SNAPSHOT</version> </dependency> </dependencies> </plugin> http://git-wip-us.apache.org/repos/asf/wicket/blob/7a15297e/wicket-core/EclipseCodeFormat.xml ---------------------------------------------------------------------- diff --git a/wicket-core/EclipseCodeFormat.xml b/wicket-core/EclipseCodeFormat.xml index e0b61dc..9303c01 100644 --- a/wicket-core/EclipseCodeFormat.xml +++ b/wicket-core/EclipseCodeFormat.xml @@ -48,7 +48,7 @@ <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/> -<setting id="org.eclipse.jdt.core.compiler.source" value="1.7"/> +<setting id="org.eclipse.jdt.core.compiler.source" value="1.8"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/> @@ -172,7 +172,7 @@ <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/> -<setting id="org.eclipse.jdt.core.compiler.compliance" value="1.7"/> +<setting id="org.eclipse.jdt.core.compiler.compliance" value="1.8"/> <setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/> @@ -248,7 +248,7 @@ <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/> -<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.7"/> +<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.8"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="80"/> <setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="0"/> http://git-wip-us.apache.org/repos/asf/wicket/blob/7a15297e/wicket-eclipse-settings/files/org.eclipse.jdt.core.prefs ---------------------------------------------------------------------- diff --git a/wicket-eclipse-settings/files/org.eclipse.jdt.core.prefs b/wicket-eclipse-settings/files/org.eclipse.jdt.core.prefs index 7b1a0fb..74c9420 100644 --- a/wicket-eclipse-settings/files/org.eclipse.jdt.core.prefs +++ b/wicket-eclipse-settings/files/org.eclipse.jdt.core.prefs @@ -91,7 +91,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.7 +org.eclipse.jdt.core.compiler.source=1.8 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 @@ -366,4 +366,4 @@ org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false org.eclipse.jdt.core.formatter.wrap_before_binary_operator=false org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true org.eclipse.jdt.core.incompatibleJDKLevel=ignore -org.eclipse.jdt.core.incompleteClasspath=error \ No newline at end of file +org.eclipse.jdt.core.incompleteClasspath=error http://git-wip-us.apache.org/repos/asf/wicket/blob/7a15297e/wicket-eclipse-settings/pom.xml ---------------------------------------------------------------------- diff --git a/wicket-eclipse-settings/pom.xml b/wicket-eclipse-settings/pom.xml index c783126..129aa83 100644 --- a/wicket-eclipse-settings/pom.xml +++ b/wicket-eclipse-settings/pom.xml @@ -16,68 +16,68 @@ limitations under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> - <prerequisites> - <maven>3.0.4</maven> - </prerequisites> - <parent> - <groupId>org.apache</groupId> - <artifactId>apache</artifactId> - <version>16</version> - </parent> - <groupId>org.apache.wicket</groupId> - <artifactId>wicket-eclipse-settings</artifactId> - <version>3</version> - <packaging>jar</packaging> - <name>Wicket Eclipse Settings</name> - <description> + <modelVersion>4.0.0</modelVersion> + <prerequisites> + <maven>3.0.4</maven> + </prerequisites> + <parent> + <groupId>org.apache</groupId> + <artifactId>apache</artifactId> + <version>18</version> + </parent> + <groupId>org.apache.wicket</groupId> + <artifactId>wicket-eclipse-settings</artifactId> + <version>4-SNAPSHOT</version> + <packaging>jar</packaging> + <name>Wicket Eclipse Settings</name> + <description> Used to contribute eclipse settings files for each submodule </description> - <build> - <defaultGoal>package</defaultGoal> - <resources> - <resource> - <directory>files</directory> - <filtering>false</filtering> - <includes> - <include>**/*</include> - </includes> - </resource> - </resources> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - </plugin> - <plugin> - <inherited>true</inherited> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-deploy-plugin</artifactId> - <version>2.8.2</version> - <configuration> - <updateReleaseInfo>true</updateReleaseInfo> - </configuration> - <executions> - <execution> - <goals> - <goal>deploy</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-gpg-plugin</artifactId> - <version>1.6</version> - <executions> - <execution> - <id>sign-artifacts</id> - <goals> - <goal>sign</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> + <build> + <defaultGoal>package</defaultGoal> + <resources> + <resource> + <directory>files</directory> + <filtering>false</filtering> + <includes> + <include>**/*</include> + </includes> + </resource> + </resources> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + </plugin> + <plugin> + <inherited>true</inherited> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <version>2.8.2</version> + <configuration> + <updateReleaseInfo>true</updateReleaseInfo> + </configuration> + <executions> + <execution> + <goals> + <goal>deploy</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-gpg-plugin</artifactId> + <version>1.6</version> + <executions> + <execution> + <id>sign-artifacts</id> + <goals> + <goal>sign</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> </project>
