diff --git a/README.md b/README.md
index 3a76a6b..c5b3990 100644
--- a/README.md
+++ b/README.md
@@ -210,7 +210,7 @@ To use the plugin from Ant you will need something like the following in your bu
 	<path id="xjc.classpath">
 		<fileset dir="libs">
 			<include name="jaxb2-basics-tools-0.6.5.jar" />
-			<include name="jaxb-xew-plugin-1.6.jar" />
+			<include name="jaxb-xew-plugin-1.7.jar" />
 		</fileset>
 	</path>
 	<taskdef name="xjc" classname="com.sun.tools.xjc.XJCTask">
@@ -232,7 +232,7 @@ To use the plugin from Ant you will need something like the following in your bu
 
 #### maven-jaxb2-plugin
 
-Note: `maven-jaxb2-plugin` prior to v0.8.0 was compiled against JAXB XJC API which is not compatible with this plugin. Version 0.8.1 is guaranteed to work, versions 0.8.2 and 0.8.3 should also work fine.
+Note: `maven-jaxb2-plugin` prior to v0.8.0 was compiled against JAXB XJC API which _is not compatible with this plugin_. Version 0.8.1 is guaranteed to work, versions 0.8.2 and later should also work fine.
 ```xml
 <plugin>
 	<groupId>org.jvnet.jaxb2.maven2</groupId>
@@ -261,7 +261,7 @@ Note: `maven-jaxb2-plugin` prior to v0.8.0 was compiled against JAXB XJC API whi
 					<plugin>
 						<groupId>com.github.jaxb-xew-plugin</groupId>
 						<artifactId>jaxb-xew-plugin</artifactId>
-						<version>1.6</version>
+						<version>1.7</version>
 					</plugin>
 				</plugins>
 			</configuration>
@@ -271,7 +271,7 @@ Note: `maven-jaxb2-plugin` prior to v0.8.0 was compiled against JAXB XJC API whi
 ```
 #### jaxb2-maven-plugin
 
