Skip to content

Commit

Permalink
Update parent-pom, run with Java 8 not 5, ci build
Browse files Browse the repository at this point in the history 
- jboss-parent from 165 to 39
- rm maven-enforcer-plugin with
 - requireMavenVersion >2.2.0
 - requireJavaVersion 1.5.0
- rm java5 surefire test
- fix checkstyle in code and xml
- add dependabot
- add ci build
  • Loading branch information
@stbischof
stbischof committed May 27, 2024
1 parent 023ba08 commit 43665ae
Show file tree
Hide file tree
Showing 19 changed files with 65 additions and 236 deletions.
17 changes: 17 additions & 0 deletions .github/dependabot.yml
View file
Original file line number Diff line number Diff line change
@@ -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"

30 changes: 30 additions & 0 deletions .github/workflows/build_test.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: Java Build, Test

on:
push:
branches: [ "master" ]
pull_request:
branches: [ "master" ]

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
11 changes: 0 additions & 11 deletions ant/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,6 @@
</configuration>
</plugin>

<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<!-- Run in Java5; be build with a JDK6 compiler so ensure we don't
use any JDK6 libs -->
<jvm>${env.JAVA5_HOME}/bin/java</jvm>
<!-- Speeeeeeed -->
<forkMode>once</forkMode>
</configuration>
</plugin>

</plugins>
</build>

Expand Down
6 changes: 1 addition & 5 deletions build-resources/src/main/resources/code-style/checkstyle.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@

<module name="TreeWalker">

<property name="cacheFile" value="${checkstyle.cache.file}"/>

<!-- Checks for imports -->
<module name="AvoidStarImport"/>
<module name="RedundantImport"/>
Expand All @@ -37,9 +35,7 @@
<module name="EmptyStatement"/>
<module name="EqualsHashCode"/>
<module name="IllegalInstantiation"/>
<module name="RedundantThrows">
<property name="allowUnchecked" value="true"/>
</module>
<module name="RedundantModifier"/>

<!-- Miscellaneous other checks. -->
<module name="UpperEll"/>
Expand Down
8 changes: 0 additions & 8 deletions gen/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,14 +93,6 @@
</configuration>
</plugin>

<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<!-- Run in Java5; be build with a JDK6 compiler so ensure we don't use any JDK6 libs -->
<jvm>${env.JAVA5_HOME}/bin/java</jvm>
</configuration>
</plugin>

<plugin>
<groupId>org.jboss.shrinkwrap.descriptors</groupId>
<artifactId>shrinkwrap-descriptors-metadata-parser</artifactId>
Expand Down
10 changes: 0 additions & 10 deletions impl-base/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,16 +49,6 @@
<build>
<plugins>

<!-- Surefire -->
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<!-- Run in Java5; be build with a JDK6 compiler so ensure we don't
use any JDK6 libs -->
<jvm>${env.JAVA5_HOME}/bin/java</jvm>
</configuration>
</plugin>

<!-- Export test JAR for use in other modules -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down
15 changes: 0 additions & 15 deletions impl-javaee-prototype/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,19 +45,4 @@

</dependencies>

<build>
<plugins>
<!-- Surefire -->
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<!-- Run in Java5; be build with a JDK6 compiler so ensure we don't
use any JDK6 libs -->
<jvm>${env.JAVA5_HOME}/bin/java</jvm>
<!-- Speeeeeeed -->
<forkMode>once</forkMode>
</configuration>
</plugin>
</plugins>
</build>
</project>
15 changes: 0 additions & 15 deletions impl-javaee/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,19 +58,4 @@

</dependencies>

<build>
<plugins>
<!-- Surefire -->
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<!-- Run in Java5; be build with a JDK6 compiler so ensure we don't
use any JDK6 libs -->
<jvm>${env.JAVA5_HOME}/bin/java</jvm>
<!-- Speeeeeeed -->
<forkMode>once</forkMode>
</configuration>
</plugin>
</plugins>
</build>
</project>
15 changes: 0 additions & 15 deletions impl-jboss/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,19 +58,4 @@

</dependencies>

