svn commit: r1762171 - /maven/site/trunk/content/apt/guides/mini/guide-creating-archetypes.apt
Author: hboutemy Date: Sun Sep 25 09:42:24 2016 New Revision: 1762171 URL: http://svn.apache.org/viewvc?rev=1762171&view=rev Log: help wanted on MNGSITE-292 Modified: maven/site/trunk/content/apt/guides/mini/guide-creating-archetypes.apt Modified: maven/site/trunk/content/apt/guides/mini/guide-creating-archetypes.apt URL: http://svn.apache.org/viewvc/maven/site/trunk/content/apt/guides/mini/guide-creating-archetypes.apt?rev=1762171&r1=1762170&r2=1762171&view=diff == --- maven/site/trunk/content/apt/guides/mini/guide-creating-archetypes.apt (original) +++ maven/site/trunk/content/apt/guides/mini/guide-creating-archetypes.apt Sun Sep 25 09:42:24 2016 @@ -28,6 +28,10 @@ Guide to Creating Archetypes + <>: this mini-guide explains Archetype 1.x and should be updated to match Archetype 2.x + (the essential difference being {{{/archetype/archetype-models/archetype-descriptor/archetype-descriptor.html}the <<>> descriptor}}). + Please attach a patch to {{{https://issues.apache.org/jira/browse/MNGSITE-292}MNGSITE-292 Jira issue}}. + Creating an archetype is a pretty straight forward process. An archetype is a very simple artifact, that contains the project prototype you wish to create. An archetype is made up of:
svn commit: r1762180 - /maven/site/trunk/content/apt/guides/mini/guide-creating-archetypes.apt
Author: hboutemy Date: Sun Sep 25 10:26:44 2016 New Revision: 1762180 URL: http://svn.apache.org/viewvc?rev=1762180&view=rev Log: fixed the link to (old) archetype descriptor Modified: maven/site/trunk/content/apt/guides/mini/guide-creating-archetypes.apt Modified: maven/site/trunk/content/apt/guides/mini/guide-creating-archetypes.apt URL: http://svn.apache.org/viewvc/maven/site/trunk/content/apt/guides/mini/guide-creating-archetypes.apt?rev=1762180&r1=1762179&r2=1762180&view=diff == --- maven/site/trunk/content/apt/guides/mini/guide-creating-archetypes.apt (original) +++ maven/site/trunk/content/apt/guides/mini/guide-creating-archetypes.apt Sun Sep 25 10:26:44 2016 @@ -36,7 +36,7 @@ Guide to Creating Archetypes very simple artifact, that contains the project prototype you wish to create. An archetype is made up of: - * an {{{http://maven.apache.org/archetype/archetype-models/archetype-descriptor/archetype-descriptor.html}archetype descriptor}} + * an {{{archetype-archives/archetype-2.1/archetype-common/archetype.html}archetype descriptor}} (<<>> in directory: <<>>). It lists all the files that will be contained in the archetype and categorizes them so they can be processed
svn commit: r1762188 - in /maven/plugins/trunk/maven-pmd-plugin/src/site: apt/examples/multi-module-config.apt.vm apt/index.apt.vm site.xml
Author: adangel Date: Sun Sep 25 10:51:34 2016 New Revision: 1762188 URL: http://svn.apache.org/viewvc?rev=1762188&view=rev Log: [MPMD-227] Document multimodule configuration example Added: maven/plugins/trunk/maven-pmd-plugin/src/site/apt/examples/multi-module-config.apt.vm Modified: maven/plugins/trunk/maven-pmd-plugin/src/site/apt/index.apt.vm maven/plugins/trunk/maven-pmd-plugin/src/site/site.xml Added: maven/plugins/trunk/maven-pmd-plugin/src/site/apt/examples/multi-module-config.apt.vm URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/site/apt/examples/multi-module-config.apt.vm?rev=1762188&view=auto == --- maven/plugins/trunk/maven-pmd-plugin/src/site/apt/examples/multi-module-config.apt.vm (added) +++ maven/plugins/trunk/maven-pmd-plugin/src/site/apt/examples/multi-module-config.apt.vm Sun Sep 25 10:51:34 2016 @@ -0,0 +1,204 @@ + -- + Multimodule Configuration + -- + -- + 2016-09-25 + -- + +~~ 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. + +~~ NOTE: For help with the syntax of this file, see: +~~ http://maven.apache.org/doxia/references/apt-format.html + +Multimodule Configuration + + If you have a multimodule project with many modules and you want to share the PMD ruleset configuration, + so that each module uses the same PMD rules, this is possible, but requires a little setup. + + The setup is very similar to the one described for Checkstyle, see + {{{https://maven.apache.org/plugins/maven-checkstyle-plugin/examples/multi-module-config.html}Multimodule Configuration for Checkstyle}}. + + This example will use the same mysterious project called . This is what + the structure of that project looks like: + ++-+ +whizbang +|-- pom.xml +|-- core +| `-- pom.xml +|-- gui +| `-- pom.xml +|-- jmx +| `-- pom.xml +`-- src ++-+ + +* Create a subproject for the PMD rulesets + + We'll start by adding another sub project that will house our common + configuration for PMD. Let's call it . + In it we put the resources that we want to share between our whizbang modules. + In this example, we will add our custom PMD ruleset to be used by the PMD Plugin. + The same subproject can be used to house shared configurations for Checkstyle. + ++-+ +whizbang +|-- pom.xml +|-- build-tools +| |-- src +| | `-- main +| | `-- resources +| | `-- whizbang +| | `-- pmd-ruleset.xml +| `-- pom.xml +|-- core +|-- gui +|-- jmx +`-- src ++-+ + + <> put the resources into a subdirectory that you can ensure will be + unique and not conflict with anyone else. + + The <<>> file for should look like this: + ++-+ + + 4.0.0 + com.example.whizbang + build-tools + 1.0 + Build Tools + ++-+ + + A sample <<>> could look lke this: + ++-+ + +http://pmd.sourceforge.net/ruleset/2.0.0"; +xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; +xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 http://pmd.sourceforge.net/ruleset_2_0_0.xsd";> + + +This ruleset defines the PMD rules for project "whizbang". + + + + + + ++-+ + + The ruleset references the default rulesets. For more information about rulesets, see + {{{http://pmd.github.io/pmd-5.5.1/customizing/howtomakearuleset.html}How to make a new ruleset}}. + +* Configure the other projects to use it + + Now we can include the PMD configuration in the top level + <<>>. + + <> You have to specify a plugin dependency on <<>> in the + <<<\>>> element of your <<>>. It will not work inside the + <<<\>>> element, because <<<\>>> does not support + plugin dependencies. The rest of the configuration is done in the normal way + in the <<<\>>> element. + ++-+ + + 4.0.0 + com.example.whizbang + whizbang-parent + 1.0 + pom + WhizBang Parent + + + +org.apache.maven.plugins +maven-pmd-plugin +${project.version} + + +whizbang/pmd-ruleset.xml + + true + + + + + check + + + + +
maven git commit: Cleaned up code using the ComparableVersion class prevents warnings in IDE about raw types.
Repository: maven Updated Branches: refs/heads/master 343ba6821 -> 62e840fc4 Cleaned up code using the ComparableVersion class prevents warnings in IDE about raw types. Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/62e840fc Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/62e840fc Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/62e840fc Branch: refs/heads/master Commit: 62e840fc47828336dd65d9b60d166bac135b2827 Parents: 343ba68 Author: Karl Heinz Marbaise Authored: Sat Sep 24 19:05:11 2016 +0200 Committer: Karl Heinz Marbaise Committed: Sun Sep 25 13:08:39 2016 +0200 -- .../versioning/ComparableVersionTest.java| 19 +-- 1 file changed, 9 insertions(+), 10 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/62e840fc/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java -- diff --git a/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java b/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java index aea98dd..322cba0 100644 --- a/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java +++ b/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java @@ -28,11 +28,10 @@ import junit.framework.TestCase; * * @author mailto:hbout...@apache.org";>Hervé Boutemy */ -@SuppressWarnings( "unchecked" ) public class ComparableVersionTest extends TestCase { -private Comparable newComparable( String version ) +private ComparableVersion newComparable( String version ) { ComparableVersion ret = new ComparableVersion( version ); String canonical = ret.getCanonical(); @@ -56,7 +55,7 @@ public class ComparableVersionTest private void checkVersionsOrder( String[] versions ) { -Comparable[] c = new Comparable[versions.length]; +ComparableVersion[] c = new ComparableVersion[versions.length]; for ( int i = 0; i < versions.length; i++ ) { c[i] = newComparable( versions[i] ); @@ -64,10 +63,10 @@ public class ComparableVersionTest for ( int i = 1; i < versions.length; i++ ) { -Comparable low = c[i - 1]; +ComparableVersion low = c[i - 1]; for ( int j = i; j < versions.length; j++ ) { -Comparable high = c[j]; +ComparableVersion high = c[j]; assertTrue( "expected " + low + " < " + high, low.compareTo( high ) < 0 ); assertTrue( "expected " + high + " > " + low, high.compareTo( low ) > 0 ); } @@ -76,8 +75,8 @@ public class ComparableVersionTest private void checkVersionsEqual( String v1, String v2 ) { -Comparable c1 = newComparable( v1 ); -Comparable c2 = newComparable( v2 ); +ComparableVersion c1 = newComparable( v1 ); +ComparableVersion c2 = newComparable( v2 ); assertTrue( "expected " + v1 + " == " + v2, c1.compareTo( c2 ) == 0 ); assertTrue( "expected " + v2 + " == " + v1, c2.compareTo( c1 ) == 0 ); assertTrue( "expected same hashcode for " + v1 + " and " + v2, c1.hashCode() == c2.hashCode() ); @@ -87,8 +86,8 @@ public class ComparableVersionTest private void checkVersionsOrder( String v1, String v2 ) { -Comparable c1 = newComparable( v1 ); -Comparable c2 = newComparable( v2 ); +ComparableVersion c1 = newComparable( v1 ); +ComparableVersion c2 = newComparable( v2 ); assertTrue( "expected " + v1 + " < " + v2, c1.compareTo( c2 ) < 0 ); assertTrue( "expected " + v2 + " > " + v1, c2.compareTo( c1 ) > 0 ); } @@ -224,7 +223,7 @@ public class ComparableVersionTest ComparableVersion c1 = new ComparableVersion( "1" ); c1.parseVersion( "2" ); -Comparable c2 = newComparable( "2" ); +ComparableVersion c2 = newComparable( "2" ); assertEquals( "reused instance should be equivalent to new instance", c1, c2 ); }
svn commit: r1762192 - in /maven/shared/trunk: maven-dependency-tree/src/site/apt/index.apt.vm maven-reporting-exec/src/site/apt/index.apt.vm
Author: gboue Date: Sun Sep 25 11:57:49 2016 New Revision: 1762192 URL: http://svn.apache.org/viewvc?rev=1762192&view=rev Log: Updated broken jira.codehaus.org links to issues.apache.org/jira Modified: maven/shared/trunk/maven-dependency-tree/src/site/apt/index.apt.vm maven/shared/trunk/maven-reporting-exec/src/site/apt/index.apt.vm Modified: maven/shared/trunk/maven-dependency-tree/src/site/apt/index.apt.vm URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-tree/src/site/apt/index.apt.vm?rev=1762192&r1=1762191&r2=1762192&view=diff == --- maven/shared/trunk/maven-dependency-tree/src/site/apt/index.apt.vm (original) +++ maven/shared/trunk/maven-dependency-tree/src/site/apt/index.apt.vm Sun Sep 25 11:57:49 2016 @@ -36,4 +36,4 @@ ${project.name} Older Maven 2-specific component entry point is <<<{{{./apidocs/org/apache/maven/shared/dependency/tree/DependencyTreeBuilder.html}DependencyTreeBuilder}}>>>, which is consistent with Maven 2 even when used with Maven 3, which can cause inconsistent results between resolved list (consistent - with Maven 3) and resolved tree (consistent with Maven 2): see {{{http://jira.codehaus.org/browse/MSHARED-167}MSHARED-167}}. + with Maven 3) and resolved tree (consistent with Maven 2): see {{{https://issues.apache.org/jira/browse/MSHARED-167}MSHARED-167}}. Modified: maven/shared/trunk/maven-reporting-exec/src/site/apt/index.apt.vm URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-reporting-exec/src/site/apt/index.apt.vm?rev=1762192&r1=1762191&r2=1762192&view=diff == --- maven/shared/trunk/maven-reporting-exec/src/site/apt/index.apt.vm (original) +++ maven/shared/trunk/maven-reporting-exec/src/site/apt/index.apt.vm Sun Sep 25 11:57:49 2016 @@ -58,7 +58,7 @@ ${project.name} {{{/ref/current/maven-model/maven.html#class_reporting}<<<\>>> section of POM}}: * without <<<\>>> element: reporting plugins configuration inheritance is not supported at this level - (see {{{http://jira.codehaus.org/browse/MSITE-484}MSITE-484}}), + (see {{{https://issues.apache.org/jira/browse/MSITE-484}MSITE-484}}), * with additional <<<\>>> list outside <<<\>>> that simplifies reports configuration in usual cases,
maven-surefire git commit: [SUREFIRE-1280] Replace "http://jira.codehaus.org" with "https://issues.apache.org/jira"
Repository: maven-surefire Updated Branches: refs/heads/master 432231e7e -> 308d941c9 [SUREFIRE-1280] Replace "http://jira.codehaus.org"; with "https://issues.apache.org/jira"; Updated links present in the documentation as well. Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/308d941c Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/308d941c Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/308d941c Branch: refs/heads/master Commit: 308d941c9b6ebb695aba9630f81fc5b400f21322 Parents: 432231e Author: Tunaki Authored: Sun Sep 25 14:00:49 2016 +0200 Committer: Tunaki Committed: Sun Sep 25 14:00:49 2016 +0200 -- .../site/apt/examples/fork-options-and-parallel-execution.apt.vm | 2 +- maven-surefire-plugin/src/site/markdown/multilineexceptions.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/308d941c/maven-surefire-plugin/src/site/apt/examples/fork-options-and-parallel-execution.apt.vm -- diff --git a/maven-surefire-plugin/src/site/apt/examples/fork-options-and-parallel-execution.apt.vm b/maven-surefire-plugin/src/site/apt/examples/fork-options-and-parallel-execution.apt.vm index eebe525..2f9429c 100644 --- a/maven-surefire-plugin/src/site/apt/examples/fork-options-and-parallel-execution.apt.vm +++ b/maven-surefire-plugin/src/site/apt/examples/fork-options-and-parallel-execution.apt.vm @@ -323,4 +323,4 @@ Fork Options and Parallel Test Execution * <<<$\{surefire.forkNumber\}>>> is properly propagated within <<>> since ${project.artifactId}:2.19, more details in - {{{https://jira.codehaus.org/browse/SUREFIRE-1136}SUREFIRE-1136}} + {{{https://issues.apache.org/jira/browse/SUREFIRE-1136}SUREFIRE-1136}} http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/308d941c/maven-surefire-plugin/src/site/markdown/multilineexceptions.md -- diff --git a/maven-surefire-plugin/src/site/markdown/multilineexceptions.md b/maven-surefire-plugin/src/site/markdown/multilineexceptions.md index 69c70c8..4421d49 100644 --- a/maven-surefire-plugin/src/site/markdown/multilineexceptions.md +++ b/maven-surefire-plugin/src/site/markdown/multilineexceptions.md @@ -34,4 +34,4 @@ becomes: May not contain whitespace The plugin supports Groovy assertion output. -For more information see the issue https://jira.codehaus.org/browse/SUREFIRE-986. +For more information see the issue https://issues.apache.org/jira/browse/SUREFIRE-986.
svn commit: r1762200 - /maven/site/trunk/content/apt/guides/mini/guide-creating-archetypes.apt
Author: hboutemy Date: Sun Sep 25 13:34:08 2016 New Revision: 1762200 URL: http://svn.apache.org/viewvc?rev=1762200&view=rev Log: fixed typo Modified: maven/site/trunk/content/apt/guides/mini/guide-creating-archetypes.apt Modified: maven/site/trunk/content/apt/guides/mini/guide-creating-archetypes.apt URL: http://svn.apache.org/viewvc/maven/site/trunk/content/apt/guides/mini/guide-creating-archetypes.apt?rev=1762200&r1=1762199&r2=1762200&view=diff == --- maven/site/trunk/content/apt/guides/mini/guide-creating-archetypes.apt (original) +++ maven/site/trunk/content/apt/guides/mini/guide-creating-archetypes.apt Sun Sep 25 13:34:08 2016 @@ -36,7 +36,7 @@ Guide to Creating Archetypes very simple artifact, that contains the project prototype you wish to create. An archetype is made up of: - * an {{{archetype-archives/archetype-2.1/archetype-common/archetype.html}archetype descriptor}} + * an {{{/archetype-archives/archetype-2.1/archetype-common/archetype.html}archetype descriptor}} (<<>> in directory: <<>>). It lists all the files that will be contained in the archetype and categorizes them so they can be processed
maven-archetype git commit: ARCHETYPE-510 enable Archetype 1.0.x descriptor documentation back
Repository: maven-archetype Updated Branches: refs/heads/master aa095b819 -> c28aed853 ARCHETYPE-510 enable Archetype 1.0.x descriptor documentation back Project: http://git-wip-us.apache.org/repos/asf/maven-archetype/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-archetype/commit/c28aed85 Tree: http://git-wip-us.apache.org/repos/asf/maven-archetype/tree/c28aed85 Diff: http://git-wip-us.apache.org/repos/asf/maven-archetype/diff/c28aed85 Branch: refs/heads/master Commit: c28aed853795448a6b1ca6553219015105280ba5 Parents: aa095b8 Author: Hervé Boutemy Authored: Sun Sep 25 15:50:04 2016 +0200 Committer: Hervé Boutemy Committed: Sun Sep 25 15:50:04 2016 +0200 -- archetype-common/pom.xml | 7 +++ 1 file changed, 7 insertions(+) -- http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/c28aed85/archetype-common/pom.xml -- diff --git a/archetype-common/pom.xml b/archetype-common/pom.xml index c12124f..f32533f 100644 --- a/archetype-common/pom.xml +++ b/archetype-common/pom.xml @@ -176,6 +176,13 @@ +site-docs +pre-site + + xdoc + + + site-xsd pre-site
maven-archetype git commit: updated parent pom and site.xml
Repository: maven-archetype Updated Branches: refs/heads/master c28aed853 -> 4a59126c6 updated parent pom and site.xml Project: http://git-wip-us.apache.org/repos/asf/maven-archetype/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-archetype/commit/4a59126c Tree: http://git-wip-us.apache.org/repos/asf/maven-archetype/tree/4a59126c Diff: http://git-wip-us.apache.org/repos/asf/maven-archetype/diff/4a59126c Branch: refs/heads/master Commit: 4a59126c60c4568f89b9af8c4ab77a2a72fd6b27 Parents: c28aed8 Author: Hervé Boutemy Authored: Sun Sep 25 16:13:03 2016 +0200 Committer: Hervé Boutemy Committed: Sun Sep 25 16:13:03 2016 +0200 -- pom.xml | 2 +- src/site/site.xml | 17 +++-- 2 files changed, 4 insertions(+), 15 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/4a59126c/pom.xml -- diff --git a/pom.xml b/pom.xml index 4103e53..623b385 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ org.apache.maven maven-parent -27 +30 org.apache.maven.archetype http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/4a59126c/src/site/site.xml -- diff --git a/src/site/site.xml b/src/site/site.xml index d825c32..d39af21 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -18,11 +18,6 @@ specific language governing permissions and limitations under the License. --> http://maven.apache.org/DECORATION/1.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd";> - -org.apache.maven.skins -maven-fluido-skin -1.3.0 - true @@ -39,23 +34,17 @@ under the License. -http://maven.apache.org/index.html"/> -http://maven.apache.org/maven-archetype/index.html"/> +https://maven.apache.org/index.html"/> +https://maven.apache.org/maven-archetype/index.html"/> - + http://www.apache.org/licenses/"/> - -Apache ${project.name}, ${project.name}, Apache, the Apache feather logo, and the Apache ${project.name} project logos are trademarks of The Apache Software Foundation. - -Privacy Policy - -
svn commit: r1762213 - in /maven/shared/trunk/maven-shared-jar/src: main/java/org/apache/maven/shared/jar/ main/java/org/apache/maven/shared/jar/classes/ main/java/org/apache/maven/shared/jar/identifi
Author: gboue Date: Sun Sep 25 14:54:41 2016 New Revision: 1762213 URL: http://svn.apache.org/viewvc?rev=1762213&view=rev Log: Improved code: fixed usage of raw types (except Commons Collections) and converted use of Iterator to for-each loop Modified: maven/shared/trunk/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/JarAnalyzer.java maven/shared/trunk/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/JarData.java maven/shared/trunk/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/classes/ImportVisitor.java maven/shared/trunk/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/classes/JarClasses.java maven/shared/trunk/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/classes/JarClassesAnalysis.java maven/shared/trunk/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/identification/JarIdentification.java maven/shared/trunk/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/identification/JarIdentificationAnalysis.java maven/shared/trunk/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/identification/exposers/EmbeddedMavenModelExposer.java maven/shared/trunk/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/identification/exposers/JarClassesExposer.java maven/shared/trunk/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/identification/exposers/ManifestExposer.java maven/shared/trunk/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/identification/exposers/RepositorySearchExposer.java maven/shared/trunk/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/identification/exposers/StaticMainOutputExposer.java maven/shared/trunk/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/identification/exposers/TextFileExposer.java maven/shared/trunk/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/identification/exposers/TimestampExposer.java maven/shared/trunk/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/identification/hash/JarBytecodeHashAnalyzer.java maven/shared/trunk/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/identification/repository/EmptyRepositoryHashSearch.java maven/shared/trunk/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/identification/repository/RepositoryHashSearch.java maven/shared/trunk/maven-shared-jar/src/test/java/org/apache/maven/shared/jar/AbstractJarAnalyzerTestCase.java maven/shared/trunk/maven-shared-jar/src/test/java/org/apache/maven/shared/jar/classes/ImportVisitorTest.java Modified: maven/shared/trunk/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/JarAnalyzer.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/JarAnalyzer.java?rev=1762213&r1=1762212&r2=1762213&view=diff == --- maven/shared/trunk/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/JarAnalyzer.java (original) +++ maven/shared/trunk/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/JarAnalyzer.java Sun Sep 25 14:54:41 2016 @@ -25,7 +25,6 @@ import java.io.InputStream; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; -import java.util.Iterator; import java.util.List; import java.util.jar.JarEntry; import java.util.jar.JarFile; @@ -113,16 +112,13 @@ public class JarAnalyzer } // Obtain entries list. -List entries = Collections.list( jarFile.entries() ); +List entries = Collections.list( jarFile.entries() ); // Sorting of list is done by name to ensure a bytecode hash is always consistent. -Collections.sort( entries, new Comparator() +Collections.sort( entries, new Comparator() { -public int compare( Object o1, Object o2 ) +public int compare( JarEntry entry1, JarEntry entry2 ) { -JarEntry entry1 = (JarEntry) o1; -JarEntry entry2 = (JarEntry) o2; - return entry1.getName().compareTo( entry2.getName() ); } } ); @@ -175,15 +171,12 @@ public class JarAnalyzer * @param pattern the pattern to filter against * @return the list of files found, in {@link java.util.jar.JarEntry} elements */ -public List filterEntries( Pattern pattern ) +public List filterEntries( Pattern pattern ) { -List ret = new ArrayList(); +List ret = new ArrayList(); -Iterator it = getEntries().iterator(); -while ( it.hasNext() ) +for ( JarEntry entry : getEntries() ) { -JarEntry entry = (JarEntry) it.next(); - Matcher mat = pattern.matcher( entry.getName() ); if ( mat.find() ) { @@ -198,7 +191,7 @@ public class JarAnalyzer * * @return the list of files found, in {@link
svn commit: r1762216 - /maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugins/deploy/AbstractDeployMojo.java
Author: gboue Date: Sun Sep 25 15:26:55 2016 New Revision: 1762216 URL: http://svn.apache.org/viewvc?rev=1762216&view=rev Log: Removed unused artifactFactory Modified: maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugins/deploy/AbstractDeployMojo.java Modified: maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugins/deploy/AbstractDeployMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugins/deploy/AbstractDeployMojo.java?rev=1762216&r1=1762215&r2=1762216&view=diff == --- maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugins/deploy/AbstractDeployMojo.java (original) +++ maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugins/deploy/AbstractDeployMojo.java Sun Sep 25 15:26:55 2016 @@ -21,7 +21,6 @@ package org.apache.maven.plugins.deploy; import java.util.Map; -import org.apache.maven.artifact.factory.ArtifactFactory; import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy; import org.apache.maven.artifact.repository.MavenArtifactRepository; @@ -39,11 +38,6 @@ import org.apache.maven.plugins.annotati public abstract class AbstractDeployMojo extends AbstractMojo { -/** - * Component used to create an artifact. - */ -@Component -protected ArtifactFactory artifactFactory; /** * Map that contains the layouts.
svn commit: r1762228 - in /maven/plugins/trunk/maven-compiler-plugin: ./ src/it/MCOMPILER-268_modulepath/ src/it/MCOMPILER-270_release/ src/it/MCOMPILER-275_separate-moduleinfo/ src/it/MCOMPILER-275_s
Author: rfscholte Date: Sun Sep 25 19:44:45 2016 New Revision: 1762228 URL: http://svn.apache.org/viewvc?rev=1762228&view=rev Log: [MCOMPILER-269] Support modulepath (Java9/Jigsaw) Improve detection when modulePath should be used. Added: maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-275_separate-moduleinfo/ maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-275_separate-moduleinfo/invoker.properties maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-275_separate-moduleinfo/pom.xml maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-275_separate-moduleinfo/src/ maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-275_separate-moduleinfo/src/main/ maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-275_separate-moduleinfo/src/main/java/ maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-275_separate-moduleinfo/src/main/java/com/ maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-275_separate-moduleinfo/src/main/java/com/foo/ maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-275_separate-moduleinfo/src/main/java/com/foo/MyClass.java maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-275_separate-moduleinfo/src/main/java/module-info.java maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-275_separate-moduleinfo/src/test/ maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-275_separate-moduleinfo/src/test/java/ maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-275_separate-moduleinfo/src/test/java/com/ maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-275_separate-moduleinfo/src/test/java/com/foo/ maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-275_separate-moduleinfo/src/test/java/com/foo/MyTest.java Modified: maven/plugins/trunk/maven-compiler-plugin/pom.xml maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-268_modulepath/pom.xml maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-268_modulepath/verify.groovy maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-270_release/verify.groovy maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/AbstractCompilerMojo.java maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/CompilerMojo.java maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/TestCompilerMojo.java maven/plugins/trunk/maven-compiler-plugin/src/test/java/org/apache/maven/plugin/compiler/CompilerMojoTestCase.java Modified: maven/plugins/trunk/maven-compiler-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/pom.xml?rev=1762228&r1=1762227&r2=1762228&view=diff == --- maven/plugins/trunk/maven-compiler-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-compiler-plugin/pom.xml Sun Sep 25 19:44:45 2016 @@ -63,7 +63,7 @@ under the License. ! The following property is used in the integration tests MCOMPILER-157 --> 3.5 -2.8 +2.8.1-SNAPSHOT 1.8.0 2.7.0-01 2.0.4-04 Modified: maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-268_modulepath/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-268_modulepath/pom.xml?rev=1762228&r1=1762227&r2=1762228&view=diff == --- maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-268_modulepath/pom.xml (original) +++ maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-268_modulepath/pom.xml Sun Sep 25 19:44:45 2016 @@ -49,7 +49,8 @@ maven-compiler-plugin @project.version@ - 9 + 9 + 9 Modified: maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-268_modulepath/verify.groovy URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-268_modulepath/verify.groovy?rev=1762228&r1=1762227&r2=1762228&view=diff == --- maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-268_modulepath/verify.groovy (original) +++ maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-268_modulepath/verify.groovy Sun Sep 25 19:44:45 2016 @@ -18,8 +18,4 @@ */ def log = new File( basedir, 'build.log').text -assert log.count( " -release" ) == 2 - -assert !( log =~ /\s-source\s/ ) -assert !( log =~ /\s-target\s/ ) - +assert log.count( " --module-path" ) == 2 Modified: maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-270_release/verify.groovy URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-270_release/verify.groovy?rev=1762228&r1=1762227&r2=1762228&view=diff =
svn commit: r1762235 - /maven/plugins/trunk/maven-compiler-plugin/pom.xml
Author: rfscholte Date: Sun Sep 25 21:07:30 2016 New Revision: 1762235 URL: http://svn.apache.org/viewvc?rev=1762235&view=rev Log: remove maven-toolchain, is part of maven-core since 3.0 Modified: maven/plugins/trunk/maven-compiler-plugin/pom.xml Modified: maven/plugins/trunk/maven-compiler-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/pom.xml?rev=1762235&r1=1762234&r2=1762235&view=diff == --- maven/plugins/trunk/maven-compiler-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-compiler-plugin/pom.xml Sun Sep 25 21:07:30 2016 @@ -99,11 +99,6 @@ under the License. ${mavenVersion} - org.apache.maven - maven-toolchain - 2.2.1 - - org.apache.maven.shared maven-shared-utils 3.1.0