-Note: `jaxb2-maven-plugin` v1.5 (the same apples to v1.6) was compiled against JAXB XJC API v2.1.13 which is not compatible with this plugin, thus additional dependency is needed to be added to **plugin classpath**.
+Note: `jaxb2-maven-plugin` v1.5 (the same apples to v1.6) was compiled against JAXB XJC API v2.1.13 which _is not compatible with this plugin_, thus additional dependency is needed to be added to **plugin classpath**.
 ```xml
 <plugin>
 	<groupId>org.codehaus.mojo</groupId>
@@ -298,7 +298,7 @@ Note: `jaxb2-maven-plugin` v1.5 (the same apples to v1.6) was compiled against J
 		<dependency>
 			<groupId>com.github.jaxb-xew-plugin</groupId>
 			<artifactId>jaxb-xew-plugin</artifactId>
-			<version>1.6</version>
+			<version>1.7</version>
 		</dependency>
 		<!--
 		 | We need to update the jaxb-xjc plugin from v2.1.13 to v2.2.4-1
@@ -336,7 +336,7 @@ dependencies {
   compile 'com.sun.xml.bind:jaxb-core:2.2.7'
   compile 'javax.xml.bind:jaxb-api:2.2.7'
 
-  xjc "com.github.jaxb-xew-plugin:jaxb-xew-plugin:1.6"
+  xjc "com.github.jaxb-xew-plugin:jaxb-xew-plugin:1.7"
   xjc "net.java.dev.jaxb2-commons:jaxb-fluent-api:2.1.8"
 }
 
@@ -357,43 +357,43 @@ compileJava.dependsOn processXSDs
 
 ## What's new
 
-### v1.7 (future release)
+### [v1.7](http://search.maven.org/#artifactdetails|com.github.jaxb-xew-plugin|jaxb-xew-plugin|1.7|jar)
 
 * Bugs fixed ([#45](https://github.com/dmak/jaxb-xew-plugin/issues/45)).
 
-### v1.6
+### [v1.6](http://search.maven.org/#artifactdetails|com.github.jaxb-xew-plugin|jaxb-xew-plugin|1.6|jar)
 
 * Bugs fixed ([#41](https://github.com/dmak/jaxb-xew-plugin/issues/41)).
 
-### v1.5
+### [v1.5](http://search.maven.org/#artifactdetails|com.github.jaxb-xew-plugin|jaxb-xew-plugin|1.5|jar)
 
 * Bugs fixed ([#32](https://github.com/dmak/jaxb-xew-plugin/issues/32), [#39](https://github.com/dmak/jaxb-xew-plugin/issues/39), [#40](https://github.com/dmak/jaxb-xew-plugin/issues/40)).
 
-### v1.4
+### [v1.4](http://search.maven.org/#artifactdetails|com.github.jaxb-xew-plugin|jaxb-xew-plugin|1.4|jar)
 
 * Bugs fixed ([#21](https://github.com/dmak/jaxb-xew-plugin/issues/21), [#32](https://github.com/dmak/jaxb-xew-plugin/issues/32), [#33](https://github.com/dmak/jaxb-xew-plugin/issues/33)).
 
-### v1.3
+### [v1.3](http://search.maven.org/#artifactdetails|com.github.jaxb-xew-plugin|jaxb-xew-plugin|1.3|jar)
 
 * Improvements:
   * More flexible control file ([#23](https://github.com/dmak/jaxb-xew-plugin/issues/23))
   * In-schema plugin customization [#28](https://github.com/dmak/jaxb-xew-plugin/issues/28))
 * Bugs fixed ([#22](https://github.com/dmak/jaxb-xew-plugin/issues/22), [#26](https://github.com/dmak/jaxb-xew-plugin/issues/26)).
-* The option `-Xxew:delete` is removed as in majorify of usecases it is set to true. Now by default plugin deletes all candidates. To prevent them from being deleted, create [control file](#control-file) with only line `/.*/=keep`.
+* The option `-Xxew:delete` is removed as in majority of usecases it is set to true. Now by default plugin deletes all candidates. To prevent them from being deleted, create [control file](#control-file) with only line `/.*/=keep`.
 
-### v1.2
+### [v1.2](http://search.maven.org/#artifactdetails|com.github.jaxb-xew-plugin|jaxb-xew-plugin|1.2|jar)
 
 * Plugin is improved ([#14](https://github.com/dmak/jaxb-xew-plugin/issues/14)). Bugs fixed ([#12](https://github.com/dmak/jaxb-xew-plugin/issues/12), [#19](https://github.com/dmak/jaxb-xew-plugin/issues/19)).
 * Plugin can now automatically apply plural form to collection properties (see `-Xxew:plural`).
 * Unit tests now compile the model with `javac` and create JAXB context. Some test involve also XML marshalling/unmarshalling/comparing.
 
-### v1.1
+### [v1.1](http://search.maven.org/#artifactdetails|com.github.jaxb-xew-plugin|jaxb-xew-plugin|1.1|jar)
 
 * Plugin is re-worked. Bugs fixed ([#1](https://github.com/dmak/jaxb-xew-plugin/issues/1), [#3](https://github.com/dmak/jaxb-xew-plugin/issues/3), [#6](https://github.com/dmak/jaxb-xew-plugin/issues/6), [#7](https://github.com/dmak/jaxb-xew-plugin/issues/7)). Some functionality is possible only by accessing private fields, so Xew plugin may not work in security-managed environment.
 * Testing framework introduced. XSDs in [`com/sun/tools/xjc/addon/xew/`](src/test/resources/com/sun/tools/xjc/addon/xew/) directory can be referred as collection of examples.
 * Logging is done via `commons-logging`. Log level is configurable like this `mvn -Dorg.apache.commons.logging.simplelog.defaultlog=DEBUG`.
 
-### v1.0
+### [v1.0](http://search.maven.org/#artifactdetails|com.github.jaxb-xew-plugin|jaxb-xew-plugin|1.0|jar)
 
 The original code of Bjarne Hansen, with some fixes.
 
diff --git a/dist/eclipse-code-formatting-rules.xml b/dist/eclipse-code-formatting-rules.xml
index 4f32897..7cb92a1 100644
--- a/dist/eclipse-code-formatting-rules.xml
+++ b/dist/eclipse-code-formatting-rules.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <profiles version="12">
-<profile kind="CodeFormatterProfile" name="Eclipse (Common)" version="12">
+<profile kind="CodeFormatterProfile" name="Eclipse-based common (XEW)" version="12">
 <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
@@ -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="false"/>
@@ -68,6 +68,7 @@
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
@@ -136,8 +137,8 @@
 <setting id="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column" value="false"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
 <setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch" value="16"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
@@ -172,23 +173,25 @@
 <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"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_lambda_body" value="end_of_line"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/>
@@ -248,7 +251,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="true"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="0"/>
@@ -256,6 +259,7 @@
 <setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
diff --git a/pom.xml b/pom.xml
index 409dfa3..f41f7ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,8 +23,7 @@
 		<url>https://github.com/dmak/jaxb-xew-plugin</url>
 		<connection>scm:git:https://github.com/dmak/jaxb-xew-plugin.git</connection>
 		<developerConnection>scm:git:https://dmak@github.com/dmak/jaxb-xew-plugin.git</developerConnection>
-	  <tag>HEAD</tag>
-  </scm>
+	</scm>
 
 	<issueManagement>
 		<system>GitHub</system>
@@ -49,6 +48,13 @@
 			<id>stage-release</id>
 
 			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.sonatype.plugins</groupId>
+						<artifactId>nexus-staging-maven-plugin</artifactId>
+					</plugin>
+				</plugins>
+
 				<pluginManagement>
 					<plugins>
 						<plugin>
diff --git a/samples/cxf-codegen-plugin/pom.xml b/samples/cxf-codegen-plugin/pom.xml
index dfd4092..b6bf46b 100644
--- a/samples/cxf-codegen-plugin/pom.xml
+++ b/samples/cxf-codegen-plugin/pom.xml
@@ -39,7 +39,7 @@
 					<dependency>
 						<groupId>com.github.jaxb-xew-plugin</groupId>
 						<artifactId>jaxb-xew-plugin</artifactId>
-						<version>1.6</version>
+						<version>1.7</version>
 					</dependency>
 					<dependency>
 						<groupId>com.sun.xml.bind</groupId>
diff --git a/samples/jaxb2-maven-plugin/pom.xml b/samples/jaxb2-maven-plugin/pom.xml
index e0ab51d..1e06cd5 100644
--- a/samples/jaxb2-maven-plugin/pom.xml
+++ b/samples/jaxb2-maven-plugin/pom.xml
@@ -37,7 +37,7 @@
 					<dependency>
 						<groupId>com.github.jaxb-xew-plugin</groupId>
 						<artifactId>jaxb-xew-plugin</artifactId>
-						<version>1.6</version>
+						<version>1.7</version>
 					</dependency>
 					<dependency>
 						<groupId>net.java.dev.jaxb2-commons</groupId>
diff --git a/samples/jaxb2-maven-plugin/src/test/java/budgetary/reference/jaxb.index b/samples/jaxb2-maven-plugin/src/test/java/budgetary/reference/jaxb.index
index 0909b31..e1e92a4 100644
--- a/samples/jaxb2-maven-plugin/src/test/java/budgetary/reference/jaxb.index
+++ b/samples/jaxb2-maven-plugin/src/test/java/budgetary/reference/jaxb.index
@@ -1,3 +1,3 @@
+PrimaryContractorReferenceType
 ContractorReferenceType
 SecondaryContractorReferenceType
-PrimaryContractorReferenceType
diff --git a/samples/jaxws-maven-plugin-exclude/pom.xml b/samples/jaxws-maven-plugin-exclude/pom.xml
index c9fe3d1..42d01cc 100644
--- a/samples/jaxws-maven-plugin-exclude/pom.xml
+++ b/samples/jaxws-maven-plugin-exclude/pom.xml
@@ -46,7 +46,7 @@
 					<dependency>
 						<groupId>com.github.jaxb-xew-plugin</groupId>
 						<artifactId>jaxb-xew-plugin</artifactId>
-						<version>1.6</version>
+						<version>1.7</version>
 					</dependency>
 				</dependencies>
 			</plugin>
diff --git a/samples/jaxws-maven-plugin-visitor/pom.xml b/samples/jaxws-maven-plugin-visitor/pom.xml
index 7865126..cb413a8 100644
--- a/samples/jaxws-maven-plugin-visitor/pom.xml
+++ b/samples/jaxws-maven-plugin-visitor/pom.xml
@@ -43,7 +43,7 @@
 					<dependency>
 						<groupId>com.github.jaxb-xew-plugin</groupId>
 						<artifactId>jaxb-xew-plugin</artifactId>
-						<version>1.6</version>
+						<version>1.7</version>
 						<!--
 							Mind that this exclusion is needed to be added to plugin classpath
 							as jaxb-xew-plugin was compiled against jaxb-xjc v2.2.4-1 but
diff --git a/samples/maven-jaxb2-plugin/pom.xml b/samples/maven-jaxb2-plugin/pom.xml
index 673cb94..78dc803 100644
--- a/samples/maven-jaxb2-plugin/pom.xml
+++ b/samples/maven-jaxb2-plugin/pom.xml
@@ -37,7 +37,7 @@
 								<plugin>
 									<groupId>com.github.jaxb-xew-plugin</groupId>
 									<artifactId>jaxb-xew-plugin</artifactId>
-									<version>1.6</version>
+									<version>1.7</version>
 								</plugin>
 							</plugins>
 						</configuration>