Merge branch 'release/5.0-rc1'

bsorrentino · Mar 4, 2021 · 85cca01 · 85cca01
2 parents 32b978c + a5fd69a
commit 85cca01
Show file tree

Hide file tree

Showing 34 changed files with 1,803 additions and 494 deletions.
diff --git a/.github/workflows/deploy-jdk8.yml b/.github/workflows/deploy-jdk8.yml
diff --git a/.github/workflows/deploy-snapshot.yaml b/.github/workflows/deploy-snapshot.yaml
@@ -24,3 +24,19 @@ jobs:
         env:
           SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
         run: mvn -B deploy --file pom.xml -s settings-template.xml
+
+  build-jdk8:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK 8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 8
+
+      - name: Build with Maven
+        env:
+          SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
+        run: mvn -B deploy --file pom-jdk8.xml -s settings-template.xml
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -10,7 +10,7 @@ on: workflow_dispatch
 #      - 'v*'
 
 jobs:
-  build:
+  deploy:
 
     runs-on: ubuntu-latest
 
@@ -31,3 +31,23 @@ jobs:
       # mvn -Prelease source:jar javadoc:jar deploy -Dgpg.passphrase=thephrase
       run: mvn -B -Prelease source:jar javadoc:jar deploy --file pom.xml -s settings-template.xml -Dgpg.passphrase=${{ secrets.GPG_PASSPHRASE }}
 
