svn commit: r1624890 - /maven/shared/trunk/maven-dependency-tree/pom.xml
Author: khmarbaise Date: Sun Sep 14 18:05:15 2014 New Revision: 1624890 URL: http://svn.apache.org/r1624890 Log: [maven-release-plugin] prepare for next development iteration Modified: maven/shared/trunk/maven-dependency-tree/pom.xml Modified: maven/shared/trunk/maven-dependency-tree/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-tree/pom.xml?rev=1624890r1=1624889r2=1624890view=diff == --- maven/shared/trunk/maven-dependency-tree/pom.xml (original) +++ maven/shared/trunk/maven-dependency-tree/pom.xml Sun Sep 14 18:05:15 2014 @@ -28,15 +28,15 @@ /parent artifactIdmaven-dependency-tree/artifactId - version2.2/version + version2.3-SNAPSHOT/version nameApache Maven Dependency Tree/name descriptionA tree-based API for resolution of Maven project dependencies/description scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-dependency-tree-2.2/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-dependency-tree-2.2/developerConnection - urlhttp://svn.apache.org/viewvc/maven/shared/tags/maven-dependency-tree-2.2/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-dependency-tree//connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-dependency-tree//developerConnection + urlhttp://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-tree//url /scm issueManagement systemjira/system
svn commit: r1624889 - /maven/shared/tags/maven-dependency-tree-2.2/
Author: khmarbaise Date: Sun Sep 14 18:05:12 2014 New Revision: 1624889 URL: http://svn.apache.org/r1624889 Log: [maven-release-plugin] copy for tag maven-dependency-tree-2.2 Added: maven/shared/tags/maven-dependency-tree-2.2/ - copied from r1624888, maven/shared/trunk/maven-dependency-tree/
svn commit: r1624888 - /maven/shared/trunk/maven-dependency-tree/pom.xml
Author: khmarbaise Date: Sun Sep 14 18:05:07 2014 New Revision: 1624888 URL: http://svn.apache.org/r1624888 Log: [maven-release-plugin] prepare release maven-dependency-tree-2.2 Modified: maven/shared/trunk/maven-dependency-tree/pom.xml Modified: maven/shared/trunk/maven-dependency-tree/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-tree/pom.xml?rev=1624888r1=1624887r2=1624888view=diff == --- maven/shared/trunk/maven-dependency-tree/pom.xml (original) +++ maven/shared/trunk/maven-dependency-tree/pom.xml Sun Sep 14 18:05:07 2014 @@ -28,15 +28,15 @@ /parent artifactIdmaven-dependency-tree/artifactId - version2.2-SNAPSHOT/version + version2.2/version nameApache Maven Dependency Tree/name descriptionA tree-based API for resolution of Maven project dependencies/description scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-dependency-tree//connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-dependency-tree//developerConnection - urlhttp://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-tree//url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-dependency-tree-2.2/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-dependency-tree-2.2/developerConnection + urlhttp://svn.apache.org/viewvc/maven/shared/tags/maven-dependency-tree-2.2/url /scm issueManagement systemjira/system
svn commit: r1624900 - /maven/plugins/trunk/maven-dependency-plugin/pom.xml
Author: khmarbaise Date: Sun Sep 14 20:01:53 2014 New Revision: 1624900 URL: http://svn.apache.org/r1624900 Log: [MDEP-459] - Upgrade maven-dependency-analyzer to 1.5 Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/pom.xml?rev=1624900r1=1624899r2=1624900view=diff == --- maven/plugins/trunk/maven-dependency-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-dependency-plugin/pom.xml Sun Sep 14 20:01:53 2014 @@ -174,11 +174,10 @@ under the License. /dependency !-- shared -- -!-- FIXME: Before we can release we need either go down to 1.4 or release maven-shared component first. -- dependency groupIdorg.apache.maven.shared/groupId artifactIdmaven-dependency-analyzer/artifactId - version1.5-SNAPSHOT/version + version1.5/version /dependency dependency groupIdorg.apache.maven.shared/groupId
svn commit: r1624995 - /maven/site/trunk/content/markdown/pom.md
Author: khmarbaise Date: Mon Sep 15 10:48:17 2014 New Revision: 1624995 URL: http://svn.apache.org/r1624995 Log: - Try to fix formatting issue. Modified: maven/site/trunk/content/markdown/pom.md Modified: maven/site/trunk/content/markdown/pom.md URL: http://svn.apache.org/viewvc/maven/site/trunk/content/markdown/pom.md?rev=1624995r1=1624994r2=1624995view=diff == --- maven/site/trunk/content/markdown/pom.md (original) +++ maven/site/trunk/content/markdown/pom.md Mon Sep 15 10:48:17 2014 @@ -9,7 +9,6 @@ 2. [POM Relationships](#POM_Relationships) 1. [Dependencies](#Dependencies) 1. [Exclusions](#Exclusions) - 2. [Inheritance](#Inheritance) 1. [The Super POM](#The_Super_POM) 2. [Dependency Management](#Dependency_Management)
svn commit: r1625383 [3/3] - in /maven/plugins/trunk/maven-dependency-plugin: ./ src/changes/ src/it-harness-poms/copy-dependencies/ src/it-harness-poms/copy-dependencies2/ src/it-harness-poms/mdep-27
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/codehaus/plexus/util/interpolation/ValueSource.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/codehaus/plexus/util/interpolation/ValueSource.java?rev=1625383r1=1625382r2=1625383view=diff == --- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/codehaus/plexus/util/interpolation/ValueSource.java (original) +++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/codehaus/plexus/util/interpolation/ValueSource.java Tue Sep 16 20:34:05 2014 @@ -1,5 +1,25 @@ package org.codehaus.plexus.util.interpolation; +/* + * 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. + */ + + /** * COPIED FROM plexus-utils-1.5.15 TO SATISFY TESTS * @@ -10,4 +30,4 @@ package org.codehaus.plexus.util.interpo public interface ValueSource extends org.codehaus.plexus.interpolation.ValueSource { -} \ No newline at end of file +}
svn commit: r1625383 [1/3] - in /maven/plugins/trunk/maven-dependency-plugin: ./ src/changes/ src/it-harness-poms/copy-dependencies/ src/it-harness-poms/copy-dependencies2/ src/it-harness-poms/mdep-27
Author: khmarbaise Date: Tue Sep 16 20:34:05 2014 New Revision: 1625383 URL: http://svn.apache.org/r1625383 Log: [MDEP-463] - Fixed RAT issues. Added apache-rat-plugin configuration to exclude three files which contain direct output of m-d-p:tree which is used to be compared the result of IT's. Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml maven/plugins/trunk/maven-dependency-plugin/src/changes/changes.xml maven/plugins/trunk/maven-dependency-plugin/src/it-harness-poms/copy-dependencies/pom.xml maven/plugins/trunk/maven-dependency-plugin/src/it-harness-poms/copy-dependencies2/pom.xml maven/plugins/trunk/maven-dependency-plugin/src/it-harness-poms/mdep-27/pom.xml maven/plugins/trunk/maven-dependency-plugin/src/it-harness-poms/mdep-50/pom.xml maven/plugins/trunk/maven-dependency-plugin/src/it-harness-poms/mdep-61/pom.xml maven/plugins/trunk/maven-dependency-plugin/src/it-harness-poms/mdep-66/pom.xml maven/plugins/trunk/maven-dependency-plugin/src/it-harness-poms/mdep-67/pom.xml maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-dep-mgt/invoker.properties maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-report/invoker.properties maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-report/src/main/java/Main.java maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-report/verify.bsh maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze/invoker.properties maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze/src/main/java/Main.java maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze/verify.bsh maven/plugins/trunk/maven-dependency-plugin/src/it/projects/build-classpath/invoker.properties maven/plugins/trunk/maven-dependency-plugin/src/it/projects/build-classpath/test.properties maven/plugins/trunk/maven-dependency-plugin/src/it/projects/build-classpath/verify.bsh maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-and-unpack-with-alternate-local-repo/invoker.properties maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-and-unpack-with-alternate-local-repo/verify.bsh maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-cli/invoker.properties maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-cli/test.properties maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-cli/verify.bsh maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-dependencies/invoker.properties maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-dependencies/verify.bsh maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-reactor/invoker.properties maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-reactor/verify.bsh maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy/invoker.properties maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy/verify.bsh maven/plugins/trunk/maven-dependency-plugin/src/it/projects/dependency-properties/invoker.properties maven/plugins/trunk/maven-dependency-plugin/src/it/projects/dependency-properties/verify.bsh maven/plugins/trunk/maven-dependency-plugin/src/it/projects/filterunpack/verify.groovy maven/plugins/trunk/maven-dependency-plugin/src/it/projects/go-offline/invoker.properties maven/plugins/trunk/maven-dependency-plugin/src/it/projects/go-offline/test.properties maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-439-analyze-java8/invoker.properties maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-439-analyze-java8/pom.xml maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-439-analyze-java8/src/main/java/org/sugis/maven/Java8Slf4jDep.java maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-450-project-with-ancestor/invoker.properties maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-450-project-with-ancestor/verify.groovy maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-450-project-without-ancestor/invoker.properties maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-450-project-without-ancestor/verify.groovy maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-bad-pom/invoker.properties maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-bad-pom/setup.bsh maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-bad-pom/test.properties maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-bad-pom/verify.bsh maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-non-transitive/invoker.properties maven/plugins/trunk/maven-dependency-plugin/src/it/projects
svn commit: r1625383 [2/3] - in /maven/plugins/trunk/maven-dependency-plugin: ./ src/changes/ src/it-harness-poms/copy-dependencies/ src/it-harness-poms/copy-dependencies2/ src/it-harness-poms/mdep-27
Modified: maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-reresolve/verify.bsh URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-reresolve/verify.bsh?rev=1625383r1=1625382r2=1625383view=diff == --- maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-reresolve/verify.bsh (original) +++ maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-reresolve/verify.bsh Tue Sep 16 20:34:05 2014 @@ -1,3 +1,22 @@ +/* + * 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. + */ + import java.io.*; System.out.println( Checking for presence of purged dependency directories ); Modified: maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-snapshots-only/invoker.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-snapshots-only/invoker.properties?rev=1625383r1=1625382r2=1625383view=diff == --- maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-snapshots-only/invoker.properties (original) +++ maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-snapshots-only/invoker.properties Tue Sep 16 20:34:05 2014 @@ -1 +1,18 @@ +# 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. + invoker.goals = ${project.groupId}:${project.artifactId}:${project.version}:purge-local-repository Modified: maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-snapshots-only/setup.bsh URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-snapshots-only/setup.bsh?rev=1625383r1=1625382r2=1625383view=diff == --- maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-snapshots-only/setup.bsh (original) +++ maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-snapshots-only/setup.bsh Tue Sep 16 20:34:05 2014 @@ -1,3 +1,22 @@ +/* + * 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. + */ + import java.io.*; File purgedJar = new File( localRepositoryPath, org/apache/maven/its/dependency/purged/1.0/purged-1.0.jar ); Modified: maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-snapshots-only/test.properties URL:
svn commit: r1625390 [3/3] - in /maven/plugins/trunk/maven-compiler-plugin: ./ src/it/MCOMPILER-170/ src/it/MCOMPILER-170/mcompiler-170-1/ src/it/MCOMPILER-170/mcompiler-170-1/src/main/java/org/apache
Modified: maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-21_methodname-change/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-21_methodname-change/pom.xml?rev=1625390r1=1625389r2=1625390view=diff == --- maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-21_methodname-change/pom.xml (original) +++ maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-21_methodname-change/pom.xml Tue Sep 16 20:58:10 2014 @@ -1,49 +1,69 @@ -?xml version=1.0 encoding=UTF-8? -project xmlns=http://maven.apache.org/POM/4.0.0; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; - xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd; - modelVersion4.0.0/modelVersion - - groupIdorg.apache.maven.plugins.compiler.it/groupId - artifactIdmcompiler-21_methodname-change/artifactId - version1.0-SNAPSHOT/version - - description -This IT tests what happens if the method name in a single class BeanA gets changed. -In this case 'mvn compile' (without a clean) should fail as BeanA2 -still uses the old method of BeanA. - /description - - build -pluginManagement - plugins -plugin - groupIdorg.apache.maven.plugins/groupId - artifactIdmaven-compiler-plugin/artifactId - version@project.version@/version -/plugin - /plugins -/pluginManagement -plugins - plugin -!-- Called as second invoker goal to simulate file adjustment -- -groupIdorg.codehaus.gmaven/groupId -artifactIdgmaven-plugin/artifactId -version1.4/version -configuration - source -def beanAFile = new File( project.basedir, 'src/main/java/BeanA.java' ) - -processFileInplace( beanAFile ) { text - - text.replaceAll( /getI/, 'getI_doesntexistanymore') -} - -def processFileInplace(file, Closure processText) { - def text = file.text - file.write(processText(text)) -} - /source -/configuration - /plugin -/plugins - /build -/project +?xml version=1.0 encoding=UTF-8? + +!-- +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. +-- + +project xmlns=http://maven.apache.org/POM/4.0.0; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; + xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd; + modelVersion4.0.0/modelVersion + + groupIdorg.apache.maven.plugins.compiler.it/groupId + artifactIdmcompiler-21_methodname-change/artifactId + version1.0-SNAPSHOT/version + + description +This IT tests what happens if the method name in a single class BeanA gets changed. +In this case 'mvn compile' (without a clean) should fail as BeanA2 +still uses the old method of BeanA. + /description + + build +pluginManagement + plugins +plugin + groupIdorg.apache.maven.plugins/groupId + artifactIdmaven-compiler-plugin/artifactId + version@project.version@/version +/plugin + /plugins +/pluginManagement +plugins + plugin +!-- Called as second invoker goal to simulate file adjustment -- +groupIdorg.codehaus.gmaven/groupId +artifactIdgmaven-plugin/artifactId +version1.4/version +configuration + source +def beanAFile = new File( project.basedir, 'src/main/java/BeanA.java' ) + +processFileInplace( beanAFile ) { text - + text.replaceAll( /getI/, 'getI_doesntexistanymore') +} + +def processFileInplace(file, Closure processText) { + def text = file.text + file.write(processText(text)) +} + /source +/configuration + /plugin +/plugins + /build +/project Modified: maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-21_methodname-change/src/main/java/BeanA.java URL:
svn commit: r1625390 [2/3] - in /maven/plugins/trunk/maven-compiler-plugin: ./ src/it/MCOMPILER-170/ src/it/MCOMPILER-170/mcompiler-170-1/ src/it/MCOMPILER-170/mcompiler-170-1/src/main/java/org/apache
Modified: maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-224/annotation-processor/src/main/java/org/issue/MCompiler224.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-224/annotation-processor/src/main/java/org/issue/MCompiler224.java?rev=1625390r1=1625389r2=1625390view=diff == --- maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-224/annotation-processor/src/main/java/org/issue/MCompiler224.java (original) +++ maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-224/annotation-processor/src/main/java/org/issue/MCompiler224.java Tue Sep 16 20:58:10 2014 @@ -1,5 +1,25 @@ package org.issue; +/* + * 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. + */ + + public @interface MCompiler224 { Modified: maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-224/annotation-processor/src/main/java/org/issue/MCompiler224AnnotationProcessor.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-224/annotation-processor/src/main/java/org/issue/MCompiler224AnnotationProcessor.java?rev=1625390r1=1625389r2=1625390view=diff == --- maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-224/annotation-processor/src/main/java/org/issue/MCompiler224AnnotationProcessor.java (original) +++ maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-224/annotation-processor/src/main/java/org/issue/MCompiler224AnnotationProcessor.java Tue Sep 16 20:58:10 2014 @@ -1,5 +1,25 @@ package org.issue; +/* + * 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. + */ + + import java.util.Set; import javax.annotation.processing.AbstractProcessor; Modified: maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-224/annotation-user/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-224/annotation-user/pom.xml?rev=1625390r1=1625389r2=1625390view=diff == Binary files - no diff available. Modified: maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-224/annotation-user/src/main/java/org/issue/user/User.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-224/annotation-user/src/main/java/org/issue/user/User.java?rev=1625390r1=1625389r2=1625390view=diff == --- maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-224/annotation-user/src/main/java/org/issue/user/User.java (original) +++ maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-224/annotation-user/src/main/java/org/issue/user/User.java Tue Sep 16 20:58:10 2014 @@ -1,5 +1,25 @@ package org.issue.user; +/* + * 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
svn commit: r1625390 [1/3] - in /maven/plugins/trunk/maven-compiler-plugin: ./ src/it/MCOMPILER-170/ src/it/MCOMPILER-170/mcompiler-170-1/ src/it/MCOMPILER-170/mcompiler-170-1/src/main/java/org/apache
Author: khmarbaise Date: Tue Sep 16 20:58:10 2014 New Revision: 1625390 URL: http://svn.apache.org/r1625390 Log: [MCOMPILER-232] - Fixed all RAT warnings. Modified: maven/plugins/trunk/maven-compiler-plugin/pom.xml maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-170/invoker.properties maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-170/mcompiler-170-1/pom.xml maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-170/mcompiler-170-1/src/main/java/org/apache/maven/plugins/compiler/it/App.java maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-170/mcompiler-170-1/src/main/java/org/apache/maven/plugins/compiler/it/App2.java maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-170/mcompiler-170-1/src/main/java/org/apache/maven/plugins/compiler/it/App3.java maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-170/mcompiler-170-1/src/main/java/org/apache/maven/plugins/compiler/it/App4.java maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-170/mcompiler-170-1/src/main/java/org/apache/maven/plugins/compiler/it/App5.java maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-170/mcompiler-170-1/src/main/java/org/apache/maven/plugins/compiler/it/App6.java maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-170/mcompiler-170-1/src/main/java/org/apache/maven/plugins/compiler/it/App7.java maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-170/mcompiler-170-1/src/test/java/org/apache/maven/plugins/compiler/it/AppTest.java maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-170/mcompiler-170-2/pom.xml maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-170/mcompiler-170-2/src/main/java/org/apache/maven/plugins/compiler/it/App.java maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-170/mcompiler-170-2/src/main/java/org/apache/maven/plugins/compiler/it/App2.java maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-170/mcompiler-170-2/src/main/java/org/apache/maven/plugins/compiler/it/App3.java maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-170/mcompiler-170-2/src/main/java/org/apache/maven/plugins/compiler/it/App4.java maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-170/mcompiler-170-2/src/main/java/org/apache/maven/plugins/compiler/it/App5.java maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-170/mcompiler-170-2/src/main/java/org/apache/maven/plugins/compiler/it/App6.java maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-170/mcompiler-170-2/src/main/java/org/apache/maven/plugins/compiler/it/App7.java maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-170/mcompiler-170-2/src/test/java/org/apache/maven/plugins/compiler/it/AppTest.java maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-170/mcompiler-170-3/pom.xml maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-170/mcompiler-170-3/src/main/java/org/apache/maven/plugins/compiler/it/App.java maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-170/mcompiler-170-3/src/main/java/org/apache/maven/plugins/compiler/it/App2.java maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-170/mcompiler-170-3/src/main/java/org/apache/maven/plugins/compiler/it/App3.java maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-170/mcompiler-170-3/src/main/java/org/apache/maven/plugins/compiler/it/App4.java maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-170/mcompiler-170-3/src/main/java/org/apache/maven/plugins/compiler/it/App5.java maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-170/mcompiler-170-3/src/main/java/org/apache/maven/plugins/compiler/it/App6.java maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-170/mcompiler-170-3/src/main/java/org/apache/maven/plugins/compiler/it/App7.java maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-170/mcompiler-170-3/src/test/java/org/apache/maven/plugins/compiler/it/AppTest.java maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-170/mcompiler-170-4/pom.xml maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-170/mcompiler-170-4/src/main/java/org/apache/maven/plugins/compiler/it/App.java maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-170/mcompiler-170-4/src/main/java/org/apache/maven/plugins/compiler/it/App2.java maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-170/mcompiler-170-4/src/main/java/org/apache/maven/plugins/compiler/it/App3.java maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-170/mcompiler-170-4/src/main/java/org/apache/maven/plugins/compiler/it/App4.java maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-170/mcompiler-170-4/src/main/java/org/apache/maven/plugins/compiler/it/App5.java maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-170/mcompiler-170-4/src/main/java/org/apache
svn commit: r1625397 [1/2] - in /maven/plugins/trunk/maven-shade-plugin/src: it/MSHADE-105/bundle/src/main/java/test/ it/MSHADE-133/src/main/resources/ it/artifact-includes-excludes/repo/org/apache/ma
Author: khmarbaise Date: Tue Sep 16 21:21:01 2014 New Revision: 1625397 URL: http://svn.apache.org/r1625397 Log: [MSHADE-179] - Fixed a large number of apache-rat-plugin issues. Modified: maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-105/bundle/src/main/java/test/Dummy.java maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-133/src/main/resources/logback.xml maven/plugins/trunk/maven-shade-plugin/src/it/artifact-includes-excludes/repo/org/apache/maven/its/shade/aie/a/maven-metadata.xml maven/plugins/trunk/maven-shade-plugin/src/it/artifact-includes-excludes/repo/org/apache/maven/its/shade/aie/b/maven-metadata.xml maven/plugins/trunk/maven-shade-plugin/src/it/attached-artifact-type/invoker.properties maven/plugins/trunk/maven-shade-plugin/src/it/attached-artifact-type/shade/src/main/resources/META-INF/ejb-jar.xml maven/plugins/trunk/maven-shade-plugin/src/it/component-descriptor-relocation/repo/org/apache/maven/its/shade/cdr/comp/maven-metadata.xml maven/plugins/trunk/maven-shade-plugin/src/it/component-descriptor-relocation/src/main/java/org/apache/maven/test/TestComponent.java maven/plugins/trunk/maven-shade-plugin/src/it/component-descriptor-relocation/src/main/resources/META-INF/plexus/components.xml maven/plugins/trunk/maven-shade-plugin/src/it/dep-reduced-pom-relocated-result/invoker.properties maven/plugins/trunk/maven-shade-plugin/src/it/dep-reduced-pom-use-base-version/repo/org/apache/maven/its/shade/drp/a/0.1-SNAPSHOT/maven-metadata.xml maven/plugins/trunk/maven-shade-plugin/src/it/dep-reduced-pom-with-local-parent/invoker.properties maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-with-reloc/repo/org/apache/maven/its/shade/dcwr/a/maven-metadata.xml maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-with-reloc/repo/org/apache/maven/its/shade/dcwr/b/maven-metadata.xml maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-without-reloc/repo/org/apache/maven/its/shade/dcwor/a/maven-metadata.xml maven/plugins/trunk/maven-shade-plugin/src/it/duplicate-classes-without-reloc/repo/org/apache/maven/its/shade/dcwor/b/maven-metadata.xml maven/plugins/trunk/maven-shade-plugin/src/it/filter-artifact-contents/repo/org/apache/maven/its/shade/fac/a/maven-metadata.xml maven/plugins/trunk/maven-shade-plugin/src/it/filter-artifact-contents/repo/org/apache/maven/its/shade/fac/b/maven-metadata.xml maven/plugins/trunk/maven-shade-plugin/src/it/finalNameBuild-attached/src/main/resources/META-INF/ejb-jar.xml maven/plugins/trunk/maven-shade-plugin/src/it/finalNameBuild/src/main/resources/META-INF/ejb-jar.xml maven/plugins/trunk/maven-shade-plugin/src/it/finalNameShade-attached/src/main/resources/META-INF/ejb-jar.xml maven/plugins/trunk/maven-shade-plugin/src/it/finalNameShade/src/main/resources/META-INF/ejb-jar.xml maven/plugins/trunk/maven-shade-plugin/src/it/implicit-inclusion-of-project-artifact/src/main/java/Passed.java maven/plugins/trunk/maven-shade-plugin/src/it/mini-jar-malformed-dependencies/pom.xml maven/plugins/trunk/maven-shade-plugin/src/it/mini-jar-package-info/invoker.properties maven/plugins/trunk/maven-shade-plugin/src/it/mini-jar-package-info/test/src/main/java/org/apache/maven/it/pi/Main.java maven/plugins/trunk/maven-shade-plugin/src/it/mini-jar-respect-includes/invoker.properties maven/plugins/trunk/maven-shade-plugin/src/it/mini-jar-respect-includes/src/main/java/Main.java maven/plugins/trunk/maven-shade-plugin/src/it/mini-jar/invoker.properties maven/plugins/trunk/maven-shade-plugin/src/it/mini-jar/src/main/java/Main.java maven/plugins/trunk/maven-shade-plugin/src/it/mshade-123/assembly.xml maven/plugins/trunk/maven-shade-plugin/src/it/mshade-123/pom.xml maven/plugins/trunk/maven-shade-plugin/src/it/non-runtime-scope-excluded/repo/org/apache/maven/its/shade/nrse/compile/maven-metadata.xml maven/plugins/trunk/maven-shade-plugin/src/it/non-runtime-scope-excluded/repo/org/apache/maven/its/shade/nrse/provided/maven-metadata.xml maven/plugins/trunk/maven-shade-plugin/src/it/non-runtime-scope-excluded/repo/org/apache/maven/its/shade/nrse/runtime/maven-metadata.xml maven/plugins/trunk/maven-shade-plugin/src/it/non-runtime-scope-excluded/repo/org/apache/maven/its/shade/nrse/test/maven-metadata.xml maven/plugins/trunk/maven-shade-plugin/src/it/plugin-descriptor-relocation/repo/org/apache/maven/its/shade/cdr/comp/maven-metadata.xml maven/plugins/trunk/maven-shade-plugin/src/it/project-with-reactors-included/invoker.properties maven/plugins/trunk/maven-shade-plugin/src/it/project-with-reactors-included/one/src/main/java/org/apache/maven/plugins/shade/its/one/App.java maven/plugins/trunk/maven-shade-plugin/src/it/project-with-reactors-included/one/src/main/java/org/apache/maven/plugins/shade/its/one/AppOne.java maven/plugins/trunk/maven-shade-plugin/src
svn commit: r1625397 [2/2] - in /maven/plugins/trunk/maven-shade-plugin/src: it/MSHADE-105/bundle/src/main/java/test/ it/MSHADE-133/src/main/resources/ it/artifact-includes-excludes/repo/org/apache/ma
Modified: maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer/repo/org/apache/maven/its/shade/srt/two/maven-metadata.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer/repo/org/apache/maven/its/shade/srt/two/maven-metadata.xml?rev=1625397r1=1625396r2=1625397view=diff == --- maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer/repo/org/apache/maven/its/shade/srt/two/maven-metadata.xml (original) +++ maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer/repo/org/apache/maven/its/shade/srt/two/maven-metadata.xml Tue Sep 16 21:21:01 2014 @@ -1,4 +1,24 @@ ?xml version=1.0 encoding=UTF-8? + +!-- +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. +-- + metadata groupIdorg.apache.maven.its.shade.srt/groupId artifactIdtwo/artifactId Modified: maven/plugins/trunk/maven-shade-plugin/src/it/shading-with-java-8-sources/invoker.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/shading-with-java-8-sources/invoker.properties?rev=1625397r1=1625396r2=1625397view=diff == --- maven/plugins/trunk/maven-shade-plugin/src/it/shading-with-java-8-sources/invoker.properties (original) +++ maven/plugins/trunk/maven-shade-plugin/src/it/shading-with-java-8-sources/invoker.properties Tue Sep 16 21:21:01 2014 @@ -1,2 +1,19 @@ +# 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. + invoker.java.version = 1.8+ -invoker.goals=clean verify \ No newline at end of file +invoker.goals=clean verify Modified: maven/plugins/trunk/maven-shade-plugin/src/it/shading-with-java-8-sources/src/main/java/org/apache/maven/plugins/shade/its/App.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/shading-with-java-8-sources/src/main/java/org/apache/maven/plugins/shade/its/App.java?rev=1625397r1=1625396r2=1625397view=diff == --- maven/plugins/trunk/maven-shade-plugin/src/it/shading-with-java-8-sources/src/main/java/org/apache/maven/plugins/shade/its/App.java (original) +++ maven/plugins/trunk/maven-shade-plugin/src/it/shading-with-java-8-sources/src/main/java/org/apache/maven/plugins/shade/its/App.java Tue Sep 16 21:21:01 2014 @@ -1,5 +1,25 @@ package org.apache.maven.plugins.shade.its; +/* + * 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. + */ + + /** * Hello world! */ Modified: maven/plugins/trunk/maven-shade-plugin/src/it/users-shader-impl/invoker.properties URL:
svn commit: r6540 - /release/maven/shared/
Author: khmarbaise Date: Wed Sep 17 20:12:53 2014 New Revision: 6540 Log: - Added Shared Maven Dependency Tree Version 2.2 Added: release/maven/shared/maven-dependency-tree-2.2-source-release.zip (with props) release/maven/shared/maven-dependency-tree-2.2-source-release.zip.asc release/maven/shared/maven-dependency-tree-2.2-source-release.zip.md5 Removed: release/maven/shared/maven-dependency-tree-2.1-source-release.zip release/maven/shared/maven-dependency-tree-2.1-source-release.zip.asc release/maven/shared/maven-dependency-tree-2.1-source-release.zip.md5 Added: release/maven/shared/maven-dependency-tree-2.2-source-release.zip == Binary file - no diff available. Propchange: release/maven/shared/maven-dependency-tree-2.2-source-release.zip -- svn:mime-type = application/octet-stream Added: release/maven/shared/maven-dependency-tree-2.2-source-release.zip.asc == --- release/maven/shared/maven-dependency-tree-2.2-source-release.zip.asc (added) +++ release/maven/shared/maven-dependency-tree-2.2-source-release.zip.asc Wed Sep 17 20:12:53 2014 @@ -0,0 +1,28 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG/MacGPG2 v2.0.19 (Darwin) +Comment: GPGTools - http://gpgtools.org + +iQQcBAABCgAGBQJUFdmMAAoJECGiSz+LD1lKJB4f+gPnHL5HJ59J+6SC/ADpZ4WX +62wNUwobdMDYK1c9BOT/h2gyOyA49XosxoElsxEbJ+mYGH4I0/PbzPXeKjmWjJAi +oKV3MMXmZxjQPlTHYJj+VdebJasVM59AzP3GsBL9pLA76TTwAqt8yOB/fZ4PmOcl +lwEVQ8CG3hjAemRmgVNP3YAiwGdUOK9CTtFRsSgsPeWtB0Qk9cAvD076DfQftStK +SrM07HQmA4RVIaJe6YNDolExnh9ASLmytbINJ0eNDbvG7L6Dm7u3W+WXJgmAXrMT +N8ZDgyWFtBqehTUQ3qjkcy7zsXoU7LE7esA1FycFrnZvPVxzisgV8UWXlX9c1PY7 +ANzr9KhBSj1SauC7fXBho3cg2rfCI7RxtgwiLNA4Bhtr9BrvkbJtT7vTAj77aSL3 +vmICKSoEvJHXrV38ZiRM3VJUp+qi1v9G83dfkKpjd4PKjQvC/Qji8afDbrUj8O+V +KTttCmqiW8+PWABQPRg4G2AMWAOXeBrnFtNv0ByBlgpF34q5dMWIzVFWaGQHJ4f4 +BDnhw6ksoeoM+P4MSFXx0l8pZl8OTLjq7o7q4LEWu9Ol7yyIuO3QIGeP0crmIS/6 +P6kS2Yf9/AF0ODwOwbwLYh0qfofnEz8kk6Y8oNsO7HxVYxl1yIoA1dxHrVIDOYAc +tI82uivNby6vmfs8TXwzFs+AEbg7aGiNtSHHeDwQEpowUh3ZBUfajP1vnlJVgQQ6 +jsmh63U4phL3DV/8OWOJ517vawWPcUlU79IAmM4kaVes+x+Vhwa8xxgtexDsejkh +jFgA4v9gGpnmbLY1UDqV5wvdCJv8kIo8Kv+F2gcsj1NOhOi3zNRSw7D4LKojqUCS +eh9MlTT9mjDfoVgAJnzgwLeFaflN6iJIMMohgugqG1FsUnSxVno2IJerQwrZE9bu ++yw7VNIVtcTUgMcACYXlpT1MkgVOJaF1EKmevvNzjbRnK8fmvu6R1QEI0xJgnf/f +rVQwDxOr9kBVmH6T4vOQj+VKudmf2e3UYyEo7x623zKD+G7u3arZtj3anvaiVUxl +rFQ+S/Be7LTlIxwRe+6pWwq9nicvEcLlNFS240wEBJHSyyvk+q+bNthYx5vHAlG6 +QOr4vuA7vy/oBhOTZFDtMmmrUqvBWiVdeaS85intLfqy1mFtA60Fm59aGVqRFBbJ +NTvfm0frPcvG8ijlIJP5yYYhBLRhtw/eRIBcRIj8RuBnNyjnHxnIlEKCPNF1MD1u +5WGJGATYCewSxLoOhWsFw9Fl+W84LIyW4cj9X8J/o5y/d4Zk1g+VwrGGMoPOiTBg +rMkie6Qwo6YtdNcmuyDxcu2OZRfLEfiN/Py3tyKLnzrOtlEnZ8FFTniJbMFMRPw= +=R25w +-END PGP SIGNATURE- Added: release/maven/shared/maven-dependency-tree-2.2-source-release.zip.md5 == --- release/maven/shared/maven-dependency-tree-2.2-source-release.zip.md5 (added) +++ release/maven/shared/maven-dependency-tree-2.2-source-release.zip.md5 Wed Sep 17 20:12:53 2014 @@ -0,0 +1 @@ +13e53c7ac250655d5f5a75b24aec6005 \ No newline at end of file
svn commit: r922591 - in /websites/production/maven/content: shared-archives/maven-dependency-tree-2.2/ shared/maven-dependency-tree/
Author: khmarbaise Date: Wed Sep 17 20:12:37 2014 New Revision: 922591 Log: Publish Apache Maven Dependency Tree Version 2.2 Added: websites/production/maven/content/shared-archives/maven-dependency-tree-2.2/ - copied from r922590, websites/production/maven/content/shared-archives/maven-dependency-tree-LATEST/ websites/production/maven/content/shared/maven-dependency-tree/ - copied from r922590, websites/production/maven/content/shared-archives/maven-dependency-tree-LATEST/
svn commit: r1625799 - /maven/site/trunk/content/apt/shared/index.apt
Author: khmarbaise Date: Wed Sep 17 20:14:51 2014 New Revision: 1625799 URL: http://svn.apache.org/r1625799 Log: - Updated Apache Maven Shared: Maven Dependency Tree Version 2.2 Modified: maven/site/trunk/content/apt/shared/index.apt Modified: maven/site/trunk/content/apt/shared/index.apt URL: http://svn.apache.org/viewvc/maven/site/trunk/content/apt/shared/index.apt?rev=1625799r1=1625798r2=1625799view=diff == --- maven/site/trunk/content/apt/shared/index.apt (original) +++ maven/site/trunk/content/apt/shared/index.apt Wed Sep 17 20:14:51 2014 @@ -23,7 +23,7 @@ Shared Components *+--+---+--++-+ | {{{/shared/maven-dependency-analyzer/} maven-dependency-analyzer}} | 1.5 | 2014-09-11| Maven Dependency Analyzer component. | {{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-dependency-analyzer/}SVN}} | {{{http://jira.codehaus.org/browse/MSHARED/component/13265}JIRA}} *+--+---+--++-+ -| {{{/shared/maven-dependency-tree/} maven-dependency-tree}} | 2.1 | 2013-05-06| Maven Dependency Tree constructs a tree model of a Maven project's dependencies. | {{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-dependency-tree/}SVN}} | {{{http://jira.codehaus.org/browse/MSHARED/component/13264}JIRA}} +| {{{/shared/maven-dependency-tree/} maven-dependency-tree}} | 2.2 | 2014-09-14| Maven Dependency Tree constructs a tree model of a Maven project's dependencies. | {{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-dependency-tree/}SVN}} | {{{http://jira.codehaus.org/browse/MSHARED/component/13264}JIRA}} *+--+---+--++-+ | {{{/doxia/doxia-tools/doxia-integration-tools/} maven-doxia-tools}} | | | moved to {{{/doxia/doxia-tools/doxia-integration-tools/} doxia-integration-tools}} | | *+--+---+--++-+
svn commit: r1625803 - /maven/site/trunk/content/markdown/pom.md
Author: khmarbaise Date: Wed Sep 17 20:19:30 2014 New Revision: 1625803 URL: http://svn.apache.org/r1625803 Log: - Undone r1624995 cause it does not fix something. Modified: maven/site/trunk/content/markdown/pom.md Modified: maven/site/trunk/content/markdown/pom.md URL: http://svn.apache.org/viewvc/maven/site/trunk/content/markdown/pom.md?rev=1625803r1=1625802r2=1625803view=diff == --- maven/site/trunk/content/markdown/pom.md (original) +++ maven/site/trunk/content/markdown/pom.md Wed Sep 17 20:19:30 2014 @@ -9,6 +9,7 @@ 2. [POM Relationships](#POM_Relationships) 1. [Dependencies](#Dependencies) 1. [Exclusions](#Exclusions) + 2. [Inheritance](#Inheritance) 1. [The Super POM](#The_Super_POM) 2. [Dependency Management](#Dependency_Management)
svn commit: r922592 - in /websites/production/maven/content: ./ ant-tasks-archives/ ant-tasks/ archetype-archives/ archetype/ archives/maven-1.x/ core-its/ enforcer-archives/ enforcer/ jxr-archives/ j
Author: khmarbaise Date: Wed Sep 17 20:18:22 2014 New Revision: 922592 Log: Update Apache Maven Shared: Maven Dependency Tree 2.2. Added: websites/production/maven/content/ - copied from r922591, websites/staging/maven/trunk/content/ websites/production/maven/content/ant-tasks/ - copied from r922591, websites/production/maven/content/ant-tasks/ websites/production/maven/content/ant-tasks-archives/ - copied from r922591, websites/production/maven/content/ant-tasks-archives/ websites/production/maven/content/archetype/ - copied from r922591, websites/production/maven/content/archetype/ websites/production/maven/content/archetype-archives/ - copied from r922591, websites/production/maven/content/archetype-archives/ websites/production/maven/content/archives/maven-1.x/ - copied from r922591, websites/production/maven/content/archives/maven-1.x/ websites/production/maven/content/core-its/ - copied from r922591, websites/production/maven/content/core-its/ websites/production/maven/content/enforcer/ - copied from r922591, websites/production/maven/content/enforcer/ websites/production/maven/content/enforcer-archives/ - copied from r922591, websites/production/maven/content/enforcer-archives/ websites/production/maven/content/jxr/ - copied from r922591, websites/production/maven/content/jxr/ websites/production/maven/content/jxr-archives/ - copied from r922591, websites/production/maven/content/jxr-archives/ websites/production/maven/content/maven-archetype-bundles/ - copied from r922591, websites/production/maven/content/maven-archetype-bundles/ websites/production/maven/content/maven-indexer/ - copied from r922591, websites/production/maven/content/maven-indexer/ websites/production/maven/content/maven-indexer-archives/ - copied from r922591, websites/production/maven/content/maven-indexer-archives/ websites/production/maven/content/maven-release/ - copied from r922591, websites/production/maven/content/maven-release/ websites/production/maven/content/maven-release-archives/ - copied from r922591, websites/production/maven/content/maven-release-archives/ websites/production/maven/content/plugin-testing/ - copied from r922591, websites/production/maven/content/plugin-testing/ websites/production/maven/content/plugin-testing-archives/ - copied from r922591, websites/production/maven/content/plugin-testing-archives/ websites/production/maven/content/plugin-tools/ - copied from r922591, websites/production/maven/content/plugin-tools/ websites/production/maven/content/plugin-tools-archives/ - copied from r922591, websites/production/maven/content/plugin-tools-archives/ websites/production/maven/content/plugins-archives/ - copied from r922591, websites/production/maven/content/plugins-archives/ websites/production/maven/content/plugins/maven-acr-plugin/ - copied from r922591, websites/production/maven/content/plugins/maven-acr-plugin/ websites/production/maven/content/plugins/maven-ant-plugin/ - copied from r922591, websites/production/maven/content/plugins/maven-ant-plugin/ websites/production/maven/content/plugins/maven-antrun-plugin/ - copied from r922591, websites/production/maven/content/plugins/maven-antrun-plugin/ websites/production/maven/content/plugins/maven-archetype-plugin/ - copied from r922591, websites/production/maven/content/plugins/maven-archetype-plugin/ websites/production/maven/content/plugins/maven-assembly-plugin/ - copied from r922591, websites/production/maven/content/plugins/maven-assembly-plugin/ websites/production/maven/content/plugins/maven-changelog-plugin/ - copied from r922591, websites/production/maven/content/plugins/maven-changelog-plugin/ websites/production/maven/content/plugins/maven-changes-plugin/ - copied from r922591, websites/production/maven/content/plugins/maven-changes-plugin/ websites/production/maven/content/plugins/maven-checkstyle-plugin/ - copied from r922591, websites/production/maven/content/plugins/maven-checkstyle-plugin/ websites/production/maven/content/plugins/maven-clean-plugin/ - copied from r922591, websites/production/maven/content/plugins/maven-clean-plugin/ websites/production/maven/content/plugins/maven-compiler-plugin/ - copied from r922591, websites/production/maven/content/plugins/maven-compiler-plugin/ websites/production/maven/content/plugins/maven-dependency-plugin/ - copied from r922591, websites/production/maven/content/plugins/maven-dependency-plugin/ websites/production/maven/content/plugins/maven-deploy-plugin/ - copied from r922591, websites/production/maven/content/plugins/maven-deploy-plugin/ websites/production/maven/content/plugins/maven-doap-plugin/ - copied from r922591
svn commit: r1625809 - /maven/site/trunk/content/apt/shared/index.apt
Author: khmarbaise Date: Wed Sep 17 20:37:21 2014 New Revision: 1625809 URL: http://svn.apache.org/r1625809 Log: - Fixed Link to SCM area. Modified: maven/site/trunk/content/apt/shared/index.apt Modified: maven/site/trunk/content/apt/shared/index.apt URL: http://svn.apache.org/viewvc/maven/site/trunk/content/apt/shared/index.apt?rev=1625809r1=1625808r2=1625809view=diff == --- maven/site/trunk/content/apt/shared/index.apt (original) +++ maven/site/trunk/content/apt/shared/index.apt Wed Sep 17 20:37:21 2014 @@ -57,7 +57,7 @@ Shared Components *+--+---+--++-+ | {{{/shared/maven-verifier/} maven-verifier}} | 1.5 | 2013-12-06| Used to run Maven builds as part of tests. | {{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-verifier/}SVN}} | {{{http://jira.codehaus.org/browse/MSHARED/component/13281}JIRA}} *+--+---+--++-+ -| {{scm} maven-scm}} | 1.9.2| 2014-09-17| Generic API to SCM systems. | {{{git://git.apache.org/maven-scm.git}GIT}} | {{{http://jira.codehaus.org/browse/SCM}JIRA}} +| {{{/scm/} maven-scm}} | 1.9.2| 2014-09-17| Generic API to SCM systems. | {{{git://git.apache.org/maven-scm.git}GIT}} | {{{http://jira.codehaus.org/browse/SCM}JIRA}} *+--+---+--++-+
svn commit: r1625819 - /maven/plugins/trunk/maven-dependency-plugin/pom.xml
Author: khmarbaise Date: Wed Sep 17 20:51:14 2014 New Revision: 1625819 URL: http://svn.apache.org/r1625819 Log: [MDEP-464] - Upgrade shared component maven-invoker from 2.0.11 to 2.1.1 Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/pom.xml?rev=1625819r1=1625818r2=1625819view=diff == --- maven/plugins/trunk/maven-dependency-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-dependency-plugin/pom.xml Wed Sep 17 20:51:14 2014 @@ -192,7 +192,7 @@ under the License. dependency groupIdorg.apache.maven.shared/groupId artifactIdmaven-invoker/artifactId - version2.0.11/version + version2.1.1/version /dependency dependency
svn commit: r1625939 - /maven/plugins/trunk/maven-dependency-plugin/pom.xml
Author: khmarbaise Date: Thu Sep 18 10:58:47 2014 New Revision: 1625939 URL: http://svn.apache.org/r1625939 Log: [MDEP-464] - Upgrade shared component maven-invoker from 2.0.11 to 2.1.1 Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/pom.xml?rev=1625939r1=1625938r2=1625939view=diff == --- maven/plugins/trunk/maven-dependency-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-dependency-plugin/pom.xml Thu Sep 18 10:58:47 2014 @@ -182,7 +182,7 @@ under the License. dependency groupIdorg.apache.maven.shared/groupId artifactIdmaven-dependency-tree/artifactId - version2.1/version + version2.2/version /dependency dependency groupIdorg.apache.maven.shared/groupId
svn propchange: r1625939 - svn:log
Author: khmarbaise Revision: 1625939 Modified property: svn:log Modified: svn:log at Thu Sep 18 11:00:35 2014 -- --- svn:log (original) +++ svn:log Thu Sep 18 11:00:35 2014 @@ -1,3 +1,3 @@ -[MDEP-464] - - Upgrade shared component maven-invoker from 2.0.11 to - 2.1.1 +[MDEP-462] + - Upgrade shared component maven-dependency-tree from 2.1 + to 2.2
svn commit: r1626048 - /maven/plugins/tags/maven-dependency-plugin-2.9/
Author: khmarbaise Date: Thu Sep 18 19:04:12 2014 New Revision: 1626048 URL: http://svn.apache.org/r1626048 Log: [maven-release-plugin] copy for tag maven-dependency-plugin-2.9 Added: maven/plugins/tags/maven-dependency-plugin-2.9/ - copied from r1626047, maven/plugins/trunk/maven-dependency-plugin/
svn commit: r1626047 - /maven/plugins/trunk/maven-dependency-plugin/pom.xml
Author: khmarbaise Date: Thu Sep 18 19:04:08 2014 New Revision: 1626047 URL: http://svn.apache.org/r1626047 Log: [maven-release-plugin] prepare release maven-dependency-plugin-2.9 Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/pom.xml?rev=1626047r1=1626046r2=1626047view=diff == --- maven/plugins/trunk/maven-dependency-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-dependency-plugin/pom.xml Thu Sep 18 19:04:08 2014 @@ -30,7 +30,7 @@ under the License. /parent artifactIdmaven-dependency-plugin/artifactId - version2.9-SNAPSHOT/version + version2.9/version packagingmaven-plugin/packaging nameApache Maven Dependency Plugin/name @@ -41,9 +41,9 @@ under the License. /prerequisites scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-dependency-plugin//connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-dependency-plugin//developerConnection - urlhttp://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin//url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-dependency-plugin-2.9/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-dependency-plugin-2.9/developerConnection + urlhttp://svn.apache.org/viewvc/maven/plugins/tags/maven-dependency-plugin-2.9/url /scm issueManagement systemJIRA/system @@ -360,7 +360,7 @@ under the License. sourcesrc/test/resources/m2repo/source /mockRepo -- -proxyRepo/ +proxyRepo / /repositories /configuration /plugin
svn commit: r1626049 - /maven/plugins/trunk/maven-dependency-plugin/pom.xml
Author: khmarbaise Date: Thu Sep 18 19:04:15 2014 New Revision: 1626049 URL: http://svn.apache.org/r1626049 Log: [maven-release-plugin] prepare for next development iteration Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/pom.xml?rev=1626049r1=1626048r2=1626049view=diff == --- maven/plugins/trunk/maven-dependency-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-dependency-plugin/pom.xml Thu Sep 18 19:04:15 2014 @@ -30,7 +30,7 @@ under the License. /parent artifactIdmaven-dependency-plugin/artifactId - version2.9/version + version2.10-SNAPSHOT/version packagingmaven-plugin/packaging nameApache Maven Dependency Plugin/name @@ -41,9 +41,9 @@ under the License. /prerequisites scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-dependency-plugin-2.9/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-dependency-plugin-2.9/developerConnection - urlhttp://svn.apache.org/viewvc/maven/plugins/tags/maven-dependency-plugin-2.9/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-dependency-plugin//connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-dependency-plugin//developerConnection + urlhttp://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin//url /scm issueManagement systemJIRA/system
svn commit: r1626635 - /maven/site/trunk/content/apt/plugins/index.apt
Author: khmarbaise Date: Sun Sep 21 21:30:13 2014 New Revision: 1626635 URL: http://svn.apache.org/r1626635 Log: - Apache Maven Dependency Plugin Version 2.9 Released Modified: maven/site/trunk/content/apt/plugins/index.apt Modified: maven/site/trunk/content/apt/plugins/index.apt URL: http://svn.apache.org/viewvc/maven/site/trunk/content/apt/plugins/index.apt?rev=1626635r1=1626634r2=1626635view=diff == --- maven/site/trunk/content/apt/plugins/index.apt (original) +++ maven/site/trunk/content/apt/plugins/index.apt Sun Sep 21 21:30:13 2014 @@ -6,8 +6,9 @@ Dennis Lundberg Olivier Lamy Benson Margulies + Karl-Heinz Marbaise - - 2014-09-20 + 2014-09-21 - ~~ Licensed to the Apache Software Foundation (ASF) under one @@ -136,7 +137,7 @@ Available Plugins *--++--++--+++ | {{{/plugins/maven-assembly-plugin/} assembly}} | B | 2.4.1| 2014-07-30 | Build an assembly (distribution) of sources and/or binaries. | {{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-assembly-plugin}SVN}} | {{{http://jira.codehaus.org/browse/MASSEMBLY}JIRA}} *--++--++--+++ -| {{{/plugins/maven-dependency-plugin/} dependency}} | B+R| 2.8 | 2013-05-18 | Dependency manipulation (copy, unpack) and analysis. | {{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-dependency-plugin}SVN}} | {{{http://jira.codehaus.org/browse/MDEP}JIRA}} +| {{{/plugins/maven-dependency-plugin/} dependency}} | B+R| 2.9 | 2014-09-18 | Dependency manipulation (copy, unpack) and analysis. | {{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-dependency-plugin}SVN}} | {{{http://jira.codehaus.org/browse/MDEP}JIRA}} *--++--++--+++ | {{{/enforcer/maven-enforcer-plugin/} enforcer}}| B | 1.3.1| 2013-07-12 | Environmental constraint checking (Maven Version, JDK etc), User Custom Rule Execution. | {{{http://svn.apache.org/repos/asf/maven/enforcer/trunk/maven-enforcer-plugin}SVN}} | {{{http://jira.codehaus.org/browse/MENFORCER}JIRA}} *--++--++--+++
svn commit: r6614 - /release/maven/plugins/
Author: khmarbaise Date: Sun Sep 21 21:31:06 2014 New Revision: 6614 Log: - Added Apache Maven Dependency Plugin Version 2.9 Added: release/maven/plugins/maven-dependency-plugin-2.9-source-release.zip (with props) release/maven/plugins/maven-dependency-plugin-2.9-source-release.zip.asc release/maven/plugins/maven-dependency-plugin-2.9-source-release.zip.md5 Removed: release/maven/plugins/maven-dependency-plugin-2.8-source-release.zip release/maven/plugins/maven-dependency-plugin-2.8-source-release.zip.asc release/maven/plugins/maven-dependency-plugin-2.8-source-release.zip.md5 Added: release/maven/plugins/maven-dependency-plugin-2.9-source-release.zip == Binary file - no diff available. Propchange: release/maven/plugins/maven-dependency-plugin-2.9-source-release.zip -- svn:mime-type = application/octet-stream Added: release/maven/plugins/maven-dependency-plugin-2.9-source-release.zip.asc == --- release/maven/plugins/maven-dependency-plugin-2.9-source-release.zip.asc (added) +++ release/maven/plugins/maven-dependency-plugin-2.9-source-release.zip.asc Sun Sep 21 21:31:06 2014 @@ -0,0 +1,28 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG/MacGPG2 v2.0.19 (Darwin) +Comment: GPGTools - http://gpgtools.org + +iQQcBAABCgAGBQJUGzGEAAoJECGiSz+LD1lK1Zwf/3bl0x20Buyogk9lqL/4QbN7 +XeJgRvAIS4WBtpSx0iDC/fSPiT3iPDP2SZGaw3c3kVbMAFo7Dx7escAsnPcUJuu7 +XIw3LjZ938Ve7ickZWdyqB+2rvi5NazfRCsP9d/yOq3szKqDmFgI364PFlup+DDw +X0Av2cvUiyxg0MyXU5GOmTJHJA1Tq1aXuFy3u/Y8lZMg/6An6AryeDgScKvifooa +T2m0qvQ/6vzY2MxJFhfS81r8y7KJaFlwRVvGh7qo2XZyrTn5smYdzo7NWPaBsulg +hgPztSXI92gnNU2DAdAlxPVq4fx+B92gprmm2VtNbh0H1FPFm2WkWPC1FJVAf44/ +xVsx91LmqIh1At1OHgWP9EW5EtThMjkk2y9FwM9I0UsjsdLQS4NjQCD1Uev1HclR +Y10Ut0+8SpiHs7fDzgurIuwsPTuxwxmkuvNdrz7MdyJQv06iDTVD7nWuY1kNXGwq +w2AHP+gFwWyprgHZf0fNM0Otlge7atXcsLHC8CT5sY4CB9fAqyLnT848oJpYFWcW +pLhWNPIZgv3nmC+v47IWO52GydvdDH2QXplILWlWlRWwMzAxwaeYL7+gEItRQBKR +LbNHbgIrh6MROntLyDxXtdGMypOSoiSBrn49ggi/QeExMTj0+UfKkq9Md9KuX4ym +YcwTkk4M9IzSlM4Xeva1WfMYlSNgDvHK3RSYJCGYOes1Px8ZoFaWZiLauRn8X3nn +WuBMjeSMxX412R1e6IZB7Yh93NTN/sIswuGyjK+x49Ejh8uPu7PBrePlx6JQBbyY +vh+fk9MquedrCkUDnhEaWmZd8IwRKFCZfqi7Qc90eAhNCZ93oqso4866fm+73qez +GARqYQZXoJuAyZhAL59RD+gLLsKilUkCN/HG66utXqake4CFkGpUCEcNMne236RD +XONUV2jN7Tqx8TS2GOryCTHdZDc2CmbsBWdBuD5G8e7EfKp9WkYckPapUhoZ/yXN +TPfogZ80lJfRGrGyAcDNtP0OdnCsOrYgLjc73C8itf/hWySKnGPyYysABbbSZvHx +BCRmR6R4KEhwsVgeUR+1oc6gaZRuixqjAhMuZ1qXeW9qAUJr/XseEPcwuLCOJ3Sr +RngvpvUd5j3GKsBTiBff8q2Fx/z0ZbLUy/HSCJ5H5bxeaNIMYoaspKQufMFyddQn +8SQX6nW+rcFznm9xlFu0FR6a8lrmHh22qPSoARjrBZ+zBcdVSMWbBcuQ013fxhsB +bquqUslb86LmJN7uybHI8lllIycF2bPxJmTVnLA3ASjuXRGB4LV1gJjBpJmCzmMc +74qB+iit7ghyDvFpBbr50e+A+t01v6Ytu/sl+0t1/XcqsWP5e0h2HyJY6UYUvK8= +=QoHX +-END PGP SIGNATURE- Added: release/maven/plugins/maven-dependency-plugin-2.9-source-release.zip.md5 == --- release/maven/plugins/maven-dependency-plugin-2.9-source-release.zip.md5 (added) +++ release/maven/plugins/maven-dependency-plugin-2.9-source-release.zip.md5 Sun Sep 21 21:31:06 2014 @@ -0,0 +1 @@ +13032abb5199c5c80277c3bfb4aa8a18 \ No newline at end of file
svn commit: r1626671 - /maven/plugins/trunk/maven-remote-resources-plugin/pom.xml
Author: khmarbaise Date: Mon Sep 22 06:41:09 2014 New Revision: 1626671 URL: http://svn.apache.org/r1626671 Log: - Added TODO hint. Modified: maven/plugins/trunk/maven-remote-resources-plugin/pom.xml Modified: maven/plugins/trunk/maven-remote-resources-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/pom.xml?rev=1626671r1=1626670r2=1626671view=diff == --- maven/plugins/trunk/maven-remote-resources-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-remote-resources-plugin/pom.xml Mon Sep 22 06:41:09 2014 @@ -160,6 +160,7 @@ under the License. version3.8.1/version scopetest/scope /dependency +!-- TODO: Should be removed only Maven 2.0 -- dependency groupIdorg.codehaus.plexus/groupId artifactIdplexus-container-default/artifactId
svn commit: r1626672 - /maven/plugins/trunk/maven-clean-plugin/pom.xml
Author: khmarbaise Date: Mon Sep 22 06:44:35 2014 New Revision: 1626672 URL: http://svn.apache.org/r1626672 Log: [maven-release-plugin] prepare release maven-clean-plugin-2.6 Modified: maven/plugins/trunk/maven-clean-plugin/pom.xml Modified: maven/plugins/trunk/maven-clean-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-clean-plugin/pom.xml?rev=1626672r1=1626671r2=1626672view=diff == --- maven/plugins/trunk/maven-clean-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-clean-plugin/pom.xml Mon Sep 22 06:44:35 2014 @@ -30,7 +30,7 @@ under the License. /parent artifactIdmaven-clean-plugin/artifactId - version2.6-SNAPSHOT/version + version2.6/version packagingmaven-plugin/packaging nameApache Maven Clean Plugin/name @@ -44,9 +44,9 @@ under the License. /prerequisites scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-clean-plugin/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-clean-plugin/developerConnection - urlhttp://svn.apache.org/viewvc/maven/plugins/trunk/maven-clean-plugin/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-clean-plugin-2.6/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-clean-plugin-2.6/developerConnection + urlhttp://svn.apache.org/viewvc/maven/plugins/tags/maven-clean-plugin-2.6/url /scm issueManagement systemJIRA/system
svn commit: r1626674 - /maven/plugins/trunk/maven-clean-plugin/pom.xml
Author: khmarbaise Date: Mon Sep 22 06:44:45 2014 New Revision: 1626674 URL: http://svn.apache.org/r1626674 Log: [maven-release-plugin] prepare for next development iteration Modified: maven/plugins/trunk/maven-clean-plugin/pom.xml Modified: maven/plugins/trunk/maven-clean-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-clean-plugin/pom.xml?rev=1626674r1=1626673r2=1626674view=diff == --- maven/plugins/trunk/maven-clean-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-clean-plugin/pom.xml Mon Sep 22 06:44:45 2014 @@ -30,7 +30,7 @@ under the License. /parent artifactIdmaven-clean-plugin/artifactId - version2.6/version + version2.7-SNAPSHOT/version packagingmaven-plugin/packaging nameApache Maven Clean Plugin/name @@ -44,9 +44,9 @@ under the License. /prerequisites scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-clean-plugin-2.6/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-clean-plugin-2.6/developerConnection - urlhttp://svn.apache.org/viewvc/maven/plugins/tags/maven-clean-plugin-2.6/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-clean-plugin/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-clean-plugin/developerConnection + urlhttp://svn.apache.org/viewvc/maven/plugins/trunk/maven-clean-plugin/url /scm issueManagement systemJIRA/system
svn commit: r1626673 - /maven/plugins/tags/maven-clean-plugin-2.6/
Author: khmarbaise Date: Mon Sep 22 06:44:41 2014 New Revision: 1626673 URL: http://svn.apache.org/r1626673 Log: [maven-release-plugin] copy for tag maven-clean-plugin-2.6 Added: maven/plugins/tags/maven-clean-plugin-2.6/ - copied from r1626672, maven/plugins/trunk/maven-clean-plugin/
svn commit: r1627139 - /maven/plugins/trunk/maven-changes-plugin/pom.xml
Author: khmarbaise Date: Tue Sep 23 19:58:48 2014 New Revision: 1627139 URL: http://svn.apache.org/r1627139 Log: [MCHANGES-343] - Updated maven-reporting-impl to version 2.3 Modified: maven/plugins/trunk/maven-changes-plugin/pom.xml Modified: maven/plugins/trunk/maven-changes-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/pom.xml?rev=1627139r1=1627138r2=1627139view=diff == --- maven/plugins/trunk/maven-changes-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-changes-plugin/pom.xml Tue Sep 23 19:58:48 2014 @@ -124,7 +124,7 @@ under the License. dependency groupIdorg.apache.maven.reporting/groupId artifactIdmaven-reporting-impl/artifactId - version2.2/version + version2.3/version /dependency dependency groupIdorg.apache.maven.shared/groupId
svn commit: r1627666 - /maven/site/trunk/content/apt/plugins/index.apt
Author: khmarbaise Date: Thu Sep 25 21:01:16 2014 New Revision: 1627666 URL: http://svn.apache.org/r1627666 Log: - Apache Maven Clean Plugin Version 2.6 Released Modified: maven/site/trunk/content/apt/plugins/index.apt Modified: maven/site/trunk/content/apt/plugins/index.apt URL: http://svn.apache.org/viewvc/maven/site/trunk/content/apt/plugins/index.apt?rev=1627666r1=1627665r2=1627666view=diff == --- maven/site/trunk/content/apt/plugins/index.apt (original) +++ maven/site/trunk/content/apt/plugins/index.apt Thu Sep 25 21:01:16 2014 @@ -67,7 +67,7 @@ Available Plugins *--++--++--+++ | Core plugins || || Plugins corresponding to default core phases (ie. clean, compile). They may have multiple goals as well. | | *--++--++--+++ -| {{{/plugins/maven-clean-plugin/} clean}} | B | 2.5 | 2012-05-26 | Clean up after the build. | {{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-clean-plugin}SVN}} | {{{http://jira.codehaus.org/browse/MCLEAN}JIRA}} +| {{{/plugins/maven-clean-plugin/} clean}} | B | 2.6 | 2014-09-22 | Clean up after the build. | {{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-clean-plugin}SVN}} | {{{http://jira.codehaus.org/browse/MCLEAN}JIRA}} *--++--++--+++ | {{{/plugins/maven-compiler-plugin/} compiler}} | B | 3.1 | 2013-04-08 | Compiles Java sources. | {{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-compiler-plugin}SVN}} | {{{http://jira.codehaus.org/browse/MCOMPILER}JIRA}} *--++--++--+++
svn commit: r6659 - /release/maven/plugins/
Author: khmarbaise Date: Thu Sep 25 21:01:02 2014 New Revision: 6659 Log: - Added Apache Maven Clean Plugin Version 2.6 Added: release/maven/plugins/maven-clean-plugin-2.6-source-release.zip (with props) release/maven/plugins/maven-clean-plugin-2.6-source-release.zip.asc release/maven/plugins/maven-clean-plugin-2.6-source-release.zip.md5 Removed: release/maven/plugins/maven-clean-plugin-2.5-source-release.zip release/maven/plugins/maven-clean-plugin-2.5-source-release.zip.asc release/maven/plugins/maven-clean-plugin-2.5-source-release.zip.md5 Added: release/maven/plugins/maven-clean-plugin-2.6-source-release.zip == Binary file - no diff available. Propchange: release/maven/plugins/maven-clean-plugin-2.6-source-release.zip -- svn:mime-type = application/octet-stream Added: release/maven/plugins/maven-clean-plugin-2.6-source-release.zip.asc == --- release/maven/plugins/maven-clean-plugin-2.6-source-release.zip.asc (added) +++ release/maven/plugins/maven-clean-plugin-2.6-source-release.zip.asc Thu Sep 25 21:01:02 2014 @@ -0,0 +1,28 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG/MacGPG2 v2.0.19 (Darwin) +Comment: GPGTools - http://gpgtools.org + +iQQcBAABCgAGBQJUH8WRAAoJECGiSz+LD1lK5rIf/1GHBL0+6P0BrczJv3hqWsuU +8jI/kCkLFNS3SsyKfeS0Maf/6FP1wPx2brUs7lny0zf791ouEURP9k+2aydIahv4 +odcp9BWImEVANV6Y8ZNnPqJvWWdqlCLuYb+VD44HmipPSVwVAtBgO+i7zcYjEFVR +qKaVdM//fxSb/HBdKXP8MpnUOqGho7ViaW8ECfAbWTte6hWpbqAFjNVDmnHjWLQS +H4DgjqDpPyb1cWwPsGfmuRVcuMMiFojTC9sv3bBNNZHmjUACNh6sOloZ8U9nNjjl +4fiE9e+O4TwAmokbiYkslPX6/D4UPdt4jhzvOg9CvuWcuU0ixLHFlj0EmYRjdXkA +YN9i8jZ6++HTnoKttXXYA3v7Blna1rkVX0Q/DDoo6U2QaC9FzRdksfglrX/lYbUq +uJPGr/sIQGb+ZFYQK3U8gcN87pxQnv5Nj/d7JbEySYvYEYJwdhDNsx5KgxOB8KhW +X2JgfYW4dYkuh2Q0hvrzU9p4uxBhiglY+7V0T8TZjiYCWkUeq8uPX66UF7HMZvrt +1uxrQDz0lpWxdqKeUk1Elp71rrsCZ/5LnZ/IBMkl8yWhPU9mWs5EYLXOTggKgAwL +7b96CZoDo3HwP3hiDhXES3ZAckLq9OdS89l2Vl9ACracjm6mwre/kTd1UOVIPBlU +FF/KovKScYvE9w/hLx9vOe0pOjnmDOxH2AvGUBOAALtOvtTEkiw1eH+Qv1i63X1D +W8sojrX8LqFtwPTJCHiGj32OyNXxZbtT3ay695ZmPh3TOg7TTUuFl8zObcbyyT23 +jvp/RD/AYHZl9OEFROljNMpX4vE141gKqPDrvWRky7+UWCZm0mCaPh25yzjvpblV +h9Ce6YlXy+s+7ei8Yw6dLixJzJE9xB/JsRHr+msOzYl8mNjPrhE008uAVfInt+k+ +JeHd1BTqAWktbucS0jvYVszG8yIPRZZTwFVVkdbVfzTB2/TyLAe1rNdB6sohuF8b +g+RrXPDs7FGcwaUC1JtMxfkH4PFo7QYjR+voHndlu47y/jsUEzKf40R9LmRaj9ZG +UpkiR+8gWIHJHCrWNUj78bEMokzerT/m/s7e6cq0Q7qtKiZxOIjEi6ZIqwMM6lIV +MMomH+8g9bJGcxckBBUB+i2+pNzCB/+upjOKRi5HjHnTMVf24xZeUGQdHt4VTAcb +S3ayTh4tHFHfOPznXuj97DQhTYHDgbG1ztfIn+KJQmpRIvdtt2feqxyzI9CA5JRK +N4ZkKz7LodSLvlWDe0yVh8luAXYUMIYevrPFmIbncOi3F8zrq4CSBWY/OBnGkX43 +mlw38QfJe31+1RsHoWpYAywG+7+nlTYQuPcuwP9XQnJHZfhJTj0787t0zY6DOoI= +=9osy +-END PGP SIGNATURE- Added: release/maven/plugins/maven-clean-plugin-2.6-source-release.zip.md5 == --- release/maven/plugins/maven-clean-plugin-2.6-source-release.zip.md5 (added) +++ release/maven/plugins/maven-clean-plugin-2.6-source-release.zip.md5 Thu Sep 25 21:01:02 2014 @@ -0,0 +1 @@ +c7afc1aab874be0c0a11a73acb633c6f \ No newline at end of file
svn commit: r1627971 - /maven/plugins/trunk/maven-ear-plugin/pom.xml
Author: khmarbaise Date: Sat Sep 27 14:27:46 2014 New Revision: 1627971 URL: http://svn.apache.org/r1627971 Log: [MEAR-195] - Removed plexus-container-default:1.0-alpha-9-stable-1 dependency Modified: maven/plugins/trunk/maven-ear-plugin/pom.xml Modified: maven/plugins/trunk/maven-ear-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/pom.xml?rev=1627971r1=1627970r2=1627971view=diff == --- maven/plugins/trunk/maven-ear-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-ear-plugin/pom.xml Sat Sep 27 14:27:46 2014 @@ -120,11 +120,6 @@ under the License. /dependency dependency groupIdorg.codehaus.plexus/groupId - artifactIdplexus-container-default/artifactId - version1.0-alpha-9-stable-1/version -/dependency -dependency - groupIdorg.codehaus.plexus/groupId artifactIdplexus-utils/artifactId version3.0.15/version /dependency
svn commit: r1627986 - /maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java
Author: khmarbaise Date: Sat Sep 27 18:07:52 2014 New Revision: 1627986 URL: http://svn.apache.org/r1627986 Log: - Removed unused code. Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java?rev=1627986r1=1627985r2=1627986view=diff == --- maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java (original) +++ maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java Sat Sep 27 18:07:52 2014 @@ -70,8 +70,6 @@ import java.util.zip.ZipException; public class EarMojo extends AbstractEarMojo { -private static final String[] EMPTY_STRING_ARRAY = {}; - /** * Single directory for extra files to include in the EAR. */
svn commit: r1627992 - /maven/shared/trunk/maven-filtering/pom.xml
Author: khmarbaise Date: Sat Sep 27 19:48:30 2014 New Revision: 1627992 URL: http://svn.apache.org/r1627992 Log: [MSHARED-351] - Upgrade plexus-interpolation to 1.19 Modified: maven/shared/trunk/maven-filtering/pom.xml Modified: maven/shared/trunk/maven-filtering/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/pom.xml?rev=1627992r1=1627991r2=1627992view=diff == --- maven/shared/trunk/maven-filtering/pom.xml (original) +++ maven/shared/trunk/maven-filtering/pom.xml Sat Sep 27 19:48:30 2014 @@ -115,7 +115,7 @@ dependency groupIdorg.codehaus.plexus/groupId artifactIdplexus-interpolation/artifactId - version1.12/version + version1.19/version /dependency dependency groupIdorg.sonatype.plexus/groupId
svn commit: r1627993 - /maven/shared/trunk/maven-filtering/pom.xml
Author: khmarbaise Date: Sat Sep 27 19:51:46 2014 New Revision: 1627993 URL: http://svn.apache.org/r1627993 Log: [MSHARED-352] - Upgrade plexus-utils to 3.0.15 Modified: maven/shared/trunk/maven-filtering/pom.xml Modified: maven/shared/trunk/maven-filtering/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/pom.xml?rev=1627993r1=1627992r2=1627993view=diff == --- maven/shared/trunk/maven-filtering/pom.xml (original) +++ maven/shared/trunk/maven-filtering/pom.xml Sat Sep 27 19:51:46 2014 @@ -110,7 +110,7 @@ dependency groupIdorg.codehaus.plexus/groupId artifactIdplexus-utils/artifactId - version1.5.15/version + version3.0.15/version /dependency dependency groupIdorg.codehaus.plexus/groupId
svn commit: r1627994 - /maven/shared/trunk/maven-filtering/pom.xml
Author: khmarbaise Date: Sat Sep 27 19:57:35 2014 New Revision: 1627994 URL: http://svn.apache.org/r1627994 Log: [MSHARED-353] - Upgrade maven-shared-utils to 0.6 Modified: maven/shared/trunk/maven-filtering/pom.xml Modified: maven/shared/trunk/maven-filtering/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/pom.xml?rev=1627994r1=1627993r2=1627994view=diff == --- maven/shared/trunk/maven-filtering/pom.xml (original) +++ maven/shared/trunk/maven-filtering/pom.xml Sat Sep 27 19:57:35 2014 @@ -99,7 +99,7 @@ dependency groupIdorg.apache.maven.shared/groupId artifactIdmaven-shared-utils/artifactId - version0.3/version + version0.6/version /dependency dependency
svn commit: r1627995 - /maven/shared/trunk/maven-filtering/pom.xml
Author: khmarbaise Date: Sat Sep 27 20:01:03 2014 New Revision: 1627995 URL: http://svn.apache.org/r1627995 Log: [MSHARED-354] - Remvoved plexus-container-default:1.0-alpha-9-stable-1 Modified: maven/shared/trunk/maven-filtering/pom.xml Modified: maven/shared/trunk/maven-filtering/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/pom.xml?rev=1627995r1=1627994r2=1627995view=diff == --- maven/shared/trunk/maven-filtering/pom.xml (original) +++ maven/shared/trunk/maven-filtering/pom.xml Sat Sep 27 20:01:03 2014 @@ -104,11 +104,6 @@ dependency groupIdorg.codehaus.plexus/groupId - artifactIdplexus-container-default/artifactId - version1.0-alpha-9-stable-1/version -/dependency -dependency - groupIdorg.codehaus.plexus/groupId artifactIdplexus-utils/artifactId version3.0.15/version /dependency
svn commit: r1627996 - /maven/shared/trunk/maven-filtering/pom.xml
Author: khmarbaise Date: Sat Sep 27 20:06:13 2014 New Revision: 1627996 URL: http://svn.apache.org/r1627996 Log: [MSHARED-355] - Upgraded to minimum build version 2.2.1 and compatibility as well. Modified: maven/shared/trunk/maven-filtering/pom.xml Modified: maven/shared/trunk/maven-filtering/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/pom.xml?rev=1627996r1=1627995r2=1627996view=diff == --- maven/shared/trunk/maven-filtering/pom.xml (original) +++ maven/shared/trunk/maven-filtering/pom.xml Sat Sep 27 20:06:13 2014 @@ -35,7 +35,7 @@ descriptionA component to assist in filtering of resource files with properties from a Maven project./description prerequisites -maven2.0.6/maven +maven${mavenVersion}/maven /prerequisites scm @@ -55,7 +55,7 @@ /distributionManagement properties -mavenVersion2.0.6/mavenVersion +mavenVersion2.2.1/mavenVersion /properties contributors
svn commit: r1627998 - /maven/shared/trunk/maven-mapping/pom.xml
Author: khmarbaise Date: Sat Sep 27 20:15:05 2014 New Revision: 1627998 URL: http://svn.apache.org/r1627998 Log: [MSHARED-356] - Upgrade build minimum to 2.2.1 and compatibility. Modified: maven/shared/trunk/maven-mapping/pom.xml Modified: maven/shared/trunk/maven-mapping/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-mapping/pom.xml?rev=1627998r1=1627997r2=1627998view=diff == --- maven/shared/trunk/maven-mapping/pom.xml (original) +++ maven/shared/trunk/maven-mapping/pom.xml Sat Sep 27 20:15:05 2014 @@ -56,7 +56,7 @@ /distributionManagement properties -mavenVersion2.0.6/mavenVersion +mavenVersion2.2.1/mavenVersion /properties dependencies
svn commit: r1627999 - /maven/shared/trunk/maven-mapping/pom.xml
Author: khmarbaise Date: Sat Sep 27 20:17:07 2014 New Revision: 1627999 URL: http://svn.apache.org/r1627999 Log: [MSHARED-357] - Upgrade plexus-interpolation to 1.19 Modified: maven/shared/trunk/maven-mapping/pom.xml Modified: maven/shared/trunk/maven-mapping/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-mapping/pom.xml?rev=1627999r1=1627998r2=1627999view=diff == --- maven/shared/trunk/maven-mapping/pom.xml (original) +++ maven/shared/trunk/maven-mapping/pom.xml Sat Sep 27 20:17:07 2014 @@ -68,7 +68,7 @@ dependency groupIdorg.codehaus.plexus/groupId artifactIdplexus-interpolation/artifactId - version1.15/version + version1.19/version /dependency dependency
svn commit: r1628001 - /maven/shared/trunk/maven-invoker/pom.xml
Author: khmarbaise Date: Sat Sep 27 20:22:30 2014 New Revision: 1628001 URL: http://svn.apache.org/r1628001 Log: [MSHARED-358] - Upgrade of plexus-utils to 3.0.15 Modified: maven/shared/trunk/maven-invoker/pom.xml Modified: maven/shared/trunk/maven-invoker/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/pom.xml?rev=1628001r1=1628000r2=1628001view=diff == --- maven/shared/trunk/maven-invoker/pom.xml (original) +++ maven/shared/trunk/maven-invoker/pom.xml Sat Sep 27 20:22:30 2014 @@ -61,7 +61,7 @@ under the License. dependency groupIdorg.codehaus.plexus/groupId artifactIdplexus-utils/artifactId - version3.0.8/version + version3.0.15/version /dependency !-- dependency
svn commit: r1628002 - /maven/shared/trunk/maven-invoker/pom.xml
Author: khmarbaise Date: Sat Sep 27 20:26:59 2014 New Revision: 1628002 URL: http://svn.apache.org/r1628002 Log: - Removed comment in pom.xml Modified: maven/shared/trunk/maven-invoker/pom.xml Modified: maven/shared/trunk/maven-invoker/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/pom.xml?rev=1628002r1=1628001r2=1628002view=diff == --- maven/shared/trunk/maven-invoker/pom.xml (original) +++ maven/shared/trunk/maven-invoker/pom.xml Sat Sep 27 20:26:59 2014 @@ -63,13 +63,6 @@ under the License. artifactIdplexus-utils/artifactId version3.0.15/version /dependency -!-- -dependency - groupIdorg.apache.maven.shared/groupId - artifactIdmaven-shared-utils/artifactId - version0.1-SNAPSHOT/version -/dependency - -- dependency groupIdorg.codehaus.plexus/groupId artifactIdplexus-component-annotations/artifactId
svn commit: r1628003 - /maven/shared/trunk/maven-shared-utils/pom.xml
Author: khmarbaise Date: Sat Sep 27 20:30:03 2014 New Revision: 1628003 URL: http://svn.apache.org/r1628003 Log: [MSHARED-359] - Upgrade to Maven 2.2.1 build and compatibility. Modified: maven/shared/trunk/maven-shared-utils/pom.xml Modified: maven/shared/trunk/maven-shared-utils/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/pom.xml?rev=1628003r1=1628002r2=1628003view=diff == --- maven/shared/trunk/maven-shared-utils/pom.xml (original) +++ maven/shared/trunk/maven-shared-utils/pom.xml Sat Sep 27 20:30:03 2014 @@ -55,7 +55,7 @@ /distributionManagement properties -mavenVersion2.1.0/mavenVersion +mavenVersion2.2.1/mavenVersion /properties dependencies
svn commit: r1628049 - /maven/shared/trunk/maven-shared-utils/pom.xml
Author: khmarbaise Date: Sun Sep 28 07:35:41 2014 New Revision: 1628049 URL: http://svn.apache.org/r1628049 Log: [MSHARED-359] - Followup prerequisites hard coded to 2.2.1 instead of using a property which could result in problems with other project which are using maven-shared-utils and defined the dependency with 2.2.1 hard coded as well. Modified: maven/shared/trunk/maven-shared-utils/pom.xml Modified: maven/shared/trunk/maven-shared-utils/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/pom.xml?rev=1628049r1=1628048r2=1628049view=diff == --- maven/shared/trunk/maven-shared-utils/pom.xml (original) +++ maven/shared/trunk/maven-shared-utils/pom.xml Sun Sep 28 07:35:41 2014 @@ -34,7 +34,7 @@ descriptionShared utils without any further dependencies/description prerequisites -maven${mavenVersion}/maven +maven2.2.1/maven /prerequisites scm @@ -54,10 +54,6 @@ /site /distributionManagement - properties -mavenVersion2.2.1/mavenVersion - /properties - dependencies dependency groupIdjunit/groupId @@ -94,7 +90,7 @@ dependency groupIdorg.apache.maven/groupId artifactIdmaven-toolchain/artifactId - version${mavenVersion}/version + version2.2.1/version scopeprovided/scope /dependency /dependencies
svn commit: r6677 - /release/maven/plugins/
Author: khmarbaise Date: Sun Sep 28 11:35:27 2014 New Revision: 6677 Log: - Added Apache Maven Changes Plugin Version 2.11 Added: release/maven/plugins/maven-changes-plugin-2.11-source-release.zip (with props) release/maven/plugins/maven-changes-plugin-2.11-source-release.zip.asc release/maven/plugins/maven-changes-plugin-2.11-source-release.zip.md5 Removed: release/maven/plugins/maven-changes-plugin-2.10-source-release.zip release/maven/plugins/maven-changes-plugin-2.10-source-release.zip.asc release/maven/plugins/maven-changes-plugin-2.10-source-release.zip.md5 Added: release/maven/plugins/maven-changes-plugin-2.11-source-release.zip == Binary file - no diff available. Propchange: release/maven/plugins/maven-changes-plugin-2.11-source-release.zip -- svn:mime-type = application/octet-stream Added: release/maven/plugins/maven-changes-plugin-2.11-source-release.zip.asc == --- release/maven/plugins/maven-changes-plugin-2.11-source-release.zip.asc (added) +++ release/maven/plugins/maven-changes-plugin-2.11-source-release.zip.asc Sun Sep 28 11:35:27 2014 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v1 + +iQEcBAABAgAGBQJUIrZhAAoJEADstMTtWIWsetUH/2OpMXioJF9wVhZnNwDQghW3 +vRZGY/QNfJH4oUojZvt7GWLMT8E4O6WoOlImGOfZ4uij5e/7UljfJ9yiBr8BKpsk +oFhgAk5Q8xFcp8jBvaWH/zVZc2UgcHokyZSUPhvd4Tty2bNwCNkWVOReYN9K2PYG +xQBMkRmzUvdVo1lWNCz9AZdBcAX0cCAzYHCbs1hQhCCN6O9Zgzlrts6AJtNH7fPR +aWJKxrf96zpT0jiLqKZX2yt6giqgPjykVwaBh1VEi60TfGxKck7JBYpojd87p/7O +rQzZdS+LTWjnVtRWhgwH2mxur+AintYQuNlTzvyGusU8DtBE6h9LJ+xI+aE+JTM= +=UIjm +-END PGP SIGNATURE- Added: release/maven/plugins/maven-changes-plugin-2.11-source-release.zip.md5 == --- release/maven/plugins/maven-changes-plugin-2.11-source-release.zip.md5 (added) +++ release/maven/plugins/maven-changes-plugin-2.11-source-release.zip.md5 Sun Sep 28 11:35:27 2014 @@ -0,0 +1 @@ +9c358d937789bea9425681372fd5407b \ No newline at end of file
svn commit: r1628067 - /maven/plugins/trunk/maven-ear-plugin/pom.xml
Author: khmarbaise Date: Sun Sep 28 12:47:35 2014 New Revision: 1628067 URL: http://svn.apache.org/r1628067 Log: [MEAR-196] - Upgrade to plexus-archiver version 2.6 Modified: maven/plugins/trunk/maven-ear-plugin/pom.xml Modified: maven/plugins/trunk/maven-ear-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/pom.xml?rev=1628067r1=1628066r2=1628067view=diff == --- maven/plugins/trunk/maven-ear-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-ear-plugin/pom.xml Sun Sep 28 12:47:35 2014 @@ -116,7 +116,7 @@ under the License. dependency groupIdorg.codehaus.plexus/groupId artifactIdplexus-archiver/artifactId - version2.5/version + version2.6/version /dependency dependency groupIdorg.codehaus.plexus/groupId
svn commit: r1628238 - /maven/plugins/trunk/maven-linkcheck-plugin/pom.xml
Author: khmarbaise Date: Mon Sep 29 18:05:15 2014 New Revision: 1628238 URL: http://svn.apache.org/r1628238 Log: [MLINKCHECK-15] - Upgrade maven-reporting-impl to 2.3 Modified: maven/plugins/trunk/maven-linkcheck-plugin/pom.xml Modified: maven/plugins/trunk/maven-linkcheck-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-linkcheck-plugin/pom.xml?rev=1628238r1=1628237r2=1628238view=diff == --- maven/plugins/trunk/maven-linkcheck-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-linkcheck-plugin/pom.xml Mon Sep 29 18:05:15 2014 @@ -104,7 +104,7 @@ under the License. dependency groupIdorg.apache.maven.reporting/groupId artifactIdmaven-reporting-impl/artifactId - version2.2/version + version2.3/version /dependency dependency groupIdorg.apache.maven.shared/groupId
svn commit: r1628240 - /maven/plugins/trunk/maven-linkcheck-plugin/pom.xml
Author: khmarbaise Date: Mon Sep 29 18:11:57 2014 New Revision: 1628240 URL: http://svn.apache.org/r1628240 Log: [MLINKCHECK-16] - Upgrade plexus-utils to 3.0.18 Modified: maven/plugins/trunk/maven-linkcheck-plugin/pom.xml Modified: maven/plugins/trunk/maven-linkcheck-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-linkcheck-plugin/pom.xml?rev=1628240r1=1628239r2=1628240view=diff == --- maven/plugins/trunk/maven-linkcheck-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-linkcheck-plugin/pom.xml Mon Sep 29 18:11:57 2014 @@ -170,7 +170,7 @@ under the License. dependency groupIdorg.codehaus.plexus/groupId artifactIdplexus-utils/artifactId - version3.0.15/version + version3.0.18/version /dependency /dependencies
svn commit: r1628247 - in /maven/plugins/trunk/maven-war-plugin/src: main/java/org/apache/maven/plugin/war/ test/java/org/apache/maven/plugin/war/ test/java/org/apache/maven/plugin/war/stub/
Author: khmarbaise Date: Mon Sep 29 18:26:58 2014 New Revision: 1628247 URL: http://svn.apache.org/r1628247 Log: - Improved code to be more Java 5 Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarDependenciesAnalysisTest.java maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarExplodedMojoTest.java maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/MavenProjectArtifactsStub.java maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/ModelStub.java Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java?rev=1628247r1=1628246r2=1628247view=diff == --- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java (original) +++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java Mon Sep 29 18:26:58 2014 @@ -447,6 +447,7 @@ public abstract class AbstractWarMojo * @throws MojoFailureException if an unexpected error occurred while packaging the webapp * @throws IOExceptionif an error occurred while copying the files */ +@SuppressWarnings( unchecked ) public void buildWebapp( MavenProject project, File webappDirectory ) throws MojoExecutionException, MojoFailureException, IOException { Modified: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarDependenciesAnalysisTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarDependenciesAnalysisTest.java?rev=1628247r1=1628246r2=1628247view=diff == --- maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarDependenciesAnalysisTest.java (original) +++ maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarDependenciesAnalysisTest.java Mon Sep 29 18:26:58 2014 @@ -132,7 +132,7 @@ public class WarDependenciesAnalysisTest mojo.setWebXml( new File( xmlSource, web.xml ) ); mojo.execute(); -final List assertedFiles = new ArrayList(); +final ListFile assertedFiles = new ArrayListFile(); assertedFiles.addAll( assertDefaultContent( webAppDirectory ) ); assertedFiles.addAll( assertWebXml( webAppDirectory ) ); assertedFiles.addAll( assertCustomContent( webAppDirectory, firstCustomContent, library not found ) ); @@ -146,7 +146,7 @@ public class WarDependenciesAnalysisTest mojo.execute(); -final List assertedFiles2 = new ArrayList(); +final ListFile assertedFiles2 = new ArrayListFile(); assertedFiles2.addAll( assertDefaultContent( webAppDirectory ) ); assertedFiles2.addAll( assertWebXml( webAppDirectory ) ); if ( secondCustomContent != null ) Modified: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarExplodedMojoTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarExplodedMojoTest.java?rev=1628247r1=1628246r2=1628247view=diff == --- maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarExplodedMojoTest.java (original) +++ maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarExplodedMojoTest.java Mon Sep 29 18:26:58 2014 @@ -290,7 +290,7 @@ public class WarExplodedMojoTest // configure mojo project.addArtifact( warArtifact ); -this.configureMojo( mojo, new LinkedList(), classesDir, webAppSource, webAppDirectory, project ); +this.configureMojo( mojo, new LinkedListString(), classesDir, webAppSource, webAppDirectory, project ); setVariableValueToObject( mojo, workDirectory, workDirectory ); mojo.execute(); Modified: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/MavenProjectArtifactsStub.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/MavenProjectArtifactsStub.java?rev=1628247r1=1628246r2=1628247view=diff == --- maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/MavenProjectArtifactsStub.java
svn commit: r1628249 - /maven/plugins/trunk/maven-install-plugin/pom.xml
Author: khmarbaise Date: Mon Sep 29 18:33:05 2014 New Revision: 1628249 URL: http://svn.apache.org/r1628249 Log: [MINSTALL-109] - Upgraded plexus-utils from 3.0.15 to 3.0.18 Modified: maven/plugins/trunk/maven-install-plugin/pom.xml Modified: maven/plugins/trunk/maven-install-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/pom.xml?rev=1628249r1=1628248r2=1628249view=diff == --- maven/plugins/trunk/maven-install-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-install-plugin/pom.xml Mon Sep 29 18:33:05 2014 @@ -117,7 +117,7 @@ under the License. dependency groupIdorg.codehaus.plexus/groupId artifactIdplexus-utils/artifactId - version3.0.15/version + version3.0.18/version /dependency /dependencies
svn commit: r1628297 - in /maven/plugins/trunk/maven-repository-plugin: pom.xml src/it/bundle-create-no-scm/pom.xml src/it/bundle-create/pom.xml
Author: khmarbaise Date: Mon Sep 29 20:32:14 2014 New Revision: 1628297 URL: http://svn.apache.org/r1628297 Log: [MREPOSITORY-29] - Added missing artifacts to extraArtifacts and updated the IT accordingly. Modified: maven/plugins/trunk/maven-repository-plugin/pom.xml maven/plugins/trunk/maven-repository-plugin/src/it/bundle-create-no-scm/pom.xml maven/plugins/trunk/maven-repository-plugin/src/it/bundle-create/pom.xml Modified: maven/plugins/trunk/maven-repository-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-repository-plugin/pom.xml?rev=1628297r1=1628296r2=1628297view=diff == --- maven/plugins/trunk/maven-repository-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-repository-plugin/pom.xml Mon Sep 29 20:32:14 2014 @@ -266,6 +266,12 @@ under the License. /goals configuration localRepositoryPath${project.build.directory}/it-repo/localRepositoryPath + extraArtifacts + extraArtifactorg.apache.maven.plugins:maven-source-plugin:2.3:maven-plugin/extraArtifact + extraArtifactorg.apache.maven.plugins:maven-surefire-plugin:2.12:maven-plugin/extraArtifact + extraArtifactorg.apache.maven.plugins:maven-resources-plugin:2.6:maven-plugin/extraArtifact + extraArtifactorg.apache.maven.plugins:maven-jar-plugin:2.5:maven-plugin/extraArtifact + /extraArtifacts /configuration /execution /executions Modified: maven/plugins/trunk/maven-repository-plugin/src/it/bundle-create-no-scm/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-repository-plugin/src/it/bundle-create-no-scm/pom.xml?rev=1628297r1=1628296r2=1628297view=diff == --- maven/plugins/trunk/maven-repository-plugin/src/it/bundle-create-no-scm/pom.xml (original) +++ maven/plugins/trunk/maven-repository-plugin/src/it/bundle-create-no-scm/pom.xml Mon Sep 29 20:32:14 2014 @@ -65,17 +65,17 @@ under the License. plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-jar-plugin/artifactId -version2.1/version +version2.5/version /plugin plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-resources-plugin/artifactId -version2.5/version +version2.6/version /plugin plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-source-plugin/artifactId -version2.0.4/version +version2.3/version executions execution idattach-sources/id @@ -88,7 +88,7 @@ under the License. plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-surefire-plugin/artifactId -version2.3.1/version +version2.12/version /plugin /plugins /build Modified: maven/plugins/trunk/maven-repository-plugin/src/it/bundle-create/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-repository-plugin/src/it/bundle-create/pom.xml?rev=1628297r1=1628296r2=1628297view=diff == --- maven/plugins/trunk/maven-repository-plugin/src/it/bundle-create/pom.xml (original) +++ maven/plugins/trunk/maven-repository-plugin/src/it/bundle-create/pom.xml Mon Sep 29 20:32:14 2014 @@ -71,17 +71,17 @@ under the License. plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-jar-plugin/artifactId -version2.1/version +version2.5/version /plugin plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-resources-plugin/artifactId -version2.5/version +version2.6/version /plugin plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-source-plugin/artifactId -version2.0.4/version +version2.3/version executions execution idattach-sources/id @@ -94,7 +94,7 @@ under the License. plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-surefire-plugin/artifactId -version2.3.1/version +version2.12/version /plugin /plugins /build
svn commit: r1628300 - /maven/plugins/trunk/maven-repository-plugin/pom.xml
Author: khmarbaise Date: Mon Sep 29 20:36:23 2014 New Revision: 1628300 URL: http://svn.apache.org/r1628300 Log: [MREPOSITORY-30] - Upgrade to Maven 2.2.1 minimum. Modified: maven/plugins/trunk/maven-repository-plugin/pom.xml Modified: maven/plugins/trunk/maven-repository-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-repository-plugin/pom.xml?rev=1628300r1=1628299r2=1628300view=diff == --- maven/plugins/trunk/maven-repository-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-repository-plugin/pom.xml Mon Sep 29 20:36:23 2014 @@ -57,7 +57,7 @@ under the License. /distributionManagement properties -mavenVersion2.0.6/mavenVersion +mavenVersion2.2.1/mavenVersion mavenPluginVersion3.2/mavenPluginVersion /properties
svn commit: r1628302 - in /maven/plugins/trunk/maven-repository-plugin: pom.xml src/it/bundle-create-alt-pom/alternative-pom.xml src/it/bundle-create-no-scm/pom.xml src/it/bundle-create/pom.xml
Author: khmarbaise Date: Mon Sep 29 20:42:35 2014 New Revision: 1628302 URL: http://svn.apache.org/r1628302 Log: [MREPOSITORY-29] - Followup Added missing maven-compiler-plugin to extraArtifact and fixed the IT's accordingly. Modified: maven/plugins/trunk/maven-repository-plugin/pom.xml maven/plugins/trunk/maven-repository-plugin/src/it/bundle-create-alt-pom/alternative-pom.xml maven/plugins/trunk/maven-repository-plugin/src/it/bundle-create-no-scm/pom.xml maven/plugins/trunk/maven-repository-plugin/src/it/bundle-create/pom.xml Modified: maven/plugins/trunk/maven-repository-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-repository-plugin/pom.xml?rev=1628302r1=1628301r2=1628302view=diff == --- maven/plugins/trunk/maven-repository-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-repository-plugin/pom.xml Mon Sep 29 20:42:35 2014 @@ -271,6 +271,7 @@ under the License. extraArtifactorg.apache.maven.plugins:maven-surefire-plugin:2.12:maven-plugin/extraArtifact extraArtifactorg.apache.maven.plugins:maven-resources-plugin:2.6:maven-plugin/extraArtifact extraArtifactorg.apache.maven.plugins:maven-jar-plugin:2.5:maven-plugin/extraArtifact + extraArtifactorg.apache.maven.plugins:maven-compiler-plugin:3.1:maven-plugin/extraArtifact /extraArtifacts /configuration /execution Modified: maven/plugins/trunk/maven-repository-plugin/src/it/bundle-create-alt-pom/alternative-pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-repository-plugin/src/it/bundle-create-alt-pom/alternative-pom.xml?rev=1628302r1=1628301r2=1628302view=diff == --- maven/plugins/trunk/maven-repository-plugin/src/it/bundle-create-alt-pom/alternative-pom.xml (original) +++ maven/plugins/trunk/maven-repository-plugin/src/it/bundle-create-alt-pom/alternative-pom.xml Mon Sep 29 20:42:35 2014 @@ -66,22 +66,22 @@ under the License. plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-compiler-plugin/artifactId -version2.0.2/version +version3.1/version /plugin plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-jar-plugin/artifactId -version2.1/version +version2.5/version /plugin plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-resources-plugin/artifactId -version2.5/version +version2.6/version /plugin plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-source-plugin/artifactId -version2.0.4/version +version2.3/version executions execution idattach-sources/id @@ -94,7 +94,7 @@ under the License. plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-surefire-plugin/artifactId -version2.3.1/version +version2.12/version /plugin /plugins /build Modified: maven/plugins/trunk/maven-repository-plugin/src/it/bundle-create-no-scm/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-repository-plugin/src/it/bundle-create-no-scm/pom.xml?rev=1628302r1=1628301r2=1628302view=diff == --- maven/plugins/trunk/maven-repository-plugin/src/it/bundle-create-no-scm/pom.xml (original) +++ maven/plugins/trunk/maven-repository-plugin/src/it/bundle-create-no-scm/pom.xml Mon Sep 29 20:42:35 2014 @@ -60,7 +60,7 @@ under the License. plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-compiler-plugin/artifactId -version2.0.2/version +version3.1/version /plugin plugin groupIdorg.apache.maven.plugins/groupId Modified: maven/plugins/trunk/maven-repository-plugin/src/it/bundle-create/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-repository-plugin/src/it/bundle-create/pom.xml?rev=1628302r1=1628301r2=1628302view=diff == --- maven/plugins/trunk/maven-repository-plugin/src/it/bundle-create/pom.xml (original) +++ maven/plugins/trunk/maven-repository-plugin/src/it/bundle-create/pom.xml Mon Sep 29 20:42:35 2014 @@ -66,7 +66,7 @@ under the License. plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-compiler-plugin/artifactId -version2.0.2/version +version3.1/version /plugin plugin groupIdorg.apache.maven.plugins/groupId
svn commit: r1628306 - /maven/jxr/trunk/maven-jxr-plugin/pom.xml
Author: khmarbaise Date: Mon Sep 29 20:53:17 2014 New Revision: 1628306 URL: http://svn.apache.org/r1628306 Log: [JXR-111] - Upgraded to Maven 2.2.1 Modified: maven/jxr/trunk/maven-jxr-plugin/pom.xml Modified: maven/jxr/trunk/maven-jxr-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/jxr/trunk/maven-jxr-plugin/pom.xml?rev=1628306r1=1628305r2=1628306view=diff == --- maven/jxr/trunk/maven-jxr-plugin/pom.xml (original) +++ maven/jxr/trunk/maven-jxr-plugin/pom.xml Mon Sep 29 20:53:17 2014 @@ -36,7 +36,7 @@ under the License. inceptionYear2005/inceptionYear properties -mavenVersion2.0.9/mavenVersion +mavenVersion2.2.1/mavenVersion doxia-sitetoolsVersion1.2/doxia-sitetoolsVersion doxiaVersion1.2/doxiaVersion mavenPluginToolsVersion3.2/mavenPluginToolsVersion
svn commit: r1628308 - /maven/jxr/trunk/pom.xml
Author: khmarbaise Date: Mon Sep 29 20:55:50 2014 New Revision: 1628308 URL: http://svn.apache.org/r1628308 Log: [JXR-112] - Upgrade plexus-utils from 3.0.10 to 3.0.18 Modified: maven/jxr/trunk/pom.xml Modified: maven/jxr/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/jxr/trunk/pom.xml?rev=1628308r1=1628307r2=1628308view=diff == --- maven/jxr/trunk/pom.xml (original) +++ maven/jxr/trunk/pom.xml Mon Sep 29 20:55:50 2014 @@ -88,7 +88,7 @@ under the License. dependency groupIdorg.codehaus.plexus/groupId artifactIdplexus-utils/artifactId -version3.0.10/version +version3.0.18/version /dependency /dependencies /dependencyManagement
svn commit: r1628313 - /maven/jxr/trunk/maven-jxr-plugin/pom.xml
Author: khmarbaise Date: Mon Sep 29 20:58:34 2014 New Revision: 1628313 URL: http://svn.apache.org/r1628313 Log: [JXR-113] - Upgraded maven-reporting-impl from 2.1 to 2.3 Modified: maven/jxr/trunk/maven-jxr-plugin/pom.xml Modified: maven/jxr/trunk/maven-jxr-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/jxr/trunk/maven-jxr-plugin/pom.xml?rev=1628313r1=1628312r2=1628313view=diff == --- maven/jxr/trunk/maven-jxr-plugin/pom.xml (original) +++ maven/jxr/trunk/maven-jxr-plugin/pom.xml Mon Sep 29 20:58:34 2014 @@ -133,7 +133,7 @@ under the License. dependency groupIdorg.apache.maven.reporting/groupId artifactIdmaven-reporting-impl/artifactId - version2.1/version + version2.3/version /dependency dependency groupIdorg.apache.maven.wagon/groupId
svn commit: r1628320 - /maven/plugins/trunk/maven-resources-plugin/pom.xml
Author: khmarbaise Date: Mon Sep 29 21:19:04 2014 New Revision: 1628320 URL: http://svn.apache.org/r1628320 Log: [maven-release-plugin] prepare for next development iteration Modified: maven/plugins/trunk/maven-resources-plugin/pom.xml Modified: maven/plugins/trunk/maven-resources-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/pom.xml?rev=1628320r1=1628319r2=1628320view=diff == --- maven/plugins/trunk/maven-resources-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-resources-plugin/pom.xml Mon Sep 29 21:19:04 2014 @@ -30,7 +30,7 @@ under the License. /parent artifactIdmaven-resources-plugin/artifactId - version2.7/version + version2.8-SNAPSHOT/version packagingmaven-plugin/packaging nameApache Maven Resources Plugin/name @@ -49,9 +49,9 @@ under the License. /prerequisites scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-resources-plugin-2.7/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-resources-plugin-2.7/developerConnection - urlhttp://svn.apache.org/viewvc/maven/plugins/tags/maven-resources-plugin-2.7/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-resources-plugin/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-resources-plugin/developerConnection + urlhttp://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/url /scm issueManagement systemJIRA/system
svn commit: r1628318 - /maven/plugins/trunk/maven-resources-plugin/pom.xml
Author: khmarbaise Date: Mon Sep 29 21:18:57 2014 New Revision: 1628318 URL: http://svn.apache.org/r1628318 Log: [maven-release-plugin] prepare release maven-resources-plugin-2.7 Modified: maven/plugins/trunk/maven-resources-plugin/pom.xml Modified: maven/plugins/trunk/maven-resources-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/pom.xml?rev=1628318r1=1628317r2=1628318view=diff == --- maven/plugins/trunk/maven-resources-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-resources-plugin/pom.xml Mon Sep 29 21:18:57 2014 @@ -30,7 +30,7 @@ under the License. /parent artifactIdmaven-resources-plugin/artifactId - version2.7-SNAPSHOT/version + version2.7/version packagingmaven-plugin/packaging nameApache Maven Resources Plugin/name @@ -49,9 +49,9 @@ under the License. /prerequisites scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-resources-plugin/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-resources-plugin/developerConnection - urlhttp://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-resources-plugin-2.7/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-resources-plugin-2.7/developerConnection + urlhttp://svn.apache.org/viewvc/maven/plugins/tags/maven-resources-plugin-2.7/url /scm issueManagement systemJIRA/system
svn commit: r1628319 - /maven/plugins/tags/maven-resources-plugin-2.7/
Author: khmarbaise Date: Mon Sep 29 21:19:02 2014 New Revision: 1628319 URL: http://svn.apache.org/r1628319 Log: [maven-release-plugin] copy for tag maven-resources-plugin-2.7 Added: maven/plugins/tags/maven-resources-plugin-2.7/ (props changed) - copied from r1628318, maven/plugins/trunk/maven-resources-plugin/ Propchange: maven/plugins/tags/maven-resources-plugin-2.7/ -- --- svn:ignore (added) +++ svn:ignore Mon Sep 29 21:19:02 2014 @@ -0,0 +1,12 @@ +*~ +*.log +.classpath +.project +*.ipr +*.iws +*.iml +.idea +.wtpmodules +target +.settings +bin Propchange: maven/plugins/tags/maven-resources-plugin-2.7/ -- svn:mergeinfo = /maven/plugins/branches/MRESOURCES-56:632505-692535
svn commit: r1628322 - /maven/site/trunk/content/filtered-resources/.htaccess
Author: khmarbaise Date: Mon Sep 29 21:34:21 2014 New Revision: 1628322 URL: http://svn.apache.org/r1628322 Log: - Redirect for correct location of maven-jxr instead of /plugins/maven-jxr-plugin/ Modified: maven/site/trunk/content/filtered-resources/.htaccess Modified: maven/site/trunk/content/filtered-resources/.htaccess URL: http://svn.apache.org/viewvc/maven/site/trunk/content/filtered-resources/.htaccess?rev=1628322r1=1628321r2=1628322view=diff == --- maven/site/trunk/content/filtered-resources/.htaccess (original) +++ maven/site/trunk/content/filtered-resources/.htaccess Mon Sep 29 21:34:21 2014 @@ -21,6 +21,7 @@ Redirect Permanent /welcome-to-new-commi Redirect Permanent /plugins/maven-checkstyle-plugin/customize.html http://maven.apache.org/plugins/maven-checkstyle-plugin/examples/custom-checker-config.html Redirect Permanent /plugins/maven-checkstyle-plugin/howto.html http://maven.apache.org/plugins/maven-checkstyle-plugin/usage.html Redirect Permanent /plugins/maven-checkstyle-plugin/tips.html http://maven.apache.org/plugins/maven-checkstyle-plugin/examples/multi-module-config.html +Redirect Permanent /plugins/maven-jxr-plugin/ http://maven.apache.org/jxr/index.html RedirectMatch ^/maven2/(.*)$ /$1 RedirectMatch ^/reference/(.*)$ /archives/maven-1.x/reference/$1
svn commit: r1628550 - /maven/plugins/trunk/maven-jar-plugin/pom.xml
Author: khmarbaise Date: Tue Sep 30 21:20:32 2014 New Revision: 1628550 URL: http://svn.apache.org/r1628550 Log: [MJAR-179] - Based on the new version of plexus-archiver 2.6.2 the issue has been fixed. Modified: maven/plugins/trunk/maven-jar-plugin/pom.xml Modified: maven/plugins/trunk/maven-jar-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/pom.xml?rev=1628550r1=1628549r2=1628550view=diff == --- maven/plugins/trunk/maven-jar-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-jar-plugin/pom.xml Tue Sep 30 21:20:32 2014 @@ -117,7 +117,7 @@ under the License. dependency groupIdorg.codehaus.plexus/groupId artifactIdplexus-archiver/artifactId - version2.6.1/version + version2.6.2/version exclusions exclusion groupIdorg.codehaus.plexus/groupId
svn commit: r1628552 - /maven/plugins/trunk/maven-repository-plugin/pom.xml
Author: khmarbaise Date: Tue Sep 30 21:32:17 2014 New Revision: 1628552 URL: http://svn.apache.org/r1628552 Log: [MREPOSITORY-31] - Update to plexus-archiver 2.6.2 Modified: maven/plugins/trunk/maven-repository-plugin/pom.xml Modified: maven/plugins/trunk/maven-repository-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-repository-plugin/pom.xml?rev=1628552r1=1628551r2=1628552view=diff == --- maven/plugins/trunk/maven-repository-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-repository-plugin/pom.xml Tue Sep 30 21:32:17 2014 @@ -123,7 +123,7 @@ under the License. dependency groupIdorg.codehaus.plexus/groupId artifactIdplexus-archiver/artifactId - version2.6.1/version + version2.6.2/version /dependency dependency groupIdorg.codehaus.plexus/groupId
svn commit: r1628553 - /maven/plugins/trunk/maven-assembly-plugin/pom.xml
Author: khmarbaise Date: Tue Sep 30 21:40:20 2014 New Revision: 1628553 URL: http://svn.apache.org/r1628553 Log: [MASSEMBLY-714] - Followup upgrade to plexus-archiver 2.6.2 Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=1628553r1=1628552r2=1628553view=diff == --- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Tue Sep 30 21:40:20 2014 @@ -125,7 +125,7 @@ under the License. dependency groupIdorg.codehaus.plexus/groupId artifactIdplexus-archiver/artifactId - version2.6.1/version + version2.6.2/version exclusions exclusion groupIdorg.codehaus.plexus/groupId
svn commit: r1628554 - /maven/plugins/trunk/maven-ear-plugin/pom.xml
Author: khmarbaise Date: Tue Sep 30 21:44:43 2014 New Revision: 1628554 URL: http://svn.apache.org/r1628554 Log: [MEAR-197] - Upgrade to plexus-archiver version 2.6.2 Modified: maven/plugins/trunk/maven-ear-plugin/pom.xml Modified: maven/plugins/trunk/maven-ear-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/pom.xml?rev=1628554r1=1628553r2=1628554view=diff == --- maven/plugins/trunk/maven-ear-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-ear-plugin/pom.xml Tue Sep 30 21:44:43 2014 @@ -116,7 +116,7 @@ under the License. dependency groupIdorg.codehaus.plexus/groupId artifactIdplexus-archiver/artifactId - version2.6.1/version + version2.6.2/version /dependency dependency groupIdorg.codehaus.plexus/groupId
svn commit: r1628559 - /maven/plugins/trunk/maven-ejb-plugin/pom.xml
Author: khmarbaise Date: Tue Sep 30 21:48:38 2014 New Revision: 1628559 URL: http://svn.apache.org/r1628559 Log: [MEJB-71] - Upgrade plexus-archiver from 2.6.1 to 2.6.2 Modified: maven/plugins/trunk/maven-ejb-plugin/pom.xml Modified: maven/plugins/trunk/maven-ejb-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/pom.xml?rev=1628559r1=1628558r2=1628559view=diff == --- maven/plugins/trunk/maven-ejb-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-ejb-plugin/pom.xml Tue Sep 30 21:48:38 2014 @@ -107,7 +107,7 @@ under the License. dependency groupIdorg.codehaus.plexus/groupId artifactIdplexus-archiver/artifactId - version2.6.1/version + version2.6.2/version exclusions exclusion groupIdorg.codehaus.plexus/groupId
svn commit: r1628561 - /maven/plugins/trunk/maven-war-plugin/pom.xml
Author: khmarbaise Date: Tue Sep 30 22:07:17 2014 New Revision: 1628561 URL: http://svn.apache.org/r1628561 Log: [MWAR-321] - Upgrade plexus-archiver from 2.6.1 to 2.6.2 Modified: maven/plugins/trunk/maven-war-plugin/pom.xml Modified: maven/plugins/trunk/maven-war-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/pom.xml?rev=1628561r1=1628560r2=1628561view=diff == --- maven/plugins/trunk/maven-war-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-war-plugin/pom.xml Tue Sep 30 22:07:17 2014 @@ -130,7 +130,7 @@ under the License. dependency groupIdorg.codehaus.plexus/groupId artifactIdplexus-archiver/artifactId - version2.6.1/version + version2.6.2/version exclusions exclusion groupIdorg.codehaus.plexus/groupId
svn commit: r1628564 - /maven/plugins/trunk/maven-source-plugin/pom.xml
Author: khmarbaise Date: Tue Sep 30 22:12:25 2014 New Revision: 1628564 URL: http://svn.apache.org/r1628564 Log: [MSOURCES-74] - Upgrade plexus-archiver from 2.6.1 to 2.6.1 Modified: maven/plugins/trunk/maven-source-plugin/pom.xml Modified: maven/plugins/trunk/maven-source-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/pom.xml?rev=1628564r1=1628563r2=1628564view=diff == --- maven/plugins/trunk/maven-source-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-source-plugin/pom.xml Tue Sep 30 22:12:25 2014 @@ -109,7 +109,7 @@ under the License. dependency groupIdorg.codehaus.plexus/groupId artifactIdplexus-archiver/artifactId - version2.6.1/version + version2.6.2/version exclusions exclusion groupIdorg.codehaus.plexus/groupId
svn propchange: r1628564 - svn:log
Author: khmarbaise Revision: 1628564 Modified property: svn:log Modified: svn:log at Wed Oct 1 19:12:34 2014 -- --- svn:log (original) +++ svn:log Wed Oct 1 19:12:34 2014 @@ -1,2 +1,2 @@ [MSOURCES-74] - - Upgrade plexus-archiver from 2.6.1 to 2.6.1 + - Upgrade plexus-archiver from 2.6.1 to 2.6.2
svn commit: r1628828 - /maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/skinny-wars.apt.vm
Author: khmarbaise Date: Wed Oct 1 20:10:43 2014 New Revision: 1628828 URL: http://svn.apache.org/r1628828 Log: [MWAR-312] - Updated documentation about skinny-wars. Modified: maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/skinny-wars.apt.vm Modified: maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/skinny-wars.apt.vm URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/skinny-wars.apt.vm?rev=1628828r1=1628827r2=1628828view=diff == --- maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/skinny-wars.apt.vm (original) +++ maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/skinny-wars.apt.vm Wed Oct 1 20:10:43 2014 @@ -2,8 +2,9 @@ Creating Skinny WARs -- Mike Perham + Karl-Heinz Marbaise -- - 2008-08-03 + 2014-10-01 -- ~~ Licensed to the Apache Software Foundation (ASF) under one @@ -34,69 +35,11 @@ Creating Skinny WARs the J2EE specification allows WARs to reference external JARs packaged within the EAR via the Class-Path setting in their MANIFEST.MF. - The Maven WAR and EAR Plugins do not directly support this mode of operation but - we can fake it through some POM and configuration magic. First you need to tell - Maven to exclude the dependent JARs and add references to them in the MANIFEST.MF - instead. This goes into your WAR project's pom.xml: + The Maven EAR Plugin has direct support for creating skinny wars which simply + means to {{{http://maven.apache.org/plugins/maven-ear-plugin/examples/skinny-wars.html}configure the maven-ear-plugin}} + accordingly. -+-+ -project - ... - build -plugins - plugin -artifactIdmaven-war-plugin/artifactId -version${project.version}/version -configuration - !-- In version 2.1-alpha-1, this was incorrectly named warSourceExcludes -- - packagingExcludesWEB-INF/lib/*.jar/packagingExcludes - archive -manifest - addClasspathtrue/addClasspath - classpathPrefixlib//classpathPrefix -/manifest - /archive -/configuration - /plugin -/plugins - /build - ... -/project -+-+ - - Here's another variant of the above example, but this time we use - \packagingIncludes\ to select a few JARs to be included in the WAR. - This is useful when there is a need to package a small, but non-empty, subset - of JARs into the WAR. When making an EAR of skinny WARs, one wants to package - all of the JARs into the EAR. Sometimes a list of JARs must be packaged into - the WAR though in order for it to work properly, like with tag libraries. - -+-+ -project - ... - build -plugins - plugin -artifactIdmaven-war-plugin/artifactId -version${project.version}/version -configuration - !-- Use this to include a selection of jars that will be included in the WAR -- - packagingIncludesWEB-INF/lib/my-tag-library.jar,**/*.xml,**/*.properties,**/*.class,**/*.png,**/*.css,**/*.js,**/*.jsp/packagingIncludes - archive -manifest - addClasspathtrue/addClasspath - classpathPrefixlib//classpathPrefix -/manifest - /archive -/configuration - /plugin -/plugins - /build - ... -/project -+-+ - - Next we need to change the EAR project's pom.xml to package those dependent JARs in the EAR. + You need to change the EAR project's pom.xml to package those dependent JARs in the EAR. Notice that we package everything into a lib/ directory within the EAR. This is just my own personal preference to distinguish between J2EE modules (which will be packaged in the root of the EAR) and Java libraries (which are packaged in lib/). @@ -107,9 +50,10 @@ Creating Skinny WARs plugins plugin artifactIdmaven-ear-plugin/artifactId -version2.3.2/version +version2.9.1/version configuration defaultLibBundleDirlib//defaultLibBundleDir + skinnyWarstrue/skinnyWars /configuration /plugin /plugins @@ -161,4 +105,4 @@ Creating Skinny WARs * Alternatives Our users have submitted alternatives to the above recipe on - {{{http://docs.codehaus.org/display/MAVENUSER/Solving+the+Skinny+Wars+problem}the Wiki}}. \ No newline at end of file + {{{http://docs.codehaus.org/display/MAVENUSER/Solving+the+Skinny+Wars+problem}the Wiki}}.
svn commit: r1628835 - /maven/plugins/trunk/maven-war-plugin/pom.xml
Author: khmarbaise Date: Wed Oct 1 21:07:11 2014 New Revision: 1628835 URL: http://svn.apache.org/r1628835 Log: [MWAR-322] - Removed plexus-container-dependency:1.0-alpha-9-stable-1 dependency. Modified: maven/plugins/trunk/maven-war-plugin/pom.xml Modified: maven/plugins/trunk/maven-war-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/pom.xml?rev=1628835r1=1628834r2=1628835view=diff == --- maven/plugins/trunk/maven-war-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-war-plugin/pom.xml Wed Oct 1 21:07:11 2014 @@ -148,13 +148,6 @@ under the License. version1.19/version /dependency -!-- FIXME: This can be removed with upgrade to Maven 2.2.1 minimum version -- -dependency - groupIdorg.codehaus.plexus/groupId - artifactIdplexus-container-default/artifactId - version1.0-alpha-9-stable-1/version -/dependency - !-- 1.4.2 to avoid http://jira.codehaus.org/browse/XSTR-709 -- dependency groupIdcom.thoughtworks.xstream/groupId
svn commit: r1628837 - /maven/plugins/trunk/maven-war-plugin/pom.xml
Author: khmarbaise Date: Wed Oct 1 21:12:38 2014 New Revision: 1628837 URL: http://svn.apache.org/r1628837 Log: [MWAR-323] - Upgraded xtream from 1.4.2 to 1.4.4 to remove note about XSTR-709 Modified: maven/plugins/trunk/maven-war-plugin/pom.xml Modified: maven/plugins/trunk/maven-war-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/pom.xml?rev=1628837r1=1628836r2=1628837view=diff == --- maven/plugins/trunk/maven-war-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-war-plugin/pom.xml Wed Oct 1 21:12:38 2014 @@ -148,11 +148,10 @@ under the License. version1.19/version /dependency -!-- 1.4.2 to avoid http://jira.codehaus.org/browse/XSTR-709 -- dependency groupIdcom.thoughtworks.xstream/groupId artifactIdxstream/artifactId - version1.4.2/version + version1.4.4/version /dependency dependency
svn commit: r1628839 - in /maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging: AbstractWarPackagingTask.java DependenciesAnalysisPackagingTask.java
Author: khmarbaise Date: Wed Oct 1 21:28:57 2014 New Revision: 1628839 URL: http://svn.apache.org/r1628839 Log: - Removed unused imports - Refactored code to remove CPD warning in DependenciesAnalysisPackagingTask Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/DependenciesAnalysisPackagingTask.java Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java?rev=1628839r1=1628838r2=1628839view=diff == --- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java (original) +++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java Wed Oct 1 21:28:57 2014 @@ -21,7 +21,6 @@ package org.apache.maven.plugin.war.pack import java.io.File; import java.io.IOException; -import java.util.List; import org.apache.commons.io.input.XmlStreamReader; import org.apache.maven.artifact.Artifact; Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/DependenciesAnalysisPackagingTask.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/DependenciesAnalysisPackagingTask.java?rev=1628839r1=1628838r2=1628839view=diff == --- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/DependenciesAnalysisPackagingTask.java (original) +++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/DependenciesAnalysisPackagingTask.java Wed Oct 1 21:28:57 2014 @@ -55,21 +55,8 @@ public class DependenciesAnalysisPackagi { context.getLog().debug( notBundledMessage ); } -else if ( war.equals( dependency.getType() ) || zip.equals( dependency.getType() ) ) -{ -context.getLog().warn( warOrZipMessage ); -} -else if ( tld.equals( dependency.getType() ) || aar.equals( dependency.getType() ) -|| mar.equals( dependency.getType() ) || xar.equals( dependency.getType() ) -|| jar.equals( dependency.getType() ) || ejb.equals( dependency.getType() ) -|| ejb-client.equals( dependency.getType() ) || test-jar.equals( dependency.getType() ) -|| par.equals( dependency.getType() ) ) -{ -context.getLog().info( standardMessage ); -if ( removeFile ) -{ -removeDependency( context, dependency ); -} +else { +handleDependencyScope( context, dependency, warOrZipMessage, standardMessage, removeFile ); } }
svn commit: r1628849 [3/3] - in /maven/plugins/trunk/maven-war-plugin/src: main/java/org/apache/maven/plugin/war/ main/java/org/apache/maven/plugin/war/overlay/ main/java/org/apache/maven/plugin/war/p
Modified: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarMojoTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarMojoTest.java?rev=1628849r1=1628848r2=1628849view=diff == --- maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarMojoTest.java (original) +++ maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarMojoTest.java Wed Oct 1 22:03:26 2014 @@ -43,8 +43,8 @@ public class WarMojoTest { WarMojo mojo; -private static File pomFile = -new File( getBasedir(), target/test-classes/unit/warmojotest/plugin-config-primary-artifact.xml ); +private static File pomFile = new File( getBasedir(), + target/test-classes/unit/warmojotest/plugin-config-primary-artifact.xml ); protected File getTestDirectory() { @@ -75,7 +75,7 @@ public class WarMojoTest String warName = simple; File webAppSource = createWebAppSource( testId ); File classesDir = createClassesDir( testId, true ); -File xmlSource = createXMLConfigDir( testId, new String[]{web.xml} ); +File xmlSource = createXMLConfigDir( testId, new String[] { web.xml } ); project.setArtifact( warArtifact ); this.configureMojo( mojo, new LinkedListString(), classesDir, webAppSource, webAppDirectory, project ); @@ -85,12 +85,12 @@ public class WarMojoTest mojo.execute(); -//validate jar file +// validate jar file File expectedJarFile = new File( outputDir, simple.war ); -assertJarContent( expectedJarFile, new String[]{META-INF/MANIFEST.MF, WEB-INF/web.xml, pansit.jsp, +assertJarContent( expectedJarFile, new String[] { META-INF/MANIFEST.MF, WEB-INF/web.xml, pansit.jsp, org/web/app/last-exile.jsp, META-INF/maven/org.apache.maven.test/maven-test-plugin/pom.xml, - META-INF/maven/org.apache.maven.test/maven-test-plugin/pom.properties}, - new String[]{null, mojo.getWebXml().toString(), null, null, null, null} ); + META-INF/maven/org.apache.maven.test/maven-test-plugin/pom.properties }, new String[] { null, +mojo.getWebXml().toString(), null, null, null, null } ); } public void testSimpleWarPackagingExcludeWithIncludesRegEx() @@ -104,25 +104,23 @@ public class WarMojoTest String warName = simple; File webAppSource = createWebAppSource( testId ); File classesDir = createClassesDir( testId, true ); -File xmlSource = createXMLConfigDir( testId, new String[]{web.xml} ); +File xmlSource = createXMLConfigDir( testId, new String[] { web.xml } ); project.setArtifact( warArtifact ); this.configureMojo( mojo, new LinkedListString(), classesDir, webAppSource, webAppDirectory, project ); setVariableValueToObject( mojo, outputDirectory, outputDir ); setVariableValueToObject( mojo, warName, warName ); mojo.setWebXml( new File( xmlSource, web.xml ) ); -setVariableValueToObject( mojo,packagingIncludes,%regex[(.(?!exile))+] ); - - +setVariableValueToObject( mojo, packagingIncludes, %regex[(.(?!exile))+] ); + mojo.execute(); -//validate jar file +// validate jar file File expectedJarFile = new File( outputDir, simple.war ); -assertJarContent( expectedJarFile, new String[]{META-INF/MANIFEST.MF, WEB-INF/web.xml, pansit.jsp, +assertJarContent( expectedJarFile, new String[] { META-INF/MANIFEST.MF, WEB-INF/web.xml, pansit.jsp, META-INF/maven/org.apache.maven.test/maven-test-plugin/pom.xml, - META-INF/maven/org.apache.maven.test/maven-test-plugin/pom.properties}, - new String[]{null, mojo.getWebXml().toString(), null, null, null, }, - new String[]{org/web/app/last-exile.jsp} ); + META-INF/maven/org.apache.maven.test/maven-test-plugin/pom.properties }, new String[] { null, +mojo.getWebXml().toString(), null, null, null, }, new String[] { org/web/app/last-exile.jsp } ); } public void testClassifier() @@ -137,7 +135,7 @@ public class WarMojoTest String warName = simple; File webAppSource = createWebAppSource( testId ); File classesDir = createClassesDir( testId, true ); -File xmlSource = createXMLConfigDir( testId, new String[]{web.xml} ); +File xmlSource = createXMLConfigDir( testId, new String[] { web.xml } ); project.setArtifact( warArtifact ); this.configureMojo( mojo, new LinkedListString(), classesDir, webAppSource, webAppDirectory, project ); @@ -149,12 +147,12 @@
svn commit: r1628849 [2/3] - in /maven/plugins/trunk/maven-war-plugin/src: main/java/org/apache/maven/plugin/war/ main/java/org/apache/maven/plugin/war/overlay/ main/java/org/apache/maven/plugin/war/p
Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/SaveWebappStructurePostPackagingTask.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/SaveWebappStructurePostPackagingTask.java?rev=1628849r1=1628848r2=1628849view=diff == --- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/SaveWebappStructurePostPackagingTask.java (original) +++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/SaveWebappStructurePostPackagingTask.java Wed Oct 1 22:03:26 2014 @@ -30,7 +30,6 @@ import java.io.IOException; * Saves the webapp structure cache. * * @author Stephane Nicoll - * * @version $Id$ */ public class SaveWebappStructurePostPackagingTask @@ -41,7 +40,6 @@ public class SaveWebappStructurePostPack private final WebappStructureSerializer serialier; - public SaveWebappStructurePostPackagingTask( File targetFile ) { this.targetFile = targetFile; Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarPackagingContext.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarPackagingContext.java?rev=1628849r1=1628848r2=1628849view=diff == --- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarPackagingContext.java (original) +++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarPackagingContext.java Wed Oct 1 22:03:26 2014 @@ -49,8 +49,7 @@ public interface WarPackagingContext MavenProject getProject(); /** - * Returns the webapp directory. Packaging tasks should use this - * directory to generate the webapp. + * Returns the webapp directory. Packaging tasks should use this directory to generate the webapp. * * @return the webapp directory */ @@ -92,8 +91,7 @@ public interface WarPackagingContext File getClassesDirectory(); /** - * Specify whether the classes resources should be archived in - * the ttWEB-INF/lib/tt of the generated web app. + * Specify whether the classes resources should be archived in the ttWEB-INF/lib/tt of the generated web app. * * @return true if the classes should be archived, false otherwise */ @@ -128,16 +126,14 @@ public interface WarPackagingContext MavenArchiveConfiguration getArchive(); /** - * Returns the Jar archiver needed for archiving classes directory into - * jar file under WEB-INF/lib. + * Returns the Jar archiver needed for archiving classes directory into jar file under WEB-INF/lib. * * @return the jar archiver to user */ JarArchiver getJarArchiver(); /** - * Returns the output file name mapping to use, if any. Returns ttnull/tt - * if no file name mapping is set. + * Returns the output file name mapping to use, if any. Returns ttnull/tt if no file name mapping is set. * * @return the output file name mapping or ttnull/tt */ @@ -158,15 +154,14 @@ public interface WarPackagingContext WebappStructure getWebappStructure(); /** - * Returns the list of registered overlays for this session. This list might - * differ from the one returned by the cache; in this case, it means that the - * project's configuration has changed. The plugin will handle those cases nicely - * but it would be better in general to invoke the clean goal. + * Returns the list of registered overlays for this session. This list might differ from the one returned by the + * cache; in this case, it means that the project's configuration has changed. The plugin will handle those cases + * nicely but it would be better in general to invoke the clean goal. * * @return the list of registered overlays, including the current project */ ListString getOwnerIds(); - + /** * Returns the {@link MavenFileFilter} instance to use. * @@ -174,25 +169,24 @@ public interface WarPackagingContext * @since 2.1-alpha-2 */ MavenFileFilter getMavenFileFilter(); - + /** * @return {@link List} of {@link FilterWrapper} * @since 2.1-alpha-2 */ ListFilterWrapper getFilterWrappers(); - + /** - * Specify if the given ttfileName/tt belongs to the list of extensions - * that must not be filtered + * Specify if the given ttfileName/tt belongs to the list of extensions that must not be filtered * * @param fileName the name of file * @return tttrue/tt if it should not be filtered, ttfalse/tt otherwise *
svn commit: r1628849 [1/3] - in /maven/plugins/trunk/maven-war-plugin/src: main/java/org/apache/maven/plugin/war/ main/java/org/apache/maven/plugin/war/overlay/ main/java/org/apache/maven/plugin/war/p
Author: khmarbaise Date: Wed Oct 1 22:03:26 2014 New Revision: 1628849 URL: http://svn.apache.org/r1628849 Log: [MWAR-325] - Cleaned up several Checkstyle (errors, warnings) - CPD issues. Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/Overlay.java maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarExplodedMojo.java maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarInPlaceMojo.java maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarManifestMojo.java maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/overlay/DefaultOverlay.java maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/overlay/InvalidOverlayConfigurationException.java maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/overlay/OverlayManager.java maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/ArtifactsPackagingTask.java maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/ClassesPackagingTask.java maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/DependenciesAnalysisPackagingTask.java maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/OverlayPackagingTask.java maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/SaveWebappStructurePostPackagingTask.java maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarPackagingContext.java maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarPackagingTask.java maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarPostPackagingTask.java maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/ClassesPackager.java maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/DependencyInfo.java maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/PathSet.java maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/WarUtils.java maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/WebappStructure.java maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/WebappStructureSerializer.java maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/AbstractWarExplodedMojoTest.java maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/AbstractWarMojoTest.java maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarDependenciesAnalysisTest.java maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarExplodedMojoFilteringTest.java maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarExplodedMojoTest.java maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarInPlaceMojoTest.java maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarManifestMojoTest.java maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarMojoTest.java maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarOverlaysTest.java maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarZipTest.java Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java?rev=1628849r1=1628848r2=1628849view=diff == --- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java (original) +++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java Wed Oct 1 22:03:26 2014 @@ -84,9 +84,9 @@ public abstract class AbstractWarMojo private File classesDirectory; /** - * Whether a JAR file will be created for the classes in the webapp. Using this optional configuration - * parameter
svn commit: r6711 - /release/maven/plugins/
Author: khmarbaise Date: Thu Oct 2 10:59:53 2014 New Revision: 6711 Log: - Added Apache Maven JavaDoc Plugin Version 2.10.1 Added: release/maven/plugins/maven-javadoc-plugin-2.10.1-source-release.zip (with props) release/maven/plugins/maven-javadoc-plugin-2.10.1-source-release.zip.asc release/maven/plugins/maven-javadoc-plugin-2.10.1-source-release.zip.md5 Removed: release/maven/plugins/maven-javadoc-plugin-2.10-source-release.zip release/maven/plugins/maven-javadoc-plugin-2.10-source-release.zip.asc release/maven/plugins/maven-javadoc-plugin-2.10-source-release.zip.md5 Added: release/maven/plugins/maven-javadoc-plugin-2.10.1-source-release.zip == Binary file - no diff available. Propchange: release/maven/plugins/maven-javadoc-plugin-2.10.1-source-release.zip -- svn:mime-type = application/octet-stream Added: release/maven/plugins/maven-javadoc-plugin-2.10.1-source-release.zip.asc == --- release/maven/plugins/maven-javadoc-plugin-2.10.1-source-release.zip.asc (added) +++ release/maven/plugins/maven-javadoc-plugin-2.10.1-source-release.zip.asc Thu Oct 2 10:59:53 2014 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v1.4.11 (MingW32) + +iQEcBAABAgAGBQJUJrgSAAoJEBoqHJS96JaIRI4H/RfwtdFdZ/bpPEMYzI2p/us8 +26acs+gMZf4ncTpUJw50Lr2EYhPaphebt51/iftJolfvq/inwG2q8S/bFv46CcNS +JVxQm7WY2XfOWjuXOfNFGu4u9saH//PHW/zZHjG+E8PDBvN1jWB3WSTNDsY611JG +BfZ9FXdHoQ0Hk34LlP+GeKktP7g1KgKPcHo52UEOKUhE7YvgE7GFvqCkp1ospkuj +vRnj6QokaChKXCT57UlHytE3h/ROB/yl+jUNllTfASxozOtzhgOaxSCLorNZY7ZJ +Clf/XVX7JH4WS0oajDAyGS+/BUeryi6DaxVdbuiEAu8aD8Yv4yzFCePCVHK872g= +=u8nl +-END PGP SIGNATURE- Added: release/maven/plugins/maven-javadoc-plugin-2.10.1-source-release.zip.md5 == --- release/maven/plugins/maven-javadoc-plugin-2.10.1-source-release.zip.md5 (added) +++ release/maven/plugins/maven-javadoc-plugin-2.10.1-source-release.zip.md5 Thu Oct 2 10:59:53 2014 @@ -0,0 +1 @@ +2d57987102d4654bde909af593a42ba6 \ No newline at end of file
svn commit: r1628944 - /maven/site/trunk/content/apt/plugins/index.apt
Author: khmarbaise Date: Thu Oct 2 11:30:11 2014 New Revision: 1628944 URL: http://svn.apache.org/r1628944 Log: - Updated for maven-javadoc-plugin version 2.10.1 Modified: maven/site/trunk/content/apt/plugins/index.apt Modified: maven/site/trunk/content/apt/plugins/index.apt URL: http://svn.apache.org/viewvc/maven/site/trunk/content/apt/plugins/index.apt?rev=1628944r1=1628943r2=1628944view=diff == --- maven/site/trunk/content/apt/plugins/index.apt (original) +++ maven/site/trunk/content/apt/plugins/index.apt Thu Oct 2 11:30:11 2014 @@ -115,7 +115,7 @@ Available Plugins *--++--++--+++ | {{{/plugins/maven-docck-plugin/} docck}} | B | 1.0 | 2008-11-16 | Documentation checker plugin. | {{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-docck-plugin}SVN}} | {{{http://jira.codehaus.org/browse/MDOCCK}JIRA}} *--++--++--+++ -| {{{/plugins/maven-javadoc-plugin/} javadoc}} | B+R| 2.10 | 2014-09-20 | Generate Javadoc for the project. | {{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-javadoc-plugin}SVN}} | {{{http://jira.codehaus.org/browse/MJAVADOC}JIRA}} +| {{{/plugins/maven-javadoc-plugin/} javadoc}} | B+R| 2.10.1 | 2014-09-27 | Generate Javadoc for the project. | {{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-javadoc-plugin}SVN}} | {{{http://jira.codehaus.org/browse/MJAVADOC}JIRA}} *--++--++--+++ | {{{/jxr/maven-jxr-plugin/} jxr}} | R | 2.4 | 2013-12-10 | Generate a source cross reference. | {{{http://svn.apache.org/repos/asf/maven/jxr/trunk/maven-jxr-plugin}SVN}} | {{{http://jira.codehaus.org/browse/JXR}JIRA}} *--++--++--+++
svn commit: r6713 - /release/maven/plugins/
Author: khmarbaise Date: Thu Oct 2 19:53:58 2014 New Revision: 6713 Log: - Added Apache Maven Resources Plugin Version 2.7 Added: release/maven/plugins/maven-resources-plugin-2.7-source-release.zip (with props) release/maven/plugins/maven-resources-plugin-2.7-source-release.zip.asc release/maven/plugins/maven-resources-plugin-2.7-source-release.zip.md5 Removed: release/maven/plugins/maven-resources-plugin-2.6-source-release.zip release/maven/plugins/maven-resources-plugin-2.6-source-release.zip.asc release/maven/plugins/maven-resources-plugin-2.6-source-release.zip.md5 Added: release/maven/plugins/maven-resources-plugin-2.7-source-release.zip == Binary file - no diff available. Propchange: release/maven/plugins/maven-resources-plugin-2.7-source-release.zip -- svn:mime-type = application/octet-stream Added: release/maven/plugins/maven-resources-plugin-2.7-source-release.zip.asc == --- release/maven/plugins/maven-resources-plugin-2.7-source-release.zip.asc (added) +++ release/maven/plugins/maven-resources-plugin-2.7-source-release.zip.asc Thu Oct 2 19:53:58 2014 @@ -0,0 +1,28 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG/MacGPG2 v2.0.19 (Darwin) +Comment: GPGTools - http://gpgtools.org + +iQQcBAABCgAGBQJUKc4YAAoJECGiSz+LD1lKIdEf/R8KvCAElNADlwdRa1jay0EO +F9UnZ/LpZHmlH0l4aShsFwnK9EpMKxgwvFbbrwm5+gSUgaca5Rm6gN1BvxJNuFul +mmlbllfXdIdXmNCSAiNv4cX4e9TzJIzsW062CzASIHHNumEc3+iT1bXuIeJVP1mi +Cozgppk+zi85xzS25qf4t5eYqjjGmqNjfJzCgdDQNrGaDYe0T5u1FuH5Ebyl30On +7FPKohcU1dD/ZdwAKgbY3kkAr7eclo2LywUISB478Fz/L4Zlx9gzbekeYUGwOu7x +5PDpSaaLEbMh+mFCrKves6XrXwggcRSkH/N8rMnTsKS1LEKOyWv198rP6j9LQeCB +UbSjdUIXrFi3lyWCkm010K2FM+eOjaiiTFt/XwV7E+QZvpfyG8yksqrUcr2pdPjd +MZltjZ6apV5Gk9XfEffwCosU2n6W70Pp7AN43gceRY2eijbiPpxErNpGGEH0J4NT +AtnIlQW5Lt596/Sfuul1jRb2dce+kWRGLAICD/4OemkJN9yqWQIWI9+OWbm82MxD +SBGz8azTI/BnN6uzqm58DwAglL73JpdQrQaf/R/wK7HeaOsR4ic49AmtoDvMkwvl +NqcmgU2Xu7COhqPo0w45WsuTbzYQI8E4yX/kmAgfImYhOE9J0ouUC7u06hd/t7vE +THDTyOE9REPVsbQHfVr1ByhiqHu6Mhky7YmhJEOjDB37I2i/hrXLUMXV7d8ULbNg +1MNBCqmXBxwyGMJVPwv0+kQMHanMb1piI5KWV2yOy8t31ZUUDli4YSDz3Pv3JoQb +6VAfKWemKmemDkBHxondtYWlphyURepLsNWjvqm0czkE5pPXCNrt+nFjxypOGbMg +Mo+3KXcVdbs/lF7juW9+635isSacPKO9ehB7+ALVndYNrf6kQ4Mp22O/g4oFiDHI +frPmUbPQcBP8yKNpcQ8cc/DVGOzeJmLgUXfUJqtjpK4+vECRLazt/RX7wmPkdyz4 +aGIfMrW+soHSjgAEDFhwXjvW3hMLr3xgBTGCos2sHWuUwvwe3W60dJbEo4wvj6D+ +P3c4d/L+C0E1fDmDVOIZmw15X6Hv3fID6pgy+xmn7K9P2StMHaNBlq4c2kjjS4AM +y36pVA92DYgujL6WJ1+w5Q+9iyswhVumLgZgJHGfAVP62Ou9lz14Yw0qvDIT8Umf +1OiaJWwMzn/gG7mag95b5FZzIrnLbmvAO8RwFMoaO8wnc8ePwgl1/PgJiJlGcYd3 +IeAh/tTJZfXBF18yB1TyX5zd70sZgET/A4pk+yEZZ8YfuxnBSuoCUrWar5D9uTsM +/9qtDxiqnq2Tf/n0vqWk/tGnjV+mUBhXabgurqcruy8OVYO0qCocVzgbsElZY6c= +=kNLw +-END PGP SIGNATURE- Added: release/maven/plugins/maven-resources-plugin-2.7-source-release.zip.md5 == --- release/maven/plugins/maven-resources-plugin-2.7-source-release.zip.md5 (added) +++ release/maven/plugins/maven-resources-plugin-2.7-source-release.zip.md5 Thu Oct 2 19:53:58 2014 @@ -0,0 +1 @@ +35905f90e2e5f6bf101e97d2e782dc6f \ No newline at end of file
svn commit: r1629059 - /maven/site/trunk/content/apt/plugins/index.apt
Author: khmarbaise Date: Thu Oct 2 19:54:27 2014 New Revision: 1629059 URL: http://svn.apache.org/r1629059 Log: - Update maven-resources-plugin to version 2.7 Modified: maven/site/trunk/content/apt/plugins/index.apt Modified: maven/site/trunk/content/apt/plugins/index.apt URL: http://svn.apache.org/viewvc/maven/site/trunk/content/apt/plugins/index.apt?rev=1629059r1=1629058r2=1629059view=diff == --- maven/site/trunk/content/apt/plugins/index.apt (original) +++ maven/site/trunk/content/apt/plugins/index.apt Thu Oct 2 19:54:27 2014 @@ -77,7 +77,7 @@ Available Plugins *--++--++--+++ | {{{/plugins/maven-install-plugin/} install}} | B | 2.5.2| 2014-08-27 | Install the built artifact into the local repository. | {{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-install-plugin}SVN}} | {{{http://jira.codehaus.org/browse/MINSTALL}JIRA}} *--++--++--+++ -| {{{/plugins/maven-resources-plugin/} resources}} | B | 2.6 | 2012-08-18 | Copy the resources to the output directory for including in the JAR. | {{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-resources-plugin}SVN}} | {{{http://jira.codehaus.org/browse/MRESOURCES}JIRA}} +| {{{/plugins/maven-resources-plugin/} resources}} | B | 2.7 | 2014-09-29 | Copy the resources to the output directory for including in the JAR. | {{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-resources-plugin}SVN}} | {{{http://jira.codehaus.org/browse/MRESOURCES}JIRA}} *--++--++--+++ | {{{/plugins/maven-site-plugin/} site}} | B | 3.4 | 2014-07-07 | Generate a site for the current project. | {{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-site-plugin/}SVN}} | {{{http://jira.codehaus.org/browse/MSITE}JIRA}} *--++--++--+++
svn commit: r1629187 - /maven/plugins/trunk/maven-linkcheck-plugin/pom.xml
Author: khmarbaise Date: Fri Oct 3 12:06:22 2014 New Revision: 1629187 URL: http://svn.apache.org/r1629187 Log: [MLINKCHECK-17] - Updated plexus-i18n from 1.0-beta-7 to 1.0-beta-10 Modified: maven/plugins/trunk/maven-linkcheck-plugin/pom.xml Modified: maven/plugins/trunk/maven-linkcheck-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-linkcheck-plugin/pom.xml?rev=1629187r1=1629186r2=1629187view=diff == --- maven/plugins/trunk/maven-linkcheck-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-linkcheck-plugin/pom.xml Fri Oct 3 12:06:22 2014 @@ -147,7 +147,7 @@ under the License. dependency groupIdorg.codehaus.plexus/groupId artifactIdplexus-i18n/artifactId - version1.0-beta-7/version + version1.0-beta-10/version exclusions exclusion groupIdorg.codehaus.plexus/groupId
svn commit: r1629195 - /maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java
Author: khmarbaise Date: Fri Oct 3 13:01:27 2014 New Revision: 1629195 URL: http://svn.apache.org/r1629195 Log: - Improved Code to be more Java 5. Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java?rev=1629195r1=1629194r2=1629195view=diff == --- maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java (original) +++ maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java Fri Oct 3 13:01:27 2014 @@ -110,7 +110,7 @@ public class EarMojo * @since 2.3.2 */ @Parameter -private List nonFilteredFileExtensions; +private ListString nonFilteredFileExtensions; /** * To escape interpolated value with Windows path c:\foo\bar will be replaced with c:\\foo\\bar.
svn commit: r1629424 - /maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/it/EarMojoIT.java
Author: khmarbaise Date: Sat Oct 4 17:04:32 2014 New Revision: 1629424 URL: http://svn.apache.org/r1629424 Log: [MEAR-199] - Fixed the integration test to get a comparsion between used manifest file and the one which is inside the EAR file. Modified: maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/it/EarMojoIT.java Modified: maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/it/EarMojoIT.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/it/EarMojoIT.java?rev=1629424r1=1629423r2=1629424view=diff == --- maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/it/EarMojoIT.java (original) +++ maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/it/EarMojoIT.java Sat Oct 4 17:04:32 2014 @@ -20,11 +20,17 @@ package org.apache.maven.plugin.ear.it; */ import org.apache.maven.it.util.IOUtil; +import org.codehaus.plexus.archiver.ear.EarArchiver; +import org.codehaus.plexus.archiver.zip.ZipArchiver; +import org.codehaus.plexus.archiver.zip.ZipUnArchiver; import org.codehaus.plexus.util.FileUtils; import org.codehaus.plexus.util.ReaderFactory; import java.io.File; +import java.io.FileInputStream; import java.util.Properties; +import java.util.jar.JarFile; +import java.util.jar.Manifest; /** * @author a href=snic...@apache.orgStephane Nicoll/a @@ -182,12 +188,20 @@ public class EarMojoIT public void testProject016() throws Exception { -System.out.println( Skipped project-016: need a way to extract the EAR archive ); -/* - * final File baseDir = doTestProject( project-016, new String[]{ejb-sample-one-1.0.jar} ); final File - * expectedManifest = new File(baseDir, src/main/ear/META-INF/MANIFEST.MF); // TODO: needs a way to extract - * the EAR archive - */ +final File baseDir = doTestProject( project-016, new String[] { ejb-sample-one-1.0.jar } ); + +final File targetFolder = new File( baseDir, target ); +final File createdEarFile = new File( targetFolder, maven-ear-plugin-test-project-016-99.0.ear ); + +final File sourceManifestFile = new File( baseDir, src/main/ear/MANIFEST.MF ); + +JarFile jarFile = new JarFile( createdEarFile ); +Manifest manifestFromCreatedEARFile = jarFile.getManifest(); +jarFile.close(); + +Manifest sourceManifest = new Manifest( new FileInputStream( sourceManifestFile ) ); + +assertTrue( There are differences in the manifest., sourceManifest.equals( manifestFromCreatedEARFile ) ); } /**
svn commit: r1629425 - /maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/it/EarMojoIT.java
Author: khmarbaise Date: Sat Oct 4 17:06:41 2014 New Revision: 1629425 URL: http://svn.apache.org/r1629425 Log: [MEAR-199] - Followup cleaned up imports. Modified: maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/it/EarMojoIT.java Modified: maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/it/EarMojoIT.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/it/EarMojoIT.java?rev=1629425r1=1629424r2=1629425view=diff == --- maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/it/EarMojoIT.java (original) +++ maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/it/EarMojoIT.java Sat Oct 4 17:06:41 2014 @@ -19,19 +19,16 @@ package org.apache.maven.plugin.ear.it; * under the License. */ -import org.apache.maven.it.util.IOUtil; -import org.codehaus.plexus.archiver.ear.EarArchiver; -import org.codehaus.plexus.archiver.zip.ZipArchiver; -import org.codehaus.plexus.archiver.zip.ZipUnArchiver; -import org.codehaus.plexus.util.FileUtils; -import org.codehaus.plexus.util.ReaderFactory; - import java.io.File; import java.io.FileInputStream; import java.util.Properties; import java.util.jar.JarFile; import java.util.jar.Manifest; +import org.apache.maven.it.util.IOUtil; +import org.codehaus.plexus.util.FileUtils; +import org.codehaus.plexus.util.ReaderFactory; + /** * @author a href=snic...@apache.orgStephane Nicoll/a * @version $Id$
svn commit: r1629427 - /maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java
Author: khmarbaise Date: Sat Oct 4 17:25:38 2014 New Revision: 1629427 URL: http://svn.apache.org/r1629427 Log: - Fixed typo. Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java?rev=1629427r1=1629426r2=1629427view=diff == --- maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java (original) +++ maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java Sat Oct 4 17:25:38 2014 @@ -709,7 +709,7 @@ public class EarMojo { //MEAR-189: //We use the original name, cause in case of fileNameMapping to no-version/full -//we coulnd not not delete it and it will end up in the resulting EAR and the WAR +//we could not not delete it and it will end up in the resulting EAR and the WAR //will not be cleaned up. File artifact = new File( new File( workDirectory, module.getLibDir() ), jm.getOriginalBundleFileName() );
svn commit: r1629453 - /maven/plugins/trunk/maven-verifier-plugin/pom.xml
Author: khmarbaise Date: Sat Oct 4 22:26:44 2014 New Revision: 1629453 URL: http://svn.apache.org/r1629453 Log: [MVERIFIER-15] - Upgrade to Maven 2.2.1 Modified: maven/plugins/trunk/maven-verifier-plugin/pom.xml Modified: maven/plugins/trunk/maven-verifier-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-verifier-plugin/pom.xml?rev=1629453r1=1629452r2=1629453view=diff == --- maven/plugins/trunk/maven-verifier-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-verifier-plugin/pom.xml Sat Oct 4 22:26:44 2014 @@ -57,7 +57,7 @@ under the License. /distributionManagement properties -mavenVersion2.0.6/mavenVersion +mavenVersion2.2.1/mavenVersion mavenPluginVersion3.2/mavenPluginVersion /properties
svn commit: r1629492 - /maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntMojo.java
Author: khmarbaise Date: Sun Oct 5 13:25:55 2014 New Revision: 1629492 URL: http://svn.apache.org/r1629492 Log: [MANT-78] - Fixed injections of settings. Modified: maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntMojo.java Modified: maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntMojo.java?rev=1629492r1=1629491r2=1629492view=diff == --- maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntMojo.java (original) +++ maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntMojo.java Sun Oct 5 13:25:55 2014 @@ -88,7 +88,7 @@ public class AntMojo /** * The current user system settings for use in Maven. */ -@Component +@Parameter( defaultValue = ${settings}, readonly = true, required = true ) private Settings settings; /**
svn commit: r1629493 - /maven/plugins/trunk/maven-ant-plugin/pom.xml
Author: khmarbaise Date: Sun Oct 5 13:32:04 2014 New Revision: 1629493 URL: http://svn.apache.org/r1629493 Log: [MANT-80] - Upgrade plexus-utils from 3.0.15 to 3.0.18 Modified: maven/plugins/trunk/maven-ant-plugin/pom.xml Modified: maven/plugins/trunk/maven-ant-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/pom.xml?rev=1629493r1=1629492r2=1629493view=diff == --- maven/plugins/trunk/maven-ant-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-ant-plugin/pom.xml Sun Oct 5 13:32:04 2014 @@ -111,7 +111,7 @@ under the License. dependency groupIdorg.codehaus.plexus/groupId artifactIdplexus-utils/artifactId - version3.0.15/version + version3.0.18/version /dependency dependency groupIdorg.apache.ant/groupId
svn commit: r1629497 - /maven/plugins/trunk/maven-antrun-plugin/pom.xml
Author: khmarbaise Date: Sun Oct 5 13:51:42 2014 New Revision: 1629497 URL: http://svn.apache.org/r1629497 Log: [MANTRUN-190] - Upgrade org.apache.ant:ant:1.8.2 to 1.9.4 Modified: maven/plugins/trunk/maven-antrun-plugin/pom.xml Modified: maven/plugins/trunk/maven-antrun-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/pom.xml?rev=1629497r1=1629496r2=1629497view=diff == --- maven/plugins/trunk/maven-antrun-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-antrun-plugin/pom.xml Sun Oct 5 13:51:42 2014 @@ -91,7 +91,7 @@ under the License. dependency groupIdorg.apache.ant/groupId artifactIdant/artifactId - version1.8.2/version + version1.9.4/version /dependency /dependencies
svn commit: r1629498 - /maven/plugins/trunk/maven-antrun-plugin/pom.xml
Author: khmarbaise Date: Sun Oct 5 13:55:37 2014 New Revision: 1629498 URL: http://svn.apache.org/r1629498 Log: [MANTRUN-191] - Upgrade plexus-utils from 3.0.15 to 3.0.18 Modified: maven/plugins/trunk/maven-antrun-plugin/pom.xml Modified: maven/plugins/trunk/maven-antrun-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/pom.xml?rev=1629498r1=1629497r2=1629498view=diff == --- maven/plugins/trunk/maven-antrun-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-antrun-plugin/pom.xml Sun Oct 5 13:55:37 2014 @@ -86,7 +86,7 @@ under the License. dependency groupIdorg.codehaus.plexus/groupId artifactIdplexus-utils/artifactId - version3.0.15/version + version3.0.18/version /dependency dependency groupIdorg.apache.ant/groupId
svn commit: r1629500 - /maven/plugins/trunk/maven-repository-plugin/pom.xml
Author: khmarbaise Date: Sun Oct 5 14:01:41 2014 New Revision: 1629500 URL: http://svn.apache.org/r1629500 Log: [MREPOSITORY-32] - Removed plexus-container-default:1.0-alpha-9-stable-1 Modified: maven/plugins/trunk/maven-repository-plugin/pom.xml Modified: maven/plugins/trunk/maven-repository-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-repository-plugin/pom.xml?rev=1629500r1=1629499r2=1629500view=diff == --- maven/plugins/trunk/maven-repository-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-repository-plugin/pom.xml Sun Oct 5 14:01:41 2014 @@ -127,11 +127,6 @@ under the License. /dependency dependency groupIdorg.codehaus.plexus/groupId - artifactIdplexus-container-default/artifactId - version1.0-alpha-9-stable-1/version -/dependency -dependency - groupIdorg.codehaus.plexus/groupId artifactIdplexus-interactivity-api/artifactId version1.0-alpha-6/version exclusions
svn commit: r1629525 - /maven/plugins/trunk/maven-repository-plugin/deploySite.sh
Author: khmarbaise Date: Sun Oct 5 19:55:12 2014 New Revision: 1629525 URL: http://svn.apache.org/r1629525 Log: - Added deploySite.sh script. Added: maven/plugins/trunk/maven-repository-plugin/deploySite.sh (with props) Added: maven/plugins/trunk/maven-repository-plugin/deploySite.sh URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-repository-plugin/deploySite.sh?rev=1629525view=auto == --- maven/plugins/trunk/maven-repository-plugin/deploySite.sh (added) +++ maven/plugins/trunk/maven-repository-plugin/deploySite.sh Sun Oct 5 19:55:12 2014 @@ -0,0 +1,23 @@ +#!/bin/sh + +# +# 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. +# + +mvn -Preporting site site:stage $@ +mvn scm-publish:publish-scm $@ Propchange: maven/plugins/trunk/maven-repository-plugin/deploySite.sh -- svn:executable = *
svn commit: r1629527 - /maven/plugins/trunk/maven-repository-plugin/pom.xml
Author: khmarbaise Date: Sun Oct 5 19:58:42 2014 New Revision: 1629527 URL: http://svn.apache.org/r1629527 Log: [maven-release-plugin] prepare release maven-repository-plugin-2.3.2 Modified: maven/plugins/trunk/maven-repository-plugin/pom.xml Modified: maven/plugins/trunk/maven-repository-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-repository-plugin/pom.xml?rev=1629527r1=1629526r2=1629527view=diff == --- maven/plugins/trunk/maven-repository-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-repository-plugin/pom.xml Sun Oct 5 19:58:42 2014 @@ -30,7 +30,7 @@ under the License. /parent artifactIdmaven-repository-plugin/artifactId - version2.3.2-SNAPSHOT/version + version2.3.2/version packagingmaven-plugin/packaging nameApache Maven Repository Plugin/name @@ -41,9 +41,9 @@ under the License. /prerequisites scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-repository-plugin//connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-repository-plugin//developerConnection - urlhttp://svn.apache.org/viewvc/maven/plugins/trunk/maven-repository-plugin//url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-repository-plugin-2.3.2/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-repository-plugin-2.3.2/developerConnection + urlhttp://svn.apache.org/viewvc/maven/plugins/tags/maven-repository-plugin-2.3.2/url /scm issueManagement systemJIRA/system
svn commit: r1629528 - /maven/plugins/trunk/maven-repository-plugin/pom.xml
Author: khmarbaise Date: Sun Oct 5 19:58:58 2014 New Revision: 1629528 URL: http://svn.apache.org/r1629528 Log: [maven-release-plugin] rollback the release of maven-repository-plugin-2.3.2 Modified: maven/plugins/trunk/maven-repository-plugin/pom.xml Modified: maven/plugins/trunk/maven-repository-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-repository-plugin/pom.xml?rev=1629528r1=1629527r2=1629528view=diff == --- maven/plugins/trunk/maven-repository-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-repository-plugin/pom.xml Sun Oct 5 19:58:58 2014 @@ -30,7 +30,7 @@ under the License. /parent artifactIdmaven-repository-plugin/artifactId - version2.3.2/version + version2.3.2-SNAPSHOT/version packagingmaven-plugin/packaging nameApache Maven Repository Plugin/name @@ -41,9 +41,9 @@ under the License. /prerequisites scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-repository-plugin-2.3.2/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-repository-plugin-2.3.2/developerConnection - urlhttp://svn.apache.org/viewvc/maven/plugins/tags/maven-repository-plugin-2.3.2/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-repository-plugin//connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-repository-plugin//developerConnection + urlhttp://svn.apache.org/viewvc/maven/plugins/trunk/maven-repository-plugin//url /scm issueManagement systemJIRA/system
svn commit: r1629529 - /maven/plugins/trunk/maven-repository-plugin/pom.xml
Author: khmarbaise Date: Sun Oct 5 20:00:03 2014 New Revision: 1629529 URL: http://svn.apache.org/r1629529 Log: [maven-release-plugin] prepare release maven-repository-plugin-2.4 Modified: maven/plugins/trunk/maven-repository-plugin/pom.xml Modified: maven/plugins/trunk/maven-repository-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-repository-plugin/pom.xml?rev=1629529r1=1629528r2=1629529view=diff == --- maven/plugins/trunk/maven-repository-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-repository-plugin/pom.xml Sun Oct 5 20:00:03 2014 @@ -30,7 +30,7 @@ under the License. /parent artifactIdmaven-repository-plugin/artifactId - version2.3.2-SNAPSHOT/version + version2.4/version packagingmaven-plugin/packaging nameApache Maven Repository Plugin/name @@ -41,9 +41,9 @@ under the License. /prerequisites scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-repository-plugin//connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-repository-plugin//developerConnection - urlhttp://svn.apache.org/viewvc/maven/plugins/trunk/maven-repository-plugin//url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-repository-plugin-2.4/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-repository-plugin-2.4/developerConnection + urlhttp://svn.apache.org/viewvc/maven/plugins/tags/maven-repository-plugin-2.4/url /scm issueManagement systemJIRA/system
svn commit: r1629531 - /maven/plugins/trunk/maven-repository-plugin/pom.xml
Author: khmarbaise Date: Sun Oct 5 20:00:12 2014 New Revision: 1629531 URL: http://svn.apache.org/r1629531 Log: [maven-release-plugin] prepare for next development iteration Modified: maven/plugins/trunk/maven-repository-plugin/pom.xml Modified: maven/plugins/trunk/maven-repository-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-repository-plugin/pom.xml?rev=1629531r1=1629530r2=1629531view=diff == --- maven/plugins/trunk/maven-repository-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-repository-plugin/pom.xml Sun Oct 5 20:00:12 2014 @@ -30,7 +30,7 @@ under the License. /parent artifactIdmaven-repository-plugin/artifactId - version2.4/version + version2.5-SNAPSHOT/version packagingmaven-plugin/packaging nameApache Maven Repository Plugin/name @@ -41,9 +41,9 @@ under the License. /prerequisites scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-repository-plugin-2.4/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-repository-plugin-2.4/developerConnection - urlhttp://svn.apache.org/viewvc/maven/plugins/tags/maven-repository-plugin-2.4/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-repository-plugin//connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-repository-plugin//developerConnection + urlhttp://svn.apache.org/viewvc/maven/plugins/trunk/maven-repository-plugin//url /scm issueManagement systemJIRA/system
svn commit: r1629530 - /maven/plugins/tags/maven-repository-plugin-2.4/
Author: khmarbaise Date: Sun Oct 5 20:00:08 2014 New Revision: 1629530 URL: http://svn.apache.org/r1629530 Log: [maven-release-plugin] copy for tag maven-repository-plugin-2.4 Added: maven/plugins/tags/maven-repository-plugin-2.4/ - copied from r1629529, maven/plugins/trunk/maven-repository-plugin/
svn commit: r1629533 - /maven/plugins/trunk/maven-repository-plugin/pom.xml
Author: khmarbaise Date: Sun Oct 5 20:15:13 2014 New Revision: 1629533 URL: http://svn.apache.org/r1629533 Log: [maven-release-plugin] rollback the release of maven-repository-plugin-2.4 Modified: maven/plugins/trunk/maven-repository-plugin/pom.xml Modified: maven/plugins/trunk/maven-repository-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-repository-plugin/pom.xml?rev=1629533r1=1629532r2=1629533view=diff == --- maven/plugins/trunk/maven-repository-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-repository-plugin/pom.xml Sun Oct 5 20:15:13 2014 @@ -30,7 +30,7 @@ under the License. /parent artifactIdmaven-repository-plugin/artifactId - version2.5-SNAPSHOT/version + version2.3.2-SNAPSHOT/version packagingmaven-plugin/packaging nameApache Maven Repository Plugin/name