[maven-jlink-plugin] branch master updated (5e2b127 -> 747c14f)

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
5 messages Options
Reply | Threaded
Open this post in threaded view
|

[maven-jlink-plugin] branch master updated (5e2b127 -> 747c14f)

slachiewicz
This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven-jlink-plugin.git.


    from 5e2b127  [MJLINK-55] - Pre Release Marker in Site must be changed
     add fad177c  [MJLINK-56] Use Junit5 imports, add display name, remove commented code.
     new 43a0019  [MJLINK-56] Remove dependency to junit 4
     new cf0d2b4  jdk8 with buildchain
     new 4e1e135  Add Java 15 to test matrix
     new 747c14f  Bump assertj-core to 3.18.1

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .github/workflows/maven.yml                        | 35 +++++++++++++++++++-
 .gitignore                                         |  2 ++
 pom.xml                                            | 14 +-------
 .../maven/plugins/jlink/AbstractJLinkMojoTest.java | 38 ++++++++--------------
 4 files changed, 51 insertions(+), 38 deletions(-)

Reply | Threaded
Open this post in threaded view
|

[maven-jlink-plugin] 01/04: [MJLINK-56] Remove dependency to junit 4

slachiewicz
This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-jlink-plugin.git

commit 43a001937e45f54ce6d3d3ba742af275fe181fb5
Author: Sylwester Lachiewicz <[hidden email]>
AuthorDate: Thu Nov 19 17:44:24 2020 +0100

    [MJLINK-56] Remove dependency to junit 4
   
    Closes #15
---
 pom.xml | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3332a5e..26d1f0d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -109,13 +109,6 @@
       <version>3.6</version>
     </dependency>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
       <version>3.5.13</version>
@@ -132,11 +125,6 @@
       <artifactId>junit-jupiter</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.junit.vintage</groupId>
-      <artifactId>junit-vintage-engine</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <dependencyManagement>

Reply | Threaded
Open this post in threaded view
|

[maven-jlink-plugin] 02/04: jdk8 with buildchain

slachiewicz
In reply to this post by slachiewicz
This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-jlink-plugin.git

commit cf0d2b45bdde608aaee7f0e876c4b239d85b48cb
Author: Benjamin Marwell <[hidden email]>
AuthorDate: Wed Nov 18 10:31:34 2020 +0100

    jdk8 with buildchain
   
    Closes #18
---
 .github/workflows/maven.yml | 33 +++++++++++++++++++++++++++++++++
 .gitignore                  |  2 ++
 2 files changed, 35 insertions(+)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index cf4a2fa..3f38cf9 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -42,10 +42,43 @@ jobs:
           restore-keys: |
             maven-${{ matrix.os }}-java${{ matrix.java }}-
             maven-${{ matrix.os }}-
+      - name: Set up Toolchain
+        if: ${{ matrix.java == '8' && matrix.os == 'ubuntu-latest' }}
+        uses: DamianReeves/write-file-action@v1.0
+        with:
+          path: it-toolchains.xml
+          contents: |
+            <?xml version="1.0" encoding="UTF8"?>
+            <toolchains>
+              <toolchain>
+                <type>jdk</type>
+                  <provides>
+                    <version>11</version>
+                    <vendor>adopt</vendor>
+                  </provides>
+                  <configuration>
+                    <jdkHome>$HOME/.jabba/jdk/adopt-openj9@1.11.0-7</jdkHome>
+                  </configuration>
+              </toolchain>
+            </toolchains>
+          write-mode: overwrite
+      - name: Install Toolchain JDK
+        if: ${{ matrix.java == '8' && matrix.os == 'ubuntu-latest' }}
+        uses: battila7/jdk-via-jabba@v1
+        with:
+          jdk: adopt-openj9@1.11.0-7
+      - name: delete jdk-via-jabba tmp dir
+        if: ${{ matrix.java == '8' && matrix.os == 'ubuntu-latest' }}
+        run: rm -rvf _temp/
       - name: Set up JDK
         uses: actions/setup-java@v1
         with:
           java-version: ${{ matrix.java }}
 
       - name: Build with Maven
+        if: ${{ matrix.java != '8' || matrix.os != 'ubuntu-latest' }}
         run: mvn verify -e -B -V -Prun-its
+      - name: Build with Maven and Toolchain
+        if: ${{ matrix.java == '8' && matrix.os == 'ubuntu-latest' }}
+        run: mvn verify -e -B -V -Prun-its --global-toolchains it-toolchains.xml
+
diff --git a/.gitignore b/.gitignore
index f79c928..4b8cf07 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,5 @@ out/
 /bootstrap
 /dependencies.xml
 .java-version
+# for testing
+it-toolchains.xml

Reply | Threaded
Open this post in threaded view
|

[maven-jlink-plugin] 03/04: Add Java 15 to test matrix

slachiewicz
In reply to this post by slachiewicz
This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-jlink-plugin.git

commit 4e1e1359a4d94d1432ed25370580c64f0359d267
Author: Sylwester Lachiewicz <[hidden email]>
AuthorDate: Thu Nov 19 17:51:58 2020 +0100

    Add Java 15 to test matrix
---
 .github/workflows/maven.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 3f38cf9..b34aaa3 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -25,7 +25,7 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-latest, windows-latest ]
-        java: [ 8, 11 ]
+        java: [ 8, 11, 15 ]
       fail-fast: false
 
     runs-on: ${{ matrix.os }}

Reply | Threaded
Open this post in threaded view
|

[maven-jlink-plugin] 04/04: Bump assertj-core to 3.18.1

slachiewicz
In reply to this post by slachiewicz
This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-jlink-plugin.git

commit 747c14fcfb3a57e129f8c272a42996b92a99505c
Author: Sylwester Lachiewicz <[hidden email]>
AuthorDate: Thu Nov 19 17:53:22 2020 +0100

    Bump assertj-core to 3.18.1
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 26d1f0d..08adfba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -117,7 +117,7 @@
     <dependency>
       <groupId>org.assertj</groupId>
       <artifactId>assertj-core</artifactId>
-      <version>3.16.1</version>
+      <version>3.18.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>