You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by fp...@apache.org on 2022/01/27 08:28:01 UTC
[shiro] branch main updated: [SHIRO-851] - Handling properties for compile/enconding vs. default configurations of plugins
This is an automated email from the ASF dual-hosted git repository.
fpapon pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/shiro.git
The following commit(s) were added to refs/heads/main by this push:
new e8190f0 [SHIRO-851] - Handling properties for compile/enconding vs. default configurations of plugins
new 2aaf6e6 Merge pull request #340 from khmarbaise/SHIRO-851
e8190f0 is described below
commit e8190f0c2faf8d9e759cb4825767cdbdbb8c2f65
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Mon Jan 24 21:50:10 2022 +0100
[SHIRO-851] - Handling properties for compile/enconding vs. default configurations of plugins
---
pom.xml | 20 +++-----------------
1 file changed, 3 insertions(+), 17 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5053aff..c36a91f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -258,8 +258,6 @@
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.3.1</version>
<configuration>
- <source>${jdk.version}</source>
- <attach>true</attach>
<excludePackageNames>org.apache.shiro.samples.*</excludePackageNames>
</configuration>
</plugin>
@@ -405,9 +403,9 @@
<artifactId>aspectj-maven-plugin</artifactId>
<version>1.14.0</version>
<configuration>
- <source>${jdk.version}</source>
- <target>${jdk.version}</target>
- <complianceLevel>${jdk.version}</complianceLevel>
+ <source>${maven.compiler.source}</source>
+ <target>${maven.compiler.target}</target>
+ <complianceLevel>${maven.compiler.target}</complianceLevel>
<showWeaveInfo>true</showWeaveInfo>
</configuration>
<executions>
@@ -438,11 +436,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
- <configuration>
- <source>${jdk.version}</source>
- <target>${jdk.version}</target>
- <encoding>${project.build.sourceEncoding}</encoding>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -1294,10 +1287,7 @@
<plugins>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>3.1.0</version>
<configuration>
- <source>${jdk.version}</source>
- <encoding>${project.build.sourceEncoding}</encoding>
<linksource>true</linksource>
<links>
<link>https://docs.oracle.com/javase/6/docs/api/</link>
@@ -1353,10 +1343,6 @@
<plugin>
<artifactId>maven-pmd-plugin</artifactId>
<version>3.12.0</version>
- <configuration>
- <sourceEncoding>utf-8</sourceEncoding>
- <targetJdk>${jdk.version}</targetJdk>
- </configuration>
</plugin>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>