Preparing the release #120.

highsource · May 31, 2018 · b05de13 · b05de13
1 parent c17e4e4
commit b05de13
Show file tree

Hide file tree

Showing 28 changed files with 60 additions and 154 deletions.
diff --git a/README.md b/README.md
@@ -1,11 +1,3 @@
-# :boom: JAVA 9 ALERT :boom:
-
-This branch builds a 0.13.3-SNAPSHOT version ([in `plugin`](plugin)) that requires the Java 9 compiler because the updated dependency `org.glassfish.jaxb:jaxb-xjc-jdk9` contains Java 9 bytecode.
-The easiest way to use the new version's compiler is to set `JAVA_HOME`, e.g. in `~/.mavenrc`.
-Even that build does not pass [the Java 9 test](tests/java-9), though, because it fails to process schema bindings.
-
-***
-
 # JAXB2 Maven Plugin #
 
 Welcome to the `org.jvnet.jaxb2.maven2:maven-jaxb2-plugin`, the most advanced and feature-full Maven plugin for XML Schema compilation.
@@ -30,7 +22,7 @@ compiling XML Schemas (as well as WSDL, DTDs, RELAX NG) into Java classes in Mav
 			<plugin>
 				<groupId>org.jvnet.jaxb2.maven2</groupId>
 				<artifactId>maven-jaxb2-plugin</artifactId>
-				<version>0.13.1</version>
+				<version>0.14.0</version>
 				<executions>
 					<execution>
 						<goals>
