diff --git a/CHANGELOG.md b/CHANGELOG.md index a09f977..5dfb452 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,8 +3,27 @@ ## Next release +### [#81](https://github.com/bsorrentino/maven-annotation-plugin/issues/81) Compilation errors ignored during processing *under investigation* + +**issue #81 add compilation result** + + +[85ba56d3b87e40a](https://github.com/bsorrentino/maven-annotation-plugin/commit/85ba56d3b87e40a) bartolomeo sorrentino *2020-07-17 13:19:03* + + +## v4.0-rc1 ### Generic changes +**update readme** + + +[2262a4d28954925](https://github.com/bsorrentino/maven-annotation-plugin/commit/2262a4d28954925) bsorrentino *2020-04-17 16:16:12* + +**update chagelog** + + +[d444f63f9c4bed9](https://github.com/bsorrentino/maven-annotation-plugin/commit/d444f63f9c4bed9) bartolomeo sorrentino *2020-04-17 15:40:13* + **move to next release version** @@ -51,7 +70,7 @@ [785c31b31785d2f](https://github.com/bsorrentino/maven-annotation-plugin/commit/785c31b31785d2f) bsorrentino *2020-03-02 19:59:10* -### [#80](https://github.com/bsorrentino/maven-annotation-plugin/issues/80) How to exclude module-info.java file? *work in progress* +### [#80](https://github.com/bsorrentino/maven-annotation-plugin/issues/80) How to exclude module-info.java file? **issue #80** diff --git a/README.md b/README.md index ee8518e..db96c39 100644 --- a/README.md +++ b/README.md @@ -25,21 +25,15 @@ This plugin could be considered the 'alter ego' of maven apt plugin http://mojo. * [ANNOTATION PROCESSING 101](http://hannesdorfmann.com/annotation-processing/annotationprocessing101) - -## Snapshot - - Date | Info ---- | --- -Currently | **[Release 4.0-SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/bsc/maven/maven-processor-plugin/4.0-SNAPSHOT/)** | available from **[MAVEN CENTRAL REPO]** | - ## Releases Date | Info --- | --- + +**Jul 18, 2020** | [Release 4.0](https://github.com/bsorrentino/maven-annotation-plugin/releases/tag/v4.0) **Apr 17, 2020** | [Release 4.0-rc1](https://github.com/bsorrentino/maven-annotation-plugin/releases/tag/v4.0-rc1) **Mar 02, 2020** | [Release 4.0-beta1](https://github.com/bsorrentino/maven-annotation-plugin/releases/tag/v4.0-beta1) - ## History diff --git a/pom.xml b/pom.xml index 1bb5c2c..cf52ba2 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,11 @@ org.bsc.maven maven-processor-plugin-parent pom +<<<<<<< HEAD 4.0-SNAPSHOT +======= + 4.0 +>>>>>>> release/4.0 MAVEN PROCESSOR PLUGIN PARENT A maven plugin to process annotation for jdk6 at compile time diff --git a/processor/pom.xml b/processor/pom.xml index b43e573..6e3e0e6 100644 --- a/processor/pom.xml +++ b/processor/pom.xml @@ -13,7 +13,11 @@ This plugin could be considered the 'alter ego' of maven apt plugin http://mojo. org.bsc.maven maven-processor-plugin-parent +<<<<<<< HEAD 4.0-SNAPSHOT +======= + 4.0 +>>>>>>> release/4.0 diff --git a/processor/src/main/java/org/bsc/maven/plugin/processor/AnnotationProcessorCompiler.java b/processor/src/main/java/org/bsc/maven/plugin/processor/AnnotationProcessorCompiler.java index 3174948..6d52b2f 100644 --- a/processor/src/main/java/org/bsc/maven/plugin/processor/AnnotationProcessorCompiler.java +++ b/processor/src/main/java/org/bsc/maven/plugin/processor/AnnotationProcessorCompiler.java @@ -296,7 +296,7 @@ private AnnotationProcessorCompiler( Toolchain toolchain, } - private void execute( final Iterable options, + private boolean execute( final Iterable options, final Iterable compilationUnits, final Writer w ) throws Exception { @@ -389,6 +389,8 @@ else if( "--release".equals(option) ) { result = PlexusJavaCompilerWithOutput.INSTANCE.performCompile(javacConf); out.println( result.toString() ); out.flush(); + + return result.isSuccess(); } @Override @@ -420,8 +422,7 @@ public void addModules(Iterable moduleNames) { @Override public Boolean call() { try { - execute(options, compilationUnits, out); - return true; + return execute(options, compilationUnits, out); } catch (final Exception ex) { diagnosticListener.report( new Diagnostic() { @Override diff --git a/utils/pom.xml b/utils/pom.xml index 7a5d645..e71ac04 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -31,7 +31,11 @@ org.bsc.maven maven-processor-plugin-parent +<<<<<<< HEAD 4.0-SNAPSHOT +======= + 4.0 +>>>>>>> release/4.0