svn commit: r1814611 [2/2] - in /maven/plugins/trunk/maven-jlink-plugin: ./ src/it/mrm/repository/ src/it/mrm/repository/localhost/ src/it/mrm/repository/localhost/com.soebes.nine.jar/ src/it/mrm/repo
Added: maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/no-header-files/src/main/configs/config.test URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/no-header-files/src/main/configs/config.test?rev=1814611=auto == --- maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/no-header-files/src/main/configs/config.test (added) +++ maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/no-header-files/src/main/configs/config.test Wed Nov 8 18:21:35 2017 @@ -0,0 +1,21 @@ +/* + * 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. + */ + +Test configuration file which should be located in config/config.test in +resulting jmod file. \ No newline at end of file Added: maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/no-header-files/verify.groovy URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/no-header-files/verify.groovy?rev=1814611=auto == --- maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/no-header-files/verify.groovy (added) +++ maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/no-header-files/verify.groovy Wed Nov 8 18:21:35 2017 @@ -0,0 +1,50 @@ + +/* + * 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.*; +import java.util.*; +import java.util.jar.*; +import org.codehaus.plexus.util.*; + +boolean result = true; + +try +{ +File target = new File( basedir, "target" ); +if ( !target.exists() || !target.isDirectory() ) +{ +System.err.println( "target file is missing or not a directory." ); +return false; +} +File artifact = new File( target, "maven-jlink-plugin-cli-options-no-header-files-99.0.zip" ); +if ( !artifact.exists() || artifact.isDirectory() ) +{ +System.err.println( "maven-jlink-plugin-cli-options-no-header-files-99.0.zip file is missing or is a directory." ); +return false; +} + +} +catch( Throwable e ) +{ +e.printStackTrace(); +result = false; +} + +return result; Added: maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/no-man-pages/invoker.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/no-man-pages/invoker.properties?rev=1814611=auto == --- maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/no-man-pages/invoker.properties (added) +++ maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/no-man-pages/invoker.properties Wed Nov 8 18:21:35 2017 @@ -0,0 +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 +#
svn commit: r1814611 [1/2] - in /maven/plugins/trunk/maven-jlink-plugin: ./ src/it/mrm/repository/ src/it/mrm/repository/localhost/ src/it/mrm/repository/localhost/com.soebes.nine.jar/ src/it/mrm/repo
Author: khmarbaise Date: Wed Nov 8 18:21:35 2017 New Revision: 1814611 URL: http://svn.apache.org/viewvc?rev=1814611=rev Log: Added serveral integration tests. Upgraded maven-compiler-plugin to 3.7.0 Upgraded maven-invoker-plugin to 3.0.1 Enhanced maven-invoker-plugin configuration Added: maven/plugins/trunk/maven-jlink-plugin/src/it/mrm/repository/ maven/plugins/trunk/maven-jlink-plugin/src/it/mrm/repository/localhost/ maven/plugins/trunk/maven-jlink-plugin/src/it/mrm/repository/localhost/com.soebes.nine.jar/ maven/plugins/trunk/maven-jlink-plugin/src/it/mrm/repository/localhost/com.soebes.nine.jar/1.0-SNAPSHOT/ maven/plugins/trunk/maven-jlink-plugin/src/it/mrm/repository/localhost/com.soebes.nine.jar/1.0-SNAPSHOT/com.soebes.nine.jar-1.0-SNAPSHOT.jar (with props) maven/plugins/trunk/maven-jlink-plugin/src/it/mrm/repository/localhost/com.soebes.nine.jar/1.0-SNAPSHOT/com.soebes.nine.jar-1.0-SNAPSHOT.pom maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/ maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/bind-services/ maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/bind-services/invoker.properties maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/bind-services/pom.xml maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/bind-services/src/ maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/bind-services/src/main/ maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/bind-services/src/main/configs/ maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/bind-services/src/main/configs/config.test maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/bind-services/verify.groovy maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/compress-0/ maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/compress-0/invoker.properties maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/compress-0/pom.xml maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/compress-0/src/ maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/compress-0/src/main/ maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/compress-0/src/main/configs/ maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/compress-0/src/main/configs/config.test maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/compress-0/verify.groovy maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/compress-1/ maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/compress-1/invoker.properties maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/compress-1/pom.xml maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/compress-1/src/ maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/compress-1/src/main/ maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/compress-1/src/main/configs/ maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/compress-1/src/main/configs/config.test maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/compress-1/verify.groovy maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/compress-2/ maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/compress-2/invoker.properties maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/compress-2/pom.xml maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/compress-2/src/ maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/compress-2/src/main/ maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/compress-2/src/main/configs/ maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/compress-2/src/main/configs/config.test maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/compress-2/verify.groovy maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/disable-plugin/ maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/disable-plugin/invoker.properties maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/disable-plugin/pom.xml maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/disable-plugin/src/ maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/disable-plugin/src/main/ maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/disable-plugin/src/main/configs/ maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/disable-plugin/src/main/configs/config.test maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/disable-plugin/verify.groovy maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/endian/
svn commit: r1814612 - /maven/plugins/trunk/maven-jlink-plugin/src/it/mrm/repository/localhost/com.soebes.nine.jar/1.0-SNAPSHOT/com.soebes.nine.jar-1.0-SNAPSHOT.pom
Author: khmarbaise Date: Wed Nov 8 18:26:11 2017 New Revision: 1814612 URL: http://svn.apache.org/viewvc?rev=1814612=rev Log: Fixed missing copyright header. Modified: maven/plugins/trunk/maven-jlink-plugin/src/it/mrm/repository/localhost/com.soebes.nine.jar/1.0-SNAPSHOT/com.soebes.nine.jar-1.0-SNAPSHOT.pom Modified: maven/plugins/trunk/maven-jlink-plugin/src/it/mrm/repository/localhost/com.soebes.nine.jar/1.0-SNAPSHOT/com.soebes.nine.jar-1.0-SNAPSHOT.pom URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jlink-plugin/src/it/mrm/repository/localhost/com.soebes.nine.jar/1.0-SNAPSHOT/com.soebes.nine.jar-1.0-SNAPSHOT.pom?rev=1814612=1814611=1814612=diff == --- maven/plugins/trunk/maven-jlink-plugin/src/it/mrm/repository/localhost/com.soebes.nine.jar/1.0-SNAPSHOT/com.soebes.nine.jar-1.0-SNAPSHOT.pom (original) +++ maven/plugins/trunk/maven-jlink-plugin/src/it/mrm/repository/localhost/com.soebes.nine.jar/1.0-SNAPSHOT/com.soebes.nine.jar-1.0-SNAPSHOT.pom Wed Nov 8 18:26:11 2017 @@ -1,3 +1,24 @@ + + + + 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;> 4.0.0
maven-resolver git commit: Using project version across examples and others consistently
Repository: maven-resolver Updated Branches: refs/heads/master-all 20ad31658 -> b96642acb Using project version across examples and others consistently Signed-off-by: Manfred MoserSigned-off-by: Manfred Moser Project: http://git-wip-us.apache.org/repos/asf/maven-resolver/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-resolver/commit/b96642ac Tree: http://git-wip-us.apache.org/repos/asf/maven-resolver/tree/b96642ac Diff: http://git-wip-us.apache.org/repos/asf/maven-resolver/diff/b96642ac Branch: refs/heads/master-all Commit: b96642acb511f9c5765f40914904a6b6eb8daa18 Parents: 20ad316 Author: Manfred Moser Authored: Wed Nov 8 21:14:01 2017 -0800 Committer: Manfred Moser Committed: Wed Nov 8 21:14:01 2017 -0800 -- maven-resolver-ant-tasks/pom.xml | 2 +- maven-resolver-demos/maven-resolver-demo-maven-plugin/pom.xml | 2 +- maven-resolver-demos/maven-resolver-demo-snippets/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/b96642ac/maven-resolver-ant-tasks/pom.xml -- diff --git a/maven-resolver-ant-tasks/pom.xml b/maven-resolver-ant-tasks/pom.xml index 13eda3a..12743c0 100644 --- a/maven-resolver-ant-tasks/pom.xml +++ b/maven-resolver-ant-tasks/pom.xml @@ -46,7 +46,7 @@ 3.5.0 -1.0.3 +${project.version} 7 resolver-archives/resolver-ant-tasks-LATEST LineLength,MagicNumber http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/b96642ac/maven-resolver-demos/maven-resolver-demo-maven-plugin/pom.xml -- diff --git a/maven-resolver-demos/maven-resolver-demo-maven-plugin/pom.xml b/maven-resolver-demos/maven-resolver-demo-maven-plugin/pom.xml index 0dccadc..fc50fa0 100644 --- a/maven-resolver-demos/maven-resolver-demo-maven-plugin/pom.xml +++ b/maven-resolver-demos/maven-resolver-demo-maven-plugin/pom.xml @@ -41,7 +41,7 @@ -1.0.3 +${project.version} 3.5.0 http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/b96642ac/maven-resolver-demos/maven-resolver-demo-snippets/pom.xml -- diff --git a/maven-resolver-demos/maven-resolver-demo-snippets/pom.xml b/maven-resolver-demos/maven-resolver-demo-snippets/pom.xml index 22b3c9a..9d0c4a5 100644 --- a/maven-resolver-demos/maven-resolver-demo-snippets/pom.xml +++ b/maven-resolver-demos/maven-resolver-demo-snippets/pom.xml @@ -37,7 +37,7 @@ -1.0.3 +${project.version} 3.5.0
[1/3] maven-resolver git commit: Ignoring checkstyle files
Repository: maven-resolver Updated Branches: refs/heads/master-all 2dbca04ce -> 20ad31658 Ignoring checkstyle files Signed-off-by: Manfred MoserSigned-off-by: Manfred Moser Project: http://git-wip-us.apache.org/repos/asf/maven-resolver/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-resolver/commit/bef1c080 Tree: http://git-wip-us.apache.org/repos/asf/maven-resolver/tree/bef1c080 Diff: http://git-wip-us.apache.org/repos/asf/maven-resolver/diff/bef1c080 Branch: refs/heads/master-all Commit: bef1c080d4f6e62a8e93e28a0386ef326d54946f Parents: 2dbca04 Author: Manfred Moser Authored: Wed Nov 8 20:15:35 2017 -0800 Committer: Manfred Moser Committed: Wed Nov 8 20:15:35 2017 -0800 -- .gitignore | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/bef1c080/.gitignore -- diff --git a/.gitignore b/.gitignore index 0e36d40..b588801 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ target/ *.iml *.ipr *.iws +.checkstyle
[2/3] maven-resolver git commit: Proper reactor setup
Proper reactor setup - switched parent of ant-tasks to resolver parent - switched parent of demos to resolver parent - consistent and correct version 1.1.1-SNAPSHOT across modules Signed-off-by: Manfred MoserSigned-off-by: Manfred Moser Project: http://git-wip-us.apache.org/repos/asf/maven-resolver/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-resolver/commit/c19e69f2 Tree: http://git-wip-us.apache.org/repos/asf/maven-resolver/tree/c19e69f2 Diff: http://git-wip-us.apache.org/repos/asf/maven-resolver/diff/c19e69f2 Branch: refs/heads/master-all Commit: c19e69f287043823e93a08cf3558d07c5d7a12d8 Parents: bef1c08 Author: Manfred Moser Authored: Wed Nov 8 20:36:21 2017 -0800 Committer: Manfred Moser Committed: Wed Nov 8 20:36:21 2017 -0800 -- maven-resolver-ant-tasks/pom.xml| 9 +++-- .../maven-resolver-demo-maven-plugin/pom.xml| 2 +- maven-resolver-demos/maven-resolver-demo-snippets/pom.xml | 2 +- maven-resolver-demos/pom.xml| 9 +++-- 4 files changed, 8 insertions(+), 14 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/c19e69f2/maven-resolver-ant-tasks/pom.xml -- diff --git a/maven-resolver-ant-tasks/pom.xml b/maven-resolver-ant-tasks/pom.xml index 85edc0d..ebe4689 100644 --- a/maven-resolver-ant-tasks/pom.xml +++ b/maven-resolver-ant-tasks/pom.xml @@ -24,15 +24,12 @@ 4.0.0 -org.apache.maven -maven-parent -30 -../pom/maven/pom.xml +org.apache.maven.resolver +maven-resolver +1.1.1-SNAPSHOT - org.apache.maven.resolver maven-resolver-ant-tasks - 1.1.0-SNAPSHOT Maven Artifact Resolver Ant Tasks http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/c19e69f2/maven-resolver-demos/maven-resolver-demo-maven-plugin/pom.xml -- diff --git a/maven-resolver-demos/maven-resolver-demo-maven-plugin/pom.xml b/maven-resolver-demos/maven-resolver-demo-maven-plugin/pom.xml index 24d4312..686d8d9 100644 --- a/maven-resolver-demos/maven-resolver-demo-maven-plugin/pom.xml +++ b/maven-resolver-demos/maven-resolver-demo-maven-plugin/pom.xml @@ -25,7 +25,7 @@ org.apache.maven.resolver maven-resolver-demos -1.0.0-SNAPSHOT +1.1.1-SNAPSHOT maven-resolver-demo-maven-plugin http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/c19e69f2/maven-resolver-demos/maven-resolver-demo-snippets/pom.xml -- diff --git a/maven-resolver-demos/maven-resolver-demo-snippets/pom.xml b/maven-resolver-demos/maven-resolver-demo-snippets/pom.xml index 9786b65..22b3c9a 100644 --- a/maven-resolver-demos/maven-resolver-demo-snippets/pom.xml +++ b/maven-resolver-demos/maven-resolver-demo-snippets/pom.xml @@ -25,7 +25,7 @@ org.apache.maven.resolver maven-resolver-demos -1.0.0-SNAPSHOT +1.1.1-SNAPSHOT maven-resolver-demo-snippets http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/c19e69f2/maven-resolver-demos/pom.xml -- diff --git a/maven-resolver-demos/pom.xml b/maven-resolver-demos/pom.xml index 1b44b48..1428956 100644 --- a/maven-resolver-demos/pom.xml +++ b/maven-resolver-demos/pom.xml @@ -24,15 +24,12 @@ 4.0.0 -org.apache.maven -maven-parent -30 -../pom/maven/pom.xml +org.apache.maven.resolver +maven-resolver +1.1.1-SNAPSHOT - org.apache.maven.resolver maven-resolver-demos - 1.0.0-SNAPSHOT pom Maven Artifact Resolver Demos
[3/3] maven-resolver git commit: Removed duplicated pom elements
Removed duplicated pom elements Signed-off-by: Manfred MoserSigned-off-by: Manfred Moser Project: http://git-wip-us.apache.org/repos/asf/maven-resolver/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-resolver/commit/20ad3165 Tree: http://git-wip-us.apache.org/repos/asf/maven-resolver/tree/20ad3165 Diff: http://git-wip-us.apache.org/repos/asf/maven-resolver/diff/20ad3165 Branch: refs/heads/master-all Commit: 20ad316583e9c21a223f13a7d47c163697c5a3c7 Parents: c19e69f Author: Manfred Moser Authored: Wed Nov 8 20:53:01 2017 -0800 Committer: Manfred Moser Committed: Wed Nov 8 20:53:01 2017 -0800 -- maven-resolver-ant-tasks/pom.xml | 15 --- .../maven-resolver-demo-maven-plugin/pom.xml | 1 - maven-resolver-demos/pom.xml | 15 --- 3 files changed, 31 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/20ad3165/maven-resolver-ant-tasks/pom.xml -- diff --git a/maven-resolver-ant-tasks/pom.xml b/maven-resolver-ant-tasks/pom.xml index ebe4689..13eda3a 100644 --- a/maven-resolver-ant-tasks/pom.xml +++ b/maven-resolver-ant-tasks/pom.xml @@ -36,22 +36,7 @@ Ant tasks handling Maven artifacts using Maven Artifact Resolver and Maven Artifact Resolver Provider. https://maven.apache.org/resolver-ant-tasks/ - 2010 - - scm:git:https://git-wip-us.apache.org/repos/asf/maven-resolver.git - scm:git:https://git-wip-us.apache.org/repos/asf/maven-resolver.git -https://github.com/apache/maven-resolver/tree/${project.scm.tag} -ant-tasks - - -jira -https://issues.apache.org/jira/browse/MRESOLVER - - -Jenkins -https://builds.apache.org/job/maven-resolver-ant-tasks - apache.website http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/20ad3165/maven-resolver-demos/maven-resolver-demo-maven-plugin/pom.xml -- diff --git a/maven-resolver-demos/maven-resolver-demo-maven-plugin/pom.xml b/maven-resolver-demos/maven-resolver-demo-maven-plugin/pom.xml index 686d8d9..0dccadc 100644 --- a/maven-resolver-demos/maven-resolver-demo-maven-plugin/pom.xml +++ b/maven-resolver-demos/maven-resolver-demo-maven-plugin/pom.xml @@ -35,7 +35,6 @@ A simple Maven plugin using Maven Artifact Resolver with Maven repositories. - 2010 3.5.0 http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/20ad3165/maven-resolver-demos/pom.xml -- diff --git a/maven-resolver-demos/pom.xml b/maven-resolver-demos/pom.xml index 1428956..33809bc 100644 --- a/maven-resolver-demos/pom.xml +++ b/maven-resolver-demos/pom.xml @@ -37,22 +37,7 @@ Maven Artifact Resolver demos, showing concrete code to use Maven Artifact Resolver with Maven repositories. https://maven.apache.org/resolver-demos/ - 2010 - - scm:git:https://git-wip-us.apache.org/repos/asf/maven-resolver.git - scm:git:https://git-wip-us.apache.org/repos/asf/maven-resolver.git -https://github.com/apache/maven-resolver/tree/${project.scm.tag} -demos - - -jira -https://issues.apache.org/jira/browse/MRESOLVER - - -Jenkins -https://builds.apache.org/job/maven-resolver-demos - apache.website
[1/9] maven-resolver git commit: moved ant tasks into subfolder
Repository: maven-resolver Updated Branches: refs/heads/ant-tasks-folder [created] a088cdfca http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/a088cdfc/src/test/resources/ant/Install/ant.xml -- diff --git a/src/test/resources/ant/Install/ant.xml b/src/test/resources/ant/Install/ant.xml deleted file mode 100644 index a4bd6eb..000 --- a/src/test/resources/ant/Install/ant.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/a088cdfc/src/test/resources/ant/Install/dummy-pom.xml -- diff --git a/src/test/resources/ant/Install/dummy-pom.xml b/src/test/resources/ant/Install/dummy-pom.xml deleted file mode 100644 index 0041f8c..000 --- a/src/test/resources/ant/Install/dummy-pom.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - -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;> - 4.0.0 - - test - dummy - 0.1-SNAPSHOT - - -UTF-8 - - http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/a088cdfc/src/test/resources/ant/Install/other-pom.xml -- diff --git a/src/test/resources/ant/Install/other-pom.xml b/src/test/resources/ant/Install/other-pom.xml deleted file mode 100644 index 626bede..000 --- a/src/test/resources/ant/Install/other-pom.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - -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;> - 4.0.0 - - test - other - 0.1-SNAPSHOT - - -UTF-8 - - http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/a088cdfc/src/test/resources/ant/Reactor/ant.xml -- diff --git a/src/test/resources/ant/Reactor/ant.xml b/src/test/resources/ant/Reactor/ant.xml deleted file mode 100644 index 7b7976a..000 --- a/src/test/resources/ant/Reactor/ant.xml +++ /dev/null @@ -1,78 +0,0 @@ - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/a088cdfc/src/test/resources/ant/Reactor/pom1.xml -- diff --git a/src/test/resources/ant/Reactor/pom1.xml b/src/test/resources/ant/Reactor/pom1.xml deleted file mode 100644 index 84496ca..000 --- a/src/test/resources/ant/Reactor/pom1.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - -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;> - 4.0.0 - - test - test - 0.1-SNAPSHOT - - -UTF-8 - - http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/a088cdfc/src/test/resources/ant/Reactor/pom2.xml -- diff --git a/src/test/resources/ant/Reactor/pom2.xml b/src/test/resources/ant/Reactor/pom2.xml deleted file mode 100644 index e0d5be6..000 --- a/src/test/resources/ant/Reactor/pom2.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - -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;> - 4.0.0 - - test - test2 - 0.1-SNAPSHOT - - -UTF-8 - - - - - test - test - 0.1-SNAPSHOT - - - http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/a088cdfc/src/test/resources/ant/Resolve/ant.xml -- diff --git a/src/test/resources/ant/Resolve/ant.xml b/src/test/resources/ant/Resolve/ant.xml deleted file mode 100644 index 4565ea7..000 --- a/src/test/resources/ant/Resolve/ant.xml +++ /dev/null @@ -1,122 +0,0 @@ - - - - - -]> - - - - - - http://repo1.maven.org/maven2; type="default" releases="true" snapshots="true" updates="always" checksums="fail"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
[5/9] maven-resolver git commit: moved ant tasks into subfolder
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/a088cdfc/maven-resolver-ant-tasks/src/test/resources/ant/Deploy/ant.xml -- diff --git a/maven-resolver-ant-tasks/src/test/resources/ant/Deploy/ant.xml b/maven-resolver-ant-tasks/src/test/resources/ant/Deploy/ant.xml new file mode 100644 index 000..2ad2d7a --- /dev/null +++ b/maven-resolver-ant-tasks/src/test/resources/ant/Deploy/ant.xml @@ -0,0 +1,72 @@ + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/a088cdfc/maven-resolver-ant-tasks/src/test/resources/ant/Deploy/dummy-pom.xml -- diff --git a/maven-resolver-ant-tasks/src/test/resources/ant/Deploy/dummy-pom.xml b/maven-resolver-ant-tasks/src/test/resources/ant/Deploy/dummy-pom.xml new file mode 100644 index 000..0041f8c --- /dev/null +++ b/maven-resolver-ant-tasks/src/test/resources/ant/Deploy/dummy-pom.xml @@ -0,0 +1,34 @@ + + + + +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;> + 4.0.0 + + test + dummy + 0.1-SNAPSHOT + + +UTF-8 + + http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/a088cdfc/maven-resolver-ant-tasks/src/test/resources/ant/Deploy/other-pom.xml -- diff --git a/maven-resolver-ant-tasks/src/test/resources/ant/Deploy/other-pom.xml b/maven-resolver-ant-tasks/src/test/resources/ant/Deploy/other-pom.xml new file mode 100644 index 000..626bede --- /dev/null +++ b/maven-resolver-ant-tasks/src/test/resources/ant/Deploy/other-pom.xml @@ -0,0 +1,34 @@ + + + + +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;> + 4.0.0 + + test + other + 0.1-SNAPSHOT + + +UTF-8 + + http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/a088cdfc/maven-resolver-ant-tasks/src/test/resources/ant/Install/ant.xml -- diff --git a/maven-resolver-ant-tasks/src/test/resources/ant/Install/ant.xml b/maven-resolver-ant-tasks/src/test/resources/ant/Install/ant.xml new file mode 100644 index 000..a4bd6eb --- /dev/null +++ b/maven-resolver-ant-tasks/src/test/resources/ant/Install/ant.xml @@ -0,0 +1,71 @@ + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/a088cdfc/maven-resolver-ant-tasks/src/test/resources/ant/Install/dummy-pom.xml -- diff --git a/maven-resolver-ant-tasks/src/test/resources/ant/Install/dummy-pom.xml b/maven-resolver-ant-tasks/src/test/resources/ant/Install/dummy-pom.xml new file mode 100644 index 000..0041f8c --- /dev/null +++ b/maven-resolver-ant-tasks/src/test/resources/ant/Install/dummy-pom.xml @@ -0,0 +1,34 @@ + + + + +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;> + 4.0.0 + + test + dummy + 0.1-SNAPSHOT + + +UTF-8 + + http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/a088cdfc/maven-resolver-ant-tasks/src/test/resources/ant/Install/other-pom.xml -- diff --git a/maven-resolver-ant-tasks/src/test/resources/ant/Install/other-pom.xml b/maven-resolver-ant-tasks/src/test/resources/ant/Install/other-pom.xml new file mode 100644 index 000..626bede --- /dev/null +++ b/maven-resolver-ant-tasks/src/test/resources/ant/Install/other-pom.xml @@ -0,0 +1,34 @@ + + + + +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;> + 4.0.0 + + test + other + 0.1-SNAPSHOT + + +UTF-8 + + http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/a088cdfc/maven-resolver-ant-tasks/src/test/resources/ant/Reactor/ant.xml -- diff --git a/maven-resolver-ant-tasks/src/test/resources/ant/Reactor/ant.xml
[9/9] maven-resolver git commit: moved ant tasks into subfolder
moved ant tasks into subfolder Project: http://git-wip-us.apache.org/repos/asf/maven-resolver/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-resolver/commit/a088cdfc Tree: http://git-wip-us.apache.org/repos/asf/maven-resolver/tree/a088cdfc Diff: http://git-wip-us.apache.org/repos/asf/maven-resolver/diff/a088cdfc Branch: refs/heads/ant-tasks-folder Commit: a088cdfca0366e468ba6ad30a1616ee64d2f898e Parents: dcdf1da Author: Manfred MoserAuthored: Wed Nov 8 19:17:17 2017 -0800 Committer: Manfred Moser Committed: Wed Nov 8 19:17:17 2017 -0800 -- README.md | 243 -- build.xml | 133 --- maven-resolver-ant-tasks/README.md | 243 ++ maven-resolver-ant-tasks/build.xml | 133 +++ maven-resolver-ant-tasks/pom.xml| 364 .../src/main/assembly/bin.xml | 47 ++ .../resolver/internal/ant/AetherUtils.java | 83 ++ .../maven/resolver/internal/ant/AntLogger.java | 68 ++ .../resolver/internal/ant/AntModelResolver.java | 180 .../maven/resolver/internal/ant/AntRepoSys.java | 825 +++ .../internal/ant/AntRepositoryListener.java | 123 +++ .../resolver/internal/ant/AntSecDispatcher.java | 45 + .../ant/AntServiceLocatorErrorHandler.java | 50 ++ .../ant/AntSettingsDecryptorFactory.java| 51 ++ .../internal/ant/AntTransferListener.java | 91 ++ .../resolver/internal/ant/ConverterUtils.java | 227 + .../maven/resolver/internal/ant/Names.java | 44 + .../internal/ant/ProjectWorkspaceReader.java| 144 .../resolver/internal/ant/SettingsUtils.java| 182 .../internal/ant/tasks/AbstractDistTask.java| 180 .../ant/tasks/AbstractResolvingTask.java| 107 +++ .../ant/tasks/DependencyGraphLogger.java| 85 ++ .../resolver/internal/ant/tasks/Deploy.java | 104 +++ .../resolver/internal/ant/tasks/Install.java| 41 + .../resolver/internal/ant/tasks/Layout.java | 131 +++ .../resolver/internal/ant/tasks/RefTask.java| 98 +++ .../resolver/internal/ant/tasks/Resolve.java| 585 + .../resolver/internal/ant/types/Artifact.java | 181 .../internal/ant/types/ArtifactContainer.java | 35 + .../resolver/internal/ant/types/Artifacts.java | 97 +++ .../internal/ant/types/Authentication.java | 152 .../internal/ant/types/Dependencies.java| 197 + .../resolver/internal/ant/types/Dependency.java | 329 .../internal/ant/types/DependencyContainer.java | 31 + .../resolver/internal/ant/types/Exclusion.java | 190 + .../internal/ant/types/LocalRepository.java | 90 ++ .../resolver/internal/ant/types/Mirror.java | 154 .../internal/ant/types/ModelValueExtractor.java | 99 +++ .../maven/resolver/internal/ant/types/Pom.java | 352 .../ant/types/PomPropertyEvaluator.java | 62 ++ .../internal/ant/types/PomPropertyHelper.java | 65 ++ .../resolver/internal/ant/types/Proxy.java | 163 .../internal/ant/types/RemoteRepositories.java | 97 +++ .../internal/ant/types/RemoteRepository.java| 351 .../ant/types/RemoteRepositoryContainer.java| 35 + .../resolver/internal/ant/types/Settings.java | 86 ++ .../org/apache/maven/resolver/ant/antlib.xml| 41 + .../src/site/markdown/index.md.vm | 1 + .../src/site/resources/download.cgi | 22 + maven-resolver-ant-tasks/src/site/site.xml | 42 + .../src/site/xdoc/download.xml.vm | 126 +++ .../resolver/internal/ant/AntBuildsTest.java| 124 +++ .../maven/resolver/internal/ant/DeployTest.java | 91 ++ .../resolver/internal/ant/InstallTest.java | 98 +++ .../ant/ProjectWorkspaceReaderTest.java | 124 +++ .../resolver/internal/ant/ReactorTest.java | 100 +++ .../resolver/internal/ant/ResolveTest.java | 150 .../resolver/internal/ant/SettingsTest.java | 65 ++ .../resolver/internal/ant/tasks/LayoutTest.java | 55 ++ .../internal/ant/types/DependencyTest.java | 88 ++ .../internal/ant/types/ExclusionTest.java | 88 ++ .../resolver/internal/ant/types/PomTest.java| 43 + .../ProjectWorkspaceReader/dummy-file.txt | 1 + .../ProjectWorkspaceReader/dummy-pom.xml| 34 + .../src/test/resources/ant/Deploy/ant.xml | 72 ++ .../src/test/resources/ant/Deploy/dummy-pom.xml | 34 + .../src/test/resources/ant/Deploy/other-pom.xml | 34 + .../src/test/resources/ant/Install/ant.xml | 71 ++ .../test/resources/ant/Install/dummy-pom.xml| 34 + .../test/resources/ant/Install/other-pom.xml| 34 + .../src/test/resources/ant/Reactor/ant.xml | 78 ++ .../src/test/resources/ant/Reactor/pom1.xml | 34 + .../src/test/resources/ant/Reactor/pom2.xml | 42
[8/9] maven-resolver git commit: moved ant tasks into subfolder
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/a088cdfc/maven-resolver-ant-tasks/src/main/java/org/apache/maven/resolver/internal/ant/AntRepoSys.java -- diff --git a/maven-resolver-ant-tasks/src/main/java/org/apache/maven/resolver/internal/ant/AntRepoSys.java b/maven-resolver-ant-tasks/src/main/java/org/apache/maven/resolver/internal/ant/AntRepoSys.java new file mode 100644 index 000..3b158e4 --- /dev/null +++ b/maven-resolver-ant-tasks/src/main/java/org/apache/maven/resolver/internal/ant/AntRepoSys.java @@ -0,0 +1,825 @@ +package org.apache.maven.resolver.internal.ant; + +/* + * 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.BufferedReader; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStreamReader; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Properties; +import java.util.concurrent.CopyOnWriteArrayList; + +import org.apache.maven.model.Model; +import org.apache.maven.model.building.DefaultModelBuilderFactory; +import org.apache.maven.model.building.DefaultModelBuildingRequest; +import org.apache.maven.model.building.FileModelSource; +import org.apache.maven.model.building.ModelBuilder; +import org.apache.maven.model.building.ModelBuildingException; +import org.apache.maven.model.building.ModelBuildingRequest; +import org.apache.maven.model.resolution.ModelResolver; +import org.apache.maven.repository.internal.MavenRepositorySystemUtils; +import org.apache.maven.resolver.internal.ant.types.Artifact; +import org.apache.maven.resolver.internal.ant.types.Artifacts; +import org.apache.maven.resolver.internal.ant.types.Authentication; +import org.apache.maven.resolver.internal.ant.types.Dependencies; +import org.apache.maven.resolver.internal.ant.types.Dependency; +import org.apache.maven.resolver.internal.ant.types.DependencyContainer; +import org.apache.maven.resolver.internal.ant.types.Exclusion; +import org.apache.maven.resolver.internal.ant.types.LocalRepository; +import org.apache.maven.resolver.internal.ant.types.Mirror; +import org.apache.maven.resolver.internal.ant.types.Pom; +import org.apache.maven.resolver.internal.ant.types.Proxy; +import org.apache.maven.resolver.internal.ant.types.RemoteRepositories; +import org.apache.maven.resolver.internal.ant.types.RemoteRepository; +import org.apache.maven.settings.Server; +import org.apache.maven.settings.Settings; +import org.apache.maven.settings.building.DefaultSettingsBuilderFactory; +import org.apache.maven.settings.building.DefaultSettingsBuildingRequest; +import org.apache.maven.settings.building.SettingsBuilder; +import org.apache.maven.settings.building.SettingsBuildingException; +import org.apache.maven.settings.crypto.DefaultSettingsDecryptionRequest; +import org.apache.maven.settings.crypto.SettingsDecrypter; +import org.apache.maven.settings.crypto.SettingsDecryptionResult; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Project; +import org.apache.tools.ant.Task; +import org.apache.tools.ant.taskdefs.condition.Os; +import org.apache.tools.ant.types.Reference; +import org.codehaus.plexus.util.xml.Xpp3Dom; +import org.eclipse.aether.ConfigurationProperties; +import org.eclipse.aether.DefaultRepositoryCache; +import org.eclipse.aether.DefaultRepositorySystemSession; +import org.eclipse.aether.RepositorySystem; +import org.eclipse.aether.RepositorySystemSession; +import org.eclipse.aether.artifact.DefaultArtifact; +import org.eclipse.aether.collection.CollectRequest; +import org.eclipse.aether.collection.CollectResult; +import org.eclipse.aether.collection.DependencyCollectionException; +import org.eclipse.aether.connector.basic.BasicRepositoryConnectorFactory; +import org.eclipse.aether.deployment.DeployRequest; +import org.eclipse.aether.deployment.DeploymentException; +import org.eclipse.aether.impl.DefaultServiceLocator; +import org.eclipse.aether.impl.RemoteRepositoryManager;
[3/9] maven-resolver git commit: moved ant tasks into subfolder
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/a088cdfc/src/main/java/org/apache/maven/resolver/internal/ant/tasks/Install.java -- diff --git a/src/main/java/org/apache/maven/resolver/internal/ant/tasks/Install.java b/src/main/java/org/apache/maven/resolver/internal/ant/tasks/Install.java deleted file mode 100644 index b79716b..000 --- a/src/main/java/org/apache/maven/resolver/internal/ant/tasks/Install.java +++ /dev/null @@ -1,41 +0,0 @@ -package org.apache.maven.resolver.internal.ant.tasks; - -/* - * 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 org.apache.maven.resolver.internal.ant.AntRepoSys; - -import org.apache.tools.ant.BuildException; - -/** - */ -public class Install -extends AbstractDistTask -{ - -@Override -public void execute() -throws BuildException -{ -validate(); - -AntRepoSys.getInstance( getProject() ).install( this, getPom(), getArtifacts() ); -} - -} http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/a088cdfc/src/main/java/org/apache/maven/resolver/internal/ant/tasks/Layout.java -- diff --git a/src/main/java/org/apache/maven/resolver/internal/ant/tasks/Layout.java b/src/main/java/org/apache/maven/resolver/internal/ant/tasks/Layout.java deleted file mode 100644 index 995c00f..000 --- a/src/main/java/org/apache/maven/resolver/internal/ant/tasks/Layout.java +++ /dev/null @@ -1,131 +0,0 @@ -package org.apache.maven.resolver.internal.ant.tasks; - -/* - * 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.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.HashSet; -import java.util.List; -import java.util.TreeSet; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import org.apache.tools.ant.BuildException; -import org.eclipse.aether.artifact.Artifact; - -/** - */ -class Layout -{ - -public static final String GID = "{groupId}"; - -public static final String GID_DIRS = "{groupIdDirs}"; - -public static final String AID = "{artifactId}"; - -public static final String VER = "{version}"; - -public static final String BVER = "{baseVersion}"; - -public static final String EXT = "{extension}"; - -public static final String CLS = "{classifier}"; - -private String[] tokens; - -public Layout( String layout ) -throws BuildException -{ -Collection valid = new HashSet( Arrays.asList( GID, GID_DIRS, AID, VER, BVER, EXT, CLS ) ); -List tokens = new ArrayList(); -Matcher m = Pattern.compile( "(\\{[^}]*\\})|([^{]+)" ).matcher( layout ); -while ( m.find() ) -{ -if ( m.group( 1 ) != null && !valid.contains( m.group( 1 ) ) ) -{ -throw new BuildException( "Invalid variable '" + m.group() + "' in layout, supported variables are " -+ new TreeSet( valid ) ); -} -tokens.add( m.group() ); -} -this.tokens = tokens.toArray( new String[tokens.size()] ); -} - -public String getPath( Artifact artifact ) -{ -StringBuilder buffer = new StringBuilder( 128 ); - -for ( int i = 0; i < tokens.length; i++ ) -{ -String token = tokens[i]; -if ( GID.equals( token ) ) -{ -
[2/9] maven-resolver git commit: moved ant tasks into subfolder
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/a088cdfc/src/main/java/org/apache/maven/resolver/internal/ant/types/PomPropertyHelper.java -- diff --git a/src/main/java/org/apache/maven/resolver/internal/ant/types/PomPropertyHelper.java b/src/main/java/org/apache/maven/resolver/internal/ant/types/PomPropertyHelper.java deleted file mode 100644 index 5ec23ec..000 --- a/src/main/java/org/apache/maven/resolver/internal/ant/types/PomPropertyHelper.java +++ /dev/null @@ -1,65 +0,0 @@ -package org.apache.maven.resolver.internal.ant.types; - -/* - * 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 org.apache.tools.ant.PropertyHelper; - -/** - */ -@SuppressWarnings( "deprecation" ) -class PomPropertyHelper -extends PropertyHelper -{ - -private final ModelValueExtractor extractor; - -public static void register( ModelValueExtractor extractor, PropertyHelper propertyHelper ) -{ -PomPropertyHelper helper = new PomPropertyHelper( extractor ); -helper.setNext( propertyHelper.getNext() ); -propertyHelper.setNext( helper ); -} - -public PomPropertyHelper( ModelValueExtractor extractor ) -{ -if ( extractor == null ) -{ -throw new IllegalArgumentException( "no model value exractor specified" ); -} -this.extractor = extractor; -setProject( extractor.getProject() ); -} - -@Override -public Object getPropertyHook( String ns, String name, boolean user ) -{ -Object value = extractor.getValue( name ); -if ( value != null ) -{ -return value; -} -else if ( extractor.isApplicable( name ) ) -{ -return null; -} -return super.getPropertyHook( ns, name, user ); -} - -} http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/a088cdfc/src/main/java/org/apache/maven/resolver/internal/ant/types/Proxy.java -- diff --git a/src/main/java/org/apache/maven/resolver/internal/ant/types/Proxy.java b/src/main/java/org/apache/maven/resolver/internal/ant/types/Proxy.java deleted file mode 100644 index 6116c8e..000 --- a/src/main/java/org/apache/maven/resolver/internal/ant/types/Proxy.java +++ /dev/null @@ -1,163 +0,0 @@ -package org.apache.maven.resolver.internal.ant.types; - -/* - * 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 org.apache.maven.resolver.internal.ant.AntRepoSys; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.types.DataType; -import org.apache.tools.ant.types.Reference; - -/** - */ -public class Proxy -extends DataType -{ - -private String host; - -private int port; - -private String type; - -private String nonProxyHosts; - -private Authentication authentication; - -@Override -public void setProject( Project project ) -{ -super.setProject( project ); - -AntRepoSys.getInstance( project ).addProxy( this ); -} - -protected Proxy getRef() -{ -return (Proxy) getCheckedRef(); -} - -public void setRefid( Reference ref ) -{ -if ( host != null || port != 0 || type != null || nonProxyHosts != null ) -{ -throw tooManyAttributes(); -} -if (
[6/9] maven-resolver git commit: moved ant tasks into subfolder
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/a088cdfc/maven-resolver-ant-tasks/src/main/java/org/apache/maven/resolver/internal/ant/types/PomPropertyEvaluator.java -- diff --git a/maven-resolver-ant-tasks/src/main/java/org/apache/maven/resolver/internal/ant/types/PomPropertyEvaluator.java b/maven-resolver-ant-tasks/src/main/java/org/apache/maven/resolver/internal/ant/types/PomPropertyEvaluator.java new file mode 100644 index 000..1b76bfd --- /dev/null +++ b/maven-resolver-ant-tasks/src/main/java/org/apache/maven/resolver/internal/ant/types/PomPropertyEvaluator.java @@ -0,0 +1,62 @@ +package org.apache.maven.resolver.internal.ant.types; + +/* + * 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 org.apache.tools.ant.PropertyHelper; +import org.apache.tools.ant.PropertyHelper.PropertyEvaluator; +import org.apache.tools.ant.property.NullReturn; + +/** + */ +class PomPropertyEvaluator +implements PropertyEvaluator +{ + +private final ModelValueExtractor extractor; + +public static void register( ModelValueExtractor extractor, PropertyHelper propertyHelper ) +{ +propertyHelper.add( new PomPropertyEvaluator( extractor ) ); +} + +private PomPropertyEvaluator( ModelValueExtractor extractor ) +{ +if ( extractor == null ) +{ +throw new IllegalArgumentException( "no model value exractor specified" ); +} +this.extractor = extractor; +} + +public Object evaluate( String property, PropertyHelper propertyHelper ) +{ +Object value = extractor.getValue( property ); +if ( value != null ) +{ +return value; +} +else if ( extractor.isApplicable( property ) ) +{ +return NullReturn.NULL; +} +return null; +} + +} http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/a088cdfc/maven-resolver-ant-tasks/src/main/java/org/apache/maven/resolver/internal/ant/types/PomPropertyHelper.java -- diff --git a/maven-resolver-ant-tasks/src/main/java/org/apache/maven/resolver/internal/ant/types/PomPropertyHelper.java b/maven-resolver-ant-tasks/src/main/java/org/apache/maven/resolver/internal/ant/types/PomPropertyHelper.java new file mode 100644 index 000..5ec23ec --- /dev/null +++ b/maven-resolver-ant-tasks/src/main/java/org/apache/maven/resolver/internal/ant/types/PomPropertyHelper.java @@ -0,0 +1,65 @@ +package org.apache.maven.resolver.internal.ant.types; + +/* + * 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 org.apache.tools.ant.PropertyHelper; + +/** + */ +@SuppressWarnings( "deprecation" ) +class PomPropertyHelper +extends PropertyHelper +{ + +private final ModelValueExtractor extractor; + +public static void register( ModelValueExtractor extractor, PropertyHelper propertyHelper ) +{ +PomPropertyHelper helper = new PomPropertyHelper( extractor ); +helper.setNext( propertyHelper.getNext() ); +propertyHelper.setNext( helper ); +} + +public PomPropertyHelper( ModelValueExtractor extractor ) +{ +if ( extractor == null ) +{ +throw new IllegalArgumentException( "no model value exractor specified" ); +} +this.extractor = extractor; +setProject(
[4/9] maven-resolver git commit: moved ant tasks into subfolder
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/a088cdfc/src/main/java/org/apache/maven/resolver/internal/ant/AntRepoSys.java -- diff --git a/src/main/java/org/apache/maven/resolver/internal/ant/AntRepoSys.java b/src/main/java/org/apache/maven/resolver/internal/ant/AntRepoSys.java deleted file mode 100644 index 3b158e4..000 --- a/src/main/java/org/apache/maven/resolver/internal/ant/AntRepoSys.java +++ /dev/null @@ -1,825 +0,0 @@ -package org.apache.maven.resolver.internal.ant; - -/* - * 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.BufferedReader; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStreamReader; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.Properties; -import java.util.concurrent.CopyOnWriteArrayList; - -import org.apache.maven.model.Model; -import org.apache.maven.model.building.DefaultModelBuilderFactory; -import org.apache.maven.model.building.DefaultModelBuildingRequest; -import org.apache.maven.model.building.FileModelSource; -import org.apache.maven.model.building.ModelBuilder; -import org.apache.maven.model.building.ModelBuildingException; -import org.apache.maven.model.building.ModelBuildingRequest; -import org.apache.maven.model.resolution.ModelResolver; -import org.apache.maven.repository.internal.MavenRepositorySystemUtils; -import org.apache.maven.resolver.internal.ant.types.Artifact; -import org.apache.maven.resolver.internal.ant.types.Artifacts; -import org.apache.maven.resolver.internal.ant.types.Authentication; -import org.apache.maven.resolver.internal.ant.types.Dependencies; -import org.apache.maven.resolver.internal.ant.types.Dependency; -import org.apache.maven.resolver.internal.ant.types.DependencyContainer; -import org.apache.maven.resolver.internal.ant.types.Exclusion; -import org.apache.maven.resolver.internal.ant.types.LocalRepository; -import org.apache.maven.resolver.internal.ant.types.Mirror; -import org.apache.maven.resolver.internal.ant.types.Pom; -import org.apache.maven.resolver.internal.ant.types.Proxy; -import org.apache.maven.resolver.internal.ant.types.RemoteRepositories; -import org.apache.maven.resolver.internal.ant.types.RemoteRepository; -import org.apache.maven.settings.Server; -import org.apache.maven.settings.Settings; -import org.apache.maven.settings.building.DefaultSettingsBuilderFactory; -import org.apache.maven.settings.building.DefaultSettingsBuildingRequest; -import org.apache.maven.settings.building.SettingsBuilder; -import org.apache.maven.settings.building.SettingsBuildingException; -import org.apache.maven.settings.crypto.DefaultSettingsDecryptionRequest; -import org.apache.maven.settings.crypto.SettingsDecrypter; -import org.apache.maven.settings.crypto.SettingsDecryptionResult; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.Task; -import org.apache.tools.ant.taskdefs.condition.Os; -import org.apache.tools.ant.types.Reference; -import org.codehaus.plexus.util.xml.Xpp3Dom; -import org.eclipse.aether.ConfigurationProperties; -import org.eclipse.aether.DefaultRepositoryCache; -import org.eclipse.aether.DefaultRepositorySystemSession; -import org.eclipse.aether.RepositorySystem; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.artifact.DefaultArtifact; -import org.eclipse.aether.collection.CollectRequest; -import org.eclipse.aether.collection.CollectResult; -import org.eclipse.aether.collection.DependencyCollectionException; -import org.eclipse.aether.connector.basic.BasicRepositoryConnectorFactory; -import org.eclipse.aether.deployment.DeployRequest; -import org.eclipse.aether.deployment.DeploymentException; -import org.eclipse.aether.impl.DefaultServiceLocator; -import org.eclipse.aether.impl.RemoteRepositoryManager; -import org.eclipse.aether.installation.InstallRequest; -import
[7/9] maven-resolver git commit: moved ant tasks into subfolder
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/a088cdfc/maven-resolver-ant-tasks/src/main/java/org/apache/maven/resolver/internal/ant/tasks/Install.java -- diff --git a/maven-resolver-ant-tasks/src/main/java/org/apache/maven/resolver/internal/ant/tasks/Install.java b/maven-resolver-ant-tasks/src/main/java/org/apache/maven/resolver/internal/ant/tasks/Install.java new file mode 100644 index 000..b79716b --- /dev/null +++ b/maven-resolver-ant-tasks/src/main/java/org/apache/maven/resolver/internal/ant/tasks/Install.java @@ -0,0 +1,41 @@ +package org.apache.maven.resolver.internal.ant.tasks; + +/* + * 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 org.apache.maven.resolver.internal.ant.AntRepoSys; + +import org.apache.tools.ant.BuildException; + +/** + */ +public class Install +extends AbstractDistTask +{ + +@Override +public void execute() +throws BuildException +{ +validate(); + +AntRepoSys.getInstance( getProject() ).install( this, getPom(), getArtifacts() ); +} + +} http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/a088cdfc/maven-resolver-ant-tasks/src/main/java/org/apache/maven/resolver/internal/ant/tasks/Layout.java -- diff --git a/maven-resolver-ant-tasks/src/main/java/org/apache/maven/resolver/internal/ant/tasks/Layout.java b/maven-resolver-ant-tasks/src/main/java/org/apache/maven/resolver/internal/ant/tasks/Layout.java new file mode 100644 index 000..995c00f --- /dev/null +++ b/maven-resolver-ant-tasks/src/main/java/org/apache/maven/resolver/internal/ant/tasks/Layout.java @@ -0,0 +1,131 @@ +package org.apache.maven.resolver.internal.ant.tasks; + +/* + * 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.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.HashSet; +import java.util.List; +import java.util.TreeSet; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import org.apache.tools.ant.BuildException; +import org.eclipse.aether.artifact.Artifact; + +/** + */ +class Layout +{ + +public static final String GID = "{groupId}"; + +public static final String GID_DIRS = "{groupIdDirs}"; + +public static final String AID = "{artifactId}"; + +public static final String VER = "{version}"; + +public static final String BVER = "{baseVersion}"; + +public static final String EXT = "{extension}"; + +public static final String CLS = "{classifier}"; + +private String[] tokens; + +public Layout( String layout ) +throws BuildException +{ +Collection valid = new HashSet( Arrays.asList( GID, GID_DIRS, AID, VER, BVER, EXT, CLS ) ); +List tokens = new ArrayList(); +Matcher m = Pattern.compile( "(\\{[^}]*\\})|([^{]+)" ).matcher( layout ); +while ( m.find() ) +{ +if ( m.group( 1 ) != null && !valid.contains( m.group( 1 ) ) ) +{ +throw new BuildException( "Invalid variable '" + m.group() + "' in layout, supported variables are " ++ new TreeSet( valid ) ); +} +tokens.add( m.group() ); +} +this.tokens = tokens.toArray( new String[tokens.size()] ); +} + +public String getPath( Artifact artifact ) +{ +StringBuilder
[3/3] maven-resolver git commit: moved demos into subfolder
moved demos into subfolder Project: http://git-wip-us.apache.org/repos/asf/maven-resolver/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-resolver/commit/de1b0eaa Tree: http://git-wip-us.apache.org/repos/asf/maven-resolver/tree/de1b0eaa Diff: http://git-wip-us.apache.org/repos/asf/maven-resolver/diff/de1b0eaa Branch: refs/heads/demos-folder Commit: de1b0eaa5cc28d92f11f8cdb0527d10adfb01c97 Parents: e497a1e Author: Manfred MoserAuthored: Wed Nov 8 19:28:10 2017 -0800 Committer: Manfred Moser Committed: Wed Nov 8 19:28:10 2017 -0800 -- .gitattributes | 1 - .gitignore | 8 - maven-resolver-demo-maven-plugin/pom.xml| 120 - .../src/it/resolve-artifact/pom.xml | 51 -- .../src/it/settings.xml | 55 -- .../examples/maven/ResolveArtifactMojo.java | 108 --- .../src/site/site.xml | 36 maven-resolver-demo-snippets/pom.xml| 130 -- .../src/main/data/demo.jar | Bin 345 -> 0 bytes .../resolver/examples/AllResolverDemos.java | 42 - .../resolver/examples/DeployArtifacts.java | 66 --- .../examples/FindAvailableVersions.java | 62 --- .../resolver/examples/FindNewestVersion.java| 61 --- .../examples/GetDependencyHierarchy.java| 72 .../resolver/examples/GetDependencyTree.java| 59 -- .../examples/GetDirectDependencies.java | 61 --- .../resolver/examples/InstallArtifacts.java | 61 --- .../resolver/examples/ResolveArtifact.java | 59 -- .../examples/ResolveTransitiveDependencies.java | 73 .../examples/guice/DemoResolverModule.java | 74 .../guice/GuiceRepositorySystemFactory.java | 37 .../manual/ManualRepositorySystemFactory.java | 62 --- .../plexus/PlexusRepositorySystemFactory.java | 53 -- .../resolver/examples/resolver/Resolver.java| 131 -- .../examples/resolver/ResolverDemo.java | 78 .../examples/resolver/ResolverResult.java | 56 -- .../sisu/SisuRepositorySystemFactory.java | 58 -- .../maven/resolver/examples/util/Booter.java| 73 .../util/ConsoleDependencyGraphDumper.java | 157 .../util/ConsoleRepositoryListener.java | 132 -- .../examples/util/ConsoleTransferListener.java | 178 --- maven-resolver-demo-snippets/src/site/site.xml | 36 maven-resolver-demos/.gitattributes | 1 + maven-resolver-demos/.gitignore | 8 + .../maven-resolver-demo-maven-plugin/pom.xml| 120 + .../src/it/resolve-artifact/pom.xml | 51 ++ .../src/it/settings.xml | 55 ++ .../examples/maven/ResolveArtifactMojo.java | 108 +++ .../src/site/site.xml | 36 .../maven-resolver-demo-snippets/pom.xml| 130 ++ .../src/main/data/demo.jar | Bin 0 -> 345 bytes .../resolver/examples/AllResolverDemos.java | 42 + .../resolver/examples/DeployArtifacts.java | 66 +++ .../examples/FindAvailableVersions.java | 62 +++ .../resolver/examples/FindNewestVersion.java| 61 +++ .../examples/GetDependencyHierarchy.java| 72 .../resolver/examples/GetDependencyTree.java| 59 ++ .../examples/GetDirectDependencies.java | 61 +++ .../resolver/examples/InstallArtifacts.java | 61 +++ .../resolver/examples/ResolveArtifact.java | 59 ++ .../examples/ResolveTransitiveDependencies.java | 73 .../examples/guice/DemoResolverModule.java | 74 .../guice/GuiceRepositorySystemFactory.java | 37 .../manual/ManualRepositorySystemFactory.java | 62 +++ .../plexus/PlexusRepositorySystemFactory.java | 53 ++ .../resolver/examples/resolver/Resolver.java| 131 ++ .../examples/resolver/ResolverDemo.java | 78 .../examples/resolver/ResolverResult.java | 56 ++ .../sisu/SisuRepositorySystemFactory.java | 58 ++ .../maven/resolver/examples/util/Booter.java| 73 .../util/ConsoleDependencyGraphDumper.java | 157 .../util/ConsoleRepositoryListener.java | 132 ++ .../examples/util/ConsoleTransferListener.java | 178 +++ .../src/site/site.xml | 36 maven-resolver-demos/pom.xml| 90 ++ .../src/site/resources/download.cgi | 22 +++ maven-resolver-demos/src/site/site.xml | 44 + .../src/site/xdoc/download.xml.vm
[1/3] maven-resolver git commit: moved demos into subfolder
Repository: maven-resolver Updated Branches: refs/heads/demos-folder [created] de1b0eaa5 http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/de1b0eaa/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/resolver/Resolver.java -- diff --git a/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/resolver/Resolver.java b/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/resolver/Resolver.java new file mode 100644 index 000..ae07a4c --- /dev/null +++ b/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/resolver/Resolver.java @@ -0,0 +1,131 @@ +package org.apache.maven.resolver.examples.resolver; + +/* + * 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.ByteArrayOutputStream; +import java.io.PrintStream; + +import org.apache.maven.resolver.examples.util.Booter; +import org.apache.maven.resolver.examples.util.ConsoleDependencyGraphDumper; +import org.eclipse.aether.DefaultRepositorySystemSession; +import org.eclipse.aether.RepositorySystem; +import org.eclipse.aether.RepositorySystemSession; +import org.eclipse.aether.artifact.Artifact; +import org.eclipse.aether.artifact.DefaultArtifact; +import org.eclipse.aether.collection.CollectRequest; +import org.eclipse.aether.deployment.DeployRequest; +import org.eclipse.aether.deployment.DeploymentException; +import org.eclipse.aether.graph.Dependency; +import org.eclipse.aether.graph.DependencyNode; +import org.eclipse.aether.installation.InstallRequest; +import org.eclipse.aether.installation.InstallationException; +import org.eclipse.aether.repository.Authentication; +import org.eclipse.aether.repository.LocalRepository; +import org.eclipse.aether.repository.RemoteRepository; +import org.eclipse.aether.resolution.DependencyRequest; +import org.eclipse.aether.resolution.DependencyResolutionException; +import org.eclipse.aether.util.graph.visitor.PreorderNodeListGenerator; +import org.eclipse.aether.util.repository.AuthenticationBuilder; + +/** + */ +public class Resolver +{ +private String remoteRepository; + +private RepositorySystem repositorySystem; + +private LocalRepository localRepository; + +public Resolver( String remoteRepository, String localRepository ) +{ +this.remoteRepository = remoteRepository; +this.repositorySystem = Booter.newRepositorySystem(); +this.localRepository = new LocalRepository( localRepository ); +} + +private RepositorySystemSession newSession() +{ +DefaultRepositorySystemSession session = Booter.newRepositorySystemSession( repositorySystem ); +session.setLocalRepositoryManager( repositorySystem.newLocalRepositoryManager( session, localRepository ) ); +return session; +} + +public ResolverResult resolve( String groupId, String artifactId, String version ) +throws DependencyResolutionException +{ +RepositorySystemSession session = newSession(); +Dependency dependency = +new Dependency( new DefaultArtifact( groupId, artifactId, "", "jar", version ), "runtime" ); +RemoteRepository central = new RemoteRepository.Builder( "central", "default", remoteRepository ).build(); + +CollectRequest collectRequest = new CollectRequest(); +collectRequest.setRoot( dependency ); +collectRequest.addRepository( central ); + +DependencyRequest dependencyRequest = new DependencyRequest(); +dependencyRequest.setCollectRequest( collectRequest ); + +DependencyNode rootNode = repositorySystem.resolveDependencies( session, dependencyRequest ).getRoot(); + +StringBuilder dump = new StringBuilder(); +displayTree( rootNode, dump ); + +PreorderNodeListGenerator nlg = new PreorderNodeListGenerator(); +rootNode.accept( nlg ); + +return new ResolverResult( rootNode, nlg.getFiles(), nlg.getClassPath() ); +} + +public void install( Artifact artifact, Artifact pom ) +throws
[2/3] maven-resolver git commit: moved demos into subfolder
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/de1b0eaa/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/util/ConsoleDependencyGraphDumper.java -- diff --git a/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/util/ConsoleDependencyGraphDumper.java b/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/util/ConsoleDependencyGraphDumper.java deleted file mode 100644 index ff0926e..000 --- a/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/util/ConsoleDependencyGraphDumper.java +++ /dev/null @@ -1,157 +0,0 @@ -package org.apache.maven.resolver.examples.util; - -/* - * 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.PrintStream; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.graph.Dependency; -import org.eclipse.aether.graph.DependencyNode; -import org.eclipse.aether.graph.DependencyVisitor; -import org.eclipse.aether.util.artifact.ArtifactIdUtils; -import org.eclipse.aether.util.graph.manager.DependencyManagerUtils; -import org.eclipse.aether.util.graph.transformer.ConflictResolver; - -/** - * A dependency visitor that dumps the graph to the console. - */ -public class ConsoleDependencyGraphDumper -implements DependencyVisitor -{ - -private PrintStream out; - -private List childInfos = new ArrayList(); - -public ConsoleDependencyGraphDumper() -{ -this( null ); -} - -public ConsoleDependencyGraphDumper( PrintStream out ) -{ -this.out = ( out != null ) ? out : System.out; -} - -public boolean visitEnter( DependencyNode node ) -{ -out.println( formatIndentation() + formatNode( node ) ); -childInfos.add( new ChildInfo( node.getChildren().size() ) ); -return true; -} - -private String formatIndentation() -{ -StringBuilder buffer = new StringBuilder( 128 ); -for ( Iterator it = childInfos.iterator(); it.hasNext(); ) -{ -buffer.append( it.next().formatIndentation( !it.hasNext() ) ); -} -return buffer.toString(); -} - -private String formatNode( DependencyNode node ) -{ -StringBuilder buffer = new StringBuilder( 128 ); -Artifact a = node.getArtifact(); -Dependency d = node.getDependency(); -buffer.append( a ); -if ( d != null && d.getScope().length() > 0 ) -{ -buffer.append( " [" ).append( d.getScope() ); -if ( d.isOptional() ) -{ -buffer.append( ", optional" ); -} -buffer.append( "]" ); -} -{ -String premanaged = DependencyManagerUtils.getPremanagedVersion( node ); -if ( premanaged != null && !premanaged.equals( a.getBaseVersion() ) ) -{ -buffer.append( " (version managed from " ).append( premanaged ).append( ")" ); -} -} -{ -String premanaged = DependencyManagerUtils.getPremanagedScope( node ); -if ( premanaged != null && !premanaged.equals( d.getScope() ) ) -{ -buffer.append( " (scope managed from " ).append( premanaged ).append( ")" ); -} -} -DependencyNode winner = (DependencyNode) node.getData().get( ConflictResolver.NODE_DATA_WINNER ); -if ( winner != null && !ArtifactIdUtils.equalsId( a, winner.getArtifact() ) ) -{ -Artifact w = winner.getArtifact(); -buffer.append( " (conflicts with " ); -if ( ArtifactIdUtils.toVersionlessId( a ).equals( ArtifactIdUtils.toVersionlessId( w ) ) ) -{ -buffer.append( w.getVersion() ); -} -else -{ -buffer.append( w ); -} -buffer.append( ")" ); -} -return buffer.toString(); -} - -public boolean visitLeave( DependencyNode node ) -{ -if (
[4/4] maven-resolver git commit: Added demos as module
Added demos as module Signed-off-by: Manfred MoserSigned-off-by: Manfred Moser Project: http://git-wip-us.apache.org/repos/asf/maven-resolver/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-resolver/commit/2dbca04c Tree: http://git-wip-us.apache.org/repos/asf/maven-resolver/tree/2dbca04c Diff: http://git-wip-us.apache.org/repos/asf/maven-resolver/diff/2dbca04c Branch: refs/heads/master-all Commit: 2dbca04ce51b09964d3301bdb3a0a69b30571949 Parents: 85aa79f Author: Manfred Moser Authored: Wed Nov 8 20:07:03 2017 -0800 Committer: Manfred Moser Committed: Wed Nov 8 20:07:03 2017 -0800 -- pom.xml | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/2dbca04c/pom.xml -- diff --git a/pom.xml b/pom.xml index 10d78e6..f3ded20 100644 --- a/pom.xml +++ b/pom.xml @@ -83,6 +83,7 @@ maven-resolver-transport-http maven-resolver-transport-wagon maven-resolver-ant-tasks +maven-resolver-demos
[3/4] maven-resolver git commit: Added ant tasks as module
Added ant tasks as module Signed-off-by: Manfred MoserSigned-off-by: Manfred Moser Project: http://git-wip-us.apache.org/repos/asf/maven-resolver/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-resolver/commit/85aa79fd Tree: http://git-wip-us.apache.org/repos/asf/maven-resolver/tree/85aa79fd Diff: http://git-wip-us.apache.org/repos/asf/maven-resolver/diff/85aa79fd Branch: refs/heads/master-all Commit: 85aa79fd76ef30f230291bbc7e55bac90df36219 Parents: 905a1db Author: Manfred Moser Authored: Wed Nov 8 19:57:32 2017 -0800 Committer: Manfred Moser Committed: Wed Nov 8 19:57:32 2017 -0800 -- pom.xml | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/85aa79fd/pom.xml -- diff --git a/pom.xml b/pom.xml index dbf3296..10d78e6 100644 --- a/pom.xml +++ b/pom.xml @@ -82,6 +82,7 @@ maven-resolver-transport-file maven-resolver-transport-http maven-resolver-transport-wagon +maven-resolver-ant-tasks
[1/4] maven-resolver git commit: Merge branch 'ant-tasks-folder' into master-all
Repository: maven-resolver Updated Branches: refs/heads/master-all [created] 2dbca04ce Merge branch 'ant-tasks-folder' into master-all Signed-off-by: Manfred MoserProject: http://git-wip-us.apache.org/repos/asf/maven-resolver/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-resolver/commit/796115d4 Tree: http://git-wip-us.apache.org/repos/asf/maven-resolver/tree/796115d4 Diff: http://git-wip-us.apache.org/repos/asf/maven-resolver/diff/796115d4 Branch: refs/heads/master-all Commit: 796115d4e3b3855f86f19e44cb1597b19787018c Parents: c9d825e a088cdf Author: Manfred Moser Authored: Wed Nov 8 19:32:56 2017 -0800 Committer: Manfred Moser Committed: Wed Nov 8 19:32:56 2017 -0800 -- .gitattributes | 1 + maven-resolver-ant-tasks/README.md | 243 ++ maven-resolver-ant-tasks/build.xml | 133 +++ maven-resolver-ant-tasks/pom.xml| 364 .../src/main/assembly/bin.xml | 47 ++ .../resolver/internal/ant/AetherUtils.java | 83 ++ .../maven/resolver/internal/ant/AntLogger.java | 68 ++ .../resolver/internal/ant/AntModelResolver.java | 180 .../maven/resolver/internal/ant/AntRepoSys.java | 825 +++ .../internal/ant/AntRepositoryListener.java | 123 +++ .../resolver/internal/ant/AntSecDispatcher.java | 45 + .../ant/AntServiceLocatorErrorHandler.java | 50 ++ .../ant/AntSettingsDecryptorFactory.java| 51 ++ .../internal/ant/AntTransferListener.java | 91 ++ .../resolver/internal/ant/ConverterUtils.java | 227 + .../maven/resolver/internal/ant/Names.java | 44 + .../internal/ant/ProjectWorkspaceReader.java| 144 .../resolver/internal/ant/SettingsUtils.java| 182 .../internal/ant/tasks/AbstractDistTask.java| 180 .../ant/tasks/AbstractResolvingTask.java| 107 +++ .../ant/tasks/DependencyGraphLogger.java| 85 ++ .../resolver/internal/ant/tasks/Deploy.java | 104 +++ .../resolver/internal/ant/tasks/Install.java| 41 + .../resolver/internal/ant/tasks/Layout.java | 131 +++ .../resolver/internal/ant/tasks/RefTask.java| 98 +++ .../resolver/internal/ant/tasks/Resolve.java| 585 + .../resolver/internal/ant/types/Artifact.java | 181 .../internal/ant/types/ArtifactContainer.java | 35 + .../resolver/internal/ant/types/Artifacts.java | 97 +++ .../internal/ant/types/Authentication.java | 152 .../internal/ant/types/Dependencies.java| 197 + .../resolver/internal/ant/types/Dependency.java | 329 .../internal/ant/types/DependencyContainer.java | 31 + .../resolver/internal/ant/types/Exclusion.java | 190 + .../internal/ant/types/LocalRepository.java | 90 ++ .../resolver/internal/ant/types/Mirror.java | 154 .../internal/ant/types/ModelValueExtractor.java | 99 +++ .../maven/resolver/internal/ant/types/Pom.java | 352 .../ant/types/PomPropertyEvaluator.java | 62 ++ .../internal/ant/types/PomPropertyHelper.java | 65 ++ .../resolver/internal/ant/types/Proxy.java | 163 .../internal/ant/types/RemoteRepositories.java | 97 +++ .../internal/ant/types/RemoteRepository.java| 351 .../ant/types/RemoteRepositoryContainer.java| 35 + .../resolver/internal/ant/types/Settings.java | 86 ++ .../org/apache/maven/resolver/ant/antlib.xml| 41 + .../src/site/markdown/index.md.vm | 1 + .../src/site/resources/download.cgi | 22 + maven-resolver-ant-tasks/src/site/site.xml | 42 + .../src/site/xdoc/download.xml.vm | 126 +++ .../resolver/internal/ant/AntBuildsTest.java| 124 +++ .../maven/resolver/internal/ant/DeployTest.java | 91 ++ .../resolver/internal/ant/InstallTest.java | 98 +++ .../ant/ProjectWorkspaceReaderTest.java | 124 +++ .../resolver/internal/ant/ReactorTest.java | 100 +++ .../resolver/internal/ant/ResolveTest.java | 150 .../resolver/internal/ant/SettingsTest.java | 65 ++ .../resolver/internal/ant/tasks/LayoutTest.java | 55 ++ .../internal/ant/types/DependencyTest.java | 88 ++ .../internal/ant/types/ExclusionTest.java | 88 ++ .../resolver/internal/ant/types/PomTest.java| 43 + .../ProjectWorkspaceReader/dummy-file.txt | 1 + .../ProjectWorkspaceReader/dummy-pom.xml| 34 + .../src/test/resources/ant/Deploy/ant.xml | 72 ++ .../src/test/resources/ant/Deploy/dummy-pom.xml | 34 + .../src/test/resources/ant/Deploy/other-pom.xml | 34 + .../src/test/resources/ant/Install/ant.xml | 71 ++ .../test/resources/ant/Install/dummy-pom.xml| 34 + .../test/resources/ant/Install/other-pom.xml| 34 + .../src/test/resources/ant/Reactor/ant.xml | 78 ++
[2/4] maven-resolver git commit: Merge branch 'demos-folder' into master-all
Merge branch 'demos-folder' into master-all Signed-off-by: Manfred MoserProject: http://git-wip-us.apache.org/repos/asf/maven-resolver/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-resolver/commit/905a1db1 Tree: http://git-wip-us.apache.org/repos/asf/maven-resolver/tree/905a1db1 Diff: http://git-wip-us.apache.org/repos/asf/maven-resolver/diff/905a1db1 Branch: refs/heads/master-all Commit: 905a1db16e77d54c8e3a93c0c0403733c585e96e Parents: 796115d de1b0ea Author: Manfred Moser Authored: Wed Nov 8 19:34:22 2017 -0800 Committer: Manfred Moser Committed: Wed Nov 8 19:34:22 2017 -0800 -- maven-resolver-demos/.gitattributes | 1 + maven-resolver-demos/.gitignore | 8 + .../maven-resolver-demo-maven-plugin/pom.xml| 120 + .../src/it/resolve-artifact/pom.xml | 51 ++ .../src/it/settings.xml | 55 ++ .../examples/maven/ResolveArtifactMojo.java | 108 +++ .../src/site/site.xml | 36 .../maven-resolver-demo-snippets/pom.xml| 130 ++ .../src/main/data/demo.jar | Bin 0 -> 345 bytes .../resolver/examples/AllResolverDemos.java | 42 + .../resolver/examples/DeployArtifacts.java | 66 +++ .../examples/FindAvailableVersions.java | 62 +++ .../resolver/examples/FindNewestVersion.java| 61 +++ .../examples/GetDependencyHierarchy.java| 72 .../resolver/examples/GetDependencyTree.java| 59 ++ .../examples/GetDirectDependencies.java | 61 +++ .../resolver/examples/InstallArtifacts.java | 61 +++ .../resolver/examples/ResolveArtifact.java | 59 ++ .../examples/ResolveTransitiveDependencies.java | 73 .../examples/guice/DemoResolverModule.java | 74 .../guice/GuiceRepositorySystemFactory.java | 37 .../manual/ManualRepositorySystemFactory.java | 62 +++ .../plexus/PlexusRepositorySystemFactory.java | 53 ++ .../resolver/examples/resolver/Resolver.java| 131 ++ .../examples/resolver/ResolverDemo.java | 78 .../examples/resolver/ResolverResult.java | 56 ++ .../sisu/SisuRepositorySystemFactory.java | 58 ++ .../maven/resolver/examples/util/Booter.java| 73 .../util/ConsoleDependencyGraphDumper.java | 157 .../util/ConsoleRepositoryListener.java | 132 ++ .../examples/util/ConsoleTransferListener.java | 178 +++ .../src/site/site.xml | 36 maven-resolver-demos/pom.xml| 90 ++ .../src/site/resources/download.cgi | 22 +++ maven-resolver-demos/src/site/site.xml | 44 + .../src/site/xdoc/download.xml.vm | 126 + 36 files changed, 2532 insertions(+) --