svn commit: r1771979 - in /maven/enforcer/trunk/enforcer-rules/src/site/apt: banDuplicatePomDependencyVersions.apt.vm index.apt
Author: gboue
Date: Tue Nov 29 23:31:33 2016
New Revision: 1771979
URL: http://svn.apache.org/viewvc?rev=1771979=rev
Log:
[MENFORCER-259] The rule BanDuplicatePomDependencyVersions is not documented
Adding banDuplicatePomDependencyVersions, introduced in MENFORCER-152, to the
documentation.
Added:
maven/enforcer/trunk/enforcer-rules/src/site/apt/banDuplicatePomDependencyVersions.apt.vm
(with props)
Modified:
maven/enforcer/trunk/enforcer-rules/src/site/apt/index.apt
Added:
maven/enforcer/trunk/enforcer-rules/src/site/apt/banDuplicatePomDependencyVersions.apt.vm
URL:
http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/site/apt/banDuplicatePomDependencyVersions.apt.vm?rev=1771979=auto
==
---
maven/enforcer/trunk/enforcer-rules/src/site/apt/banDuplicatePomDependencyVersions.apt.vm
(added)
+++
maven/enforcer/trunk/enforcer-rules/src/site/apt/banDuplicatePomDependencyVersions.apt.vm
Tue Nov 29 23:31:33 2016
@@ -0,0 +1,67 @@
+~~ Licensed to the Apache Software Foundation (ASF) under one
+~~ or more contributor license agreements. See the NOTICE file
+~~ distributed with this work for additional information
+~~ regarding copyright ownership. The ASF licenses this file
+~~ to you under the Apache License, Version 2.0 (the
+~~ "License"); you may not use this file except in compliance
+~~ with the License. You may obtain a copy of the License at
+~~
+~~ http://www.apache.org/licenses/LICENSE-2.0
+~~
+~~ Unless required by applicable law or agreed to in writing,
+~~ software distributed under the License is distributed on an
+~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+~~ KIND, either express or implied. See the License for the
+~~ specific language governing permissions and limitations
+~~ under the License.
+
+ --
+ Ban Duplicate Pom Dependency Versions
+ --
+ Guillaume Boue
+ --
+ November 2016
+ --
+
+Ban Duplicate Pom Dependency Versions
+
+ This rule checks that there are no duplicate dependencies declared in the
POM of the project.
+ Duplicate dependencies are dependencies which have the same group id,
artifact id, type and classifier.
+
+ The following parameters are supported by this rule:
+
+ * message - an optional supplemental message to the user if the rule fails.
+
+ []
+
+
+ Sample Plugin Configuration:
+
++--+
+
+ [...]
+
+
+
+org.apache.maven.plugins
+maven-enforcer-plugin
+${project.version}
+
+
+no-duplicate-declared-dependencies
+
+ enforce
+
+
+
+
+
+
+
+
+
+
+
+ [...]
+
++---+
Propchange:
maven/enforcer/trunk/enforcer-rules/src/site/apt/banDuplicatePomDependencyVersions.apt.vm
--
svn:eol-style = native
Propchange:
maven/enforcer/trunk/enforcer-rules/src/site/apt/banDuplicatePomDependencyVersions.apt.vm
--
svn:keywords = Author Date Id Revision
Modified: maven/enforcer/trunk/enforcer-rules/src/site/apt/index.apt
URL:
http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/site/apt/index.apt?rev=1771979=1771978=1771979=diff
==
--- maven/enforcer/trunk/enforcer-rules/src/site/apt/index.apt (original)
+++ maven/enforcer/trunk/enforcer-rules/src/site/apt/index.apt Tue Nov 29
23:31:33 2016
@@ -32,7 +32,9 @@ Standard Rules
* {{{./alwaysPass.html}alwaysPass}} - Always passes... used to test plugin
configuration.
* {{{./banDistributionManagement.html}banDistributionManagement}} - enforces
that project doesn't have distributionManagement.
-
+
+ *
{{{./banDuplicatePomDependencyVersions.html}banDuplicatePomDependencyVersions}}
- enforces that the project doesn't have duplicate declared dependencies.
+
* {{{./bannedDependencies.html}bannedDependencies}} - enforces that excluded
dependencies aren't included.
* {{{./bannedPlugins.html}bannedPlugins}} - enforces that specific plugins
aren't included in the build.
svn commit: r1771961 - in /maven/shared/trunk: maven-osgi/pom.xml maven-reporting-api/pom.xml maven-repository-builder/pom.xml maven-runtime/pom.xml maven-script-interpreter/pom.xml maven-shared-incre
Author: rfscholte Date: Tue Nov 29 21:51:30 2016 New Revision: 1771961 URL: http://svn.apache.org/viewvc?rev=1771961=rev Log: Upgrade parent to org.apache.maven.shared:maven-shared-components:30 Modified: maven/shared/trunk/maven-osgi/pom.xml maven/shared/trunk/maven-reporting-api/pom.xml maven/shared/trunk/maven-repository-builder/pom.xml maven/shared/trunk/maven-runtime/pom.xml maven/shared/trunk/maven-script-interpreter/pom.xml maven/shared/trunk/maven-shared-incremental/pom.xml maven/shared/trunk/maven-verifier/pom.xml Modified: maven/shared/trunk/maven-osgi/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-osgi/pom.xml?rev=1771961=1771960=1771961=diff == --- maven/shared/trunk/maven-osgi/pom.xml (original) +++ maven/shared/trunk/maven-osgi/pom.xml Tue Nov 29 21:51:30 2016 @@ -23,7 +23,7 @@ org.apache.maven.shared maven-shared-components -21 +30 ../../pom/maven/maven-shared-components/pom.xml Modified: maven/shared/trunk/maven-reporting-api/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-reporting-api/pom.xml?rev=1771961=1771960=1771961=diff == --- maven/shared/trunk/maven-reporting-api/pom.xml (original) +++ maven/shared/trunk/maven-reporting-api/pom.xml Tue Nov 29 21:51:30 2016 @@ -25,7 +25,7 @@ under the License. org.apache.maven.shared maven-shared-components -21 +30 ../../pom/maven/maven-shared-components/pom.xml Modified: maven/shared/trunk/maven-repository-builder/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-repository-builder/pom.xml?rev=1771961=1771960=1771961=diff == --- maven/shared/trunk/maven-repository-builder/pom.xml (original) +++ maven/shared/trunk/maven-repository-builder/pom.xml Tue Nov 29 21:51:30 2016 @@ -23,7 +23,7 @@ under the License. org.apache.maven.shared maven-shared-components -21 +30 ../../pom/maven/maven-shared-components/pom.xml Modified: maven/shared/trunk/maven-runtime/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-runtime/pom.xml?rev=1771961=1771960=1771961=diff == --- maven/shared/trunk/maven-runtime/pom.xml (original) +++ maven/shared/trunk/maven-runtime/pom.xml Tue Nov 29 21:51:30 2016 @@ -25,7 +25,7 @@ org.apache.maven.shared maven-shared-components -21 +30 ../../pom/maven/maven-shared-components/pom.xml Modified: maven/shared/trunk/maven-script-interpreter/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-script-interpreter/pom.xml?rev=1771961=1771960=1771961=diff == --- maven/shared/trunk/maven-script-interpreter/pom.xml (original) +++ maven/shared/trunk/maven-script-interpreter/pom.xml Tue Nov 29 21:51:30 2016 @@ -22,7 +22,7 @@ org.apache.maven.shared maven-shared-components -21 +30 ../../pom/maven/maven-shared-components/pom.xml Modified: maven/shared/trunk/maven-shared-incremental/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-incremental/pom.xml?rev=1771961=1771960=1771961=diff == --- maven/shared/trunk/maven-shared-incremental/pom.xml (original) +++ maven/shared/trunk/maven-shared-incremental/pom.xml Tue Nov 29 21:51:30 2016 @@ -22,7 +22,7 @@ org.apache.maven.shared maven-shared-components -21 +30 ../../pom/maven/maven-shared-components/pom.xml Modified: maven/shared/trunk/maven-verifier/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-verifier/pom.xml?rev=1771961=1771960=1771961=diff == --- maven/shared/trunk/maven-verifier/pom.xml (original) +++ maven/shared/trunk/maven-verifier/pom.xml Tue Nov 29 21:51:30 2016 @@ -23,7 +23,7 @@ org.apache.maven.shared maven-shared-components -21 +30 ../../pom/maven/maven-shared-components
svn commit: r1771960 - in /maven/plugins/trunk/maven-dependency-plugin: main/ test/
Author: michaelo Date: Tue Nov 29 21:44:46 2016 New Revision: 1771960 URL: http://svn.apache.org/viewvc?rev=1771960=rev Log: Revert broken commit of r1768770 Removed: maven/plugins/trunk/maven-dependency-plugin/main/ maven/plugins/trunk/maven-dependency-plugin/test/
svn commit: r1771943 - in /maven/plugins/trunk/maven-shade-plugin/src: main/java/org/apache/maven/plugins/shade/resource/GroovyResourceTransformer.java test/java/org/apache/maven/plugins/shade/resourc
Author: gboue
Date: Tue Nov 29 19:05:13 2016
New Revision: 1771943
URL: http://svn.apache.org/viewvc?rev=1771943=rev
Log:
Fixed compilation errors. The variables extModuleName and extModuleVersion in
the GroovyResourceTransformer need setters to be changed properly in tests,
instead of having reflection hacks.
Modified:
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/GroovyResourceTransformer.java
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/GroovyResourceTransformerTest.java
Modified:
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/GroovyResourceTransformer.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/GroovyResourceTransformer.java?rev=1771943=1771942=1771943=diff
==
---
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/GroovyResourceTransformer.java
(original)
+++
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/GroovyResourceTransformer.java
Tue Nov 29 19:05:13 2016
@@ -134,4 +134,14 @@ public class GroovyResourceTransformer
return buff.toString();
}
}
+
+public void setExtModuleName( String extModuleName )
+{
+this.extModuleName = extModuleName;
+}
+
+public void setExtModuleVersion( String extModuleVersion )
+{
+this.extModuleVersion = extModuleVersion;
+}
}
Modified:
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/GroovyResourceTransformerTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/GroovyResourceTransformerTest.java?rev=1771943=1771942=1771943=diff
==
---
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/GroovyResourceTransformerTest.java
(original)
+++
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/GroovyResourceTransformerTest.java
Tue Nov 29 19:05:13 2016
@@ -78,13 +78,20 @@ public class GroovyResourceTransformerTe
JarOutputStream jaos = new JarOutputStream( fos );
transformer.modifyOutputStream( jaos );
jaos.close();
-JarFile jar = new JarFile( tempJar );
Properties desc = null;
-ZipEntry entry = jar.getEntry(
GroovyResourceTransformer.EXT_MODULE_NAME );
-if ( entry != null )
+JarFile jar = new JarFile( tempJar );
+try
+{
+ZipEntry entry = jar.getEntry(
GroovyResourceTransformer.EXT_MODULE_NAME );
+if ( entry != null )
+{
+desc = new Properties();
+desc.load( jar.getInputStream( entry ) );
+}
+}
+finally
{
-desc = new Properties();
-desc.load( jar.getInputStream( entry ) );
+jar.close();
}
return desc;
}
@@ -110,8 +117,8 @@ public class GroovyResourceTransformerTe
throws Exception
{
GroovyResourceTransformer transformer = new
GroovyResourceTransformer();
-transformer.extModuleName = "the-module-name";
-transformer.extModuleVersion = "2.0";
+transformer.setExtModuleName( "the-module-name" );
+transformer.setExtModuleVersion( "2.0" );
transformer.processResource( GroovyResourceTransformer.EXT_MODULE_NAME,
module( "mod1", "1.0", "some.ext",
"some.staticExt" ),
Collections.emptyList() );
