Updated parent pom dependencies and plugin versions
Project: http://git-wip-us.apache.org/repos/asf/shiro/repo Commit: http://git-wip-us.apache.org/repos/asf/shiro/commit/42e3b51a Tree: http://git-wip-us.apache.org/repos/asf/shiro/tree/42e3b51a Diff: http://git-wip-us.apache.org/repos/asf/shiro/diff/42e3b51a Branch: refs/heads/master Commit: 42e3b51ad698cfe9519853f3617a9484db210ee4 Parents: d44204a Author: Brian Demers <[email protected]> Authored: Mon Nov 7 16:50:17 2016 -0500 Committer: Brian Demers <[email protected]> Committed: Mon Nov 7 16:50:17 2016 -0500 ---------------------------------------------------------------------- pom.xml | 141 ++++++++------------------------------------ samples/spring/pom.xml | 4 +- 2 files changed, 28 insertions(+), 117 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/shiro/blob/42e3b51a/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 7051eb8..8fe6095 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache</groupId> <artifactId>apache</artifactId> - <version>17</version> + <version>18</version> </parent> <groupId>org.apache.shiro</groupId> @@ -51,8 +51,8 @@ <url>http://issues.apache.org/jira/browse/SHIRO</url> </issueManagement> <ciManagement> - <system>Hudson</system> - <url>http://hudson.zones.apache.org/hudson/view/Shiro/</url> + <system>Jenkins</system> + <url>https://builds.apache.org/job/Shiro/</url> </ciManagement> <distributionManagement> @@ -96,13 +96,13 @@ <!-- Test 3rd-party dependencies: --> <easymock.version>3.4</easymock.version> - <gmaven.version>1.3</gmaven.version> + <gmaven.version>1.5</gmaven.version> <groovy.version>2.4.7</groovy.version> <junit.version>4.12</junit.version> <hibernate.version>4.2.21.Final</hibernate.version> <!-- so we can mock static methods in 3rd party libraries that sometimes don't use proper interfaces ahem, hazelcast, ahem... --> - <powermock.version>1.6.5</powermock.version> + <powermock.version>1.6.6</powermock.version> <maven.compiler.source>${jdk.version}</maven.compiler.source> <maven.compiler.target>${jdk.version}</maven.compiler.target> @@ -225,12 +225,12 @@ <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> - <version>2.1.0</version> + <version>3.2.0</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-gpg-plugin</artifactId> - <version>1.1</version> + <version>1.6</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -240,12 +240,12 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-scm-publish-plugin</artifactId> - <version>1.0</version> + <version>1.1</version> </plugin> <plugin> <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> - <version>0.11</version> + <version>0.12</version> <configuration> <!-- note that this configuration needs to be maintain both in pluginManagement and reporting sections --> <excludes> @@ -294,105 +294,15 @@ </dependency> </dependencies> </plugin> - <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.--> - <plugin> - <groupId>org.eclipse.m2e</groupId> - <artifactId>lifecycle-mapping</artifactId> - <version>1.0.0</version> - <configuration> - <lifecycleMappingMetadata> - <pluginExecutions> - <pluginExecution> - <pluginExecutionFilter> - <groupId> - org.codehaus.mojo - </groupId> - <artifactId> - aspectj-maven-plugin - </artifactId> - <versionRange> - [1.3,) - </versionRange> - <goals> - <goal>test-compile</goal> - <goal>compile</goal> - </goals> - </pluginExecutionFilter> - <action> - <ignore /> - </action> - </pluginExecution> - <pluginExecution> - <pluginExecutionFilter> - <groupId> - org.apache.maven.plugins - </groupId> - <artifactId> - maven-antrun-plugin - </artifactId> - <versionRange> - [1.3,) - </versionRange> - <goals> - <goal>run</goal> - </goals> - </pluginExecutionFilter> - <action> - <ignore /> - </action> - </pluginExecution> - <pluginExecution> - <pluginExecutionFilter> - <groupId> - org.codehaus.mojo - </groupId> - <artifactId> - dependency-maven-plugin - </artifactId> - <versionRange> - [1.0,) - </versionRange> - <goals> - <goal>unpack</goal> - </goals> - </pluginExecutionFilter> - <action> - <ignore /> - </action> - </pluginExecution> - <pluginExecution> - <pluginExecutionFilter> - <groupId> - org.codehaus.gmaven - </groupId> - <artifactId> - gmaven-plugin - </artifactId> - <versionRange> - [1.4,) - </versionRange> - <goals> - <goal>compile</goal> - <goal>testCompile</goal> - </goals> - </pluginExecutionFilter> - <action> - <ignore/> - </action> - </pluginExecution> - </pluginExecutions> - </lifecycleMappingMetadata> - </configuration> - </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> - <version>1.7</version> + <version>1.12</version> </plugin> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>dependency-maven-plugin</artifactId> - <version>1.0</version> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.10</version> </plugin> <plugin> <groupId>org.jacoco</groupId> @@ -436,7 +346,7 @@ <plugin> <groupId>org.owasp</groupId> <artifactId>dependency-check-maven</artifactId> - <version>1.4.3</version> + <version>1.4.4</version> </plugin> </plugins> </pluginManagement> @@ -448,7 +358,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> + <version>3.6.0</version> <configuration> <source>${jdk.version}</source> <target>${jdk.version}</target> @@ -565,7 +475,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-release-plugin</artifactId> - <version>2.5.1</version> + <version>2.5.3</version> <configuration> <!-- do not update upstream, with a pending release. --> <pushChanges>false</pushChanges> @@ -900,7 +810,7 @@ <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>1.2.16</version> + <version>1.2.17</version> <scope>test</scope> <exclusions> <exclusion> @@ -1107,6 +1017,7 @@ <version>${spring-boot.version}</version> </dependency> + <!-- Guice --> <dependency> <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> @@ -1153,7 +1064,7 @@ <plugins> <plugin> <artifactId>maven-javadoc-plugin</artifactId> - <version>2.8.1</version> + <version>2.9.1</version> <configuration> <source>${jdk.version}</source> <encoding>${project.build.sourceEncoding}</encoding> @@ -1196,14 +1107,14 @@ </plugin> <plugin> <artifactId>maven-jxr-plugin</artifactId> - <version>2.1</version> + <version>2.5</version> <configuration> <aggregate>true</aggregate> </configuration> </plugin> <plugin> <artifactId>maven-pmd-plugin</artifactId> - <version>2.5</version> + <version>3.7</version> <configuration> <sourceEncoding>utf-8</sourceEncoding> <targetJdk>1.5</targetJdk> @@ -1211,7 +1122,7 @@ </plugin> <plugin> <artifactId>maven-project-info-reports-plugin</artifactId> - <version>2.2</version> + <version>2.9</version> <!-- Disable, just to make it go faster --> <configuration> <dependencyLocationsEnabled>false</dependencyLocationsEnabled> @@ -1220,7 +1131,7 @@ <plugin> <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> - <version>0.11</version> + <version>0.12</version> <!-- only run at the root --> <inherited>false</inherited> <configuration> @@ -1278,7 +1189,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>jdepend-maven-plugin</artifactId> - <version>2.0-beta-2</version> + <version>2.0</version> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> @@ -1319,7 +1230,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>2.8.1</version> + <version>2.9.1</version> <executions> <execution> <id>attach-api-docs</id> @@ -1333,7 +1244,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> - <version>2.2.1</version> + <version>3.0.1</version> <executions> <execution> <id>attach-sources</id> http://git-wip-us.apache.org/repos/asf/shiro/blob/42e3b51a/samples/spring/pom.xml ---------------------------------------------------------------------- diff --git a/samples/spring/pom.xml b/samples/spring/pom.xml index 30361fa..d5257c4 100644 --- a/samples/spring/pom.xml +++ b/samples/spring/pom.xml @@ -70,8 +70,8 @@ </dependencies> </plugin> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>dependency-maven-plugin</artifactId> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> <executions> <execution> <phase>generate-resources</phase>