@@ -46,6 +38,22 @@ compiling XML Schemas (as well as WSDL, DTDs, RELAX NG) into Java classes in Mav
 </project>
 ```
 
+### JAXB Versions
+
+If you need a specific JAXB version, you can explicitly use one of the following variants:
+
+* `org.jvnet.jaxb2.maven2:maven-jaxb20-plugin` - JAXB 2.0.
+* `org.jvnet.jaxb2.maven2:maven-jaxb21-plugin` - JAXB 2.1.
+* `org.jvnet.jaxb2.maven2:maven-jaxb22-plugin` - JAXB 2.2.
+* `org.jvnet.jaxb2.maven2:maven-jaxb23-plugin` - JAXB 2.3.
+* `org.jvnet.jaxb2.maven2:maven-jaxb2-plugin` - "most actual version", at the moment same as `org.jvnet.jaxb2.maven2:maven-jaxb23-plugin`.
+
+### Java versions
+
+Supported Java versions are `1.7`, `1.8`, `9` (only `maven-jaxb2-plugin` and `maven-jaxb23-plugin`).
+
+Java version `1.6` is no longer supported (since version `0.14.0`).
+
 ## [Documentation](https://github.com/highsource/maven-jaxb2-plugin/wiki) ##
 
 Please refer to the [wiki](https://github.com/highsource/maven-jaxb2-plugin/wiki) for the full documentation.
@@ -68,6 +76,6 @@ This project is not developed, supported or in any other way affiliated with Apa
 
 This project is also *not* developed by or affiliated with Oracle or Sun. Even if it is featured on [https://jaxb.java.net/](https://jaxb.java.net) pages, 
 
-**This plugin is in no way _official_ JAXB2 Maven plugin by Oracle.**
+**This plugin is in no way _official_ JAXB2 Maven plugin by Sun or Oracle.**
 
-This is a completely indepentent development. [I](https://github.com/highsource) am *not* an Oracle employee.
+This is a completely indepentent development. [I](https://github.com/highsource) am *not* an Oracle employee.
diff --git a/TODO.md b/TODO.md
diff --git a/build-1.5.bat b/build-1.5.bat
diff --git a/build-1.6.bat b/build-1.6.bat
diff --git a/deploy-1.5.bat b/deploy-1.5.bat
diff --git a/deploy-1.6.bat b/deploy-1.6.bat
diff --git a/deploy.bat b/deploy.bat
diff --git a/full-build-1.6.bat b/full-build-1.6.bat
diff --git a/install-1.5.bat b/install-1.5.bat
diff --git a/install-1.6.bat b/install-1.6.bat
diff --git a/install-9.bat b/install-9.bat
diff --git a/plugin-2.0/pom.xml b/plugin-2.0/pom.xml
@@ -53,8 +53,8 @@
 			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
+					<source>1.7</source>
+					<target>1.7</target>
 				</configuration>
 			</plugin>
 		</plugins>

diff --git a/plugin-2.1/pom.xml b/plugin-2.1/pom.xml
@@ -65,8 +65,8 @@
 			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
+					<source>1.7</source>
+					<target>1.7</target>
 				</configuration>
 			</plugin>
 		</plugins>

diff --git a/plugin-2.2/pom.xml b/plugin-2.2/pom.xml
@@ -105,8 +105,8 @@
 			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
+					<source>1.7</source>
+					<target>1.7</target>
 				</configuration>
 			</plugin>
 		</plugins>

diff --git a/plugin-2.3/pom.xml b/plugin-2.3/pom.xml
@@ -61,8 +61,8 @@
 			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<configuration>
-					<source>9</source>
-					<target>9</target>
+					<source>1.7</source>
+					<target>1.7</target>
 				</configuration>
 			</plugin>
 			<plugin>

diff --git a/plugin-core/pom.xml b/plugin-core/pom.xml
@@ -63,8 +63,8 @@
 			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
+					<source>1.7</source>
+					<target>1.7</target>
 				</configuration>
 			</plugin>
 		</plugins>

diff --git a/plugin/pom.xml b/plugin/pom.xml
@@ -89,8 +89,8 @@
 			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<configuration>
-					<source>9</source>
-					<target>9</target>
+					<source>1.7</source>
+					<target>1.7</target>
 				</configuration>
 			</plugin>
 		</plugins>

diff --git a/plugin/src/test/resources/test-pom.xml b/plugin/src/test/resources/test-pom.xml
@@ -52,8 +52,8 @@
 			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
+					<source>1.7</source>
+					<target>1.7</target>
 				</configuration>
 			</plugin>
 		</plugins>

diff --git a/pom.xml b/pom.xml
@@ -368,8 +368,8 @@
 					<artifactId>maven-compiler-plugin</artifactId>
 					<version>3.7.0</version>
 					<configuration>
-						<source>1.6</source>
-						<target>1.6</target>
+						<source>1.7</source>
+						<target>1.7</target>
 					</configuration>
 				</plugin>
 				<plugin>

diff --git a/release.bat b/release.bat
diff --git a/samples/catalog/project-pom.xml b/samples/catalog/project-pom.xml
@@ -39,8 +39,8 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
+					<source>1.7</source>
+					<target>1.7</target>
 				</configuration>
 			</plugin>
 		</plugins>

diff --git a/samples/dtd/project-pom.xml b/samples/dtd/project-pom.xml
@@ -39,8 +39,8 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
+					<source>1.7</source>
+					<target>1.7</target>
 				</configuration>
 			</plugin>
 		</plugins>

diff --git a/samples/episode/project-pom.xml b/samples/episode/project-pom.xml
@@ -40,8 +40,8 @@
 				<plugin>
 					<artifactId>maven-compiler-plugin</artifactId>
 					<configuration>
-						<source>1.6</source>
-						<target>1.6</target>
+						<source>1.7</source>
+						<target>1.7</target>
 					</configuration>
 				</plugin>
 			</plugins>

diff --git a/samples/jaxbplugins/project-pom.xml b/samples/jaxbplugins/project-pom.xml
@@ -53,8 +53,8 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
+					<source>1.7</source>
+					<target>1.7</target>
 				</configuration>
 			</plugin>
 		</plugins>

diff --git a/samples/po/project-pom.xml b/samples/po/project-pom.xml
@@ -33,8 +33,8 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
+					<source>1.7</source>
+					<target>1.7</target>
 				</configuration>
 			</plugin>
 		</plugins>

diff --git a/tests/full-build-1.7.bat b/tests/full-build-1.7.bat
@@ -0,0 +1,5 @@
+setlocal
+echo Setting JAVA_HOME to %JAVA7_HOME%.
+set JAVA_HOME=%JAVA7_HOME%
+call mvn clean install -Pall -DperformRelease --fail-at-end
+endlocal
diff --git a/tests/full-build-1.8.bat b/tests/full-build-1.8.bat
@@ -0,0 +1,5 @@
+setlocal
+echo Setting JAVA_HOME to %JAVA8_HOME%.
+set JAVA_HOME=%JAVA8_HOME%
+call mvn clean install -Pall -DperformRelease --fail-at-end
+endlocal
diff --git a/tests/full-build-9.bat b/tests/full-build-9.bat
@@ -0,0 +1,5 @@
+setlocal
+echo Setting JAVA_HOME to %JAVA9_HOME%.
+set JAVA_HOME=%JAVA9_HOME%
+call mvn clean install -Pall -DperformRelease --fail-at-end
+endlocal