<build>
<plugins>
<!-- Surefire -->
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<!-- Run in Java5; be build with a JDK6 compiler so ensure we don't
use any JDK6 libs -->
<jvm>${env.JAVA5_HOME}/bin/java</jvm>
<!-- Speeeeeeed -->
<forkMode>once</forkMode>
</configuration>
</plugin>
</plugins>
</build>
</project>
15 changes: 0 additions & 15 deletions impl-misc/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,19 +63,4 @@

</dependencies>

<build>
<plugins>
<!-- Surefire -->
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<!-- Run in Java5; be build with a JDK6 compiler so ensure we don't
use any JDK6 libs -->
<jvm>${env.JAVA5_HOME}/bin/java</jvm>
<!-- Speeeeeeed -->
<forkMode>once</forkMode>
</configuration>
</plugin>
</plugins>
</build>
</project>
33 changes: 0 additions & 33 deletions meta-data-pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,39 +104,6 @@
</configuration>
</plugin>

<!-- Enforce Maven Environment -->
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
<id>enforce-maven-environment</id>
<goals>
<goal>enforce</goal>
</goals>
</execution>
</executions>
<configuration>
<rules>
<requireMavenVersion>
<version>[2.2.0,)</version>
<!-- Must be more that 2.2 to support Assembly "includeModuleDirectory":
http://maven.apache.org/plugins/maven-assembly-plugin/assembly.html -->
</requireMavenVersion>
<requireJavaVersion>
<version>[1.5.0,)</version> <!-- Must be at least JDK5 -->
</requireJavaVersion>
<requireProperty>
<property>env.JAVA_HOME</property>
<message>"JAVA_HOME needs to be set to compile"</message>
</requireProperty>
<!-- <requireProperty>
<property>env.JAVA5_HOME</property>
<message>"JAVA5_HOME needs to be set to run some tests in the JRE5 runtime"</message>
</requireProperty>-->
</rules>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
Expand Down
11 changes: 0 additions & 11 deletions metadata-parser-test/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,17 +140,6 @@
</executions>
</plugin>

<!-- Surefire -->
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<!-- Run in Java5; be build with a JDK6 compiler so ensure we don't
use any JDK6 libs -->
<jvm>${env.JAVA5_HOME}/bin/java</jvm>
<!-- Speeeeeeed -->
<forkMode>once</forkMode>
</configuration>
</plugin>
</plugins>
<pluginManagement>
<plugins>
Expand Down
11 changes: 0 additions & 11 deletions metadata-parser-test/pom.xml~
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,17 +42,6 @@
</executions>
</plugin>

<!-- Surefire -->
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<!-- Run in Java5; be build with a JDK6 compiler so ensure we don't
use any JDK6 libs -->
<jvm>${env.JAVA5_HOME}/bin/java</jvm>
<!-- Speeeeeeed -->
<forkMode>once</forkMode>
</configuration>
</plugin>
</plugins>
</build>

Expand Down
25 changes: 7 additions & 18 deletions metadata-parser/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,17 +37,6 @@
</configuration>
</plugin>

<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<!-- Run in Java5; be build with a JDK6 compiler so ensure we don't
use any JDK6 libs -->
<jvm>${env.JAVA5_HOME}/bin/java</jvm>
<!-- Speeeeeeed -->
<forkMode>once</forkMode>
</configuration>
</plugin>

</plugins>
</build>

Expand Down Expand Up @@ -127,12 +116,12 @@
<version>1.1</version>
</dependency>

<dependency>
<groupId>dom4j</groupId>
<artifactId>dom4j</artifactId>
<version>1.6.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.dom4j</groupId>
<artifactId>dom4j</artifactId>
<version>2.1.4</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.apache.maven.plugin-testing</groupId>
Expand All @@ -141,7 +130,7 @@
<scope>test</scope>
</dependency>

<!-- Testing -->
<!-- Testing -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion metadata-parser/src/main/java/org/jboss/shrinkwrap/descriptor/metadata/filter/Filter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@
* @author <a href="mailto:ralf.battenfeld@bluewin.ch">Ralf Battenfeld</a>
*/
public interface Filter {
boolean filter(final Metadata metadata, final TreeWalker walker);
boolean filter(Metadata metadata, TreeWalker walker);
}
Loading

0 comments on commit 43665ae

Please sign in to comment.