diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000..9ee381df --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,17 @@ +# GitHub Dependabot configuration file + +version: 2 +updates: + + # Maintain dependencies for GitHub Actions + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "daily" + + # Maintain dependencies for maven + - package-ecosystem: "maven" + directory: "/" + schedule: + interval: "daily" + diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml new file mode 100644 index 00000000..a294c5aa --- /dev/null +++ b/.github/workflows/build_test.yml @@ -0,0 +1,30 @@ +name: Java Build, Test + +on: + push: + branches: [ "2.0.0-X" ] + pull_request: + branches: [ "2.0.0-X" ] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 + - name: Set up JDK 21 + uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 + with: + java-version: '21' + distribution: 'temurin' + cache: maven + - name: Build with Maven + run: mvn -B verify --file pom.xml + - name: Upload Test Reports + if: always() + uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3 + with: + name: Test-reports + path: | + **/test-reports/*/TEST-*.xml diff --git a/ant/pom.xml b/ant/pom.xml index a762d169..c895da8a 100644 --- a/ant/pom.xml +++ b/ant/pom.xml @@ -36,17 +36,6 @@ - - maven-surefire-plugin - - - ${env.JAVA5_HOME}/bin/java - - once - - - diff --git a/build-resources/src/main/resources/code-style/checkstyle.xml b/build-resources/src/main/resources/code-style/checkstyle.xml index 89eb4f4a..31c6aff0 100644 --- a/build-resources/src/main/resources/code-style/checkstyle.xml +++ b/build-resources/src/main/resources/code-style/checkstyle.xml @@ -16,8 +16,6 @@ - - @@ -37,9 +35,7 @@ - - - + diff --git a/gen/pom.xml b/gen/pom.xml index 94b90eae..1b5134b1 100644 --- a/gen/pom.xml +++ b/gen/pom.xml @@ -93,14 +93,6 @@ - - maven-surefire-plugin - - - ${env.JAVA5_HOME}/bin/java - - - org.jboss.shrinkwrap.descriptors shrinkwrap-descriptors-metadata-parser diff --git a/impl-base/pom.xml b/impl-base/pom.xml index 800badee..4e3951a8 100644 --- a/impl-base/pom.xml +++ b/impl-base/pom.xml @@ -49,16 +49,6 @@ - - - maven-surefire-plugin - - - ${env.JAVA5_HOME}/bin/java - - - org.apache.maven.plugins diff --git a/impl-javaee-prototype/pom.xml b/impl-javaee-prototype/pom.xml index bc47a741..2eb1ac0a 100644 --- a/impl-javaee-prototype/pom.xml +++ b/impl-javaee-prototype/pom.xml @@ -45,19 +45,4 @@ - - - - - maven-surefire-plugin - - - ${env.JAVA5_HOME}/bin/java - - once - - - - diff --git a/impl-javaee/pom.xml b/impl-javaee/pom.xml index d03ba131..1999f78e 100644 --- a/impl-javaee/pom.xml +++ b/impl-javaee/pom.xml @@ -58,19 +58,4 @@ - - - - - maven-surefire-plugin - - - ${env.JAVA5_HOME}/bin/java - - once - - - - diff --git a/impl-jboss/pom.xml b/impl-jboss/pom.xml index fccb3c1e..8e18baf6 100644 --- a/impl-jboss/pom.xml +++ b/impl-jboss/pom.xml @@ -58,19 +58,4 @@ - - - - - maven-surefire-plugin - - - ${env.JAVA5_HOME}/bin/java - - once - - - - diff --git a/impl-misc/pom.xml b/impl-misc/pom.xml index c2bd4c20..7aab14fc 100644 --- a/impl-misc/pom.xml +++ b/impl-misc/pom.xml @@ -63,19 +63,4 @@ - - - - - maven-surefire-plugin - - - ${env.JAVA5_HOME}/bin/java - - once - - - - diff --git a/meta-data-pom.xml b/meta-data-pom.xml index 0b95538f..40ea8f95 100644 --- a/meta-data-pom.xml +++ b/meta-data-pom.xml @@ -104,39 +104,6 @@ - - - maven-enforcer-plugin - - - enforce-maven-environment - - enforce - - - - - - - [2.2.0,) - - - - [1.5.0,) - - - env.JAVA_HOME - "JAVA_HOME needs to be set to compile" - - - - - - org.apache.maven.plugins maven-javadoc-plugin diff --git a/metadata-parser-test/pom.xml b/metadata-parser-test/pom.xml index 45e4312d..87c27f36 100644 --- a/metadata-parser-test/pom.xml +++ b/metadata-parser-test/pom.xml @@ -140,17 +140,6 @@ - - - maven-surefire-plugin - - - ${env.JAVA5_HOME}/bin/java - - once - - diff --git a/metadata-parser-test/pom.xml~ b/metadata-parser-test/pom.xml~ index 6a46621f..956226e2 100644 --- a/metadata-parser-test/pom.xml~ +++ b/metadata-parser-test/pom.xml~ @@ -42,17 +42,6 @@ - - - maven-surefire-plugin - - - ${env.JAVA5_HOME}/bin/java - - once - - diff --git a/metadata-parser/pom.xml b/metadata-parser/pom.xml index afc2782a..117aeff8 100644 --- a/metadata-parser/pom.xml +++ b/metadata-parser/pom.xml @@ -37,17 +37,6 @@ - - maven-surefire-plugin - - - ${env.JAVA5_HOME}/bin/java - - once - - - @@ -127,12 +116,12 @@ 1.1 - - dom4j - dom4j - 1.6.1 - test - + + org.dom4j + dom4j + 2.1.4 + test + org.apache.maven.plugin-testing @@ -141,7 +130,7 @@ test - + junit junit diff --git a/metadata-parser/src/main/java/org/jboss/shrinkwrap/descriptor/metadata/filter/Filter.java b/metadata-parser/src/main/java/org/jboss/shrinkwrap/descriptor/metadata/filter/Filter.java index e20a4a28..81f8df77 100644 --- a/metadata-parser/src/main/java/org/jboss/shrinkwrap/descriptor/metadata/filter/Filter.java +++ b/metadata-parser/src/main/java/org/jboss/shrinkwrap/descriptor/metadata/filter/Filter.java @@ -26,5 +26,5 @@ * @author Ralf Battenfeld */ public interface Filter { - boolean filter(final Metadata metadata, final TreeWalker walker); + boolean filter(Metadata metadata, TreeWalker walker); } diff --git a/pom.xml b/pom.xml index 0225ac98..1cf07f13 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.jboss jboss-parent - 16 + 39 @@ -80,6 +80,7 @@ + maven-release-plugin @@ -106,38 +107,6 @@ - - - maven-enforcer-plugin - - - enforce-maven-environment - - enforce - - - - - - - [2.2.0,) - - - - [1.5.0,) - - - - env.JAVA_HOME - "JAVA_HOME needs to be set to compile" - - - - - - org.apache.maven.plugins maven-javadoc-plugin @@ -185,15 +154,15 @@ maven-compiler-plugin true - 1.6 - 1.6 + 1.8 + 1.8 true true - 1.6 + 1.8 false - 1.5 - 1.5 + 1.8 + 1.8 @@ -201,7 +170,7 @@ org.apache.maven.plugins maven-checkstyle-plugin - 2.9.1 + code-style/checkstyle.xml true diff --git a/spi/src/main/java/org/jboss/shrinkwrap/descriptor/spi/node/Pattern.java b/spi/src/main/java/org/jboss/shrinkwrap/descriptor/spi/node/Pattern.java index 30c41cef..5f29fc48 100644 --- a/spi/src/main/java/org/jboss/shrinkwrap/descriptor/spi/node/Pattern.java +++ b/spi/src/main/java/org/jboss/shrinkwrap/descriptor/spi/node/Pattern.java @@ -51,7 +51,7 @@ final class Pattern { * @throws IllegalArgumentException * If the name is not specified */ - public Pattern(final String name) throws IllegalArgumentException { + Pattern(final String name) throws IllegalArgumentException { // Precondition check if (name == null || name.trim().length() == 0) { throw new IllegalArgumentException("name must be specified"); diff --git a/test-util/pom.xml b/test-util/pom.xml index d255ef77..4326ebcf 100644 --- a/test-util/pom.xml +++ b/test-util/pom.xml @@ -53,16 +53,6 @@ org.apache.maven.plugins maven-checkstyle-plugin - - - - maven-surefire-plugin - - - ${env.JAVA5_HOME}/bin/java - - diff --git a/test/pom.xml b/test/pom.xml index f230a114..76915b2c 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -81,23 +81,12 @@ - org.apache.maven.plugins maven-checkstyle-plugin - - - - maven-surefire-plugin - - - ${env.JAVA5_HOME}/bin/java - -