Skip to content

Commit 148fb42

Browse files
thomaswoehlkethomaswoehlke
committed
* fixed #298 try out java15
1 parent 5142475 commit 148fb42

File tree

1 file changed

+40
-145
lines changed

1 file changed

+40
-145
lines changed

‎pom.xml‎

Lines changed: 40 additions & 145 deletions
Original file line numberDiff line numberDiff line change
@@ -742,6 +742,28 @@
742742
<groupId>org.apache.maven.plugins</groupId>
743743
<artifactId>maven-pmd-plugin</artifactId>
744744
<version>${maven-pmd-plugin.version}</version>
745+
<dependencies>
746+
<dependency>
747+
<groupId>net.sourceforge.pmd</groupId>
748+
<artifactId>pmd-core</artifactId>
749+
<version>${pmdVersion}</version>
750+
</dependency>
751+
<dependency>
752+
<groupId>net.sourceforge.pmd</groupId>
753+
<artifactId>pmd-java</artifactId>
754+
<version>${pmdVersion}</version>
755+
</dependency>
756+
<dependency>
757+
<groupId>net.sourceforge.pmd</groupId>
758+
<artifactId>pmd-javascript</artifactId>
759+
<version>${pmdVersion}</version>
760+
</dependency>
761+
<dependency>
762+
<groupId>net.sourceforge.pmd</groupId>
763+
<artifactId>pmd-jsp</artifactId>
764+
<version>${pmdVersion}</version>
765+
</dependency>
766+
</dependencies>
745767
</plugin>
746768
<plugin>
747769
<groupId>org.apache.maven.plugins</groupId>
@@ -1079,123 +1101,6 @@
10791101
</execution>
10801102
</executions>
10811103
</plugin>
1082-
<!--
1083-
<plugin>
1084-
<groupId>org.apache.maven.plugins</groupId>
1085-
<artifactId>maven-dependency-plugin</artifactId>
1086-
<executions>
1087-
<execution>
1088-
<id>unpack-dependencies-classpath</id>
1089-
<phase>site</phase>
1090-
<goals>
1091-
<goal>analyze-only</goal>
1092-
<goal>analyze-dep-mgt</goal>
1093-
<goal>analyze-report</goal>
1094-
<goal>sources</goal>
1095-
<goal>resolve</goal>
1096-
<goal>resolve-plugins</goal>
1097-
<goal>collect</goal>
1098-
<goal>copy-dependencies</goal>
1099-
<goal>unpack-dependencies</goal>
1100-
<goal>build-classpath</goal>
1101-
</goals>
1102-
<configuration>
1103-
<overWriteReleases>true</overWriteReleases>
1104-
<overWriteSnapshots>true</overWriteSnapshots>
1105-
<outputFile>${project.build.outputDirectory}/classpath.txt</outputFile>
1106-
<failOnWarning>false</failOnWarning>
1107-
<type>java-source,jar</type>
1108-
<ignoredDependencies>
1109-
<ignoredDependency>org.apache.maven.plugins:maven-surefire-plugin</ignoredDependency>
1110-
</ignoredDependencies>
1111-
<ignoredUsedUndeclaredDependencies>
1112-
<ignoredUsedUndeclaredDependency>org.apache.maven.plugins:maven-surefire-plugin</ignoredUsedUndeclaredDependency>
1113-
</ignoredUsedUndeclaredDependencies>
1114-
<ignoredUnusedDeclaredDependencies>
1115-
<ignoredUnusedDeclaredDependency>org.apache.maven.plugins:maven-surefire-plugin</ignoredUnusedDeclaredDependency>
1116-
</ignoredUnusedDeclaredDependencies>
1117-
</configuration>
1118-
</execution>
1119-
<execution>
1120-
<id>check-dependencies-1</id>
1121-
<phase>site</phase>
1122-
<goals>
1123-
<goal>list</goal>
1124-
<goal>list-repositories</goal>
1125-
<goal>properties</goal>
1126-
</goals>
1127-
</execution>
1128-
<execution>
1129-
<id>check-dependencies-2</id>
1130-
<phase>site</phase>
1131-
<goals>
1132-
<goal>analyze</goal>
1133-
<goal>analyze-dep-mgt</goal>
1134-
<goal>analyze-duplicate</goal>
1135-
<goal>analyze-report</goal>
1136-
</goals>
1137-
</execution>
1138-
<execution>
1139-
<id>check-dependencies-3</id>
1140-
<phase>site</phase>
1141-
<goals>
1142-
<goal>tree</goal>
1143-
</goals>
1144-
</execution>
1145-
<execution>
1146-
<id>report</id>
1147-
<phase>site</phase>
1148-
<configuration>
1149-
<excludeGroupIds>org.webjars,org.jclouds,org.jboss.as,xml-resolver,commons-configuration,org.codehaus.plexus,commons-digester,junit,log4j,io.openliberty.features</excludeGroupIds>
1150-
<excludeArtifactIds>weld-probe-core,commons-configuration,jdk.tools,maven-antrun-plugin</excludeArtifactIds>
1151-
<failOnMissingClassifierArtifact>false</failOnMissingClassifierArtifact>
1152-
<reportSets>
1153-
<reportSet>
1154-
<reports>
1155-
<report>analyze-report</report>
1156-
</reports>
1157-
</reportSet>
1158-
</reportSets>
1159-
</configuration>
1160-
</execution>
1161-
<execution>
1162-
<id>get-dependency-classes</id>
1163-
<phase>site</phase>
1164-
<goals>
1165-
<goal>resolve</goal>
1166-
<goal>resolve-plugins</goal>
1167-
<goal>collect</goal>
1168-
<goal>copy-dependencies</goal>
1169-
<goal>unpack-dependencies</goal>
1170-
</goals>
1171-
<configuration>
1172-
<type>jar</type>
1173-
<failOnMissingClassifierArtifact>false</failOnMissingClassifierArtifact>
1174-
<outputDirectory>${project.build.directory}/dependency-classes/</outputDirectory>
1175-
</configuration>
1176-
</execution>
1177-
<execution>
1178-
<id>get-dependency-sources</id>
1179-
<phase>site</phase>
1180-
<goals>
1181-
<goal>sources</goal>
1182-
<goal>resolve</goal>
1183-
<goal>resolve-plugins</goal>
1184-
<goal>collect</goal>
1185-
<goal>copy-dependencies</goal>
1186-
<goal>unpack-dependencies</goal>
1187-
</goals>
1188-
<configuration>
1189-
<type>java-source</type>
1190-
<excludeGroupIds>org.webjars,antlr,org.beanshell,org.apache.velocity</excludeGroupIds>
1191-
<excludeArtifactIds>weld-probe-core,antlr,bsh,velocity-tools</excludeArtifactIds>
1192-
<failOnMissingClassifierArtifact>false</failOnMissingClassifierArtifact>
1193-
<outputDirectory>${project.build.directory}/dependency-sources/</outputDirectory>
1194-
</configuration>
1195-
</execution>
1196-
</executions>
1197-
</plugin>
1198-
-->
11991104
<plugin>
12001105
<groupId>org.apache.maven.plugins</groupId>
12011106
<artifactId>maven-compiler-plugin</artifactId>
@@ -1208,7 +1113,24 @@
12081113
</compilerArgs>
12091114
<showWarnings>true</showWarnings>
12101115
<showDeprecation>true</showDeprecation>
1116+
<annotationProcessorPaths>
1117+
<path>
1118+
<groupId>org.projectlombok</groupId>
1119+
<artifactId>lombok</artifactId>
1120+
<version>${lombok.version}</version>
1121+
</path>
1122+
</annotationProcessorPaths>
12111123
</configuration>
1124+
<executions>
1125+
<execution>
1126+
<id>compile-classes</id>
1127+
<phase>compile</phase>
1128+
<goals>
1129+
<goal>compile</goal>
1130+
<goal>testCompile</goal>
1131+
</goals>
1132+
</execution>
1133+
</executions>
12121134
</plugin>
12131135
<plugin>
12141136
<groupId>org.apache.maven.plugins</groupId>
@@ -1323,16 +1245,7 @@
13231245
<plugin>
13241246
<groupId>org.apache.maven.plugins</groupId>
13251247
<artifactId>maven-compiler-plugin</artifactId>
1326-
<configuration>
1327-
<source>${java.version}</source>
1328-
<target>${java.version}</target>
1329-
<encoding>${project.build.sourceEncoding}</encoding>
1330-
<compilerArgs>
1331-
<arg>-Xlint:all,-options,-path</arg>
1332-
</compilerArgs>
1333-
<showWarnings>true</showWarnings>
1334-
<showDeprecation>true</showDeprecation>
1335-
</configuration>
1248+
<inherited>true</inherited>
13361249
</plugin>
13371250
<plugin>
13381251
<groupId>org.apache.maven.plugins</groupId>
@@ -1404,24 +1317,6 @@
14041317
<dependencyDetailsEnabled>true</dependencyDetailsEnabled>
14051318
</configuration>
14061319
</plugin>
1407-
<!--
1408-
<plugin>
1409-
<groupId>org.apache.maven.plugins</groupId>
1410-
<artifactId>maven-changes-plugin</artifactId>
1411-
<configuration>
1412-
<githubAPIScheme>https</githubAPIScheme>
1413-
<githubAPIPort>443</githubAPIPort>
1414-
</configuration>
1415-
<reportSets>
1416-
<reportSet>
1417-
<id>id-github-report</id>
1418-
<reports>
1419-
<report>github-report</report>
1420-
</reports>
1421-
</reportSet>
1422-
</reportSets>
1423-
</plugin>
1424-
-->
14251320
<plugin>
14261321
<groupId>org.apache.maven.plugins</groupId>
14271322
<artifactId>maven-checkstyle-plugin</artifactId>

0 commit comments

Comments
 (0)