+  deploy-jdk8:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 1.8
+      uses: actions/setup-java@v1
+      with:
+        java-version: 1.8
+    - name: GPG Setup
+      env:
+        GPG_KEY_BASE64: ${{ secrets.GPG_KEY_BASE64 }}
+        GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
+      run: ./gpg-setup.sh
+    - name: Deploy to OSS Sonatype
+      env:
+        SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
+      # mvn -Prelease source:jar javadoc:jar deploy -Dgpg.passphrase=thephrase
+      run: mvn -B -Prelease source:jar javadoc:jar deploy --file pom-jdk8.xml -s settings-template.xml -Dgpg.passphrase=${{ secrets.GPG_PASSPHRASE }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,90 @@
 
 <!-- Changelog for bsorrentino maven-annotation-plugin. -->
 
+## Next release
+### Generic changes
+
+**clean code**
+
+
+[639b7e34b7cdefd](https://github.com/bsorrentino/maven-annotation-plugin/commit/639b7e34b7cdefd) bsorrentino *2021-03-01 17:29:26*
+
+**clean code**
+
+
+[3078349688039fb](https://github.com/bsorrentino/maven-annotation-plugin/commit/3078349688039fb) bsorrentino *2021-02-14 20:57:34*
+
+**update deploy actions**
+
+
+[ee1900ed9bdabbe](https://github.com/bsorrentino/maven-annotation-plugin/commit/ee1900ed9bdabbe) bsorrentino *2021-01-31 17:55:38*
+
+**update java target**
+
+
+[6788d55a10c5aa7](https://github.com/bsorrentino/maven-annotation-plugin/commit/6788d55a10c5aa7) bsorrentino *2021-01-31 17:18:22*
+
+**update actions**
+
+
+[51767f96147ece7](https://github.com/bsorrentino/maven-annotation-plugin/commit/51767f96147ece7) bsorrentino *2021-01-31 17:15:14*
+
+**added parent relativePath**
+
+
+[9fd838007c64cdd](https://github.com/bsorrentino/maven-annotation-plugin/commit/9fd838007c64cdd) bsorrentino *2021-01-30 16:52:23*
+
+**update to new development version**
+
+
+[e10817032e89f71](https://github.com/bsorrentino/maven-annotation-plugin/commit/e10817032e89f71) bsorrentino *2020-12-22 20:09:35*
+
+**update action name**
+
+
+[2c2259006a45426](https://github.com/bsorrentino/maven-annotation-plugin/commit/2c2259006a45426) bsorrentino *2020-12-22 20:08:22*
+
+**update changelog**
+
+
+[03305fc8a03ed7a](https://github.com/bsorrentino/maven-annotation-plugin/commit/03305fc8a03ed7a) bsorrentino *2020-12-22 20:03:58*
+
+
+###  [#91](https://github.com/bsorrentino/maven-annotation-plugin/issues/91) Add Support of JEP 238: Multi-Release JAR Files    *enhancement*  
+
+**issue #91 - created ad-hoc pom for jdk8 asset deployment**
+
+
+[5ca85b02a74abe3](https://github.com/bsorrentino/maven-annotation-plugin/commit/5ca85b02a74abe3) bsorrentino *2021-01-31 17:09:17*
+
+**issue #91 - created new DTS to separate JDK8 modules from JDK9+**
+
+
+[74837a5fc077eb3](https://github.com/bsorrentino/maven-annotation-plugin/commit/74837a5fc077eb3) bsorrentino *2021-01-31 16:40:16*
+
+
+###  [#92](https://github.com/bsorrentino/maven-annotation-plugin/issues/92) Compiling Generated .java Into .class Files     *question*  *under investigation*  
+
+**issue #92 - tests refinements**
+
+
+[ed08c34b657b566](https://github.com/bsorrentino/maven-annotation-plugin/commit/ed08c34b657b566) bsorrentino *2021-01-29 09:37:33*
+
+
+###  [#93](https://github.com/bsorrentino/maven-annotation-plugin/issues/93) Error [URI scheme is not "file"] if some processSourceArtifacts are specified    *under verification*  
+
+**issue #93**
+
+ * added UnzipService to extract Source Artifacts to the file system
+
+[c3651eb678b6383](https://github.com/bsorrentino/maven-annotation-plugin/commit/c3651eb678b6383) bsorrentino *2021-03-01 17:03:33*
+
+**issue #93 - test for issue verification**
+
+
+[dd57b08f851bec3](https://github.com/bsorrentino/maven-annotation-plugin/commit/dd57b08f851bec3) bsorrentino *2021-02-14 16:20:57*
+
+
 ## v4.5
 ### Generic changes
 
@@ -1272,5 +1356,3 @@
  * git-svn-id: https://projectname.googlecode.com/svn/trunk@2 c416075f-80b4-e980-4839-00ea3ed24e77
 
 [22a3c1b1a9be1a6](https://github.com/bsorrentino/maven-annotation-plugin/commit/22a3c1b1a9be1a6) [email protected] *2011-03-13 00:01:25*
-
-
diff --git a/README.md b/README.md
@@ -30,6 +30,8 @@ This plugin was born as the 'alter ego' of maven apt plugin [apt-maven-plugin](h
 
  Date  | Version  | Info
 --- | --- | ---
+**Feb 04, 2021** | [Release 5.1-rc1](https://github.com/bsorrentino/maven-annotation-plugin/releases/tag/5.1-rc1) | fix issue [#91](https://github.com/bsorrentino/maven-annotation-plugin/issues/91) [#92](https://github.com/bsorrentino/maven-annotation-plugin/issues/92) [#93](https://github.com/bsorrentino/maven-annotation-plugin/issues/93)
+**Feb 04, 2021** | [Release 5.1-jdk8-rc1](https://github.com/bsorrentino/maven-annotation-plugin/releases/tag/5.1-jdk8-rc1) |
 **Dec 22, 2020** | [Release 4.5](https://github.com/bsorrentino/maven-annotation-plugin/releases/tag/v4.5) | fix issue [#90](https://github.com/bsorrentino/maven-annotation-plugin/issues/90)
 **Dec 22, 2020** | [Release 4.5-jdk8](https://github.com/bsorrentino/maven-annotation-plugin/releases/tag/v4.5-jdk8) | ---
 **Oct 01, 2020** | [Release 4.4](https://github.com/bsorrentino/maven-annotation-plugin/releases/tag/v4.4) | merge PR #87. Thanks to [Martijn Dashorst](https://github.com/dashorst)
@@ -41,8 +43,8 @@ This plugin was born as the 'alter ego' of maven apt plugin [apt-maven-plugin](h
 **Jul 30, 2020** | [Release 4.1-jdk8](https://github.com/bsorrentino/maven-annotation-plugin/releases/tag/v4.1-jdk8) | Maintenance release compatible with JDK8
 **Jul 21, 2020** | [Release 4.0-jdk8](https://github.com/bsorrentino/maven-annotation-plugin/releases/tag/v4.0-jdk8) | Maintenance release compatible with JDK8
 **Jul 18, 2020** | [Release 4.0](https://github.com/bsorrentino/maven-annotation-plugin/releases/tag/v4.0) | Release based on JDK9 and above
-**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) | 
+**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/compiler-jdk8/pom.xml b/compiler-jdk8/pom.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>maven-processor-plugin-parent</artifactId>
+        <groupId>org.bsc.maven</groupId>
+        <version>5.0-jdk8-rc1</version>
+        <relativePath>../pom-jdk8.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>maven-processor-compiler</artifactId>
+    <name>MAVEN PROCESSOR COMPILER (JDK8)</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.plexus</groupId>
+            <artifactId>plexus-compiler-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.plexus</groupId>
+            <artifactId>plexus-compiler-manager</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.plexus</groupId>
+            <artifactId>plexus-compiler-javac</artifactId>
+        </dependency>
+    </dependencies>
+</project>