Skip to content

Commit 9f029e5

Browse files
stbischofstbischof
committed
Update parent-pom, run with Java 8 not 5, ci build
- jboss-parent from 16 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
1 parent 023ba08 commit 9f029e5

19 files changed

Lines changed: 65 additions & 229 deletions

File tree

‎.github/dependabot.yml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# GitHub Dependabot configuration file
2+
3+
version: 2
4+
updates:
5+
6+
# Maintain dependencies for GitHub Actions
7+
- package-ecosystem: "github-actions"
8+
directory: "/"
9+
schedule:
10+
interval: "daily"
11+
12+
# Maintain dependencies for maven
13+
- package-ecosystem: "maven"
14+
directory: "/"
15+
schedule:
16+
interval: "daily"
17+

‎.github/workflows/build_test.yml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: Java Build, Test
2+
3+
on:
4+
push:
5+
branches: [ "master" ]
6+
pull_request:
7+
branches: [ "master" ]
8+
9+
jobs:
10+
build:
11+
12+
runs-on: ubuntu-latest
13+
14+
steps:
15+
- uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
16+
- name: Set up JDK 21
17+
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
18+
with:
19+
java-version: '21'
20+
distribution: 'temurin'
21+
cache: maven
22+
- name: Build with Maven
23+
run: mvn -B verify --file pom.xml
24+
- name: Upload Test Reports
25+
if: always()
26+
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
27+
with:
28+
name: Test-reports
29+
path: |
30+
**/test-reports/*/TEST-*.xml

‎ant/pom.xml‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,6 @@
3636
</configuration>
3737
</plugin>
3838

39-
<plugin>
40-
<artifactId>maven-surefire-plugin</artifactId>
41-
<configuration>
42-
<!-- Run in Java5; be build with a JDK6 compiler so ensure we don't
43-
use any JDK6 libs -->
44-
<jvm>${env.JAVA5_HOME}/bin/java</jvm>
45-
<!-- Speeeeeeed -->
46-
<forkMode>once</forkMode>
47-
</configuration>
48-
</plugin>
49-
5039
</plugins>
5140
</build>
5241

‎build-resources/src/main/resources/code-style/checkstyle.xml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616

1717
<module name="TreeWalker">
1818

19-
<property name="cacheFile" value="${checkstyle.cache.file}"/>
20-
2119
<!-- Checks for imports -->
2220
<module name="AvoidStarImport"/>
2321
<module name="RedundantImport"/>
@@ -37,9 +35,7 @@
3735
<module name="EmptyStatement"/>
3836
<module name="EqualsHashCode"/>
3937
<module name="IllegalInstantiation"/>
40-
<module name="RedundantThrows">
41-
<property name="allowUnchecked" value="true"/>
42-
</module>
38+
<module name="RedundantModifier"/>
4339

4440
<!-- Miscellaneous other checks. -->
4541
<module name="UpperEll"/>

‎gen/pom.xml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -93,14 +93,6 @@
9393
</configuration>
9494
</plugin>
9595

96-
<plugin>
97-
<artifactId>maven-surefire-plugin</artifactId>
98-
<configuration>
99-
<!-- Run in Java5; be build with a JDK6 compiler so ensure we don't use any JDK6 libs -->
100-
<jvm>${env.JAVA5_HOME}/bin/java</jvm>
101-
</configuration>
102-
</plugin>
103-
10496
<plugin>
10597
<groupId>org.jboss.shrinkwrap.descriptors</groupId>
10698
<artifactId>shrinkwrap-descriptors-metadata-parser</artifactId>

‎impl-base/pom.xml‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,16 +49,6 @@
4949
<build>
5050
<plugins>
5151

52-
<!-- Surefire -->
53-
<plugin>
54-
<artifactId>maven-surefire-plugin</artifactId>
55-
<configuration>
56-
<!-- Run in Java5; be build with a JDK6 compiler so ensure we don't
57-
use any JDK6 libs -->
58-
<jvm>${env.JAVA5_HOME}/bin/java</jvm>
59-
</configuration>
60-
</plugin>
61-
6252
<!-- Export test JAR for use in other modules -->
6353
<plugin>
6454
<groupId>org.apache.maven.plugins</groupId>

‎impl-javaee-prototype/pom.xml‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -45,19 +45,4 @@
4545

4646
</dependencies>
4747

48-
<build>
49-
<plugins>
50-
<!-- Surefire -->
51-
<plugin>
52-
<artifactId>maven-surefire-plugin</artifactId>
53-
<configuration>
54-
<!-- Run in Java5; be build with a JDK6 compiler so ensure we don't
55-
use any JDK6 libs -->
56-
<jvm>${env.JAVA5_HOME}/bin/java</jvm>
57-
<!-- Speeeeeeed -->
58-
<forkMode>once</forkMode>
59-
</configuration>
60-
</plugin>
61-
</plugins>
62-
</build>
6348
</project>

‎impl-javaee/pom.xml‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -58,19 +58,4 @@
5858

5959
</dependencies>
6060

61-
<build>
62-
<plugins>
63-
<!-- Surefire -->
64-
<plugin>
65-
<artifactId>maven-surefire-plugin</artifactId>
66-
<configuration>
67-
<!-- Run in Java5; be build with a JDK6 compiler so ensure we don't
68-
use any JDK6 libs -->
69-
<jvm>${env.JAVA5_HOME}/bin/java</jvm>
70-
<!-- Speeeeeeed -->
71-
<forkMode>once</forkMode>
72-
</configuration>
73-
</plugin>
74-
</plugins>
75-
</build>
7661
</project>

‎impl-jboss/pom.xml‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -58,19 +58,4 @@
5858

5959
</dependencies>
6060

61-
<build>
62-
<plugins>
63-
<!-- Surefire -->
64-
<plugin>
65-
<artifactId>maven-surefire-plugin</artifactId>
66-
<configuration>
67-
<!-- Run in Java5; be build with a JDK6 compiler so ensure we don't
68-
use any JDK6 libs -->
69-
<jvm>${env.JAVA5_HOME}/bin/java</jvm>
70-
<!-- Speeeeeeed -->
71-
<forkMode>once</forkMode>
72-
</configuration>
73-
</plugin>
74-
</plugins>
75-
</build>
7661
</project>

‎impl-misc/pom.xml‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -63,19 +63,4 @@
6363

6464
</dependencies>
6565

66-
<build>
67-
<plugins>
68-
<!-- Surefire -->
69-
<plugin>
70-
<artifactId>maven-surefire-plugin</artifactId>
71-
<configuration>
72-
<!-- Run in Java5; be build with a JDK6 compiler so ensure we don't
73-
use any JDK6 libs -->
74-
<jvm>${env.JAVA5_HOME}/bin/java</jvm>
75-
<!-- Speeeeeeed -->
76-
<forkMode>once</forkMode>
77-
</configuration>
78-
</plugin>
79-
</plugins>
80-
</build>
8166
</project>

0 commit comments

Comments
 (0)