diff options
156 files changed, 145 insertions, 6720 deletions
diff --git a/org.eclipse.m2e.archetype.common/.gitignore b/.gitignore index ea8c4bf7..4dc00917 100644 --- a/org.eclipse.m2e.archetype.common/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /target +/bin diff --git a/org.eclipse.m2e.parent/.project b/.project index 9ff7fd35..0ad82102 100644 --- a/org.eclipse.m2e.parent/.project +++ b/.project @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>org.eclipse.m2e.parent</name> + <name>m2e-core</name> <comment></comment> <projects> </projects> diff --git a/org.eclipse.m2e.parent/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs index fc9add0b..c30024a3 100644 --- a/org.eclipse.m2e.parent/.settings/org.eclipse.m2e.core.prefs +++ b/.settings/org.eclipse.m2e.core.prefs @@ -1,4 +1,4 @@ -#Thu Dec 23 16:53:18 EST 2010 +#Fri Jul 29 16:31:37 MSD 2011 activeProfiles= eclipse.preferences.version=1 resolveWorkspaceProjects=true diff --git a/com.ning.async-http-client/.classpath b/com.ning.async-http-client/.classpath deleted file mode 100644 index f7e93124..00000000 --- a/com.ning.async-http-client/.classpath +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry exported="true" kind="lib" path="async-http-client-1.6.3.jar"/> - <classpathentry kind="output" path="bin"/> -</classpath> diff --git a/com.ning.async-http-client/.gitignore b/com.ning.async-http-client/.gitignore deleted file mode 100644 index ea8c4bf7..00000000 --- a/com.ning.async-http-client/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target diff --git a/com.ning.async-http-client/.project b/com.ning.async-http-client/.project deleted file mode 100644 index ff82749d..00000000 --- a/com.ning.async-http-client/.project +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>com.ning.async-http-client</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.ManifestBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.pde.PluginNature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> diff --git a/com.ning.async-http-client/META-INF/MANIFEST.MF b/com.ning.async-http-client/META-INF/MANIFEST.MF deleted file mode 100644 index b48bf54d..00000000 --- a/com.ning.async-http-client/META-INF/MANIFEST.MF +++ /dev/null @@ -1,150 +0,0 @@ -Manifest-Version: 1.0 -Export-Package: com.ning.http.client;version="1.6.3"; - uses:="org.slf4j, - com.ning.http.client.filter, - com.ning.http.client.providers.jdk, - com.ning.http.client.resumable, - javax.net.ssl, - com.ning.http.util, - com.ning.http.client.simple", - com.ning.http.client.consumers;version="1.6.3";uses:="com.ning.http.client", - com.ning.http.client.extra;version="1.6.3"; - uses:="com.ning.http.client.resumable, - org.slf4j, - com.ning.http.client, - com.ning.http.client.filter", - com.ning.http.client.filter;version="1.6.3";uses:="com.ning.http.client", - com.ning.http.client.generators;version="1.6.3";uses:="com.ning.http.client,org.slf4j", - com.ning.http.client.listenable;version="1.6.3";uses:="com.ning.http.client", - com.ning.http.client.listener;version="1.6.3";uses:="com.ning.http.client,org.slf4j", - com.ning.http.client.ntlm;version="1.6.3";uses:="com.ning.http.util,javax.crypto.spec,javax.crypto", - com.ning.http.client.oauth;version="1.6.3"; - uses:="com.ning.http.util, - com.ning.http.client, - javax.crypto.spec, - javax.crypto", - com.ning.http.client.providers.apache;version="1.6.3"; - uses:="org.apache.commons.httpclient.protocol, - javax.net, - org.apache.commons.httpclient.params, - org.apache.commons.httpclient, - com.ning.http.util, - com.ning.http.client, - org.slf4j, - com.ning.http.client.filter, - javax.net.ssl, - org.apache.commons.httpclient.methods, - org.apache.commons.httpclient.auth, - org.apache.commons.httpclient.methods.multipart, - org.apache.commons.httpclient.util, - com.ning.http.client.resumable, - com.ning.http.client.listenable", - com.ning.http.client.providers.jdk;version="1.6.3"; - uses:="javax.net.ssl, - com.ning.http.client, - org.jboss.netty.buffer, - javax.naming, - com.ning.http.util, - com.ning.http.multipart, - org.slf4j, - com.ning.http.client.filter, - com.ning.http.client.listenable", - com.ning.http.client.providers.netty;version="1.6.3"; - uses:="org.jboss.netty.buffer, - org.jboss.netty.handler.stream, - com.ning.http.client, - org.jboss.netty.channel, - com.ning.http.util, - org.jboss.netty.handler.codec.http, - javax.net.ssl, - org.jboss.netty.handler.ssl, - org.slf4j, - com.ning.http.client.listener, - org.jboss.netty.channel.group, - org.jboss.netty.channel.socket.oio, - com.ning.http.client.providers.netty.spnego, - com.ning.http.client.ntlm, - org.jboss.netty.bootstrap, - com.ning.http.multipart, - org.jboss.netty.channel.socket.nio, - com.ning.http.client.filter, - org.jboss.netty.channel.socket, - org.jboss.netty.util, - com.ning.http.client.listenable", - com.ning.http.client.providers.netty.spnego;version="1.6.3";uses:="com.ning.http.util,org.ietf.jgss,org.slf4j", - com.ning.http.client.resumable;version="1.6.3"; - uses:="org.slf4j, - com.ning.http.client.listener, - com.ning.http.client, - com.ning.http.client.filter", - com.ning.http.client.simple;version="1.6.3";uses:="com.ning.http.client", - com.ning.http.client.webdav;version="1.6.3"; - uses:="com.ning.http.client, - javax.xml.parsers, - org.w3c.dom, - org.slf4j, - org.xml.sax", - com.ning.http.multipart;version="1.6.3";uses:="com.ning.http.client,org.slf4j", - com.ning.http.util;version="1.6.3"; - uses:="com.ning.http.multipart, - com.ning.http.client, - org.jboss.netty.channel, - org.jboss.netty.channel.group, - org.slf4j, - javax.net.ssl" -Built-By: Administrator -Tool: Bnd-0.0.357 -Bundle-Name: async-http-client -Created-By: Apache Maven Bundle Plugin -Bundle-Vendor: Sonatype -Build-Jdk: 1.6.0_24 -Bundle-Version: 1.6.3.qualifier -Bnd-LastModified: 1300223323250 -Bundle-ManifestVersion: 2 -Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.html -Bundle-Description: Async Http Client library purpose is to allow Java - applications to easily execute HTTP requests and asynchronous - ly process the HTTP responses. -Bundle-SymbolicName: com.ning.async-http-client -Import-Package: com.ning.http.client;version="1.6.3", - com.ning.http.client.consumers;version="1.6.3", - com.ning.http.client.extra;version="1.6.3", - com.ning.http.client.filter;version="1.6.3", - com.ning.http.client.generators;version="1.6.3", - com.ning.http.client.listenable;version="1.6.3", - com.ning.http.client.listener;version="1.6.3", - com.ning.http.client.ntlm;version="1.6.3", - com.ning.http.client.oauth;version="1.6.3", - com.ning.http.client.providers.apache;version="1.6.3", - com.ning.http.client.providers.jdk;version="1.6.3", - com.ning.http.client.providers.netty;version="1.6.3", - com.ning.http.client.providers.netty.spnego;version="1.6.3", - com.ning.http.client.resumable;version="1.6.3", - com.ning.http.client.simple;version="1.6.3", - com.ning.http.client.webdav;version="1.6.3", - com.ning.http.multipart;version="1.6.3", - com.ning.http.util;version="1.6.3", - javax.crypto, - javax.crypto.spec, - javax.naming, - javax.net, - javax.net.ssl, - javax.xml.parsers, - org.ietf.jgss, - org.jboss.netty.bootstrap;version="3.2.0", - org.jboss.netty.buffer;version="3.2.0", - org.jboss.netty.channel;version="3.2.0", - org.jboss.netty.channel.group;version="3.2.0", - org.jboss.netty.channel.socket;version="3.2.0", - org.jboss.netty.channel.socket.nio;version="3.2.0", - org.jboss.netty.channel.socket.oio;version="3.2.0", - org.jboss.netty.handler.codec.http;version="3.2.0", - org.jboss.netty.handler.ssl;version="3.2.0", - org.jboss.netty.handler.stream;version="3.2.0", - org.jboss.netty.util;version="3.2.0", - org.slf4j;version="1.6", - org.w3c.dom, - org.xml.sax -Bundle-ClassPath: async-http-client-1.6.3.jar -Bundle-RequiredExecutionEnvironment: J2SE-1.5, - JavaSE-1.6 diff --git a/com.ning.async-http-client/about.html b/com.ning.async-http-client/about.html deleted file mode 100644 index 190e2e45..00000000 --- a/com.ning.async-http-client/about.html +++ /dev/null @@ -1,47 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> -<title>About</title> -</head> -<body lang="EN-US"> -<h2>About This Content</h2> - -<p>June, 6 2011</p> -<h3>License</h3> - -<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise -indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. -For purposes of the EPL, "Program" will mean the Content.</p> - -<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is -being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was -provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p> - -<h3>Third Party Content</h3> - -<p> -The Content includes items that have been sourced from third parties as set out below. If you -did not receive this Content directly from the Eclipse Foundation, the following is provided -for informational purposes only, and you should look to the Redistributor’s license for -terms and conditions of use. -</p> - -<h4>Async HTTP Client 1.6.3</h4> -<p> -The plug-in includes software developed by Sonatype, Inc. -Your use of Async HTTP Client 1.6.3 in binary code form contained in the plug-in is subject to the terms and conditions of the -The Apache Software License, Version 2.0 ("ASL"). -A copy of the ASL is available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>. -(a local copy can be found <a href="about_files/LICENSE-2.0.txt">here</a>) -</p> -<p>The original binaries are available at the <a href="http://maven.org">Maven Central Repository</a>. - -</body> -</html>
\ No newline at end of file diff --git a/com.ning.async-http-client/about_files/LICENSE-2.0.txt b/com.ning.async-http-client/about_files/LICENSE-2.0.txt deleted file mode 100644 index d6456956..00000000 --- a/com.ning.async-http-client/about_files/LICENSE-2.0.txt +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed 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. diff --git a/com.ning.async-http-client/async-http-client-1.6.3.jar b/com.ning.async-http-client/async-http-client-1.6.3.jar Binary files differdeleted file mode 100644 index 05b3771a..00000000 --- a/com.ning.async-http-client/async-http-client-1.6.3.jar +++ /dev/null diff --git a/com.ning.async-http-client/build.properties b/com.ning.async-http-client/build.properties deleted file mode 100644 index 0f03d9ff..00000000 --- a/com.ning.async-http-client/build.properties +++ /dev/null @@ -1,15 +0,0 @@ -# -# Copyright (c) 2008-2010 Sonatype, Inc. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# Sonatype, Inc. - initial API and implementation -# - -bin.includes = META-INF/,\ - async-http-client-1.6.3.jar,\ - about.html,\ - about_files/ diff --git a/com.ning.async-http-client/no-source-bundle.txt b/com.ning.async-http-client/no-source-bundle.txt deleted file mode 100644 index 675ce413..00000000 --- a/com.ning.async-http-client/no-source-bundle.txt +++ /dev/null @@ -1 +0,0 @@ -marker file used to disable source-bundle profile
\ No newline at end of file diff --git a/com.ning.async-http-client/pom.xml b/com.ning.async-http-client/pom.xml deleted file mode 100644 index 77d760be..00000000 --- a/com.ning.async-http-client/pom.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright (c) 2010 Sonatype, Inc. - All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License v1.0 - which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html ---> -<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"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.eclipse.m2e</groupId> - <artifactId>org.eclipse.m2e.parent</artifactId> - <version>1.0.100-SNAPSHOT</version> - <relativePath>../org.eclipse.m2e.parent</relativePath> - </parent> - - <artifactId>com.ning.async-http-client</artifactId> - <packaging>eclipse-plugin</packaging> - -</project> diff --git a/org.eclipse.m2e.archetype.common/.classpath b/org.eclipse.m2e.archetype.common/.classpath deleted file mode 100644 index 0afc3528..00000000 --- a/org.eclipse.m2e.archetype.common/.classpath +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry exported="true" kind="lib" path="jars/jchardet-1.0.jar"/> - <classpathentry exported="true" kind="lib" path="jars/dom4j-1.6.1.jar"/> - <classpathentry exported="true" kind="lib" path="jars/jdom-1.0.jar"/> - <classpathentry exported="true" kind="lib" path="jars/commons-io-1.3.2.jar"/> - <classpathentry exported="true" kind="lib" path="jars/plexus-velocity-1.1.3.jar"/> - <classpathentry exported="true" kind="lib" path="jars/commons-collections-3.2.jar"/> - <classpathentry exported="true" kind="lib" path="jars/archetype-common-2.0-alpha-4.jar"/> - <classpathentry exported="true" kind="lib" path="jars/commons-lang-2.1.jar"/> - <classpathentry exported="true" kind="lib" path="jars/oro-2.0.8.jar"/> - <classpathentry exported="true" kind="lib" path="jars/velocity-1.5.jar"/> - <classpathentry kind="output" path="target/classes"/> -</classpath> diff --git a/org.eclipse.m2e.archetype.common/.project b/org.eclipse.m2e.archetype.common/.project deleted file mode 100644 index eeef393f..00000000 --- a/org.eclipse.m2e.archetype.common/.project +++ /dev/null @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.m2e.archetype.common</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.ManifestBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.m2e.core.maven2Builder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.m2e.core.maven2Nature</nature> - <nature>org.eclipse.pde.PluginNature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> diff --git a/org.eclipse.m2e.archetype.common/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.archetype.common/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index a413c41a..00000000 --- a/org.eclipse.m2e.archetype.common/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,8 +0,0 @@ -#Thu Feb 04 10:56:12 EST 2010 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.5 diff --git a/org.eclipse.m2e.archetype.common/META-INF/MANIFEST.MF b/org.eclipse.m2e.archetype.common/META-INF/MANIFEST.MF deleted file mode 100644 index 3068ee80..00000000 --- a/org.eclipse.m2e.archetype.common/META-INF/MANIFEST.MF +++ /dev/null @@ -1,46 +0,0 @@ -Manifest-Version: 1.0 -Export-Package: META-INF.plexus, - org.apache.maven.archetype, - org.apache.maven.archetype.catalog, - org.apache.maven.archetype.catalog.io.xpp3, - org.apache.maven.archetype.common, - org.apache.maven.archetype.common.io.xpp3, - org.apache.maven.archetype.common.util, - org.apache.maven.archetype.creator, - org.apache.maven.archetype.creator.olddescriptor, - org.apache.maven.archetype.downloader, - org.apache.maven.archetype.exception, - org.apache.maven.archetype.generator, - org.apache.maven.archetype.metadata, - org.apache.maven.archetype.metadata.io.xpp3, - org.apache.maven.archetype.model, - org.apache.maven.archetype.model.io.xpp3, - org.apache.maven.archetype.old, - org.apache.maven.archetype.old.descriptor, - org.apache.maven.archetype.registry, - org.apache.maven.archetype.registry.io.xpp3, - org.apache.maven.archetype.repositorycrawler, - org.apache.maven.archetype.source, - org.codehaus.plexus.velocity -Bundle-ClassPath: jars/jchardet-1.0.jar, - jars/dom4j-1.6.1.jar, - jars/jdom-1.0.jar, - jars/commons-io-1.3.2.jar, - jars/plexus-velocity-1.1.3.jar, - jars/commons-collections-3.2.jar, - jars/archetype-common-2.0-alpha-4.jar, - jars/commons-lang-2.1.jar, - jars/oro-2.0.8.jar, - jars/velocity-1.5.jar -Bundle-Name: %Bundle-Name -Bundle-RequiredExecutionEnvironment: J2SE-1.5, - JavaSE-1.6 -Require-Bundle: org.eclipse.m2e.maven.runtime;bundle-version="[1.0.0,1.1.0)" -Bundle-Vendor: %Bundle-Vendor -MavenArtifact-BaseVersion: 2.0.1.20090526-1230 -Bundle-Version: 1.0.100.qualifier -MavenArtifact-GroupId: org.eclipse.m2e -MavenArtifact-ArtifactId: org.eclipse.m2e.archetype.common -Bundle-ManifestVersion: 2 -Bundle-SymbolicName: org.eclipse.m2e.archetype.common;singleton:=true - diff --git a/org.eclipse.m2e.archetype.common/META-INF/plexus/.gitignore b/org.eclipse.m2e.archetype.common/META-INF/plexus/.gitignore deleted file mode 100644 index e69de29b..00000000 --- a/org.eclipse.m2e.archetype.common/META-INF/plexus/.gitignore +++ /dev/null diff --git a/org.eclipse.m2e.archetype.common/OSGI-INF/l10n/bundle.properties b/org.eclipse.m2e.archetype.common/OSGI-INF/l10n/bundle.properties deleted file mode 100644 index eae11b6c..00000000 --- a/org.eclipse.m2e.archetype.common/OSGI-INF/l10n/bundle.properties +++ /dev/null @@ -1,3 +0,0 @@ -#Properties file for org.eclipse.m2e.archetype_common -Bundle-Vendor = Eclipse.org - m2e -Bundle-Name = Maven Archetype Common Bundle
\ No newline at end of file diff --git a/org.eclipse.m2e.archetype.common/about.html b/org.eclipse.m2e.archetype.common/about.html deleted file mode 100644 index 5559fe4d..00000000 --- a/org.eclipse.m2e.archetype.common/about.html +++ /dev/null @@ -1,120 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> -<title>About</title> -</head> -<body lang="EN-US"> -<h2>About This Content</h2> - -<p>June, 6 2011</p> -<h3>License</h3> - -<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise -indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. -For purposes of the EPL, "Program" will mean the Content.</p> - -<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is -being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was -provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p> - -<h3>Third Party Content</h3> - -<p> -The Content includes items that have been sourced from third parties as set out below. If you -did not receive this Content directly from the Eclipse Foundation, the following is provided -for informational purposes only, and you should look to the Redistributor’s license for -terms and conditions of use. -</p> - -<h4>Archetype 2.0-alpha-4</h4> -<p> -The plug-in includes software developed by The Apache Software Foundation as part of the Maven project. -Your use of Archetype 2.0-alpha-4 in binary code form contained in the plug-in is subject to the terms and conditions of the -The Apache Software License, Version 2.0 ("ASL"). -A copy of the ASL is available at <a href="http://maven.apache.org/license.html">http://maven.apache.org/license.html</a>. -(a local copy can be found <a href="about_files/LICENSE-2.0.txt">here</a>) -</p> -<p>The original binaries are available at the <a href="http://maven.org">Maven Central Repository</a>. - - -<h4>Apache Commons Collections 3.2, Apache Commons I/O 1.3.2, Apache Commons Lang 2.1</h4> -<p> -The plug-in includes software developed by The Apache Software Foundation as part of the Apache Commons project. -Your use of Apache Commons Collections 3.2, Apache Commons I/O 1.3.2, Apache Commons Lang 2.1 in binary code form contained in the plug-in is subject to the terms and conditions of the -The Apache Software License, Version 2.0 ("ASL"). -A copy of the ASL is available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>. -(a local copy can be found <a href="about_files/LICENSE-2.0.txt">here</a>) -</p> -<p>The original binaries are available at the <a href="http://maven.org">Maven Central Repository</a>. - - - -<h4>dom4j 1.6.1</h4> -<p> -Your use of dom4j 1.6.1 in binary code form contained in the plug-in is subject to the terms and conditions of -BSD style license ("BSD"). -A local copy of the license can be found <a href="about_files/dom4j-LICENSE.txt ">here</a>. -</p> -<p>The original binaries are available at the <a href="http://maven.org">Maven Central Repository</a>. - - -<h4>jchardet 1.0</h4> -<p> -Your use of jchardet 1.0 in binary code form contained in the plug-in is subject to the terms and conditions of the -Mozilla Public License 1.1 ("MPL"). -A copy of the ASL is available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>. -(a local copy can be found <a href="about_files/MPL-1.1.txt">here</a>) -</p> -<p>The original binaries are available at the <a href="http://maven.org">Maven Central Repository</a>. - - -<h4>JDOM 1.0</h4> -<p>JDOM is available under an Apache-style open source license, with the acknowledgment clause removed.. -This license is among the least restrictive license available, enabling developers to use JDOM in. -creating new products without requiring them to release their own products as open source.. -This is the license model used by the Apache Project, which created the Apache server.. -A copy of the license is contained in the file <a href="about_files/LICENSE.txt">jdom-LICENSE.txt</a>. -</p> - - - -<h4>Jakarta-Oro 2.0.8</h4> -<p>The plug-in includes Jakarta-Oro 2.0.8 ("Jakarta-Oro") developed by the Apache Software Foundation as part of the Jakarta project. -Your use of Jakarta-Oro 2.0.8 in binary code form contained in the plug-in is subject to the terms and conditions of the -The Apache Software License, Version 1.1 ("ASL-1.1"). -A copy of the ASL 1.1 is available at <a href="http://www.apache.org/licenses/LICENSE-1.1">http://www.apache.org/licenses/LICENSE-1.1</a>. -(a local copy can be found <a href="about_files/LICENSE-1.1.txt">here</a>) -</p> - - - -<h4>Apache Velocity 1.5</h4> -<p>The plug-in includes Apache Velocity 1.5 developed by the Apache Software Foundation. -Your use of Apache Velocity is subject to the terms and conditions of the -Apache Software License 2.0. A copy of the license - is contained in the file <a href="about_files/LICENSE.txt">LICENSE-2.0.txt</a> -and is also available at <a href="http://www.apache.org/licenses/LICENSE-2.0.txt"> -http://www.apache.org/licenses/LICENSE-2.0.txt</a>.</p> - - - -<h4>Plexus Velocity 1.1.3</h4> -<p> -Your use of Plexus Velocity 1.1.3 in binary code form contained in the plug-in is subject to the terms and conditions of the -The Apache Software License, Version 2.0 ("ASL"). -A copy of the ASL is available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>. -(a local copy can be found <a href="about_files/LICENSE-2.0.txt">here</a>) -</p> -<p>The original binaries are available at the <a href="http://maven.org">Maven Central Repository</a>. - - - -</body> -</html>
\ No newline at end of file diff --git a/org.eclipse.m2e.archetype.common/about_files/LICENSE-1.1.txt b/org.eclipse.m2e.archetype.common/about_files/LICENSE-1.1.txt deleted file mode 100644 index de6706f2..00000000 --- a/org.eclipse.m2e.archetype.common/about_files/LICENSE-1.1.txt +++ /dev/null @@ -1,58 +0,0 @@ -/* ==================================================================== - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2000 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: - * "This product includes software developed by the - * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowledgment may appear in the software itself, - * if and wherever such third-party acknowledgments normally appear. - * - * 4. The names "Apache" and "Apache Software Foundation" must - * not be used to endorse or promote products derived from this - * software without prior written permission. For written - * permission, please contact apache@apache.org. - * - * 5. Products derived from this software may not be called "Apache", - * nor may "Apache" appear in their name, without prior written - * permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * <http://www.apache.org/>. - * - * Portions of this software are based upon public domain software - * originally written at the National Center for Supercomputing Applications, - * University of Illinois, Urbana-Champaign. - */ - diff --git a/org.eclipse.m2e.archetype.common/about_files/LICENSE-2.0.txt b/org.eclipse.m2e.archetype.common/about_files/LICENSE-2.0.txt deleted file mode 100644 index d6456956..00000000 --- a/org.eclipse.m2e.archetype.common/about_files/LICENSE-2.0.txt +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed 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. diff --git a/org.eclipse.m2e.archetype.common/about_files/MPL-1.1.txt b/org.eclipse.m2e.archetype.common/about_files/MPL-1.1.txt deleted file mode 100644 index 7714141d..00000000 --- a/org.eclipse.m2e.archetype.common/about_files/MPL-1.1.txt +++ /dev/null @@ -1,470 +0,0 @@ - MOZILLA PUBLIC LICENSE - Version 1.1 - - --------------- - -1. Definitions. - - 1.0.1. "Commercial Use" means distribution or otherwise making the - Covered Code available to a third party. - - 1.1. "Contributor" means each entity that creates or contributes to - the creation of Modifications. - - 1.2. "Contributor Version" means the combination of the Original - Code, prior Modifications used by a Contributor, and the Modifications - made by that particular Contributor. - - 1.3. "Covered Code" means the Original Code or Modifications or the - combination of the Original Code and Modifications, in each case - including portions thereof. - - 1.4. "Electronic Distribution Mechanism" means a mechanism generally - accepted in the software development community for the electronic - transfer of data. - - 1.5. "Executable" means Covered Code in any form other than Source - Code. - - 1.6. "Initial Developer" means the individual or entity identified - as the Initial Developer in the Source Code notice required by Exhibit - A. - - 1.7. "Larger Work" means a work which combines Covered Code or - portions thereof with code not governed by the terms of this License. - - 1.8. "License" means this document. - - 1.8.1. "Licensable" means having the right to grant, to the maximum - extent possible, whether at the time of the initial grant or - subsequently acquired, any and all of the rights conveyed herein. - - 1.9. "Modifications" means any addition to or deletion from the - substance or structure of either the Original Code or any previous - Modifications. When Covered Code is released as a series of files, a - Modification is: - A. Any addition to or deletion from the contents of a file - containing Original Code or previous Modifications. - - B. Any new file that contains any part of the Original Code or - previous Modifications. - - 1.10. "Original Code" means Source Code of computer software code - which is described in the Source Code notice required by Exhibit A as - Original Code, and which, at the time of its release under this - License is not already Covered Code governed by this License. - - 1.10.1. "Patent Claims" means any patent claim(s), now owned or - hereafter acquired, including without limitation, method, process, - and apparatus claims, in any patent Licensable by grantor. - - 1.11. "Source Code" means the preferred form of the Covered Code for - making modifications to it, including all modules it contains, plus - any associated interface definition files, scripts used to control - compilation and installation of an Executable, or source code - differential comparisons against either the Original Code or another - well known, available Covered Code of the Contributor's choice. The - Source Code can be in a compressed or archival form, provided the - appropriate decompression or de-archiving software is widely available - for no charge. - - 1.12. "You" (or "Your") means an individual or a legal entity - exercising rights under, and complying with all of the terms of, this - License or a future version of this License issued under Section 6.1. - For legal entities, "You" includes any entity which controls, is - controlled by, or is under common control with You. For purposes of - this definition, "control" means (a) the power, direct or indirect, - to cause the direction or management of such entity, whether by - contract or otherwise, or (b) ownership of more than fifty percent - (50%) of the outstanding shares or beneficial ownership of such - entity. - -2. Source Code License. - - 2.1. The Initial Developer Grant. - The Initial Developer hereby grants You a world-wide, royalty-free, - non-exclusive license, subject to third party intellectual property - claims: - (a) under intellectual property rights (other than patent or - trademark) Licensable by Initial Developer to use, reproduce, - modify, display, perform, sublicense and distribute the Original - Code (or portions thereof) with or without Modifications, and/or - as part of a Larger Work; and - - (b) under Patents Claims infringed by the making, using or - selling of Original Code, to make, have made, use, practice, - sell, and offer for sale, and/or otherwise dispose of the - Original Code (or portions thereof). - - (c) the licenses granted in this Section 2.1(a) and (b) are - effective on the date Initial Developer first distributes - Original Code under the terms of this License. - - (d) Notwithstanding Section 2.1(b) above, no patent license is - granted: 1) for code that You delete from the Original Code; 2) - separate from the Original Code; or 3) for infringements caused - by: i) the modification of the Original Code or ii) the - combination of the Original Code with other software or devices. - - 2.2. Contributor Grant. - Subject to third party intellectual property claims, each Contributor - hereby grants You a world-wide, royalty-free, non-exclusive license - - (a) under intellectual property rights (other than patent or - trademark) Licensable by Contributor, to use, reproduce, modify, - display, perform, sublicense and distribute the Modifications - created by such Contributor (or portions thereof) either on an - unmodified basis, with other Modifications, as Covered Code - and/or as part of a Larger Work; and - - (b) under Patent Claims infringed by the making, using, or - selling of Modifications made by that Contributor either alone - and/or in combination with its Contributor Version (or portions - of such combination), to make, use, sell, offer for sale, have - made, and/or otherwise dispose of: 1) Modifications made by that - Contributor (or portions thereof); and 2) the combination of - Modifications made by that Contributor with its Contributor - Version (or portions of such combination). - - (c) the licenses granted in Sections 2.2(a) and 2.2(b) are - effective on the date Contributor first makes Commercial Use of - the Covered Code. - - (d) Notwithstanding Section 2.2(b) above, no patent license is - granted: 1) for any code that Contributor has deleted from the - Contributor Version; 2) separate from the Contributor Version; - 3) for infringements caused by: i) third party modifications of - Contributor Version or ii) the combination of Modifications made - by that Contributor with other software (except as part of the - Contributor Version) or other devices; or 4) under Patent Claims - infringed by Covered Code in the absence of Modifications made by - that Contributor. - -3. Distribution Obligations. - - 3.1. Application of License. - The Modifications which You create or to which You contribute are - governed by the terms of this License, including without limitation - Section 2.2. The Source Code version of Covered Code may be - distributed only under the terms of this License or a future version - of this License released under Section 6.1, and You must include a - copy of this License with every copy of the Source Code You - distribute. You may not offer or impose any terms on any Source Code - version that alters or restricts the applicable version of this - License or the recipients' rights hereunder. However, You may include - an additional document offering the additional rights described in - Section 3.5. - - 3.2. Availability of Source Code. - Any Modification which You create or to which You contribute must be - made available in Source Code form under the terms of this License - either on the same media as an Executable version or via an accepted - Electronic Distribution Mechanism to anyone to whom you made an - Executable version available; and if made available via Electronic - Distribution Mechanism, must remain available for at least twelve (12) - months after the date it initially became available, or at least six - (6) months after a subsequent version of that particular Modification - has been made available to such recipients. You are responsible for - ensuring that the Source Code version remains available even if the - Electronic Distribution Mechanism is maintained by a third party. - - 3.3. Description of Modifications. - You must cause all Covered Code to which You contribute to contain a - file documenting the changes You made to create that Covered Code and - the date of any change. You must include a prominent statement that - the Modification is derived, directly or indirectly, from Original - Code provided by the Initial Developer and including the name of the - Initial Developer in (a) the Source Code, and (b) in any notice in an - Executable version or related documentation in which You describe the - origin or ownership of the Covered Code. - - 3.4. Intellectual Property Matters - (a) Third Party Claims. - If Contributor has knowledge that a license under a third party's - intellectual property rights is required to exercise the rights - granted by such Contributor under Sections 2.1 or 2.2, - Contributor must include a text file with the Source Code - distribution titled "LEGAL" which describes the claim and the - party making the claim in sufficient detail that a recipient will - know whom to contact. If Contributor obtains such knowledge after - the Modification is made available as described in Section 3.2, - Contributor shall promptly modify the LEGAL file in all copies - Contributor makes available thereafter and shall take other steps - (such as notifying appropriate mailing lists or newsgroups) - reasonably calculated to inform those who received the Covered - Code that new knowledge has been obtained. - - (b) Contributor APIs. - If Contributor's Modifications include an application programming - interface and Contributor has knowledge of patent licenses which - are reasonably necessary to implement that API, Contributor must - also include this information in the LEGAL file. - - (c) Representations. - Contributor represents that, except as disclosed pursuant to - Section 3.4(a) above, Contributor believes that Contributor's - Modifications are Contributor's original creation(s) and/or - Contributor has sufficient rights to grant the rights conveyed by - this License. - - 3.5. Required Notices. - You must duplicate the notice in Exhibit A in each file of the Source - Code. If it is not possible to put such notice in a particular Source - Code file due to its structure, then You must include such notice in a - location (such as a relevant directory) where a user would be likely - to look for such a notice. If You created one or more Modification(s) - You may add your name as a Contributor to the notice described in - Exhibit A. You must also duplicate this License in any documentation - for the Source Code where You describe recipients' rights or ownership - rights relating to Covered Code. You may choose to offer, and to - charge a fee for, warranty, support, indemnity or liability - obligations to one or more recipients of Covered Code. However, You - may do so only on Your own behalf, and not on behalf of the Initial - Developer or any Contributor. You must make it absolutely clear than - any such warranty, support, indemnity or liability obligation is - offered by You alone, and You hereby agree to indemnify the Initial - Developer and every Contributor for any liability incurred by the - Initial Developer or such Contributor as a result of warranty, - support, indemnity or liability terms You offer. - - 3.6. Distribution of Executable Versions. - You may distribute Covered Code in Executable form only if the - requirements of Section 3.1-3.5 have been met for that Covered Code, - and if You include a notice stating that the Source Code version of - the Covered Code is available under the terms of this License, - including a description of how and where You have fulfilled the - obligations of Section 3.2. The notice must be conspicuously included - in any notice in an Executable version, related documentation or - collateral in which You describe recipients' rights relating to the - Covered Code. You may distribute the Executable version of Covered - Code or ownership rights under a license of Your choice, which may - contain terms different from this License, provided that You are in - compliance with the terms of this License and that the license for the - Executable version does not attempt to limit or alter the recipient's - rights in the Source Code version from the rights set forth in this - License. If You distribute the Executable version under a different - license You must make it absolutely clear that any terms which differ - from this License are offered by You alone, not by the Initial - Developer or any Contributor. You hereby agree to indemnify the - Initial Developer and every Contributor for any liability incurred by - the Initial Developer or such Contributor as a result of any such - terms You offer. - - 3.7. Larger Works. - You may create a Larger Work by combining Covered Code with other code - not governed by the terms of this License and distribute the Larger - Work as a single product. In such a case, You must make sure the - requirements of this License are fulfilled for the Covered Code. - -4. Inability to Comply Due to Statute or Regulation. - - If it is impossible for You to comply with any of the terms of this - License with respect to some or all of the Covered Code due to - statute, judicial order, or regulation then You must: (a) comply with - the terms of this License to the maximum extent possible; and (b) - describe the limitations and the code they affect. Such description - must be included in the LEGAL file described in Section 3.4 and must - be included with all distributions of the Source Code. Except to the - extent prohibited by statute or regulation, such description must be - sufficiently detailed for a recipient of ordinary skill to be able to - understand it. - -5. Application of this License. - - This License applies to code to which the Initial Developer has - attached the notice in Exhibit A and to related Covered Code. - -6. Versions of the License. - - 6.1. New Versions. - Netscape Communications Corporation ("Netscape") may publish revised - and/or new versions of the License from time to time. Each version - will be given a distinguishing version number. - - 6.2. Effect of New Versions. - Once Covered Code has been published under a particular version of the - License, You may always continue to use it under the terms of that - version. You may also choose to use such Covered Code under the terms - of any subsequent version of the License published by Netscape. No one - other than Netscape has the right to modify the terms applicable to - Covered Code created under this License. - - 6.3. Derivative Works. - If You create or use a modified version of this License (which you may - only do in order to apply it to code which is not already Covered Code - governed by this License), You must (a) rename Your license so that - the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape", - "MPL", "NPL" or any confusingly similar phrase do not appear in your - license (except to note that your license differs from this License) - and (b) otherwise make it clear that Your version of the license - contains terms which differ from the Mozilla Public License and - Netscape Public License. (Filling in the name of the Initial - Developer, Original Code or Contributor in the notice described in - Exhibit A shall not of themselves be deemed to be modifications of - this License.) - -7. DISCLAIMER OF WARRANTY. - - COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, - WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, - WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF - DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. - THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE - IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, - YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE - COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER - OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF - ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. - -8. TERMINATION. - - 8.1. This License and the rights granted hereunder will terminate - automatically if You fail to comply with terms herein and fail to cure - such breach within 30 days of becoming aware of the breach. All - sublicenses to the Covered Code which are properly granted shall - survive any termination of this License. Provisions which, by their - nature, must remain in effect beyond the termination of this License - shall survive. - - 8.2. If You initiate litigation by asserting a patent infringement - claim (excluding declatory judgment actions) against Initial Developer - or a Contributor (the Initial Developer or Contributor against whom - You file such action is referred to as "Participant") alleging that: - - (a) such Participant's Contributor Version directly or indirectly - infringes any patent, then any and all rights granted by such - Participant to You under Sections 2.1 and/or 2.2 of this License - shall, upon 60 days notice from Participant terminate prospectively, - unless if within 60 days after receipt of notice You either: (i) - agree in writing to pay Participant a mutually agreeable reasonable - royalty for Your past and future use of Modifications made by such - Participant, or (ii) withdraw Your litigation claim with respect to - the Contributor Version against such Participant. If within 60 days - of notice, a reasonable royalty and payment arrangement are not - mutually agreed upon in writing by the parties or the litigation claim - is not withdrawn, the rights granted by Participant to You under - Sections 2.1 and/or 2.2 automatically terminate at the expiration of - the 60 day notice period specified above. - - (b) any software, hardware, or device, other than such Participant's - Contributor Version, directly or indirectly infringes any patent, then - any rights granted to You by such Participant under Sections 2.1(b) - and 2.2(b) are revoked effective as of the date You first made, used, - sold, distributed, or had made, Modifications made by that - Participant. - - 8.3. If You assert a patent infringement claim against Participant - alleging that such Participant's Contributor Version directly or - indirectly infringes any patent where such claim is resolved (such as - by license or settlement) prior to the initiation of patent - infringement litigation, then the reasonable value of the licenses - granted by such Participant under Sections 2.1 or 2.2 shall be taken - into account in determining the amount or value of any payment or - license. - - 8.4. In the event of termination under Sections 8.1 or 8.2 above, - all end user license agreements (excluding distributors and resellers) - which have been validly granted by You or any distributor hereunder - prior to termination shall survive termination. - -9. LIMITATION OF LIABILITY. - - UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT - (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL - DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, - OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR - ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY - CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, - WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER - COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN - INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF - LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY - RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW - PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE - EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO - THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. - -10. U.S. GOVERNMENT END USERS. - - The Covered Code is a "commercial item," as that term is defined in - 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer - software" and "commercial computer software documentation," as such - terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 - C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), - all U.S. Government End Users acquire Covered Code with only those - rights set forth herein. - -11. MISCELLANEOUS. - - This License represents the complete agreement concerning subject - matter hereof. If any provision of this License is held to be - unenforceable, such provision shall be reformed only to the extent - necessary to make it enforceable. This License shall be governed by - California law provisions (except to the extent applicable law, if - any, provides otherwise), excluding its conflict-of-law provisions. - With respect to disputes in which at least one party is a citizen of, - or an entity chartered or registered to do business in the United - States of America, any litigation relating to this License shall be - subject to the jurisdiction of the Federal Courts of the Northern - District of California, with venue lying in Santa Clara County, - California, with the losing party responsible for costs, including - without limitation, court costs and reasonable attorneys' fees and - expenses. The application of the United Nations Convention on - Contracts for the International Sale of Goods is expressly excluded. - Any law or regulation which provides that the language of a contract - shall be construed against the drafter shall not apply to this - License. - -12. RESPONSIBILITY FOR CLAIMS. - - As between Initial Developer and the Contributors, each party is - responsible for claims and damages arising, directly or indirectly, - out of its utilization of rights under this License and You agree to - work with Initial Developer and Contributors to distribute such - responsibility on an equitable basis. Nothing herein is intended or - shall be deemed to constitute any admission of liability. - -13. MULTIPLE-LICENSED CODE. - - Initial Developer may designate portions of the Covered Code as - "Multiple-Licensed". "Multiple-Licensed" means that the Initial - Developer permits you to utilize portions of the Covered Code under - Your choice of the NPL or the alternative licenses, if any, specified - by the Initial Developer in the file described in Exhibit A. - -EXHIBIT A -Mozilla Public License. - - ``The contents of this file are subject to the Mozilla Public License - Version 1.1 (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.mozilla.org/MPL/ - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the - License for the specific language governing rights and limitations - under the License. - - The Original Code is ______________________________________. - - The Initial Developer of the Original Code is ________________________. - Portions created by ______________________ are Copyright (C) ______ - _______________________. All Rights Reserved. - - Contributor(s): ______________________________________. - - Alternatively, the contents of this file may be used under the terms - of the _____ license (the "[___] License"), in which case the - provisions of [______] License are applicable instead of those - above. If you wish to allow use of your version of this file only - under the terms of the [____] License and not to allow others to use - your version of this file under the MPL, indicate your decision by - deleting the provisions above and replace them with the notice and - other provisions required by the [___] License. If you do not delete - the provisions above, a recipient may use your version of this file - under either the MPL or the [___] License." - - [NOTE: The text of this Exhibit A may differ slightly from the text of - the notices in the Source Code files of the Original Code. You should - use the text of this Exhibit A rather than the text found in the - Original Code Source Code for Your Modifications.] - diff --git a/org.eclipse.m2e.archetype.common/about_files/dom4j-LICENSE.txt b/org.eclipse.m2e.archetype.common/about_files/dom4j-LICENSE.txt deleted file mode 100644 index 7cae050c..00000000 --- a/org.eclipse.m2e.archetype.common/about_files/dom4j-LICENSE.txt +++ /dev/null @@ -1,40 +0,0 @@ -Copyright 2001-2005 (C) MetaStuff, Ltd. All Rights Reserved. - -Redistribution and use of this software and associated documentation -("Software"), with or without modification, are permitted provided -that the following conditions are met: - -1. Redistributions of source code must retain copyright - statements and notices. Redistributions must also contain a - copy of this document. - -2. Redistributions in binary form must reproduce the - above copyright notice, this list of conditions and the - following disclaimer in the documentation and/or other - materials provided with the distribution. - -3. The name "DOM4J" must not be used to endorse or promote - products derived from this Software without prior written - permission of MetaStuff, Ltd. For written permission, - please contact dom4j-info@metastuff.com. - -4. Products derived from this Software may not be called "DOM4J" - nor may "DOM4J" appear in their names without prior written - permission of MetaStuff, Ltd. DOM4J is a registered - trademark of MetaStuff, Ltd. - -5. Due credit should be given to the DOM4J Project - - http://www.dom4j.org - -THIS SOFTWARE IS PROVIDED BY METASTUFF, LTD. AND CONTRIBUTORS -``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT -NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL -METASTUFF, LTD. OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/org.eclipse.m2e.archetype.common/about_files/jdom-LICENSE.txt b/org.eclipse.m2e.archetype.common/about_files/jdom-LICENSE.txt deleted file mode 100644 index d1d6d0d8..00000000 --- a/org.eclipse.m2e.archetype.common/about_files/jdom-LICENSE.txt +++ /dev/null @@ -1,56 +0,0 @@ -/*-- - - $Id: LICENSE.txt,v 1.1.2.1 2008/01/02 02:20:40 jhuang Exp $ - - Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin. - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions, and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions, and the disclaimer that follows - these conditions in the documentation and/or other materials - provided with the distribution. - - 3. The name "JDOM" must not be used to endorse or promote products - derived from this software without prior written permission. For - written permission, please contact <request_AT_jdom_DOT_org>. - - 4. Products derived from this software may not be called "JDOM", nor - may "JDOM" appear in their name, without prior written permission - from the JDOM Project Management <request_AT_jdom_DOT_org>. - - In addition, we request (but do not require) that you include in the - end-user documentation provided with the redistribution and/or in the - software itself an acknowledgement equivalent to the following: - "This product includes software developed by the - JDOM Project (http://www.jdom.org/)." - Alternatively, the acknowledgment may be graphical using the logos - available at http://www.jdom.org/images/logos. - - THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT - CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - SUCH DAMAGE. - - This software consists of voluntary contributions made by many - individuals on behalf of the JDOM Project and was originally - created by Jason Hunter <jhunter_AT_jdom_DOT_org> and - Brett McLaughlin <brett_AT_jdom_DOT_org>. For more information - on the JDOM Project, please see <http://www.jdom.org/>. - - */ - diff --git a/org.eclipse.m2e.archetype.common/build.properties b/org.eclipse.m2e.archetype.common/build.properties deleted file mode 100644 index 3d8fb1f1..00000000 --- a/org.eclipse.m2e.archetype.common/build.properties +++ /dev/null @@ -1,16 +0,0 @@ -# -# Copyright (c) 2008-2010 Sonatype, Inc. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# Sonatype, Inc. - initial API and implementation -# - -bin.includes = META-INF/,\ - jars/,\ - OSGI-INF/l10n/bundle.properties,\ - about.html,\ - about_files/ diff --git a/org.eclipse.m2e.archetype.common/jars/archetype-common-2.0-alpha-4.jar b/org.eclipse.m2e.archetype.common/jars/archetype-common-2.0-alpha-4.jar Binary files differdeleted file mode 100644 index 32dfddb1..00000000 --- a/org.eclipse.m2e.archetype.common/jars/archetype-common-2.0-alpha-4.jar +++ /dev/null diff --git a/org.eclipse.m2e.archetype.common/jars/commons-collections-3.2.jar b/org.eclipse.m2e.archetype.common/jars/commons-collections-3.2.jar Binary files differdeleted file mode 100644 index 75580be2..00000000 --- a/org.eclipse.m2e.archetype.common/jars/commons-collections-3.2.jar +++ /dev/null diff --git a/org.eclipse.m2e.archetype.common/jars/commons-io-1.3.2.jar b/org.eclipse.m2e.archetype.common/jars/commons-io-1.3.2.jar Binary files differdeleted file mode 100644 index 865c9e41..00000000 --- a/org.eclipse.m2e.archetype.common/jars/commons-io-1.3.2.jar +++ /dev/null diff --git a/org.eclipse.m2e.archetype.common/jars/commons-lang-2.1.jar b/org.eclipse.m2e.archetype.common/jars/commons-lang-2.1.jar Binary files differdeleted file mode 100644 index 87b80ab5..00000000 --- a/org.eclipse.m2e.archetype.common/jars/commons-lang-2.1.jar +++ /dev/null diff --git a/org.eclipse.m2e.archetype.common/jars/dom4j-1.6.1.jar b/org.eclipse.m2e.archetype.common/jars/dom4j-1.6.1.jar Binary files differdeleted file mode 100644 index c8c4dbb9..00000000 --- a/org.eclipse.m2e.archetype.common/jars/dom4j-1.6.1.jar +++ /dev/null diff --git a/org.eclipse.m2e.archetype.common/jars/jchardet-1.0.jar b/org.eclipse.m2e.archetype.common/jars/jchardet-1.0.jar Binary files differdeleted file mode 100644 index c362d03c..00000000 --- a/org.eclipse.m2e.archetype.common/jars/jchardet-1.0.jar +++ /dev/null diff --git a/org.eclipse.m2e.archetype.common/jars/jdom-1.0.jar b/org.eclipse.m2e.archetype.common/jars/jdom-1.0.jar Binary files differdeleted file mode 100644 index 288e64cb..00000000 --- a/org.eclipse.m2e.archetype.common/jars/jdom-1.0.jar +++ /dev/null diff --git a/org.eclipse.m2e.archetype.common/jars/oro-2.0.8.jar b/org.eclipse.m2e.archetype.common/jars/oro-2.0.8.jar Binary files differdeleted file mode 100644 index 23488d26..00000000 --- a/org.eclipse.m2e.archetype.common/jars/oro-2.0.8.jar +++ /dev/null diff --git a/org.eclipse.m2e.archetype.common/jars/plexus-velocity-1.1.3.jar b/org.eclipse.m2e.archetype.common/jars/plexus-velocity-1.1.3.jar Binary files differdeleted file mode 100644 index 36bac039..00000000 --- a/org.eclipse.m2e.archetype.common/jars/plexus-velocity-1.1.3.jar +++ /dev/null diff --git a/org.eclipse.m2e.archetype.common/jars/velocity-1.5.jar b/org.eclipse.m2e.archetype.common/jars/velocity-1.5.jar Binary files differdeleted file mode 100644 index 7c7f2c43..00000000 --- a/org.eclipse.m2e.archetype.common/jars/velocity-1.5.jar +++ /dev/null diff --git a/org.eclipse.m2e.archetype.common/no-source-bundle.txt b/org.eclipse.m2e.archetype.common/no-source-bundle.txt deleted file mode 100644 index 675ce413..00000000 --- a/org.eclipse.m2e.archetype.common/no-source-bundle.txt +++ /dev/null @@ -1 +0,0 @@ -marker file used to disable source-bundle profile
\ No newline at end of file diff --git a/org.eclipse.m2e.archetype.common/pom.xml b/org.eclipse.m2e.archetype.common/pom.xml deleted file mode 100644 index 6710f905..00000000 --- a/org.eclipse.m2e.archetype.common/pom.xml +++ /dev/null @@ -1,90 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright (c) 2008 Sonatype, Inc. - All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License v1.0 - which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html ---> -<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"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.eclipse.m2e</groupId> - <artifactId>org.eclipse.m2e.parent</artifactId> - <version>1.0.100-SNAPSHOT</version> - <relativePath>../org.eclipse.m2e.parent</relativePath> - </parent> - - <artifactId>org.eclipse.m2e.archetype.common</artifactId> - <packaging>eclipse-plugin</packaging> - - <name>Maven Archetype Common Bundle</name> - - <profiles> - <profile> - <id>update-dependencies</id> - <dependencies> - <dependency> - <groupId>org.apache.maven.archetype</groupId> - <artifactId>archetype-common</artifactId> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-clean-plugin</artifactId> - <configuration> - <filesets> - <fileset> - <directory>jars</directory> - <followSymlinks>false</followSymlinks> - <includes> - <include>**/*.jar</include> - </includes> - </fileset> - <fileset> - <directory>META-INF</directory> - <followSymlinks>false</followSymlinks> - <includes> - <include>**/MANIFEST.MF</include> - </includes> - </fileset> - </filesets> - </configuration> - </plugin> - - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-packaging-plugin</artifactId> - <executions> - <execution> - <phase>process-classes</phase> - <goals> - <goal>generate-bundle</goal> - </goals> - </execution> - </executions> - <configuration> - <packageSources>false</packageSources> - <exportPackages> - org.apache.maven.archetype.* - </exportPackages> - <manifestAttributes> - <Bundle-RequiredExecutionEnvironment>J2SE-1.5, JavaSE-1.6</Bundle-RequiredExecutionEnvironment> - </manifestAttributes> - <requireBundles> - <requireBundle> - <groupId>org.eclipse.m2e</groupId> - <artifactId>org.eclipse.m2e.maven.runtime</artifactId> - <version>${maven_embedder.version}</version> - </requireBundle> - </requireBundles> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> - -</project> diff --git a/org.eclipse.m2e.core.ui/pom.xml b/org.eclipse.m2e.core.ui/pom.xml index 79c6c95d..76255d4b 100644 --- a/org.eclipse.m2e.core.ui/pom.xml +++ b/org.eclipse.m2e.core.ui/pom.xml @@ -8,25 +8,11 @@ <parent> <groupId>org.eclipse.m2e</groupId> - <artifactId>org.eclipse.m2e.parent</artifactId> + <artifactId>m2e-core</artifactId> <version>1.0.100-SNAPSHOT</version> - <relativePath>../org.eclipse.m2e.parent</relativePath> </parent> <artifactId>org.eclipse.m2e.core.ui</artifactId> <packaging>eclipse-plugin</packaging> - <build> - <sourceDirectory>src</sourceDirectory> - - <resources> - <resource> - <directory>${basedir}/src</directory> - <includes> - <include>**/*.properties</include> - </includes> - </resource> - </resources> - - </build> </project> diff --git a/org.eclipse.m2e.core/pom.xml b/org.eclipse.m2e.core/pom.xml index 11c82701..9661943b 100644 --- a/org.eclipse.m2e.core/pom.xml +++ b/org.eclipse.m2e.core/pom.xml @@ -8,9 +8,8 @@ <parent> <groupId>org.eclipse.m2e</groupId> - <artifactId>org.eclipse.m2e.parent</artifactId> + <artifactId>m2e-core</artifactId> <version>1.0.100-SNAPSHOT</version> - <relativePath>../org.eclipse.m2e.parent</relativePath> </parent> <artifactId>org.eclipse.m2e.core</artifactId> diff --git a/org.eclipse.m2e.discovery/pom.xml b/org.eclipse.m2e.discovery/pom.xml index 4dc6e72f..bec81abc 100644 --- a/org.eclipse.m2e.discovery/pom.xml +++ b/org.eclipse.m2e.discovery/pom.xml @@ -11,9 +11,8 @@ <parent> <groupId>org.eclipse.m2e</groupId> - <artifactId>org.eclipse.m2e.parent</artifactId> + <artifactId>m2e-core</artifactId> <version>1.0.100-SNAPSHOT</version> - <relativePath>../org.eclipse.m2e.parent</relativePath> </parent> <artifactId>org.eclipse.m2e.discovery</artifactId> diff --git a/org.eclipse.m2e.editor.xml/pom.xml b/org.eclipse.m2e.editor.xml/pom.xml index e52b0aee..d8241198 100644 --- a/org.eclipse.m2e.editor.xml/pom.xml +++ b/org.eclipse.m2e.editor.xml/pom.xml @@ -11,9 +11,8 @@ <parent> <groupId>org.eclipse.m2e</groupId> - <artifactId>org.eclipse.m2e.parent</artifactId> + <artifactId>m2e-core</artifactId> <version>1.0.100-SNAPSHOT</version> - <relativePath>../org.eclipse.m2e.parent</relativePath> </parent> <artifactId>org.eclipse.m2e.editor.xml</artifactId> diff --git a/org.eclipse.m2e.editor/pom.xml b/org.eclipse.m2e.editor/pom.xml index cc8e3bd2..96316e04 100644 --- a/org.eclipse.m2e.editor/pom.xml +++ b/org.eclipse.m2e.editor/pom.xml @@ -11,9 +11,8 @@ <parent> <groupId>org.eclipse.m2e</groupId> - <artifactId>org.eclipse.m2e.parent</artifactId> + <artifactId>m2e-core</artifactId> <version>1.0.100-SNAPSHOT</version> - <relativePath>../org.eclipse.m2e.parent</relativePath> </parent> <artifactId>org.eclipse.m2e.editor</artifactId> diff --git a/org.eclipse.m2e.feature/pom.xml b/org.eclipse.m2e.feature/pom.xml index 3645b502..22baac1c 100644 --- a/org.eclipse.m2e.feature/pom.xml +++ b/org.eclipse.m2e.feature/pom.xml @@ -11,9 +11,8 @@ <parent> <groupId>org.eclipse.m2e</groupId> - <artifactId>org.eclipse.m2e.parent</artifactId> + <artifactId>m2e-core</artifactId> <version>1.0.100-SNAPSHOT</version> - <relativePath>../org.eclipse.m2e.parent</relativePath> </parent> <artifactId>org.eclipse.m2e.feature</artifactId> diff --git a/org.eclipse.m2e.integration.tests.common/pom.xml b/org.eclipse.m2e.integration.tests.common/pom.xml index a1e5eba9..e4c49410 100644 --- a/org.eclipse.m2e.integration.tests.common/pom.xml +++ b/org.eclipse.m2e.integration.tests.common/pom.xml @@ -6,14 +6,14 @@ which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> -<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"> +<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"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.m2e</groupId> - <artifactId>org.eclipse.m2e.parent</artifactId> + <artifactId>m2e-core</artifactId> <version>1.0.100-SNAPSHOT</version> - <relativePath>../org.eclipse.m2e.parent</relativePath> </parent> <artifactId>org.eclipse.m2e.integration.tests.common</artifactId> @@ -21,8 +21,5 @@ <name>Maven Integration for Eclipse System Tests Common</name> - <build> - <sourceDirectory>src</sourceDirectory> - </build> </project> diff --git a/org.eclipse.m2e.jdt/pom.xml b/org.eclipse.m2e.jdt/pom.xml index 23bb22dc..8149eb6e 100644 --- a/org.eclipse.m2e.jdt/pom.xml +++ b/org.eclipse.m2e.jdt/pom.xml @@ -6,14 +6,14 @@ which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> -<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"> +<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"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.m2e</groupId> - <artifactId>org.eclipse.m2e.parent</artifactId> + <artifactId>m2e-core</artifactId> <version>1.0.100-SNAPSHOT</version> - <relativePath>../org.eclipse.m2e.parent</relativePath> </parent> <artifactId>org.eclipse.m2e.jdt</artifactId> diff --git a/org.eclipse.m2e.launching/pom.xml b/org.eclipse.m2e.launching/pom.xml index 6fac0629..664c62f6 100644 --- a/org.eclipse.m2e.launching/pom.xml +++ b/org.eclipse.m2e.launching/pom.xml @@ -6,14 +6,14 @@ which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> -<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"> +<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"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.m2e</groupId> - <artifactId>org.eclipse.m2e.parent</artifactId> + <artifactId>m2e-core</artifactId> <version>1.0.100-SNAPSHOT</version> - <relativePath>../org.eclipse.m2e.parent</relativePath> </parent> <artifactId>org.eclipse.m2e.launching</artifactId> diff --git a/org.eclipse.m2e.lifecyclemapping.defaults/pom.xml b/org.eclipse.m2e.lifecyclemapping.defaults/pom.xml index d14992d6..d639bcbd 100644 --- a/org.eclipse.m2e.lifecyclemapping.defaults/pom.xml +++ b/org.eclipse.m2e.lifecyclemapping.defaults/pom.xml @@ -9,11 +9,11 @@ <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"> <modelVersion>4.0.0</modelVersion> + <parent> - <artifactId>org.eclipse.m2e.parent</artifactId> <groupId>org.eclipse.m2e</groupId> + <artifactId>m2e-core</artifactId> <version>1.0.100-SNAPSHOT</version> - <relativePath>../org.eclipse.m2e.parent</relativePath> </parent> <artifactId>org.eclipse.m2e.lifecyclemapping.defaults</artifactId> diff --git a/org.eclipse.m2e.logback.appender/pom.xml b/org.eclipse.m2e.logback.appender/pom.xml index fa125ea5..f98aa823 100644 --- a/org.eclipse.m2e.logback.appender/pom.xml +++ b/org.eclipse.m2e.logback.appender/pom.xml @@ -10,10 +10,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>org.eclipse.m2e.parent</artifactId> <groupId>org.eclipse.m2e</groupId> + <artifactId>m2e-core</artifactId> <version>1.0.100-SNAPSHOT</version> - <relativePath>../org.eclipse.m2e.parent</relativePath> </parent> <artifactId>org.eclipse.m2e.logback.appender</artifactId> diff --git a/org.eclipse.m2e.logback.configuration/pom.xml b/org.eclipse.m2e.logback.configuration/pom.xml index 6cc56c1c..502a0de0 100644 --- a/org.eclipse.m2e.logback.configuration/pom.xml +++ b/org.eclipse.m2e.logback.configuration/pom.xml @@ -10,10 +10,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>org.eclipse.m2e.parent</artifactId> <groupId>org.eclipse.m2e</groupId> + <artifactId>m2e-core</artifactId> <version>1.0.100-SNAPSHOT</version> - <relativePath>../org.eclipse.m2e.parent</relativePath> </parent> <artifactId>org.eclipse.m2e.logback.configuration</artifactId> diff --git a/org.eclipse.m2e.logback.feature/pom.xml b/org.eclipse.m2e.logback.feature/pom.xml index 2a1f2f42..7cfc524e 100644 --- a/org.eclipse.m2e.logback.feature/pom.xml +++ b/org.eclipse.m2e.logback.feature/pom.xml @@ -6,14 +6,14 @@ which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> -<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"> +<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"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.m2e</groupId> - <artifactId>org.eclipse.m2e.parent</artifactId> + <artifactId>m2e-core</artifactId> <version>1.0.100-SNAPSHOT</version> - <relativePath>../org.eclipse.m2e.parent</relativePath> </parent> <artifactId>org.eclipse.m2e.logback.feature</artifactId> diff --git a/org.eclipse.m2e.maven.indexer/.classpath b/org.eclipse.m2e.maven.indexer/.classpath deleted file mode 100644 index c1026e8b..00000000 --- a/org.eclipse.m2e.maven.indexer/.classpath +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src/"/> - <classpathentry exported="true" kind="lib" path="jars/indexer-artifact-3.1.0.jar"/> - <classpathentry exported="true" kind="lib" path="jars/indexer-core-3.1.0.jar"/> - <classpathentry exported="true" kind="lib" path="jars/lucene-core-2.4.1.jar"/> - <classpathentry exported="true" kind="lib" path="jars/lucene-highlighter-2.4.1.jar"/> - <classpathentry kind="output" path="target/classes"/> -</classpath> diff --git a/org.eclipse.m2e.maven.indexer/.gitignore b/org.eclipse.m2e.maven.indexer/.gitignore deleted file mode 100644 index fef45dc2..00000000 --- a/org.eclipse.m2e.maven.indexer/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/target -/local-patches.jar diff --git a/org.eclipse.m2e.maven.indexer/.project b/org.eclipse.m2e.maven.indexer/.project deleted file mode 100644 index 4658209b..00000000 --- a/org.eclipse.m2e.maven.indexer/.project +++ /dev/null @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.m2e.maven.indexer</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.ManifestBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.m2e.core.maven2Builder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.m2e.core.maven2Nature</nature> - <nature>org.eclipse.pde.PluginNature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> diff --git a/org.eclipse.m2e.maven.indexer/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.maven.indexer/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index a413c41a..00000000 --- a/org.eclipse.m2e.maven.indexer/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,8 +0,0 @@ -#Thu Feb 04 10:56:12 EST 2010 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.5 diff --git a/org.eclipse.m2e.maven.indexer/META-INF/MANIFEST.MF b/org.eclipse.m2e.maven.indexer/META-INF/MANIFEST.MF deleted file mode 100644 index 395e8978..00000000 --- a/org.eclipse.m2e.maven.indexer/META-INF/MANIFEST.MF +++ /dev/null @@ -1,46 +0,0 @@ -Manifest-Version: 1.0 -Export-Package: META-INF.plexus, - org.apache.lucene, - org.apache.lucene.analysis, - org.apache.lucene.analysis.standard, - org.apache.lucene.document, - org.apache.lucene.index, - org.apache.lucene.queryParser, - org.apache.lucene.search, - org.apache.lucene.search.function, - org.apache.lucene.search.payloads, - org.apache.lucene.search.spans, - org.apache.lucene.store, - org.apache.lucene.util, - org.apache.lucene.util.cache, - org.apache.maven.index, - org.apache.maven.index.archetype, - org.apache.maven.index.artifact, - org.apache.maven.index.cli, - org.apache.maven.index.context, - org.apache.maven.index.creator, - org.apache.maven.index.fs, - org.apache.maven.index.incremental, - org.apache.maven.index.locator, - org.apache.maven.index.packer, - org.apache.maven.index.search.grouping, - org.apache.maven.index.treeview, - org.apache.maven.index.updater -Bundle-ClassPath: local-patches.jar, - jars/indexer-artifact-3.1.0.jar, - jars/indexer-core-3.1.0.jar, - jars/lucene-core-2.4.1.jar, - jars/lucene-highlighter-2.4.1.jar -Bundle-Name: %Bundle-Name -Bundle-RequiredExecutionEnvironment: J2SE-1.5, - JavaSE-1.6 -Require-Bundle: org.eclipse.m2e.maven.runtime;bundle-version="[1.0.0,1.1.0)", - org.eclipse.m2e.archetype.common;bundle-version="[1.0.0,1.1.0)" -Bundle-Vendor: %Bundle-Vendor -MavenArtifact-BaseVersion: 2.0.4-SNAPSHOT -Bundle-Version: 1.0.100.qualifier -MavenArtifact-GroupId: org.eclipse.m2e -MavenArtifact-ArtifactId: org.eclipse.m2e.maven.indexer -Bundle-ManifestVersion: 2 -Bundle-SymbolicName: org.eclipse.m2e.maven.indexer;singleton:=true - diff --git a/org.eclipse.m2e.maven.indexer/META-INF/plexus/.gitignore b/org.eclipse.m2e.maven.indexer/META-INF/plexus/.gitignore deleted file mode 100644 index e69de29b..00000000 --- a/org.eclipse.m2e.maven.indexer/META-INF/plexus/.gitignore +++ /dev/null diff --git a/org.eclipse.m2e.maven.indexer/OSGI-INF/l10n/bundle.properties b/org.eclipse.m2e.maven.indexer/OSGI-INF/l10n/bundle.properties deleted file mode 100644 index 0c9ce220..00000000 --- a/org.eclipse.m2e.maven.indexer/OSGI-INF/l10n/bundle.properties +++ /dev/null @@ -1,3 +0,0 @@ -#Properties file for org.eclipse.m2e.maven.indexer -Bundle-Vendor = Eclipse.org - m2e -Bundle-Name = Maven / Nexus Indexer Bundle
\ No newline at end of file diff --git a/org.eclipse.m2e.maven.indexer/about.html b/org.eclipse.m2e.maven.indexer/about.html deleted file mode 100644 index 68a7bd29..00000000 --- a/org.eclipse.m2e.maven.indexer/about.html +++ /dev/null @@ -1,60 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> -<title>About</title> -</head> -<body lang="EN-US"> -<h2>About This Content</h2> - -<p>June, 6 2011</p> -<h3>License</h3> - -<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise -indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. -For purposes of the EPL, "Program" will mean the Content.</p> - -<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is -being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was -provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p> - -<h3>Third Party Content</h3> - -<p> -The Content includes items that have been sourced from third parties as set out below. If you -did not receive this Content directly from the Eclipse Foundation, the following is provided -for informational purposes only, and you should look to the Redistributor’s license for -terms and conditions of use. -</p> - -<h4>Maven Indexer 3.1.0</h4> -<p> -The plug-in includes software developed by The Apache Software Foundation as part of the Maven project. -Your use of Maven Indexer 3.1.0 in binary code form contained in the plug-in is subject to the terms and conditions of the -The Apache Software License, Version 2.0 ("ASL"). -A copy of the ASL is available at <a href="http://maven.apache.org/license.html">http://maven.apache.org/license.html</a>. -(a local copy can be found <a href="about_files/LICENSE-2.0.txt">here</a>) -</p> -<p>The original binaries and source are available at the <a href="http://maven.org">Maven Central Repository</a>. - - - -<h4>Lucene 2.4.1</h4> -<p> -The plug-in includes software developed by The Apache Software Foundation as part of the Lucene project. -Your use of Lucene 2.4.1 in binary code form contained in the plug-in is subject to the terms and conditions of the -The Apache Software License, Version 2.0 ("ASL"). -A copy of the ASL is available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>. -(a local copy can be found <a href="about_files/LICENSE-2.0.txt">here</a>) -</p> -<p>The original binaries and source are available at the <a href="http://maven.org">Maven Central Repository</a>. - - -</body> -</html>
\ No newline at end of file diff --git a/org.eclipse.m2e.maven.indexer/about_files/LICENSE-2.0.txt b/org.eclipse.m2e.maven.indexer/about_files/LICENSE-2.0.txt deleted file mode 100644 index d6456956..00000000 --- a/org.eclipse.m2e.maven.indexer/about_files/LICENSE-2.0.txt +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed 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. diff --git a/org.eclipse.m2e.maven.indexer/build.properties b/org.eclipse.m2e.maven.indexer/build.properties deleted file mode 100644 index 8f6514cb..00000000 --- a/org.eclipse.m2e.maven.indexer/build.properties +++ /dev/null @@ -1,20 +0,0 @@ -# -# Copyright (c) 2008-2010 Sonatype, Inc. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# Sonatype, Inc. - initial API and implementation -# - -bin.includes = META-INF/,\ - jars/,\ - OSGI-INF/,\ - local-patches.jar,\ - about.html,\ - about_files/ -jars.compile.order = local-patches.jar -source.local-patches.jar = src/ -source.local-patches.jar = src/ diff --git a/org.eclipse.m2e.maven.indexer/jars/indexer-artifact-3.1.0.jar b/org.eclipse.m2e.maven.indexer/jars/indexer-artifact-3.1.0.jar Binary files differdeleted file mode 100644 index 40631749..00000000 --- a/org.eclipse.m2e.maven.indexer/jars/indexer-artifact-3.1.0.jar +++ /dev/null diff --git a/org.eclipse.m2e.maven.indexer/jars/indexer-core-3.1.0.jar b/org.eclipse.m2e.maven.indexer/jars/indexer-core-3.1.0.jar Binary files differdeleted file mode 100644 index 4750c371..00000000 --- a/org.eclipse.m2e.maven.indexer/jars/indexer-core-3.1.0.jar +++ /dev/null diff --git a/org.eclipse.m2e.maven.indexer/jars/lucene-core-2.4.1.jar b/org.eclipse.m2e.maven.indexer/jars/lucene-core-2.4.1.jar Binary files differdeleted file mode 100644 index a2dbdd18..00000000 --- a/org.eclipse.m2e.maven.indexer/jars/lucene-core-2.4.1.jar +++ /dev/null diff --git a/org.eclipse.m2e.maven.indexer/jars/lucene-highlighter-2.4.1.jar b/org.eclipse.m2e.maven.indexer/jars/lucene-highlighter-2.4.1.jar Binary files differdeleted file mode 100644 index ee386dac..00000000 --- a/org.eclipse.m2e.maven.indexer/jars/lucene-highlighter-2.4.1.jar +++ /dev/null diff --git a/org.eclipse.m2e.maven.indexer/no-source-bundle.txt b/org.eclipse.m2e.maven.indexer/no-source-bundle.txt deleted file mode 100644 index 675ce413..00000000 --- a/org.eclipse.m2e.maven.indexer/no-source-bundle.txt +++ /dev/null @@ -1 +0,0 @@ -marker file used to disable source-bundle profile
\ No newline at end of file diff --git a/org.eclipse.m2e.maven.indexer/pom.xml b/org.eclipse.m2e.maven.indexer/pom.xml deleted file mode 100644 index ce5db6c7..00000000 --- a/org.eclipse.m2e.maven.indexer/pom.xml +++ /dev/null @@ -1,118 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright (c) 2008 Sonatype, Inc. - All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License v1.0 - which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html ---> -<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"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.eclipse.m2e</groupId> - <artifactId>org.eclipse.m2e.parent</artifactId> - <version>1.0.100-SNAPSHOT</version> - <relativePath>../org.eclipse.m2e.parent</relativePath> - </parent> - - <artifactId>org.eclipse.m2e.maven.indexer</artifactId> - <packaging>eclipse-plugin</packaging> - - <name>Nexus Indexer Bundle</name> - - <!-- - To include new nexus-indexer, - - * run the command below from CLI (use proper Tycho version, see below) - * right-click on the project in Eclipse, PDE->Update Classpath - - /opt/maven/bin/mvn -o \ - -Dtycho.mode=maven -Pupdate-dependencies \ - clean org.eclipse.tycho:tycho-packaging-plugin:generate-bundle - --> - <profiles> - <profile> - <id>update-dependencies</id> - <dependencies> - <dependency> - <groupId>org.sonatype.nexus</groupId> - <artifactId>nexus-indexer</artifactId> - <version>${nexus_indexer.version}</version> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-clean-plugin</artifactId> - <configuration> - <filesets> - <fileset> - <directory>jars</directory> - <followSymlinks>false</followSymlinks> - <includes> - <include>**/*.jar</include> - </includes> - </fileset> - <fileset> - <directory>META-INF</directory> - <followSymlinks>false</followSymlinks> - <includes> - <include>**/MANIFEST.MF</include> - </includes> - </fileset> - </filesets> - </configuration> - </plugin> - - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-packaging-plugin</artifactId> - <executions> - <execution> - <phase>process-classes</phase> - <goals> - <goal>generate-bundle</goal> - </goals> - </execution> - </executions> - <configuration> - <packageSources>false</packageSources> - <includes> - <include> - <groupId>org.sonatype.nexus</groupId> - <artifactId>nexus-indexer</artifactId> - </include> - <include> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-core</artifactId> - </include> - </includes> - <exportPackages> - org.maven.sonatype.nexus.*, - org.apache.lucene.*, - META-INF.plexus, - </exportPackages> - <manifestAttributes> - <Bundle-RequiredExecutionEnvironment>J2SE-1.5, JavaSE-1.6</Bundle-RequiredExecutionEnvironment> - </manifestAttributes> - <requireBundles> - <requireBundle> - <groupId>org.eclipse.m2e</groupId> - <artifactId>org.eclipse.m2e.maven.runtime</artifactId> - <version>${maven_embedder.version}</version> - </requireBundle> - <requireBundle> - <groupId>org.eclipse.m2e</groupId> - <artifactId>org.eclipse.m2e.archetype_common</artifactId> - <version>${archetype_common.version}</version> - </requireBundle> - </requireBundles> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> - -</project> diff --git a/org.eclipse.m2e.maven.indexer/src/org/apache/maven/index/DefaultIndexerEngine.java b/org.eclipse.m2e.maven.indexer/src/org/apache/maven/index/DefaultIndexerEngine.java deleted file mode 100644 index 4b155c1b..00000000 --- a/org.eclipse.m2e.maven.indexer/src/org/apache/maven/index/DefaultIndexerEngine.java +++ /dev/null @@ -1,184 +0,0 @@ -/** - * 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. - */ -package org.apache.maven.index; - -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; -import java.util.Set; - -import org.apache.lucene.document.Document; -import org.apache.lucene.document.Field; -import org.apache.lucene.document.Fieldable; -import org.apache.lucene.index.IndexWriter; -import org.apache.lucene.index.Term; -import org.apache.lucene.search.IndexSearcher; -import org.apache.lucene.search.TermQuery; -import org.apache.lucene.search.TopDocs; -import org.apache.maven.index.context.IndexingContext; -import org.apache.maven.index.creator.MinimalArtifactInfoIndexCreator; -import org.codehaus.plexus.component.annotations.Component; -import org.codehaus.plexus.logging.AbstractLogEnabled; - -/** - * A default {@link IndexerEngine} implementation. - * - * @author Tamas Cservenak - */ -@Component( role = IndexerEngine.class ) -public class DefaultIndexerEngine - extends AbstractLogEnabled - implements IndexerEngine -{ - - public void index( IndexingContext context, ArtifactContext ac ) - throws IOException - { - // skip artifacts not obeying repository layout (whether m1 or m2) - if ( ac != null && ac.getGav() != null ) - { - Document d = ac.createDocument( context ); - - if ( d != null ) - { - context.getIndexWriter().addDocument( d ); - - context.updateTimestamp(); - } - } - } - - public void update( IndexingContext context, ArtifactContext ac ) - throws IOException - { - Document d = ac.createDocument( context ); - - if ( d != null ) - { - Document old = getOldDocument( context, ac ); - - if ( !equals(d, old) ) - { - IndexWriter w = context.getIndexWriter(); - - w.updateDocument( new Term( ArtifactInfo.UINFO, ac.getArtifactInfo().getUinfo() ), d ); - - updateGroups( context, ac ); - - w.commit(); - - context.updateTimestamp(); - } - } - } - - private boolean equals( Document d1, Document d2 ) - { - if ( d1 == null && d2 == null ) - { - return true; - } - if ( d1 == null || d2 == null ) - { - return false; - } - - Map<String, String> m1 = toMap( d1 ); - Map<String, String> m2 = toMap( d2 ); - - m1.remove( MinimalArtifactInfoIndexCreator.FLD_LAST_MODIFIED.getKey() ); - m2.remove( MinimalArtifactInfoIndexCreator.FLD_LAST_MODIFIED.getKey() ); - - return m1.equals( m2 ); - } - - private Map<String, String> toMap( Document d ) - { - final HashMap<String, String> result = new HashMap<String, String>(); - - for ( Object o : d.getFields() ) - { - Fieldable f = (Fieldable) o; - if ( f.isStored() ) - { - result.put( f.name(), f.stringValue() ); - } - } - - return result; - } - - private Document getOldDocument( IndexingContext context, ArtifactContext ac ) - { - try - { - IndexSearcher indexSearcher = context.getIndexSearcher(); - TopDocs result = - indexSearcher.search( new TermQuery( new Term( ArtifactInfo.UINFO, ac.getArtifactInfo().getUinfo() ) ), - 2 ); - if ( result.totalHits == 1 ) - { - return indexSearcher.doc( result.scoreDocs[0].doc ); - } - } - catch ( IOException e ) - { - } - return null; - } - - private void updateGroups( IndexingContext context, ArtifactContext ac ) - throws IOException - { - String rootGroup = ac.getArtifactInfo().getRootGroup(); - Set<String> rootGroups = context.getRootGroups(); - if ( !rootGroups.contains( rootGroup ) ) - { - rootGroups.add( rootGroup ); - context.setRootGroups( rootGroups ); - } - - Set<String> allGroups = context.getAllGroups(); - if ( !allGroups.contains( ac.getArtifactInfo().groupId ) ) - { - allGroups.add( ac.getArtifactInfo().groupId ); - context.setAllGroups( allGroups ); - } - } - - public void remove( IndexingContext context, ArtifactContext ac ) - throws IOException - { - if ( ac != null ) - { - String uinfo = ac.getArtifactInfo().getUinfo(); - // add artifact deletion marker - Document doc = new Document(); - doc.add( new Field( ArtifactInfo.DELETED, uinfo, Field.Store.YES, Field.Index.NO ) ); - doc.add( new Field( ArtifactInfo.LAST_MODIFIED, // - Long.toString( System.currentTimeMillis() ), Field.Store.YES, Field.Index.NO ) ); - IndexWriter w = context.getIndexWriter(); - w.addDocument( doc ); - w.deleteDocuments( new Term( ArtifactInfo.UINFO, uinfo ) ); - w.commit(); - context.updateTimestamp(); - } - } - -} diff --git a/org.eclipse.m2e.maven.runtime/.classpath b/org.eclipse.m2e.maven.runtime/.classpath deleted file mode 100644 index 1e696db0..00000000 --- a/org.eclipse.m2e.maven.runtime/.classpath +++ /dev/null @@ -1,50 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src/maven-3.0.3"/> - <classpathentry kind="src" path="src/aether-1.12"/> - <classpathentry exported="true" kind="lib" path="jars/maven-embedder-3.0.2.jar"/> - <classpathentry exported="true" kind="lib" path="jars/maven-settings-3.0.2.jar"/> - <classpathentry exported="true" kind="lib" path="jars/maven-plugin-api-3.0.2.jar"/> - <classpathentry exported="true" kind="lib" path="jars/maven-model-builder-3.0.2.jar"/> - <classpathentry exported="true" kind="lib" path="jars/plexus-sec-dispatcher-1.3.jar"/> - <classpathentry exported="true" kind="lib" path="jars/plexus-cipher-1.4.jar"/> - <classpathentry exported="true" kind="lib" path="jars/maven-core-3.0.2.jar"/> - <classpathentry exported="true" kind="lib" path="jars/maven-model-3.0.2.jar"/> - <classpathentry exported="true" kind="lib" path="jars/maven-settings-builder-3.0.2.jar"/> - <classpathentry exported="true" kind="lib" path="jars/maven-repository-metadata-3.0.2.jar"/> - <classpathentry exported="true" kind="lib" path="jars/maven-artifact-3.0.2.jar"/> - <classpathentry exported="true" kind="lib" path="jars/maven-aether-provider-3.0.2.jar"/> - <classpathentry exported="true" kind="lib" path="jars/plexus-interpolation-1.14.jar"/> - <classpathentry exported="true" kind="lib" path="jars/maven-compat-3.0.2.jar"/> - <classpathentry exported="true" kind="lib" path="jars/commons-cli-1.2.jar"/> - <classpathentry exported="true" kind="lib" path="jars/wagon-file-1.0-beta-7.jar"/> - <classpathentry exported="true" kind="lib" path="jars/guice-plexus-shim-2.0.0.jar"/> - <classpathentry exported="true" kind="lib" path="jars/plexus-component-annotations-1.5.5.jar"/> - <classpathentry exported="true" kind="lib" path="jars/javax.inject-1.jar"/> - <classpathentry exported="true" kind="lib" path="jars/guice-bean-reflect-2.0.0.jar"/> - <classpathentry exported="true" kind="lib" path="jars/guice-bean-inject-2.0.0.jar"/> - <classpathentry exported="true" kind="lib" path="jars/guice-bean-locators-2.0.0.jar"/> - <classpathentry exported="true" kind="lib" path="jars/guice-bean-binders-2.0.0.jar"/> - <classpathentry exported="true" kind="lib" path="jars/guice-bean-scanners-2.0.0.jar"/> - <classpathentry exported="true" kind="lib" path="jars/guice-bean-converters-2.0.0.jar"/> - <classpathentry exported="true" kind="lib" path="jars/guice-plexus-metadata-2.0.0.jar"/> - <classpathentry exported="true" kind="lib" path="jars/guice-plexus-converters-2.0.0.jar"/> - <classpathentry exported="true" kind="lib" path="jars/guice-plexus-locators-2.0.0.jar"/> - <classpathentry exported="true" kind="lib" path="jars/guice-plexus-binders-2.0.0.jar"/> - <classpathentry exported="true" kind="lib" path="jars/guice-plexus-scanners-2.0.0.jar"/> - <classpathentry exported="true" kind="lib" path="jars/plexus-classworlds-2.4.jar"/> - <classpathentry exported="true" kind="lib" path="jars/plexus-utils-2.0.6.jar"/> - <classpathentry exported="true" kind="lib" path="jars/sisu-guice-2.9.4-no_aop.jar"/> - <classpathentry exported="true" kind="lib" path="jars/plexus-build-api-0.0.7.jar"/> - <classpathentry exported="true" kind="lib" path="jars/aether-connector-wagon-1.11.jar"/> - <classpathentry exported="true" kind="lib" path="jars/aether-api-1.11.jar"/> - <classpathentry exported="true" kind="lib" path="jars/aether-spi-1.11.jar"/> - <classpathentry exported="true" kind="lib" path="jars/aether-util-1.11.jar"/> - <classpathentry exported="true" kind="lib" path="jars/wagon-provider-api-1.0-beta-6.jar"/> - <classpathentry exported="true" kind="lib" path="jars/aether-impl-1.11.jar"/> - <classpathentry exported="true" kind="lib" path="jars/aether-connector-asynchttpclient-1.11.jar"/> - <classpathentry exported="true" kind="lib" path="jars/wagon-ahc-1.2.0.jar"/> - <classpathentry kind="output" path="target/classes"/> -</classpath> diff --git a/org.eclipse.m2e.maven.runtime/.gitignore b/org.eclipse.m2e.maven.runtime/.gitignore deleted file mode 100644 index fef45dc2..00000000 --- a/org.eclipse.m2e.maven.runtime/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/target -/local-patches.jar diff --git a/org.eclipse.m2e.maven.runtime/.project b/org.eclipse.m2e.maven.runtime/.project deleted file mode 100644 index 7001b560..00000000 --- a/org.eclipse.m2e.maven.runtime/.project +++ /dev/null @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.m2e.maven.runtime</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.ManifestBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.m2e.core.maven2Builder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.m2e.core.maven2Nature</nature> - <nature>org.eclipse.pde.PluginNature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> diff --git a/org.eclipse.m2e.maven.runtime/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.maven.runtime/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index b4fff146..00000000 --- a/org.eclipse.m2e.maven.runtime/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,9 +0,0 @@ -#Fri Aug 27 20:06:11 CEST 2010 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.5 diff --git a/org.eclipse.m2e.maven.runtime/META-INF/MANIFEST.MF b/org.eclipse.m2e.maven.runtime/META-INF/MANIFEST.MF deleted file mode 100644 index 218957b0..00000000 --- a/org.eclipse.m2e.maven.runtime/META-INF/MANIFEST.MF +++ /dev/null @@ -1,149 +0,0 @@ -Manifest-Version: 1.0 -Export-Package: org.codehaus.plexus.component.factory,org.sonatype.aet - her.util.filter,org.sonatype.aether.util.version,org.sonatype.aether, - org.sonatype.aether.metadata,org.apache.maven.toolchain.model.io.xpp3 - ,org.apache.maven.artifact.repository.metadata,org.sonatype.aether.co - llection,org.codehaus.plexus.configuration.xml,org.apache.maven.artif - act.installer,org.sonatype.aether.connector.wagon,com.google.inject.i - nternal,org.codehaus.plexus.util,org.codehaus.plexus.util.dag,org.cod - ehaus.plexus,org.apache.maven.wagon.providers.file,org.apache.maven.a - rtifact.metadata,org.apache.maven.model.inheritance,org.sonatype.aeth - er.spi.connector,org.apache.maven.artifact.repository.metadata.io,org - .apache.maven.model.profile,org.apache.maven.wagon.repository,org.apa - che.maven.repository.legacy.resolver.transform,org.apache.maven.model - .management,org.sonatype.aether.util.graph.selector,org.apache.maven. - repository,org.apache.maven.wagon.resource,org.codehaus.plexus.interp - olation.object,org.sonatype.aether.repository,org.apache.maven.artifa - ct.repository.metadata.io.xpp3,org.apache.maven.monitor.logging,org.a - pache.maven.classrealm,org.apache.maven.repository.legacy.resolver,or - g.apache.maven.wagon,org.sonatype.aether.util.graph,org.apache.maven. - reporting,org.codehaus.plexus.classworlds.strategy,org.sonatype.aethe - r.util,org.codehaus.plexus.logging.console,org.codehaus.plexus.compon - ent,org.apache.maven.usability.plugin.io.xpp3,org.apache.maven.settin - gs.validation,org.codehaus.plexus.component.configurator,org.apache.m - aven.model.resolution,org.sonatype.aether.spi.locator,org.sonatype.pl - exus.components.sec.dispatcher.model.io.xpp3,org.apache.maven.reposit - ory.legacy.metadata,org.apache.maven.artifact.repository.layout,org.c - odehaus.plexus.util.reflection,org.apache.maven.lifecycle,com.google. - inject.internal.util,org.sonatype.aether.util.graph.transformer,org.c - odehaus.plexus.util.xml,org.sonatype.aether.spi.localrepo,org.sonatyp - e.plexus.build.incremental,org.apache.maven.artifact.resolver,org.cod - ehaus.plexus.interpolation.reflection,org.apache.maven.plugin.interna - l,org.apache.maven.settings,org.sonatype.aether.impl,org.apache.maven - .toolchain,org.sonatype.aether.spi.io,org.apache.maven.model.profile. - activation,org.apache.maven.properties.internal,org.apache.maven.mode - l.building,org.sonatype.aether.util.concurrency,org.apache.maven.repo - sitory.legacy.repository,org.codehaus.plexus.util.xml.pull,org.codeha - us.plexus.util.introspection,org.apache.maven.artifact.handler.manage - r,org.apache.maven.cli,org.apache.maven.lifecycle.mapping,org.apache. - maven.plugin.version.internal,org.apache.maven.profiles.io.xpp3,org.s - onatype.aether.installation,org.codehaus.plexus.component.repository. - exception,org.sonatype.aether.connector.async,org.apache.maven.wagon. - authorization,org.apache.maven.plugin.lifecycle,org.codehaus.plexus.c - omponent.configurator.converters.special,org.apache.maven.plugin.life - cycle.io.xpp3,org.codehaus.plexus.configuration,org.codehaus.plexus.u - til.cli.shell,org.apache.maven.messages,org.apache.maven.model,org.ap - ache.maven.artifact.factory,org.apache.maven.repository.legacy,org.ap - ache.maven.settings.crypto,org.codehaus.plexus.component.repository,o - rg.apache.maven.wagon.proxy,com.google.inject,org.apache.maven.wagon. - events,org.apache.maven.toolchain.java,org.codehaus.plexus.util.cli,o - rg.sonatype.aether.transfer,org.apache.maven.model.plugin,org.apache. - maven.exception,org.codehaus.plexus.component.configurator.converters - ,org.apache.maven.plugin.logging,org.apache.maven.plugin.prefix.inter - nal,org.apache.maven.plugin.descriptor,org.sonatype.aether.version,or - g.apache.maven.usability.plugin,org.apache.maven.configuration.intern - al,org.apache.maven.artifact.versioning,org.codehaus.plexus.interpola - tion,org.codehaus.plexus.logging,org.apache.maven.profiles,org.apache - .maven.repository.internal,org.apache.maven.model.locator,org.apache. - maven.eventspy,org.apache.maven.model.validation,org.sonatype.aether. - util.repository,org.apache.maven.model.normalization,org.sonatype.aet - her.util.layout,org.apache.maven.artifact.resolver.filter,org.apache. - maven.model.superpom,org.codehaus.plexus.interpolation.multi,org.apac - he.maven.execution,org.sonatype.aether.artifact,org.apache.maven.arti - fact.repository,org.sonatype.aether.util.metadata,org.codehaus.plexus - .personality.plexus.lifecycle.phase,org.codehaus.plexus.component.con - figurator.converters.lookup,org.apache.maven.plugin.version,org.apach - e.maven.artifact.deployer,org.sonatype.aether.spi.log,org.apache.mave - n.settings.io,org.apache.maven.profiles.activation,META-INF.plexus,or - g.apache.maven.settings.io.xpp3,org.codehaus.plexus.interpolation.uti - l,org.apache.maven.project.validation,org.apache.maven.artifact.handl - er,org.apache.maven.model.interpolation,org.sonatype.aether.util.grap - h.manager,org.apache.maven.wagon.authentication,org.apache.maven.sett - ings.merge,org.codehaus.plexus.component.configurator.converters.comp - osite,org.codehaus.plexus.util.io,org.sonatype.aether.util.artifact,o - rg.codehaus.plexus.classworlds,org.sonatype.aether.graph,org.codehaus - .plexus.component.composition,org.apache.maven.model.composition,org. - codehaus.plexus.classworlds.launcher,org.codehaus.plexus.component.co - nfigurator.expression,org.apache.maven.project.interpolation,org.code - haus.plexus.component.configurator.converters.basic,org.sonatype.mave - n.wagon,org.apache.maven.project.path,org.sonatype.aether.impl.intern - al,org.apache.maven,org.codehaus.plexus.classworlds.realm,org.apache. - maven.artifact.manager,org.sonatype.plexus.components.cipher,org.sona - type.aether.deployment,org.apache.maven.toolchain.model,org.apache.ma - ven.wagon.observers,com.google.inject.name,org.codehaus.plexus.interp - olation.os,com.google.inject.spi,org.apache.maven.plugin.prefix,org.a - pache.maven.configuration,org.sonatype.aether.util.listener,org.apach - e.maven.repository.legacy.resolver.conflict,org.apache.maven.model.io - .xpp3,org.sonatype.plexus.components.sec.dispatcher,org.apache.maven. - model.path,org.sonatype.aether.util.graph.traverser,org.codehaus.plex - us.context,org.apache.maven.lifecycle.internal,org.apache.maven.model - .merge,org.apache.maven.monitor.event,org.apache.maven.rtinfo.interna - l,org.apache.maven.model.io,org.apache.maven.project,com.google.injec - t.matcher,org.apache.maven.project.artifact,org.apache.maven.reposito - ry.metadata,org.apache.maven.rtinfo,org.apache.maven.project.inherita - nce,org.sonatype.plexus.components.sec.dispatcher.model,org.codehaus. - plexus.component.annotations,org.apache.maven.artifact,org.apache.mav - en.eventspy.internal,org.sonatype.aether.resolution,com.google.inject - .binder,com.google.inject.util,org.apache.maven.plugin,org.apache.mav - en.settings.building -Bundle-Vendor: Eclipse.org - m2e -Bundle-ClassPath: local-patches.jar, - jars/maven-embedder-3.0.2.jar, - jars/maven-settings-3.0.2.jar, - jars/maven-plugin-api-3.0.2.jar, - jars/maven-model-builder-3.0.2.jar, - jars/plexus-sec-dispatcher-1.3.jar, - jars/plexus-cipher-1.4.jar, - jars/maven-core-3.0.2.jar, - jars/maven-model-3.0.2.jar, - jars/maven-settings-builder-3.0.2.jar, - jars/maven-repository-metadata-3.0.2.jar, - jars/maven-artifact-3.0.2.jar, - jars/maven-aether-provider-3.0.2.jar, - jars/plexus-interpolation-1.14.jar, - jars/maven-compat-3.0.2.jar, - jars/commons-cli-1.2.jar, - jars/wagon-file-1.0-beta-7.jar, - jars/guice-plexus-shim-2.0.0.jar, - jars/plexus-component-annotations-1.5.5.jar, - jars/javax.inject-1.jar, - jars/guice-bean-reflect-2.0.0.jar, - jars/guice-bean-inject-2.0.0.jar, - jars/guice-bean-locators-2.0.0.jar, - jars/guice-bean-binders-2.0.0.jar, - jars/guice-bean-scanners-2.0.0.jar, - jars/guice-bean-converters-2.0.0.jar, - jars/guice-plexus-metadata-2.0.0.jar, - jars/guice-plexus-converters-2.0.0.jar, - jars/guice-plexus-locators-2.0.0.jar, - jars/guice-plexus-binders-2.0.0.jar, - jars/guice-plexus-scanners-2.0.0.jar, - jars/plexus-classworlds-2.4.jar, - jars/plexus-utils-2.0.6.jar, - jars/sisu-guice-2.9.4-no_aop.jar, - jars/plexus-build-api-0.0.7.jar, - jars/aether-connector-wagon-1.11.jar, - jars/aether-api-1.11.jar, - jars/aether-spi-1.11.jar, - jars/aether-util-1.11.jar, - jars/wagon-provider-api-1.0-beta-6.jar, - jars/aether-impl-1.11.jar, - jars/aether-connector-asynchttpclient-1.11.jar, - jars/wagon-ahc-1.2.0.jar -Bundle-Version: 1.0.100.qualifier -Bundle-Name: Embedded Maven Runtime Bundle -Bundle-ManifestVersion: 2 -Bundle-SymbolicName: org.eclipse.m2e.maven.runtime;singleton:=true -Bundle-RequiredExecutionEnvironment: J2SE-1.5, JavaSE-1.6 -Require-Bundle: com.ning.async-http-client;bundle-version="[1.6.3,1.6.4)" - diff --git a/org.eclipse.m2e.maven.runtime/META-INF/plexus/.gitignore b/org.eclipse.m2e.maven.runtime/META-INF/plexus/.gitignore deleted file mode 100644 index e69de29b..00000000 --- a/org.eclipse.m2e.maven.runtime/META-INF/plexus/.gitignore +++ /dev/null diff --git a/org.eclipse.m2e.maven.runtime/about.html b/org.eclipse.m2e.maven.runtime/about.html deleted file mode 100644 index 2ec54b51..00000000 --- a/org.eclipse.m2e.maven.runtime/about.html +++ /dev/null @@ -1,116 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> -<title>About</title> -</head> -<body lang="EN-US"> -<h2>About This Content</h2> - -<p>June, 6 2011</p> -<h3>License</h3> - -<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise -indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. -For purposes of the EPL, "Program" will mean the Content.</p> - -<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is -being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was -provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p> - -<h3>Third Party Content</h3> - -<p> -The Content includes items that have been sourced from third parties as set out below. If you -did not receive this Content directly from the Eclipse Foundation, the following is provided -for informational purposes only, and you should look to the Redistributor’s license for -terms and conditions of use. -</p> - -<h4>Maven 3.0.2</h4> -<p> -The plug-in includes software developed by The Apache Software Foundation as part of the Maven project. -Your use of Maven 3.0.2 in binary code form contained in the plug-in is subject to the terms and conditions of the -The Apache Software License, Version 2.0 ("ASL"). -A copy of the ASL is available at <a href="http://maven.apache.org/license.html">http://maven.apache.org/license.html</a>. -(a local copy can be found <a href="about_files/LICENSE-2.0.txt">here</a>) -</p> -<p>The original binaries and source are available at the <a href="http://maven.org">Maven Central Repository</a>. - -<h4>Aether 1.11</h4> -<p> -The plug-in includes software developed by Sonatype, Inc. -Your use of Aether 1.11 in binary code form contained in the plug-in is subject to the terms and conditions of the -The Apache Software License, Version 2.0 ("ASL") or Eclipse Public License Version 1.0 ("EPL"). -A copy of the ASL is available at <a href="http://maven.apache.org/license.html">http://maven.apache.org/license.html</a>. -(a local copy can be found <a href="about_files/LICENSE-2.0.txt">here</a>) -</p> -<p>The original binaries are available at the <a href="http://maven.org">Maven Central Repository</a>. - - -<h4>Sisu 2.0.0 and Sisu Guice 2.9.4</h4> -<p> -The plug-in includes software developed by Sonatype, Inc. -Your use of Sisu 2.0.0 and Sisu Guice 2.9.4 in binary code form contained in the plug-in is subject to the terms and conditions of the -The Apache Software License, Version 2.0 ("ASL"). -A copy of the ASL is available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>. -(a local copy can be found <a href="about_files/LICENSE-2.0.txt">here</a>) -</p> -<p>The original binaries are available at the <a href="http://maven.org">Maven Central Repository</a>. - - - - -<h4>Sisu 2.0.0 and Sisu Guice 2.9.4</h4> -<p> -The plug-in includes software developed by Sonatype, Inc. -Your use of Sisu 2.0.0 and Sisu Guice 2.9.4 in binary code form contained in the plug-in is subject to the terms and conditions of the -The Apache Software License, Version 2.0 ("ASL"). -A copy of the ASL is available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>. -(a local copy can be found <a href="about_files/LICENSE-2.0.txt">here</a>) -</p> -<p>The original binaries are available at the <a href="http://maven.org">Maven Central Repository</a>. - - - -<h4>javax.inject 1.0</h4> -This plug-in includes the package "javax.inject" from the atinject project, which is -licensed under the Apache 2.0 license, available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>. -(a local copy can be found <a href="about_files/LICENSE-2.0.txt">here</a>) -</p> -<p>The source for the bundle is available from -the atinject website at <a - href="http://code.google.com/p/atinject/">http://code.google.com/p/atinject/</a>.</p> - - -<h4>Apache Commons Command Line Interface 1.2</h4> -<p> -The plug-in includes software developed by The Apache Software Foundation as part of the Apache Commons project. -Your use of Apache Commons Command Line Interface 1.2 in binary code form contained in the plug-in is subject to the terms and conditions of the -The Apache Software License, Version 2.0 ("ASL"). -A copy of the ASL is available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>. -(a local copy can be found <a href="about_files/LICENSE-2.0.txt">here</a>) -</p> -<p>The original binaries and source are available at the <a href="http://maven.org">Maven Central Repository</a>. - - - -<h4>Plexus Build API 0.0.7</h4> -<p> -The plug-in includes software developed by Sonatype, Inc. -Your use of Plexus Build API 0.0.7 in binary code form contained in the plug-in is subject to the terms and conditions of the -The Apache Software License, Version 2.0 ("ASL"). -A copy of the ASL is available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>. -(a local copy can be found <a href="about_files/LICENSE-2.0.txt">here</a>) -</p> -<p>The original binaries are available at the <a href="http://maven.org">Maven Central Repository</a>. - - -</body> -</html>
\ No newline at end of file diff --git a/org.eclipse.m2e.maven.runtime/about_files/LICENSE-2.0.txt b/org.eclipse.m2e.maven.runtime/about_files/LICENSE-2.0.txt deleted file mode 100644 index d6456956..00000000 --- a/org.eclipse.m2e.maven.runtime/about_files/LICENSE-2.0.txt +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed 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. diff --git a/org.eclipse.m2e.maven.runtime/build.properties b/org.eclipse.m2e.maven.runtime/build.properties deleted file mode 100644 index ec7ba3b5..00000000 --- a/org.eclipse.m2e.maven.runtime/build.properties +++ /dev/null @@ -1,20 +0,0 @@ -# -# Copyright (c) 2008-2010 Sonatype, Inc. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# Sonatype, Inc. - initial API and implementation -# - -bin.includes = META-INF/,\ - jars/,\ - local-patches.jar,\ - about.html,\ - about_files/ -jars.compile.order = local-patches.jar -source.local-patches.jar = src/maven-3.0.3/,src/aether-1.12/ -output.local-patches.jar = target/classes - diff --git a/org.eclipse.m2e.maven.runtime/jars/aether-api-1.11.jar b/org.eclipse.m2e.maven.runtime/jars/aether-api-1.11.jar Binary files differdeleted file mode 100644 index 5bdade87..00000000 --- a/org.eclipse.m2e.maven.runtime/jars/aether-api-1.11.jar +++ /dev/null diff --git a/org.eclipse.m2e.maven.runtime/jars/aether-connector-asynchttpclient-1.11.jar b/org.eclipse.m2e.maven.runtime/jars/aether-connector-asynchttpclient-1.11.jar Binary files differdeleted file mode 100644 index e422c92a..00000000 --- a/org.eclipse.m2e.maven.runtime/jars/aether-connector-asynchttpclient-1.11.jar +++ /dev/null diff --git a/org.eclipse.m2e.maven.runtime/jars/aether-connector-wagon-1.11.jar b/org.eclipse.m2e.maven.runtime/jars/aether-connector-wagon-1.11.jar Binary files differdeleted file mode 100644 index b5bf1b80..00000000 --- a/org.eclipse.m2e.maven.runtime/jars/aether-connector-wagon-1.11.jar +++ /dev/null diff --git a/org.eclipse.m2e.maven.runtime/jars/aether-impl-1.11.jar b/org.eclipse.m2e.maven.runtime/jars/aether-impl-1.11.jar Binary files differdeleted file mode 100644 index 8ce9f131..00000000 --- a/org.eclipse.m2e.maven.runtime/jars/aether-impl-1.11.jar +++ /dev/null diff --git a/org.eclipse.m2e.maven.runtime/jars/aether-spi-1.11.jar b/org.eclipse.m2e.maven.runtime/jars/aether-spi-1.11.jar Binary files differdeleted file mode 100644 index 8fb66034..00000000 --- a/org.eclipse.m2e.maven.runtime/jars/aether-spi-1.11.jar +++ /dev/null diff --git a/org.eclipse.m2e.maven.runtime/jars/aether-util-1.11.jar b/org.eclipse.m2e.maven.runtime/jars/aether-util-1.11.jar Binary files differdeleted file mode 100644 index 9f517eae..00000000 --- a/org.eclipse.m2e.maven.runtime/jars/aether-util-1.11.jar +++ /dev/null diff --git a/org.eclipse.m2e.maven.runtime/jars/commons-cli-1.2.jar b/org.eclipse.m2e.maven.runtime/jars/commons-cli-1.2.jar Binary files differdeleted file mode 100644 index ce4b9fff..00000000 --- a/org.eclipse.m2e.maven.runtime/jars/commons-cli-1.2.jar +++ /dev/null diff --git a/org.eclipse.m2e.maven.runtime/jars/guice-bean-binders-2.0.0.jar b/org.eclipse.m2e.maven.runtime/jars/guice-bean-binders-2.0.0.jar Binary files differdeleted file mode 100644 index d902a9dd..00000000 --- a/org.eclipse.m2e.maven.runtime/jars/guice-bean-binders-2.0.0.jar +++ /dev/null diff --git a/org.eclipse.m2e.maven.runtime/jars/guice-bean-converters-2.0.0.jar b/org.eclipse.m2e.maven.runtime/jars/guice-bean-converters-2.0.0.jar Binary files differdeleted file mode 100644 index d78b2ee9..00000000 --- a/org.eclipse.m2e.maven.runtime/jars/guice-bean-converters-2.0.0.jar +++ /dev/null diff --git a/org.eclipse.m2e.maven.runtime/jars/guice-bean-inject-2.0.0.jar b/org.eclipse.m2e.maven.runtime/jars/guice-bean-inject-2.0.0.jar Binary files differdeleted file mode 100644 index f20c2095..00000000 --- a/org.eclipse.m2e.maven.runtime/jars/guice-bean-inject-2.0.0.jar +++ /dev/null diff --git a/org.eclipse.m2e.maven.runtime/jars/guice-bean-locators-2.0.0.jar b/org.eclipse.m2e.maven.runtime/jars/guice-bean-locators-2.0.0.jar Binary files differdeleted file mode 100644 index 89892874..00000000 --- a/org.eclipse.m2e.maven.runtime/jars/guice-bean-locators-2.0.0.jar +++ /dev/null diff --git a/org.eclipse.m2e.maven.runtime/jars/guice-bean-reflect-2.0.0.jar b/org.eclipse.m2e.maven.runtime/jars/guice-bean-reflect-2.0.0.jar Binary files differdeleted file mode 100644 index ba284249..00000000 --- a/org.eclipse.m2e.maven.runtime/jars/guice-bean-reflect-2.0.0.jar +++ /dev/null diff --git a/org.eclipse.m2e.maven.runtime/jars/guice-bean-scanners-2.0.0.jar b/org.eclipse.m2e.maven.runtime/jars/guice-bean-scanners-2.0.0.jar Binary files differdeleted file mode 100644 index d286ecc6..00000000 --- a/org.eclipse.m2e.maven.runtime/jars/guice-bean-scanners-2.0.0.jar +++ /dev/null diff --git a/org.eclipse.m2e.maven.runtime/jars/guice-plexus-binders-2.0.0.jar b/org.eclipse.m2e.maven.runtime/jars/guice-plexus-binders-2.0.0.jar Binary files differdeleted file mode 100644 index 5d01444e..00000000 --- a/org.eclipse.m2e.maven.runtime/jars/guice-plexus-binders-2.0.0.jar +++ /dev/null diff --git a/org.eclipse.m2e.maven.runtime/jars/guice-plexus-converters-2.0.0.jar b/org.eclipse.m2e.maven.runtime/jars/guice-plexus-converters-2.0.0.jar Binary files differdeleted file mode 100644 index ab2839a1..00000000 --- a/org.eclipse.m2e.maven.runtime/jars/guice-plexus-converters-2.0.0.jar +++ /dev/null diff --git a/org.eclipse.m2e.maven.runtime/jars/guice-plexus-locators-2.0.0.jar b/org.eclipse.m2e.maven.runtime/jars/guice-plexus-locators-2.0.0.jar Binary files differdeleted file mode 100644 index cc387466..00000000 --- a/org.eclipse.m2e.maven.runtime/jars/guice-plexus-locators-2.0.0.jar +++ /dev/null diff --git a/org.eclipse.m2e.maven.runtime/jars/guice-plexus-metadata-2.0.0.jar b/org.eclipse.m2e.maven.runtime/jars/guice-plexus-metadata-2.0.0.jar Binary files differdeleted file mode 100644 index 17e04d71..00000000 --- a/org.eclipse.m2e.maven.runtime/jars/guice-plexus-metadata-2.0.0.jar +++ /dev/null diff --git a/org.eclipse.m2e.maven.runtime/jars/guice-plexus-scanners-2.0.0.jar b/org.eclipse.m2e.maven.runtime/jars/guice-plexus-scanners-2.0.0.jar Binary files differdeleted file mode 100644 index c577291f..00000000 --- a/org.eclipse.m2e.maven.runtime/jars/guice-plexus-scanners-2.0.0.jar +++ /dev/null diff --git a/org.eclipse.m2e.maven.runtime/jars/guice-plexus-shim-2.0.0.jar b/org.eclipse.m2e.maven.runtime/jars/guice-plexus-shim-2.0.0.jar Binary files differdeleted file mode 100644 index db7036de..00000000 --- a/org.eclipse.m2e.maven.runtime/jars/guice-plexus-shim-2.0.0.jar +++ /dev/null diff --git a/org.eclipse.m2e.maven.runtime/jars/javax.inject-1.jar b/org.eclipse.m2e.maven.runtime/jars/javax.inject-1.jar Binary files differdeleted file mode 100644 index b2a9d0bf..00000000 --- a/org.eclipse.m2e.maven.runtime/jars/javax.inject-1.jar +++ /dev/null diff --git a/org.eclipse.m2e.maven.runtime/jars/maven-aether-provider-3.0.2.jar b/org.eclipse.m2e.maven.runtime/jars/maven-aether-provider-3.0.2.jar Binary files differdeleted file mode 100644 index e6994bcb..00000000 --- a/org.eclipse.m2e.maven.runtime/jars/maven-aether-provider-3.0.2.jar +++ /dev/null diff --git a/org.eclipse.m2e.maven.runtime/jars/maven-artifact-3.0.2.jar b/org.eclipse.m2e.maven.runtime/jars/maven-artifact-3.0.2.jar Binary files differdeleted file mode 100644 index c60fd16c..00000000 --- a/org.eclipse.m2e.maven.runtime/jars/maven-artifact-3.0.2.jar +++ /dev/null diff --git a/org.eclipse.m2e.maven.runtime/jars/maven-compat-3.0.2.jar b/org.eclipse.m2e.maven.runtime/jars/maven-compat-3.0.2.jar Binary files differdeleted file mode 100644 index d2599860..00000000 --- a/org.eclipse.m2e.maven.runtime/jars/maven-compat-3.0.2.jar +++ /dev/null diff --git a/org.eclipse.m2e.maven.runtime/jars/maven-core-3.0.2.jar b/org.eclipse.m2e.maven.runtime/jars/maven-core-3.0.2.jar Binary files differdeleted file mode 100644 index 34935d66..00000000 --- a/org.eclipse.m2e.maven.runtime/jars/maven-core-3.0.2.jar +++ /dev/null diff --git a/org.eclipse.m2e.maven.runtime/jars/maven-embedder-3.0.2.jar b/org.eclipse.m2e.maven.runtime/jars/maven-embedder-3.0.2.jar Binary files differdeleted file mode 100644 index 5aa98a97..00000000 --- a/org.eclipse.m2e.maven.runtime/jars/maven-embedder-3.0.2.jar +++ /dev/null diff --git a/org.eclipse.m2e.maven.runtime/jars/maven-model-3.0.2.jar b/org.eclipse.m2e.maven.runtime/jars/maven-model-3.0.2.jar Binary files differdeleted file mode 100644 index 8b64b866..00000000 --- a/org.eclipse.m2e.maven.runtime/jars/maven-model-3.0.2.jar +++ /dev/null diff --git a/org.eclipse.m2e.maven.runtime/jars/maven-model-builder-3.0.2.jar b/org.eclipse.m2e.maven.runtime/jars/maven-model-builder-3.0.2.jar Binary files differdeleted file mode 100644 index df8ffbbe..00000000 --- a/org.eclipse.m2e.maven.runtime/jars/maven-model-builder-3.0.2.jar +++ /dev/null diff --git a/org.eclipse.m2e.maven.runtime/jars/maven-plugin-api-3.0.2.jar b/org.eclipse.m2e.maven.runtime/jars/maven-plugin-api-3.0.2.jar Binary files differdeleted file mode 100644 index d074043c..00000000 --- a/org.eclipse.m2e.maven.runtime/jars/maven-plugin-api-3.0.2.jar +++ /dev/null diff --git a/org.eclipse.m2e.maven.runtime/jars/maven-repository-metadata-3.0.2.jar b/org.eclipse.m2e.maven.runtime/jars/maven-repository-metadata-3.0.2.jar Binary files differdeleted file mode 100644 index eb579ce8..00000000 --- a/org.eclipse.m2e.maven.runtime/jars/maven-repository-metadata-3.0.2.jar +++ /dev/null diff --git a/org.eclipse.m2e.maven.runtime/jars/maven-settings-3.0.2.jar b/org.eclipse.m2e.maven.runtime/jars/maven-settings-3.0.2.jar Binary files differdeleted file mode 100644 index d9a485ce..00000000 --- a/org.eclipse.m2e.maven.runtime/jars/maven-settings-3.0.2.jar +++ /dev/null diff --git a/org.eclipse.m2e.maven.runtime/jars/maven-settings-builder-3.0.2.jar b/org.eclipse.m2e.maven.runtime/jars/maven-settings-builder-3.0.2.jar Binary files differdeleted file mode 100644 index 08b7c855..00000000 --- a/org.eclipse.m2e.maven.runtime/jars/maven-settings-builder-3.0.2.jar +++ /dev/null diff --git a/org.eclipse.m2e.maven.runtime/jars/plexus-build-api-0.0.7.jar b/org.eclipse.m2e.maven.runtime/jars/plexus-build-api-0.0.7.jar Binary files differdeleted file mode 100644 index 3a01264e..00000000 --- a/org.eclipse.m2e.maven.runtime/jars/plexus-build-api-0.0.7.jar +++ /dev/null diff --git a/org.eclipse.m2e.maven.runtime/jars/plexus-cipher-1.4.jar b/org.eclipse.m2e.maven.runtime/jars/plexus-cipher-1.4.jar Binary files differdeleted file mode 100644 index 9227205c..00000000 --- a/org.eclipse.m2e.maven.runtime/jars/plexus-cipher-1.4.jar +++ /dev/null diff --git a/org.eclipse.m2e.maven.runtime/jars/plexus-classworlds-2.4.jar b/org.eclipse.m2e.maven.runtime/jars/plexus-classworlds-2.4.jar Binary files differdeleted file mode 100644 index ef07b83a..00000000 --- a/org.eclipse.m2e.maven.runtime/jars/plexus-classworlds-2.4.jar +++ /dev/null diff --git a/org.eclipse.m2e.maven.runtime/jars/plexus-component-annotations-1.5.5.jar b/org.eclipse.m2e.maven.runtime/jars/plexus-component-annotations-1.5.5.jar Binary files differdeleted file mode 100644 index e4de16fe..00000000 --- a/org.eclipse.m2e.maven.runtime/jars/plexus-component-annotations-1.5.5.jar +++ /dev/null diff --git a/org.eclipse.m2e.maven.runtime/jars/plexus-interpolation-1.14.jar b/org.eclipse.m2e.maven.runtime/jars/plexus-interpolation-1.14.jar Binary files differdeleted file mode 100644 index eee5c573..00000000 --- a/org.eclipse.m2e.maven.runtime/jars/plexus-interpolation-1.14.jar +++ /dev/null diff --git a/org.eclipse.m2e.maven.runtime/jars/plexus-sec-dispatcher-1.3.jar b/org.eclipse.m2e.maven.runtime/jars/plexus-sec-dispatcher-1.3.jar Binary files differdeleted file mode 100644 index 9dc9f64b..00000000 --- a/org.eclipse.m2e.maven.runtime/jars/plexus-sec-dispatcher-1.3.jar +++ /dev/null diff --git a/org.eclipse.m2e.maven.runtime/jars/plexus-utils-2.0.6.jar b/org.eclipse.m2e.maven.runtime/jars/plexus-utils-2.0.6.jar Binary files differdeleted file mode 100644 index 25002a4b..00000000 --- a/org.eclipse.m2e.maven.runtime/jars/plexus-utils-2.0.6.jar +++ /dev/null diff --git a/org.eclipse.m2e.maven.runtime/jars/sisu-guice-2.9.4-no_aop.jar b/org.eclipse.m2e.maven.runtime/jars/sisu-guice-2.9.4-no_aop.jar Binary files differdeleted file mode 100644 index 4ccd861a..00000000 --- a/org.eclipse.m2e.maven.runtime/jars/sisu-guice-2.9.4-no_aop.jar +++ /dev/null diff --git a/org.eclipse.m2e.maven.runtime/jars/wagon-ahc-1.2.0.jar b/org.eclipse.m2e.maven.runtime/jars/wagon-ahc-1.2.0.jar Binary files differdeleted file mode 100644 index e6125b08..00000000 --- a/org.eclipse.m2e.maven.runtime/jars/wagon-ahc-1.2.0.jar +++ /dev/null diff --git a/org.eclipse.m2e.maven.runtime/jars/wagon-file-1.0-beta-7.jar b/org.eclipse.m2e.maven.runtime/jars/wagon-file-1.0-beta-7.jar Binary files differdeleted file mode 100644 index 2e59d4be..00000000 --- a/org.eclipse.m2e.maven.runtime/jars/wagon-file-1.0-beta-7.jar +++ /dev/null diff --git a/org.eclipse.m2e.maven.runtime/jars/wagon-provider-api-1.0-beta-6.jar b/org.eclipse.m2e.maven.runtime/jars/wagon-provider-api-1.0-beta-6.jar Binary files differdeleted file mode 100644 index 246548df..00000000 --- a/org.eclipse.m2e.maven.runtime/jars/wagon-provider-api-1.0-beta-6.jar +++ /dev/null diff --git a/org.eclipse.m2e.maven.runtime/no-source-bundle.txt b/org.eclipse.m2e.maven.runtime/no-source-bundle.txt deleted file mode 100644 index 675ce413..00000000 --- a/org.eclipse.m2e.maven.runtime/no-source-bundle.txt +++ /dev/null @@ -1 +0,0 @@ -marker file used to disable source-bundle profile
\ No newline at end of file diff --git a/org.eclipse.m2e.maven.runtime/pom.xml b/org.eclipse.m2e.maven.runtime/pom.xml deleted file mode 100644 index 71f0b6d4..00000000 --- a/org.eclipse.m2e.maven.runtime/pom.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright (c) 2008 Sonatype, Inc. - All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License v1.0 - which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html ---> -<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"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.eclipse.m2e</groupId> - <artifactId>org.eclipse.m2e.parent</artifactId> - <version>1.0.100-SNAPSHOT</version> - <relativePath>../org.eclipse.m2e.parent</relativePath> - </parent> - - <artifactId>org.eclipse.m2e.maven.runtime</artifactId> - <packaging>eclipse-plugin</packaging> - <name>Embedded Maven Runtime Bundle</name> -</project> diff --git a/org.eclipse.m2e.maven.runtime/src/README b/org.eclipse.m2e.maven.runtime/src/README deleted file mode 100644 index 4ef4415d..00000000 --- a/org.eclipse.m2e.maven.runtime/src/README +++ /dev/null @@ -1,8 +0,0 @@ -The following changes were cherry-picked - -maven-3.0.3 (SNAPSHOT) -MNG-4988 API to calculate execution plan without full mojo execution configuration -MNG-5003 populate mojo descriptor with cached plugin realm - -aether-1.12 -AETHER-92 TransferCancelledException must interrupt the current download. diff --git a/org.eclipse.m2e.maven.runtime/src/aether-1.12/org/sonatype/aether/connector/async/CompletionHandler.java b/org.eclipse.m2e.maven.runtime/src/aether-1.12/org/sonatype/aether/connector/async/CompletionHandler.java deleted file mode 100644 index 8b13300d..00000000 --- a/org.eclipse.m2e.maven.runtime/src/aether-1.12/org/sonatype/aether/connector/async/CompletionHandler.java +++ /dev/null @@ -1,388 +0,0 @@ -package org.sonatype.aether.connector.async; - -/******************************************************************************* - * Copyright (c) 2010-2011 Sonatype, Inc. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * and Apache License v2.0 which accompanies this distribution. - * The Eclipse Public License is available at - * http://www.eclipse.org/legal/epl-v10.html - * The Apache License v2.0 is available at - * http://www.apache.org/licenses/LICENSE-2.0.html - * You may elect to redistribute this code under either of these licenses. - *******************************************************************************/ - -import com.ning.http.client.AsyncHandler; -import com.ning.http.client.AsyncHttpClient; -import com.ning.http.client.HttpResponseBodyPart; -import com.ning.http.client.HttpResponseHeaders; -import com.ning.http.client.HttpResponseStatus; -import com.ning.http.client.ProgressAsyncHandler; -import com.ning.http.client.Response; -import org.sonatype.aether.spi.log.Logger; -import org.sonatype.aether.transfer.TransferCancelledException; -import org.sonatype.aether.transfer.TransferEvent; -import org.sonatype.aether.transfer.TransferListener; -import org.sonatype.aether.transfer.TransferResource; - -import java.io.IOException; -import java.net.HttpURLConnection; -import java.nio.ByteBuffer; -import java.util.Collections; -import java.util.Iterator; -import java.util.concurrent.ConcurrentLinkedQueue; -import java.util.concurrent.atomic.AtomicLong; -import java.util.concurrent.atomic.AtomicReference; - -/** - * An {@link AsyncHandler} for handling asynchronous download an upload. - * - * @author Jeanfrancois Arcand - */ -class CompletionHandler - implements ProgressAsyncHandler<Response> -{ - private final Logger logger; - - private HttpResponseStatus status; - - private HttpResponseHeaders headers; - - private final ConcurrentLinkedQueue<TransferListener> listeners = new ConcurrentLinkedQueue<TransferListener>(); - - private final AsyncHttpClient httpClient; - - private final AtomicLong byteTransfered = new AtomicLong(); - - private final AtomicReference<Throwable> exception = new AtomicReference<Throwable>(); - - private final TransferResource transferResource; - - private final TransferEvent.RequestType requestType; - - public CompletionHandler( TransferResource transferResource, AsyncHttpClient httpClient, Logger logger, - TransferEvent.RequestType requestType ) - { - this.httpClient = httpClient; - this.transferResource = transferResource; - this.logger = logger; - this.requestType = requestType; - } - - public STATE onHeaderWriteCompleted() - { - if ( TransferEvent.RequestType.PUT.equals( requestType ) ) - { - byteTransfered.set( 0 ); - try - { - fireTransferStarted(); - } - catch ( TransferCancelledException e ) - { - return STATE.ABORT; - } - } - return STATE.CONTINUE; - } - - public STATE onContentWriteCompleted() - { - return STATE.CONTINUE; - } - - public STATE onContentWriteProgress( long amount, long current, long total ) - { - return STATE.CONTINUE; - } - - /** - * {@inheritDoc} - */ - /* @Override */ - public STATE onBodyPartReceived( final HttpResponseBodyPart content ) - throws Exception - { - try - { - fireTransferProgressed( content.getBodyPartBytes() ); - } - catch ( TransferCancelledException e ) - { - return STATE.ABORT; - } - catch ( Exception ex ) - { - if ( logger.isDebugEnabled() ) - { - logger.debug( "", ex ); - } - } - return STATE.CONTINUE; - } - - /** - * {@inheritDoc} - */ - /* @Override */ - public STATE onStatusReceived( final HttpResponseStatus status ) - throws Exception - { - this.status = status; - - if ( !TransferEvent.RequestType.PUT.equals( requestType ) ) - { - if ( status.getStatusCode() >= 200 && status.getStatusCode() < 300 ) - { - try - { - fireTransferStarted(); - } - catch ( TransferCancelledException e ) - { - return STATE.ABORT; - } - } - } - - return ( status.getStatusCode() == HttpURLConnection.HTTP_NOT_FOUND ? STATE.ABORT : STATE.CONTINUE ); - } - - /** - * {@inheritDoc} - */ - /* @Override */ - public STATE onHeadersReceived( final HttpResponseHeaders headers ) - throws Exception - { - this.headers = headers; - return STATE.CONTINUE; - } - - /** - * {@inheritDoc} - */ - /* @Override */ - public final Response onCompleted() - throws Exception - { - // The connection has timed out - if ( status == null ) - { - throw new TransferException( "Invalid AHC State. Response will possibly gets corrupted." ); - } - return onCompleted( httpClient.getProvider().prepareResponse( status, headers, - Collections.<HttpResponseBodyPart> emptyList() ) ); - } - - /** - * {@inheritDoc} - */ - /* @Override */ - public void onThrowable( Throwable t ) - { - exception.set( t ); - } - - /** - * Invoked once the HTTP response has been fully read. - * - * @param response The {@link com.ning.http.client.Response} - * @return Type of the value that will be returned by the associated {@link java.util.concurrent.Future} - */ - public Response onCompleted( Response response ) - throws Exception - { - if ( response != null && response.hasResponseStatus() && response.getStatusCode() >= HttpURLConnection.HTTP_OK - && response.getStatusCode() <= HttpURLConnection.HTTP_CREATED ) - { - fireTransferSucceeded( response ); - } - return response; - } - - void fireTransferProgressed( final byte[] buffer ) - throws TransferCancelledException - { - fireTransferProgressed( ByteBuffer.wrap( buffer ) ); - } - - void fireTransferProgressed( final ByteBuffer buffer ) - throws TransferCancelledException - { - final long bytesTransferred = byteTransfered.addAndGet( buffer.remaining() ); - - final TransferEvent transferEvent = new AsyncTransferEvent() - { - - public EventType getType() - { - return TransferEvent.EventType.PROGRESSED; - } - - public long getTransferredBytes() - { - return bytesTransferred; - } - - public ByteBuffer getDataBuffer() - { - return buffer.asReadOnlyBuffer(); - } - - public int getDataLength() - { - return buffer.remaining(); - } - - }; - - for ( Iterator<TransferListener> iter = listeners.iterator(); iter.hasNext(); ) - { - final TransferListener listener = iter.next(); - listener.transferProgressed( transferEvent ); - } - } - - void fireTransferSucceeded( final Response response ) - throws IOException - { - final long bytesTransferred = byteTransfered.get(); - - final TransferEvent transferEvent = new AsyncTransferEvent() - { - - public EventType getType() - { - return TransferEvent.EventType.SUCCEEDED; - } - - public long getTransferredBytes() - { - return bytesTransferred; - } - - }; - - for ( Iterator<TransferListener> iter = listeners.iterator(); iter.hasNext(); ) - { - final TransferListener listener = iter.next(); - listener.transferSucceeded( transferEvent ); - } - } - - void fireTransferFailed() - throws IOException - { - final long bytesTransferred = byteTransfered.get(); - - final TransferEvent transferEvent = new AsyncTransferEvent() - { - - public EventType getType() - { - return TransferEvent.EventType.FAILED; - } - - public long getTransferredBytes() - { - return bytesTransferred; - } - - }; - - for ( Iterator<TransferListener> iter = listeners.iterator(); iter.hasNext(); ) - { - final TransferListener listener = iter.next(); - listener.transferFailed( transferEvent ); - - } - } - - void fireTransferStarted() - throws TransferCancelledException - { - final TransferEvent transferEvent = new AsyncTransferEvent() - { - - public EventType getType() - { - return TransferEvent.EventType.STARTED; - } - - public long getTransferredBytes() - { - return 0; - } - - }; - - for ( Iterator<TransferListener> iter = listeners.iterator(); iter.hasNext(); ) - { - final TransferListener listener = iter.next(); - listener.transferStarted( transferEvent ); - } - } - - public boolean addTransferListener( TransferListener listener ) - { - if ( listener == null ) - { - return false; - } - return listeners.offer( listener ); - } - - public boolean removeTransferListener( TransferListener listener ) - { - if ( listener == null ) - { - return false; - } - return listeners.remove( listener ); - } - - protected HttpResponseStatus status() - { - return status; - } - - abstract class AsyncTransferEvent - implements TransferEvent - { - - public RequestType getRequestType() - { - return requestType; - } - - public TransferResource getResource() - { - return transferResource; - } - - public ByteBuffer getDataBuffer() - { - return null; - } - - public int getDataLength() - { - return 0; - } - - public Exception getException() - { - return ( Exception.class.isAssignableFrom( exception.get().getClass() ) ? Exception.class.cast( exception.get() ) - : new Exception( exception.get() ) ); - } - - @Override - public String toString() - { - return getRequestType() + " " + getType() + " " + getResource(); - } - - } - -} diff --git a/org.eclipse.m2e.maven.runtime/src/maven-3.0.3/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java b/org.eclipse.m2e.maven.runtime/src/maven-3.0.3/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java deleted file mode 100644 index a719a0c7..00000000 --- a/org.eclipse.m2e.maven.runtime/src/maven-3.0.3/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java +++ /dev/null @@ -1,178 +0,0 @@ -package org.apache.maven.lifecycle; - -/* - * 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.execution.MavenSession; -import org.apache.maven.lifecycle.internal.LifecycleExecutionPlanCalculator; -import org.apache.maven.lifecycle.internal.LifecycleStarter; -import org.apache.maven.lifecycle.internal.LifecycleTaskSegmentCalculator; -import org.apache.maven.lifecycle.internal.MojoDescriptorCreator; -import org.apache.maven.lifecycle.internal.MojoExecutor; -import org.apache.maven.lifecycle.internal.ProjectIndex; -import org.apache.maven.lifecycle.internal.TaskSegment; -import org.apache.maven.model.Plugin; -import org.apache.maven.plugin.InvalidPluginDescriptorException; -import org.apache.maven.plugin.MojoExecution; -import org.apache.maven.plugin.MojoNotFoundException; -import org.apache.maven.plugin.PluginDescriptorParsingException; -import org.apache.maven.plugin.PluginManagerException; -import org.apache.maven.plugin.PluginNotFoundException; -import org.apache.maven.plugin.PluginResolutionException; -import org.apache.maven.plugin.descriptor.MojoDescriptor; -import org.apache.maven.plugin.prefix.NoPluginFoundForPrefixException; -import org.apache.maven.plugin.version.PluginVersionResolutionException; -import org.apache.maven.project.MavenProject; -import org.codehaus.plexus.component.annotations.Component; -import org.codehaus.plexus.component.annotations.Requirement; - -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.Set; - -/** - * A facade that provides lifecycle services to components outside maven core. - * - * Note that this component is not normally used from within core itself. - * - * @author Jason van Zyl - * @author Benjamin Bentmann - * @author Kristian Rosenvold - */ -@Component( role = LifecycleExecutor.class ) -public class DefaultLifecycleExecutor - implements LifecycleExecutor -{ - - @Requirement - private LifeCyclePluginAnalyzer lifeCyclePluginAnalyzer; - - @Requirement - private DefaultLifecycles defaultLifeCycles; - - @Requirement - private LifecycleTaskSegmentCalculator lifecycleTaskSegmentCalculator; - - @Requirement - private LifecycleExecutionPlanCalculator lifecycleExecutionPlanCalculator; - - @Requirement - private MojoExecutor mojoExecutor; - - @Requirement - private LifecycleStarter lifecycleStarter; - - - public void execute( MavenSession session ) - { - lifecycleStarter.execute( session ); - } - - @Requirement - private MojoDescriptorCreator mojoDescriptorCreator; - - // These methods deal with construction intact Plugin object that look like they come from a standard - // <plugin/> block in a Maven POM. We have to do some wiggling to pull the sources of information - // together and this really shows the problem of constructing a sensible default configuration but - // it's all encapsulated here so it appears normalized to the POM builder. - - // We are going to take the project packaging and find all plugin in the default lifecycle and create - // fully populated Plugin objects, including executions with goals and default configuration taken - // from the plugin.xml inside a plugin. - // - // TODO: This whole method could probably removed by injecting lifeCyclePluginAnalyzer straight into client site. - // TODO: But for some reason the whole plexus appcontext refuses to start when I try this. - - public Set<Plugin> getPluginsBoundByDefaultToAllLifecycles( String packaging ) - { - return lifeCyclePluginAnalyzer.getPluginsBoundByDefaultToAllLifecycles( packaging ); - } - - // USED BY MAVEN HELP PLUGIN - - @SuppressWarnings( { "UnusedDeclaration" } ) - @Deprecated - public Map<String, Lifecycle> getPhaseToLifecycleMap() - { - return defaultLifeCycles.getPhaseToLifecycleMap(); - } - - // NOTE: Backward-compat with maven-help-plugin:2.1 - - @SuppressWarnings( { "UnusedDeclaration" } ) - MojoDescriptor getMojoDescriptor( String task, MavenSession session, MavenProject project, String invokedVia, - boolean canUsePrefix, boolean isOptionalMojo ) - throws PluginNotFoundException, PluginResolutionException, PluginDescriptorParsingException, - MojoNotFoundException, NoPluginFoundForPrefixException, InvalidPluginDescriptorException, - PluginVersionResolutionException - { - return mojoDescriptorCreator.getMojoDescriptor( task, session, project ); - } - - // Used by m2eclipse - - @SuppressWarnings( { "UnusedDeclaration" } ) - public MavenExecutionPlan calculateExecutionPlan( MavenSession session, boolean setup, String... tasks ) - throws PluginNotFoundException, PluginResolutionException, PluginDescriptorParsingException, - MojoNotFoundException, NoPluginFoundForPrefixException, InvalidPluginDescriptorException, - PluginManagerException, LifecyclePhaseNotFoundException, LifecycleNotFoundException, - PluginVersionResolutionException - { - List<TaskSegment> taskSegments = - lifecycleTaskSegmentCalculator.calculateTaskSegments( session, Arrays.asList( tasks ) ); - - TaskSegment mergedSegment = new TaskSegment( false ); - - for ( TaskSegment taskSegment : taskSegments ) - { - mergedSegment.getTasks().addAll( taskSegment.getTasks() ); - } - - return lifecycleExecutionPlanCalculator.calculateExecutionPlan( session, session.getCurrentProject(), - mergedSegment.getTasks(), setup ); - } - - public MavenExecutionPlan calculateExecutionPlan( MavenSession session, String... tasks ) - throws PluginNotFoundException, PluginResolutionException, PluginDescriptorParsingException, - MojoNotFoundException, NoPluginFoundForPrefixException, InvalidPluginDescriptorException, - PluginManagerException, LifecyclePhaseNotFoundException, LifecycleNotFoundException, - PluginVersionResolutionException - { - return calculateExecutionPlan( session, true, tasks ); - } - - // Site 3.x - public void calculateForkedExecutions( MojoExecution mojoExecution, MavenSession session ) - throws MojoNotFoundException, PluginNotFoundException, PluginResolutionException, - PluginDescriptorParsingException, NoPluginFoundForPrefixException, InvalidPluginDescriptorException, - LifecyclePhaseNotFoundException, LifecycleNotFoundException, PluginVersionResolutionException - { - lifecycleExecutionPlanCalculator.calculateForkedExecutions( mojoExecution, session ); - } - - - // Site 3.x - public List<MavenProject> executeForkedExecutions( MojoExecution mojoExecution, MavenSession session ) - throws LifecycleExecutionException - { - return mojoExecutor.executeForkedExecutions( mojoExecution, session, new ProjectIndex( session.getProjects() ) ); - } - -} diff --git a/org.eclipse.m2e.maven.runtime/src/maven-3.0.3/org/apache/maven/lifecycle/DefaultSchedules.java b/org.eclipse.m2e.maven.runtime/src/maven-3.0.3/org/apache/maven/lifecycle/DefaultSchedules.java deleted file mode 100644 index 4c1fe571..00000000 --- a/org.eclipse.m2e.maven.runtime/src/maven-3.0.3/org/apache/maven/lifecycle/DefaultSchedules.java +++ /dev/null @@ -1,99 +0,0 @@ -package org.apache.maven.lifecycle; - -/* - * 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.lifecycle.internal.BuilderCommon; -import org.apache.maven.lifecycle.internal.ExecutionPlanItem; -import org.apache.maven.plugin.MojoExecution; -import org.apache.maven.project.MavenProject; - -import java.util.ArrayList; -import java.util.List; - -/** - * Defines scheduling information needed by weave mode. - * - * @since 3.0 - * @author Kristian Rosenvold - */ -public class DefaultSchedules -{ - List<Scheduling> schedules; - - @SuppressWarnings( { "UnusedDeclaration" } ) - public DefaultSchedules() - { - } - - public DefaultSchedules( List<Scheduling> schedules ) - { - this.schedules = schedules; - } - - public List<ExecutionPlanItem> createExecutionPlanItem( MavenProject mavenProject, List<MojoExecution> executions ) - { - BuilderCommon.attachToThread( mavenProject ); - - List<ExecutionPlanItem> result = new ArrayList<ExecutionPlanItem>(); - for ( MojoExecution mojoExecution : executions ) - { - String lifeCyclePhase = mojoExecution.getLifecyclePhase(); - final Scheduling scheduling = getScheduling( "default" ); - Schedule schedule = null; - if ( scheduling != null ) - { - schedule = scheduling.getSchedule( mojoExecution ); - if ( schedule == null ) - { - schedule = scheduling.getSchedule( lifeCyclePhase ); - } - } - result.add( new ExecutionPlanItem( mojoExecution, schedule ) ); - - } - return result; - } - - /** - * Gets scheduling associated with a given phase. - * <p/> - * This is part of the experimental weave mode and therefore not part of the public api. - * - * @param lifecyclePhaseName The name of the lifecycle phase - * @return Schecduling information related to phase - */ - - Scheduling getScheduling( String lifecyclePhaseName ) - { - for ( Scheduling schedule : schedules ) - { - if ( lifecyclePhaseName.equals( schedule.getLifecycle() ) ) - { - return schedule; - } - } - return null; - } - - public List<Scheduling> getSchedules() - { - return schedules; - } -}
\ No newline at end of file diff --git a/org.eclipse.m2e.maven.runtime/src/maven-3.0.3/org/apache/maven/lifecycle/LifecycleExecutor.java b/org.eclipse.m2e.maven.runtime/src/maven-3.0.3/org/apache/maven/lifecycle/LifecycleExecutor.java deleted file mode 100644 index 37b6e499..00000000 --- a/org.eclipse.m2e.maven.runtime/src/maven-3.0.3/org/apache/maven/lifecycle/LifecycleExecutor.java +++ /dev/null @@ -1,94 +0,0 @@ -package org.apache.maven.lifecycle; - -/* - * 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.execution.MavenSession; -import org.apache.maven.model.Plugin; -import org.apache.maven.plugin.InvalidPluginDescriptorException; -import org.apache.maven.plugin.MojoExecution; -import org.apache.maven.plugin.MojoNotFoundException; -import org.apache.maven.plugin.PluginDescriptorParsingException; -import org.apache.maven.plugin.PluginManagerException; -import org.apache.maven.plugin.PluginNotFoundException; -import org.apache.maven.plugin.PluginResolutionException; -import org.apache.maven.plugin.prefix.NoPluginFoundForPrefixException; -import org.apache.maven.plugin.version.PluginVersionResolutionException; -import org.apache.maven.project.MavenProject; - -import java.util.List; -import java.util.Set; - -/** - * A facade that provides lifecycle services to components outside maven core. - * - * - * @author Jason van Zyl - */ -@SuppressWarnings( { "UnusedDeclaration" } ) -public interface LifecycleExecutor -{ - - // USED BY MAVEN HELP PLUGIN - @Deprecated - String ROLE = LifecycleExecutor.class.getName(); - - // For a given project packaging find all the plugins that are bound to any registered - // lifecycles. The project builder needs to now what default plugin information needs to be - // merged into POM being built. Once the POM builder has this plugin information, versions can be assigned - // by the POM builder because they will have to be defined in plugin management. Once this is setComplete then it - // can be passed back so that the default configuraiton information can be populated. - // - // We need to know the specific version so that we can lookup the right version of the plugin descriptor - // which tells us what the default configuration is. - // - - /** - * @return The plugins bound to the lifecycles of the specified packaging or {@code null} if the packaging is - * unknown. - */ - Set<Plugin> getPluginsBoundByDefaultToAllLifecycles( String packaging ); - - MavenExecutionPlan calculateExecutionPlan( MavenSession session, String... tasks ) - throws PluginNotFoundException, PluginResolutionException, PluginDescriptorParsingException, - MojoNotFoundException, NoPluginFoundForPrefixException, InvalidPluginDescriptorException, - PluginManagerException, LifecyclePhaseNotFoundException, LifecycleNotFoundException, - PluginVersionResolutionException; - - MavenExecutionPlan calculateExecutionPlan( MavenSession session, boolean setup, String... tasks ) - throws PluginNotFoundException, PluginResolutionException, PluginDescriptorParsingException, - MojoNotFoundException, NoPluginFoundForPrefixException, InvalidPluginDescriptorException, - PluginManagerException, LifecyclePhaseNotFoundException, LifecycleNotFoundException, - PluginVersionResolutionException; - - void execute( MavenSession session ); - - // used by the site plugin 3.x - void calculateForkedExecutions( MojoExecution mojoExecution, MavenSession session ) - throws MojoNotFoundException, PluginNotFoundException, PluginResolutionException, - PluginDescriptorParsingException, NoPluginFoundForPrefixException, InvalidPluginDescriptorException, - LifecyclePhaseNotFoundException, LifecycleNotFoundException, PluginVersionResolutionException; - - - // used by the site plugin 3.x - List<MavenProject> executeForkedExecutions( MojoExecution mojoExecution, MavenSession session ) - throws LifecycleExecutionException; - - -} diff --git a/org.eclipse.m2e.maven.runtime/src/maven-3.0.3/org/apache/maven/lifecycle/internal/DefaultLifecycleExecutionPlanCalculator.java b/org.eclipse.m2e.maven.runtime/src/maven-3.0.3/org/apache/maven/lifecycle/internal/DefaultLifecycleExecutionPlanCalculator.java deleted file mode 100644 index b28e6c01..00000000 --- a/org.eclipse.m2e.maven.runtime/src/maven-3.0.3/org/apache/maven/lifecycle/internal/DefaultLifecycleExecutionPlanCalculator.java +++ /dev/null @@ -1,695 +0,0 @@ -/* - * 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. - */ -package org.apache.maven.lifecycle.internal; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashSet; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.TreeMap; - -import org.apache.maven.execution.MavenSession; -import org.apache.maven.lifecycle.DefaultLifecycles; -import org.apache.maven.lifecycle.DefaultSchedules; -import org.apache.maven.lifecycle.Lifecycle; -import org.apache.maven.lifecycle.LifecycleNotFoundException; -import org.apache.maven.lifecycle.LifecyclePhaseNotFoundException; -import org.apache.maven.lifecycle.MavenExecutionPlan; -import org.apache.maven.model.Plugin; -import org.apache.maven.model.PluginExecution; -import org.apache.maven.plugin.BuildPluginManager; -import org.apache.maven.plugin.InvalidPluginDescriptorException; -import org.apache.maven.plugin.MojoExecution; -import org.apache.maven.plugin.MojoNotFoundException; -import org.apache.maven.plugin.PluginDescriptorParsingException; -import org.apache.maven.plugin.PluginNotFoundException; -import org.apache.maven.plugin.PluginResolutionException; -import org.apache.maven.plugin.descriptor.MojoDescriptor; -import org.apache.maven.plugin.descriptor.Parameter; -import org.apache.maven.plugin.descriptor.PluginDescriptor; -import org.apache.maven.plugin.lifecycle.Execution; -import org.apache.maven.plugin.lifecycle.Phase; -import org.apache.maven.plugin.prefix.NoPluginFoundForPrefixException; -import org.apache.maven.plugin.version.PluginVersionResolutionException; -import org.apache.maven.plugin.version.PluginVersionResolver; -import org.apache.maven.project.MavenProject; -import org.codehaus.plexus.component.annotations.Component; -import org.codehaus.plexus.component.annotations.Requirement; -import org.codehaus.plexus.util.StringUtils; -import org.codehaus.plexus.util.xml.Xpp3Dom; -import org.codehaus.plexus.util.xml.pull.XmlPullParserException; - -/** - * @since 3.0 - * @author Benjamin Bentmann - * @author Kristian Rosenvold (Extract class) - * <p/> - * NOTE: This class is not part of any public api and can be changed or deleted without prior notice. - */ -@Component( role = LifecycleExecutionPlanCalculator.class ) -public class DefaultLifecycleExecutionPlanCalculator - implements LifecycleExecutionPlanCalculator -{ - @Requirement - private PluginVersionResolver pluginVersionResolver; - - @Requirement - private BuildPluginManager pluginManager; - - @Requirement - private DefaultLifecycles defaultLifeCycles; - - @Requirement - private DefaultSchedules defaultSchedules; - - @Requirement - private MojoDescriptorCreator mojoDescriptorCreator; - - @Requirement - private LifecyclePluginResolver lifecyclePluginResolver; - - @SuppressWarnings( { "UnusedDeclaration" } ) - public DefaultLifecycleExecutionPlanCalculator() - { - } - - public DefaultLifecycleExecutionPlanCalculator( BuildPluginManager pluginManager, - DefaultLifecycles defaultLifeCycles, - MojoDescriptorCreator mojoDescriptorCreator, - LifecyclePluginResolver lifecyclePluginResolver, - DefaultSchedules defaultSchedules ) - { - this.pluginManager = pluginManager; - this.defaultLifeCycles = defaultLifeCycles; - this.mojoDescriptorCreator = mojoDescriptorCreator; - this.lifecyclePluginResolver = lifecyclePluginResolver; - this.defaultSchedules = defaultSchedules; - } - - public MavenExecutionPlan calculateExecutionPlan( MavenSession session, MavenProject project, List<Object> tasks, boolean setup ) - throws PluginNotFoundException, PluginResolutionException, LifecyclePhaseNotFoundException, - PluginDescriptorParsingException, MojoNotFoundException, InvalidPluginDescriptorException, - NoPluginFoundForPrefixException, LifecycleNotFoundException, PluginVersionResolutionException - { - lifecyclePluginResolver.resolveMissingPluginVersions( project, session ); - - final List<MojoExecution> executions = calculateMojoExecutions( session, project, tasks ); - - if ( setup ) - { - setupMojoExecutions( session, project, executions ); - } - - final List<ExecutionPlanItem> planItem = defaultSchedules.createExecutionPlanItem( project, executions ); - - return new MavenExecutionPlan( planItem, defaultLifeCycles ); - } - - public MavenExecutionPlan calculateExecutionPlan( MavenSession session, MavenProject project, List<Object> tasks ) - throws PluginNotFoundException, PluginResolutionException, LifecyclePhaseNotFoundException, - PluginDescriptorParsingException, MojoNotFoundException, InvalidPluginDescriptorException, - NoPluginFoundForPrefixException, LifecycleNotFoundException, PluginVersionResolutionException - { - return calculateExecutionPlan( session, project, tasks, true ); - } - - private void setupMojoExecutions( MavenSession session, MavenProject project, List<MojoExecution> mojoExecutions ) - throws PluginNotFoundException, PluginResolutionException, PluginDescriptorParsingException, - MojoNotFoundException, InvalidPluginDescriptorException, NoPluginFoundForPrefixException, - LifecyclePhaseNotFoundException, LifecycleNotFoundException, PluginVersionResolutionException - { - for ( MojoExecution mojoExecution : mojoExecutions ) - { - setupMojoExecution( session, project, mojoExecution ); - } - } - - public void setupMojoExecution( MavenSession session, MavenProject project, MojoExecution mojoExecution ) - throws PluginNotFoundException, PluginResolutionException, PluginDescriptorParsingException, - MojoNotFoundException, InvalidPluginDescriptorException, NoPluginFoundForPrefixException, - LifecyclePhaseNotFoundException, LifecycleNotFoundException, PluginVersionResolutionException - { - MojoDescriptor mojoDescriptor = mojoExecution.getMojoDescriptor(); - - if ( mojoDescriptor == null ) - { - mojoDescriptor = - pluginManager.getMojoDescriptor( mojoExecution.getPlugin(), mojoExecution.getGoal(), - project.getRemotePluginRepositories(), - session.getRepositorySession() ); - - mojoExecution.setMojoDescriptor( mojoDescriptor ); - } - - populateMojoExecutionConfiguration( project, mojoExecution, - MojoExecution.Source.CLI.equals( mojoExecution.getSource() ) ); - - finalizeMojoConfiguration( mojoExecution ); - - calculateForkedExecutions( mojoExecution, session, project, new HashSet<MojoDescriptor>() ); - } - - public List<MojoExecution> calculateMojoExecutions( MavenSession session, MavenProject project, - List<Object> tasks ) - throws PluginNotFoundException, PluginResolutionException, PluginDescriptorParsingException, - MojoNotFoundException, NoPluginFoundForPrefixException, InvalidPluginDescriptorException, - PluginVersionResolutionException, LifecyclePhaseNotFoundException - { - final List<MojoExecution> mojoExecutions = new ArrayList<MojoExecution>(); - - for ( Object task : tasks ) - { - if ( task instanceof GoalTask ) - { - String pluginGoal = ( (GoalTask) task ).pluginGoal; - - MojoDescriptor mojoDescriptor = mojoDescriptorCreator.getMojoDescriptor( pluginGoal, session, project ); - - MojoExecution mojoExecution = - new MojoExecution( mojoDescriptor, "default-cli", MojoExecution.Source.CLI ); - - mojoExecutions.add( mojoExecution ); - } - else if ( task instanceof LifecycleTask ) - { - String lifecyclePhase = ( (LifecycleTask) task ).getLifecyclePhase(); - - Map<String, List<MojoExecution>> phaseToMojoMapping = - calculateLifecycleMappings( session, project, lifecyclePhase ); - - for ( List<MojoExecution> mojoExecutionsFromLifecycle : phaseToMojoMapping.values() ) - { - mojoExecutions.addAll( mojoExecutionsFromLifecycle ); - } - } - else - { - throw new IllegalStateException( "unexpected task " + task ); - } - } - return mojoExecutions; - } - - private Map<String, List<MojoExecution>> calculateLifecycleMappings( MavenSession session, MavenProject project, - String lifecyclePhase ) - throws LifecyclePhaseNotFoundException, PluginNotFoundException, PluginResolutionException, - PluginDescriptorParsingException, MojoNotFoundException, InvalidPluginDescriptorException - { - /* - * Determine the lifecycle that corresponds to the given phase. - */ - - Lifecycle lifecycle = defaultLifeCycles.get( lifecyclePhase ); - - if ( lifecycle == null ) - { - throw new LifecyclePhaseNotFoundException( - "Unknown lifecycle phase \"" + lifecyclePhase + "\". You must specify a valid lifecycle phase" + - " or a goal in the format <plugin-prefix>:<goal> or" + - " <plugin-group-id>:<plugin-artifact-id>[:<plugin-version>]:<goal>. Available lifecycle phases are: " + - defaultLifeCycles.getLifecyclePhaseList() + ".", lifecyclePhase ); - } - - /* - * Initialize mapping from lifecycle phase to bound mojos. The key set of this map denotes the phases the caller - * is interested in, i.e. all phases up to and including the specified phase. - */ - - Map<String, Map<Integer, List<MojoExecution>>> mappings = - new LinkedHashMap<String, Map<Integer, List<MojoExecution>>>(); - - for ( String phase : lifecycle.getPhases() ) - { - Map<Integer, List<MojoExecution>> phaseBindings = new TreeMap<Integer, List<MojoExecution>>(); - - mappings.put( phase, phaseBindings ); - - if ( phase.equals( lifecyclePhase ) ) - { - break; - } - } - - /* - * Grab plugin executions that are bound to the selected lifecycle phases from project. The effective model of - * the project already contains the plugin executions induced by the project's packaging type. Remember, all - * phases of interest and only those are in the lifecyle mapping, if a phase has no value in the map, we are not - * interested in any of the executions bound to it. - */ - - for ( Plugin plugin : project.getBuild().getPlugins() ) - { - for ( PluginExecution execution : plugin.getExecutions() ) - { - // if the phase is specified then I don't have to go fetch the plugin yet and pull it down - // to examine the phase it is associated to. - if ( execution.getPhase() != null ) - { - Map<Integer, List<MojoExecution>> phaseBindings = mappings.get( execution.getPhase() ); - if ( phaseBindings != null ) - { - for ( String goal : execution.getGoals() ) - { - MojoExecution mojoExecution = new MojoExecution( plugin, goal, execution.getId() ); - mojoExecution.setLifecyclePhase( execution.getPhase() ); - addMojoExecution( phaseBindings, mojoExecution, execution.getPriority() ); - } - } - } - // if not then i need to grab the mojo descriptor and look at the phase that is specified - else - { - for ( String goal : execution.getGoals() ) - { - MojoDescriptor mojoDescriptor = - pluginManager.getMojoDescriptor( plugin, goal, project.getRemotePluginRepositories(), - session.getRepositorySession() ); - - Map<Integer, List<MojoExecution>> phaseBindings = mappings.get( mojoDescriptor.getPhase() ); - if ( phaseBindings != null ) - { - MojoExecution mojoExecution = new MojoExecution( mojoDescriptor, execution.getId() ); - mojoExecution.setLifecyclePhase( mojoDescriptor.getPhase() ); - addMojoExecution( phaseBindings, mojoExecution, execution.getPriority() ); - } - } - } - } - } - - Map<String, List<MojoExecution>> lifecycleMappings = new LinkedHashMap<String, List<MojoExecution>>(); - - for ( Map.Entry<String, Map<Integer, List<MojoExecution>>> entry : mappings.entrySet() ) - { - List<MojoExecution> mojoExecutions = new ArrayList<MojoExecution>(); - - for ( List<MojoExecution> executions : entry.getValue().values() ) - { - mojoExecutions.addAll( executions ); - } - - lifecycleMappings.put( entry.getKey(), mojoExecutions ); - } - - return lifecycleMappings; - } - - private void addMojoExecution( Map<Integer, List<MojoExecution>> phaseBindings, MojoExecution mojoExecution, - int priority ) - { - List<MojoExecution> mojoExecutions = phaseBindings.get( priority ); - - if ( mojoExecutions == null ) - { - mojoExecutions = new ArrayList<MojoExecution>(); - phaseBindings.put( priority, mojoExecutions ); - } - - mojoExecutions.add( mojoExecution ); - } - - private void populateMojoExecutionConfiguration( MavenProject project, MojoExecution mojoExecution, - boolean allowPluginLevelConfig ) - { - String g = mojoExecution.getGroupId(); - - String a = mojoExecution.getArtifactId(); - - Plugin plugin = findPlugin( g, a, project.getBuildPlugins() ); - - if ( plugin == null && project.getPluginManagement() != null ) - { - plugin = findPlugin( g, a, project.getPluginManagement().getPlugins() ); - } - - if ( plugin != null ) - { - PluginExecution pluginExecution = - findPluginExecution( mojoExecution.getExecutionId(), plugin.getExecutions() ); - - Xpp3Dom pomConfiguration = null; - - if ( pluginExecution != null ) - { - pomConfiguration = (Xpp3Dom) pluginExecution.getConfiguration(); - } - else if ( allowPluginLevelConfig ) - { - pomConfiguration = (Xpp3Dom) plugin.getConfiguration(); - } - - Xpp3Dom mojoConfiguration = ( pomConfiguration != null ) ? new Xpp3Dom( pomConfiguration ) : null; - - mojoConfiguration = Xpp3Dom.mergeXpp3Dom( mojoExecution.getConfiguration(), mojoConfiguration ); - - mojoExecution.setConfiguration( mojoConfiguration ); - } - } - - private Plugin findPlugin( String groupId, String artifactId, Collection<Plugin> plugins ) - { - for ( Plugin plugin : plugins ) - { - if ( artifactId.equals( plugin.getArtifactId() ) && groupId.equals( plugin.getGroupId() ) ) - { - return plugin; - } - } - - return null; - } - - private PluginExecution findPluginExecution( String executionId, Collection<PluginExecution> executions ) - { - if ( StringUtils.isNotEmpty( executionId ) ) - { - for ( PluginExecution execution : executions ) - { - if ( executionId.equals( execution.getId() ) ) - { - return execution; - } - } - } - - return null; - } - - /** - * Post-processes the effective configuration for the specified mojo execution. This step discards all parameters - * from the configuration that are not applicable to the mojo and injects the default values for any missing - * parameters. - * - * @param mojoExecution The mojo execution whose configuration should be finalized, must not be {@code null}. - */ - private void finalizeMojoConfiguration( MojoExecution mojoExecution ) - { - MojoDescriptor mojoDescriptor = mojoExecution.getMojoDescriptor(); - - Xpp3Dom executionConfiguration = mojoExecution.getConfiguration(); - if ( executionConfiguration == null ) - { - executionConfiguration = new Xpp3Dom( "configuration" ); - } - - Xpp3Dom defaultConfiguration = getMojoConfiguration( mojoDescriptor ); - - Xpp3Dom finalConfiguration = new Xpp3Dom( "configuration" ); - - if ( mojoDescriptor.getParameters() != null ) - { - for ( Parameter parameter : mojoDescriptor.getParameters() ) - { - Xpp3Dom parameterConfiguration = executionConfiguration.getChild( parameter.getName() ); - - if ( parameterConfiguration == null ) - { - parameterConfiguration = executionConfiguration.getChild( parameter.getAlias() ); - } - - Xpp3Dom parameterDefaults = defaultConfiguration.getChild( parameter.getName() ); - - parameterConfiguration = - Xpp3Dom.mergeXpp3Dom( parameterConfiguration, parameterDefaults, Boolean.TRUE ); - - if ( parameterConfiguration != null ) - { - parameterConfiguration = new Xpp3Dom( parameterConfiguration, parameter.getName() ); - - if ( StringUtils.isEmpty( parameterConfiguration.getAttribute( "implementation" ) ) && - StringUtils.isNotEmpty( parameter.getImplementation() ) ) - { - parameterConfiguration.setAttribute( "implementation", parameter.getImplementation() ); - } - - finalConfiguration.addChild( parameterConfiguration ); - } - } - } - - mojoExecution.setConfiguration( finalConfiguration ); - } - - private Xpp3Dom getMojoConfiguration( MojoDescriptor mojoDescriptor ) - { - return MojoDescriptorCreator.convert( mojoDescriptor ); - } - - public void calculateForkedExecutions( MojoExecution mojoExecution, MavenSession session ) - throws MojoNotFoundException, PluginNotFoundException, PluginResolutionException, - PluginDescriptorParsingException, NoPluginFoundForPrefixException, InvalidPluginDescriptorException, - LifecyclePhaseNotFoundException, LifecycleNotFoundException, PluginVersionResolutionException - { - calculateForkedExecutions( mojoExecution, session, session.getCurrentProject(), new HashSet<MojoDescriptor>() ); - } - - private void calculateForkedExecutions( MojoExecution mojoExecution, MavenSession session, MavenProject project, - Collection<MojoDescriptor> alreadyForkedExecutions ) - throws MojoNotFoundException, PluginNotFoundException, PluginResolutionException, - PluginDescriptorParsingException, NoPluginFoundForPrefixException, InvalidPluginDescriptorException, - LifecyclePhaseNotFoundException, LifecycleNotFoundException, PluginVersionResolutionException - { - MojoDescriptor mojoDescriptor = mojoExecution.getMojoDescriptor(); - - if ( !mojoDescriptor.isForking() ) - { - return; - } - - if ( !alreadyForkedExecutions.add( mojoDescriptor ) ) - { - return; - } - - List<MavenProject> forkedProjects = - LifecycleDependencyResolver.getProjects( project, session, mojoDescriptor.isAggregator() ); - - for ( MavenProject forkedProject : forkedProjects ) - { - if ( forkedProject != project ) - { - lifecyclePluginResolver.resolveMissingPluginVersions( forkedProject, session ); - } - - List<MojoExecution> forkedExecutions; - - if ( StringUtils.isNotEmpty( mojoDescriptor.getExecutePhase() ) ) - { - forkedExecutions = - calculateForkedLifecycle( mojoExecution, session, forkedProject, alreadyForkedExecutions ); - } - else - { - forkedExecutions = - calculateForkedGoal( mojoExecution, session, forkedProject, alreadyForkedExecutions ); - } - - mojoExecution.setForkedExecutions( BuilderCommon.getKey( forkedProject ), forkedExecutions ); - } - - alreadyForkedExecutions.remove( mojoDescriptor ); - } - - private List<MojoExecution> calculateForkedLifecycle( MojoExecution mojoExecution, MavenSession session, - MavenProject project, - Collection<MojoDescriptor> alreadyForkedExecutions ) - throws MojoNotFoundException, PluginNotFoundException, PluginResolutionException, - PluginDescriptorParsingException, NoPluginFoundForPrefixException, InvalidPluginDescriptorException, - LifecyclePhaseNotFoundException, LifecycleNotFoundException, PluginVersionResolutionException - { - MojoDescriptor mojoDescriptor = mojoExecution.getMojoDescriptor(); - - String forkedPhase = mojoDescriptor.getExecutePhase(); - - Map<String, List<MojoExecution>> lifecycleMappings = - calculateLifecycleMappings( session, project, forkedPhase ); - - for ( List<MojoExecution> forkedExecutions : lifecycleMappings.values() ) - { - for ( MojoExecution forkedExecution : forkedExecutions ) - { - if ( forkedExecution.getMojoDescriptor() == null ) - { - MojoDescriptor forkedMojoDescriptor = - pluginManager.getMojoDescriptor( forkedExecution.getPlugin(), forkedExecution.getGoal(), - project.getRemotePluginRepositories(), - session.getRepositorySession() ); - - forkedExecution.setMojoDescriptor( forkedMojoDescriptor ); - } - - populateMojoExecutionConfiguration( project, forkedExecution, false ); - } - } - - injectLifecycleOverlay( lifecycleMappings, mojoExecution, session, project ); - - List<MojoExecution> mojoExecutions = new ArrayList<MojoExecution>(); - - for ( List<MojoExecution> forkedExecutions : lifecycleMappings.values() ) - { - for ( MojoExecution forkedExecution : forkedExecutions ) - { - if ( !alreadyForkedExecutions.contains( forkedExecution.getMojoDescriptor() ) ) - { - finalizeMojoConfiguration( forkedExecution ); - - calculateForkedExecutions( forkedExecution, session, project, alreadyForkedExecutions ); - - mojoExecutions.add( forkedExecution ); - } - } - } - - return mojoExecutions; - } - - private void injectLifecycleOverlay( Map<String, List<MojoExecution>> lifecycleMappings, - MojoExecution mojoExecution, MavenSession session, MavenProject project ) - throws PluginDescriptorParsingException, LifecycleNotFoundException, MojoNotFoundException, - PluginNotFoundException, PluginResolutionException, NoPluginFoundForPrefixException, - InvalidPluginDescriptorException, PluginVersionResolutionException - { - MojoDescriptor mojoDescriptor = mojoExecution.getMojoDescriptor(); - - PluginDescriptor pluginDescriptor = mojoDescriptor.getPluginDescriptor(); - - String forkedLifecycle = mojoDescriptor.getExecuteLifecycle(); - - if ( StringUtils.isEmpty( forkedLifecycle ) ) - { - return; - } - - org.apache.maven.plugin.lifecycle.Lifecycle lifecycleOverlay; - - try - { - lifecycleOverlay = pluginDescriptor.getLifecycleMapping( forkedLifecycle ); - } - catch ( IOException e ) - { - throw new PluginDescriptorParsingException( pluginDescriptor.getPlugin(), pluginDescriptor.getSource(), e ); - } - catch ( XmlPullParserException e ) - { - throw new PluginDescriptorParsingException( pluginDescriptor.getPlugin(), pluginDescriptor.getSource(), e ); - } - - if ( lifecycleOverlay == null ) - { - throw new LifecycleNotFoundException( forkedLifecycle ); - } - - for ( Phase phase : lifecycleOverlay.getPhases() ) - { - List<MojoExecution> forkedExecutions = lifecycleMappings.get( phase.getId() ); - - if ( forkedExecutions != null ) - { - for ( Execution execution : phase.getExecutions() ) - { - for ( String goal : execution.getGoals() ) - { - MojoDescriptor forkedMojoDescriptor; - - if ( goal.indexOf( ':' ) < 0 ) - { - forkedMojoDescriptor = pluginDescriptor.getMojo( goal ); - if ( forkedMojoDescriptor == null ) - { - throw new MojoNotFoundException( goal, pluginDescriptor ); - } - } - else - { - forkedMojoDescriptor = mojoDescriptorCreator.getMojoDescriptor( goal, session, project ); - } - - MojoExecution forkedExecution = - new MojoExecution( forkedMojoDescriptor, mojoExecution.getExecutionId() ); - - Xpp3Dom forkedConfiguration = (Xpp3Dom) execution.getConfiguration(); - - forkedExecution.setConfiguration( forkedConfiguration ); - - populateMojoExecutionConfiguration( project, forkedExecution, true ); - - forkedExecutions.add( forkedExecution ); - } - } - - Xpp3Dom phaseConfiguration = (Xpp3Dom) phase.getConfiguration(); - - if ( phaseConfiguration != null ) - { - for ( MojoExecution forkedExecution : forkedExecutions ) - { - Xpp3Dom forkedConfiguration = forkedExecution.getConfiguration(); - - forkedConfiguration = Xpp3Dom.mergeXpp3Dom( phaseConfiguration, forkedConfiguration ); - - forkedExecution.setConfiguration( forkedConfiguration ); - } - } - } - } - } - // org.apache.maven.plugins:maven-remote-resources-plugin:1.0:process - //TODO: take repo mans into account as one may be aggregating prefixes of many - //TODO: collect at the root of the repository, read the one at the root, and fetch remote if something is missing - // or the user forces the issue - - private List<MojoExecution> calculateForkedGoal( MojoExecution mojoExecution, MavenSession session, - MavenProject project, - Collection<MojoDescriptor> alreadyForkedExecutions ) - throws MojoNotFoundException, PluginNotFoundException, PluginResolutionException, - PluginDescriptorParsingException, NoPluginFoundForPrefixException, InvalidPluginDescriptorException, - LifecyclePhaseNotFoundException, LifecycleNotFoundException, PluginVersionResolutionException - { - MojoDescriptor mojoDescriptor = mojoExecution.getMojoDescriptor(); - - PluginDescriptor pluginDescriptor = mojoDescriptor.getPluginDescriptor(); - - String forkedGoal = mojoDescriptor.getExecuteGoal(); - - MojoDescriptor forkedMojoDescriptor = pluginDescriptor.getMojo( forkedGoal ); - if ( forkedMojoDescriptor == null ) - { - throw new MojoNotFoundException( forkedGoal, pluginDescriptor ); - } - - if ( alreadyForkedExecutions.contains( forkedMojoDescriptor ) ) - { - return Collections.emptyList(); - } - - MojoExecution forkedExecution = new MojoExecution( forkedMojoDescriptor, forkedGoal ); - - populateMojoExecutionConfiguration( project, forkedExecution, true ); - - finalizeMojoConfiguration( forkedExecution ); - - calculateForkedExecutions( forkedExecution, session, project, alreadyForkedExecutions ); - - return Collections.singletonList( forkedExecution ); - } - - -} diff --git a/org.eclipse.m2e.maven.runtime/src/maven-3.0.3/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculator.java b/org.eclipse.m2e.maven.runtime/src/maven-3.0.3/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculator.java deleted file mode 100644 index 7d35b102..00000000 --- a/org.eclipse.m2e.maven.runtime/src/maven-3.0.3/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculator.java +++ /dev/null @@ -1,67 +0,0 @@ -package org.apache.maven.lifecycle.internal; - -/* - * 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.execution.MavenSession; -import org.apache.maven.lifecycle.LifecycleNotFoundException; -import org.apache.maven.lifecycle.LifecyclePhaseNotFoundException; -import org.apache.maven.lifecycle.MavenExecutionPlan; -import org.apache.maven.plugin.InvalidPluginDescriptorException; -import org.apache.maven.plugin.MojoExecution; -import org.apache.maven.plugin.MojoNotFoundException; -import org.apache.maven.plugin.PluginDescriptorParsingException; -import org.apache.maven.plugin.PluginNotFoundException; -import org.apache.maven.plugin.PluginResolutionException; -import org.apache.maven.plugin.prefix.NoPluginFoundForPrefixException; -import org.apache.maven.plugin.version.PluginVersionResolutionException; -import org.apache.maven.project.MavenProject; - -import java.util.List; - -/** - * @since 3.0 - * @author Benjamin Bentmann - * @author Kristian Rosenvold (extract interface only) - * <p/> - */ -public interface LifecycleExecutionPlanCalculator -{ - MavenExecutionPlan calculateExecutionPlan( MavenSession session, MavenProject project, List<Object> tasks ) - throws PluginNotFoundException, PluginResolutionException, LifecyclePhaseNotFoundException, - PluginDescriptorParsingException, MojoNotFoundException, InvalidPluginDescriptorException, - NoPluginFoundForPrefixException, LifecycleNotFoundException, PluginVersionResolutionException; - - MavenExecutionPlan calculateExecutionPlan( MavenSession session, MavenProject project, List<Object> tasks, - boolean setup ) - throws PluginNotFoundException, PluginResolutionException, LifecyclePhaseNotFoundException, - PluginDescriptorParsingException, MojoNotFoundException, InvalidPluginDescriptorException, - NoPluginFoundForPrefixException, LifecycleNotFoundException, PluginVersionResolutionException; - - void calculateForkedExecutions( MojoExecution mojoExecution, MavenSession session ) - throws MojoNotFoundException, PluginNotFoundException, PluginResolutionException, - PluginDescriptorParsingException, NoPluginFoundForPrefixException, InvalidPluginDescriptorException, - LifecyclePhaseNotFoundException, LifecycleNotFoundException, PluginVersionResolutionException; - - void setupMojoExecution( MavenSession session, MavenProject project, MojoExecution mojoExecution ) - throws PluginNotFoundException, PluginResolutionException, PluginDescriptorParsingException, - MojoNotFoundException, InvalidPluginDescriptorException, NoPluginFoundForPrefixException, - LifecyclePhaseNotFoundException, LifecycleNotFoundException, PluginVersionResolutionException; - -} diff --git a/org.eclipse.m2e.maven.runtime/src/maven-3.0.3/org/apache/maven/lifecycle/internal/LifecycleTaskSegmentCalculator.java b/org.eclipse.m2e.maven.runtime/src/maven-3.0.3/org/apache/maven/lifecycle/internal/LifecycleTaskSegmentCalculator.java deleted file mode 100644 index 113a5ab3..00000000 --- a/org.eclipse.m2e.maven.runtime/src/maven-3.0.3/org/apache/maven/lifecycle/internal/LifecycleTaskSegmentCalculator.java +++ /dev/null @@ -1,61 +0,0 @@ -package org.apache.maven.lifecycle.internal; - -/* - * 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.execution.MavenSession; -import org.apache.maven.lifecycle.LifecycleNotFoundException; -import org.apache.maven.lifecycle.LifecyclePhaseNotFoundException; -import org.apache.maven.plugin.InvalidPluginDescriptorException; -import org.apache.maven.plugin.MojoNotFoundException; -import org.apache.maven.plugin.PluginDescriptorParsingException; -import org.apache.maven.plugin.PluginNotFoundException; -import org.apache.maven.plugin.PluginResolutionException; -import org.apache.maven.plugin.prefix.NoPluginFoundForPrefixException; -import org.apache.maven.plugin.version.PluginVersionResolutionException; - -import java.util.List; - -/** - * Calculates the task segments in the build - * - * @since 3.0 - * @author Benjamin Bentmann - * @author Jason van Zyl - * @author jdcasey - * @author Kristian Rosenvold (extracted interface) - * <p/> - * NOTE: This interface is not part of any public api and can be changed or deleted without prior notice. - */ - -public interface LifecycleTaskSegmentCalculator -{ - List<TaskSegment> calculateTaskSegments( MavenSession session ) - throws PluginNotFoundException, PluginResolutionException, PluginDescriptorParsingException, - MojoNotFoundException, NoPluginFoundForPrefixException, InvalidPluginDescriptorException, - PluginVersionResolutionException, LifecyclePhaseNotFoundException, LifecycleNotFoundException; - - public List<TaskSegment> calculateTaskSegments( MavenSession session, List<String> tasks ) - throws PluginNotFoundException, PluginResolutionException, PluginDescriptorParsingException, - MojoNotFoundException, NoPluginFoundForPrefixException, InvalidPluginDescriptorException, - PluginVersionResolutionException; - - boolean requiresProject( MavenSession session ); - -} diff --git a/org.eclipse.m2e.maven.runtime/src/maven-3.0.3/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java b/org.eclipse.m2e.maven.runtime/src/maven-3.0.3/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java deleted file mode 100644 index da0673af..00000000 --- a/org.eclipse.m2e.maven.runtime/src/maven-3.0.3/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java +++ /dev/null @@ -1,236 +0,0 @@ -package org.apache.maven.model.inheritance; - -/* - * 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.HashMap; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -import org.apache.maven.model.Model; -import org.apache.maven.model.Plugin; -import org.apache.maven.model.PluginContainer; -import org.apache.maven.model.ReportPlugin; -import org.apache.maven.model.Reporting; -import org.apache.maven.model.building.ModelBuildingRequest; -import org.apache.maven.model.building.ModelProblemCollector; -import org.apache.maven.model.merge.MavenModelMerger; -import org.codehaus.plexus.component.annotations.Component; - -/** - * Handles inheritance of model values. - * - * @author Benjamin Bentmann - */ -@Component( role = InheritanceAssembler.class ) -public class DefaultInheritanceAssembler - implements InheritanceAssembler -{ - - private InheritanceModelMerger merger = new InheritanceModelMerger(); - - public void assembleModelInheritance( Model child, Model parent, ModelBuildingRequest request, - ModelProblemCollector problems ) - { - Map<Object, Object> hints = new HashMap<Object, Object>(); - hints.put( MavenModelMerger.CHILD_PATH_ADJUSTMENT, getChildPathAdjustment( child, parent ) ); - merger.merge( child, parent, false, hints ); - } - - /** - * Calculates the relative path from the base directory of the parent to the parent directory of the base directory - * of the child. The general idea is to adjust inherited URLs to match the project layout (in SCM). This calculation - * is only a heuristic based on our conventions. In detail, the algo relies on the following assumptions. The parent - * uses aggregation and refers to the child via the modules section. The module path to the child is considered to - * point at the POM rather than its base directory if the path ends with ".xml" (ignoring case). The name of the - * child's base directory matches the artifact id of the child. Note that for the sake of independence from the user - * environment, the filesystem is intentionally not used for the calculation. - * - * @param child The child model, must not be <code>null</code>. - * @param parent The parent model, may be <code>null</code>. - * @return The path adjustment, can be empty but never <code>null</code>. - */ - private String getChildPathAdjustment( Model child, Model parent ) - { - String adjustment = ""; - - if ( parent != null ) - { - String childArtifactId = child.getArtifactId(); - - for ( String module : parent.getModules() ) - { - module = module.replace( '\\', '/' ); - - if ( module.regionMatches( true, module.length() - 4, ".xml", 0, 4 ) ) - { - module = module.substring( 0, module.lastIndexOf( '/' ) + 1 ); - } - - String moduleName = module; - if ( moduleName.endsWith( "/" ) ) - { - moduleName = moduleName.substring( 0, moduleName.length() - 1 ); - } - - int lastSlash = moduleName.lastIndexOf( '/' ); - - moduleName = moduleName.substring( lastSlash + 1 ); - - if ( moduleName.equals( childArtifactId ) && lastSlash >= 0 ) - { - adjustment = module.substring( 0, lastSlash ); - break; - } - } - } - - return adjustment; - } - - private static class InheritanceModelMerger - extends MavenModelMerger - { - - @Override - protected void mergePluginContainer_Plugins( PluginContainer target, PluginContainer source, - boolean sourceDominant, Map<Object, Object> context ) - { - List<Plugin> src = source.getPlugins(); - if ( !src.isEmpty() ) - { - List<Plugin> tgt = target.getPlugins(); - Map<Object, Plugin> master = new LinkedHashMap<Object, Plugin>( src.size() * 2 ); - - for ( Plugin element : src ) - { - if ( element.isInherited() || !element.getExecutions().isEmpty() ) - { - // NOTE: Enforce recursive merge to trigger merging/inheritance logic for executions - Plugin plugin = new Plugin(); - plugin.setLocation( "", element.getLocation( "" ) ); - plugin.setGroupId( null ); - mergePlugin( plugin, element, sourceDominant, context ); - - Object key = getPluginKey( element ); - - master.put( key, plugin ); - } - } - - Map<Object, List<Plugin>> predecessors = new LinkedHashMap<Object, List<Plugin>>(); - List<Plugin> pending = new ArrayList<Plugin>(); - for ( Plugin element : tgt ) - { - Object key = getPluginKey( element ); - Plugin existing = master.get( key ); - if ( existing != null ) - { - mergePlugin( element, existing, sourceDominant, context ); - - master.put( key, element ); - - if ( !pending.isEmpty() ) - { - predecessors.put( key, pending ); - pending = new ArrayList<Plugin>(); - } - } - else - { - pending.add( element ); - } - } - - List<Plugin> result = new ArrayList<Plugin>( src.size() + tgt.size() ); - for ( Map.Entry<Object, Plugin> entry : master.entrySet() ) - { - List<Plugin> pre = predecessors.get( entry.getKey() ); - if ( pre != null ) - { - result.addAll( pre ); - } - result.add( entry.getValue() ); - } - result.addAll( pending ); - - target.setPlugins( result ); - } - } - - @Override - protected void mergePlugin( Plugin target, Plugin source, boolean sourceDominant, Map<Object, Object> context ) - { - if ( source.isInherited() ) - { - mergeConfigurationContainer( target, source, sourceDominant, context ); - } - mergePlugin_GroupId( target, source, sourceDominant, context ); - mergePlugin_ArtifactId( target, source, sourceDominant, context ); - mergePlugin_Version( target, source, sourceDominant, context ); - mergePlugin_Extensions( target, source, sourceDominant, context ); - mergePlugin_Dependencies( target, source, sourceDominant, context ); - mergePlugin_Executions( target, source, sourceDominant, context ); - } - - @Override - protected void mergeReporting_Plugins( Reporting target, Reporting source, boolean sourceDominant, - Map<Object, Object> context ) - { - List<ReportPlugin> src = source.getPlugins(); - if ( !src.isEmpty() ) - { - List<ReportPlugin> tgt = target.getPlugins(); - Map<Object, ReportPlugin> merged = - new LinkedHashMap<Object, ReportPlugin>( ( src.size() + tgt.size() ) * 2 ); - - for ( ReportPlugin element : src ) - { - Object key = getReportPluginKey( element ); - if ( element.isInherited() ) - { - // NOTE: Enforce recursive merge to trigger merging/inheritance logic for executions as well - ReportPlugin plugin = new ReportPlugin(); - plugin.setLocation( "", element.getLocation( "" ) ); - plugin.setGroupId( null ); - mergeReportPlugin( plugin, element, sourceDominant, context ); - - merged.put( key, plugin ); - } - } - - for ( ReportPlugin element : tgt ) - { - Object key = getReportPluginKey( element ); - ReportPlugin existing = merged.get( key ); - if ( existing != null ) - { - mergeReportPlugin( element, existing, sourceDominant, context ); - } - merged.put( key, element ); - } - - target.setPlugins( new ArrayList<ReportPlugin>( merged.values() ) ); - } - } - } - -} diff --git a/org.eclipse.m2e.maven.runtime/src/maven-3.0.3/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java b/org.eclipse.m2e.maven.runtime/src/maven-3.0.3/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java deleted file mode 100644 index 9c646b75..00000000 --- a/org.eclipse.m2e.maven.runtime/src/maven-3.0.3/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java +++ /dev/null @@ -1,718 +0,0 @@ -package org.apache.maven.plugin.internal; - -/* - * 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.BufferedInputStream; -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.PrintStream; -import java.io.Reader; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.jar.JarFile; -import java.util.zip.ZipEntry; - -import org.apache.maven.RepositoryUtils; -import org.apache.maven.artifact.Artifact; -import org.apache.maven.classrealm.ClassRealmManager; -import org.apache.maven.execution.MavenSession; -import org.apache.maven.model.Plugin; -import org.apache.maven.monitor.logging.DefaultLog; -import org.apache.maven.plugin.ContextEnabled; -import org.apache.maven.plugin.DebugConfigurationListener; -import org.apache.maven.plugin.InvalidPluginDescriptorException; -import org.apache.maven.plugin.MavenPluginManager; -import org.apache.maven.plugin.MavenPluginValidator; -import org.apache.maven.plugin.Mojo; -import org.apache.maven.plugin.MojoExecution; -import org.apache.maven.plugin.MojoNotFoundException; -import org.apache.maven.plugin.PluginConfigurationException; -import org.apache.maven.plugin.PluginContainerException; -import org.apache.maven.plugin.PluginDescriptorCache; -import org.apache.maven.plugin.PluginDescriptorParsingException; -import org.apache.maven.plugin.PluginIncompatibleException; -import org.apache.maven.plugin.PluginParameterException; -import org.apache.maven.plugin.PluginParameterExpressionEvaluator; -import org.apache.maven.plugin.PluginRealmCache; -import org.apache.maven.plugin.PluginResolutionException; -import org.apache.maven.plugin.descriptor.MojoDescriptor; -import org.apache.maven.plugin.descriptor.Parameter; -import org.apache.maven.plugin.descriptor.PluginDescriptor; -import org.apache.maven.plugin.descriptor.PluginDescriptorBuilder; -import org.apache.maven.project.MavenProject; -import org.apache.maven.rtinfo.RuntimeInformation; -import org.codehaus.plexus.PlexusContainer; -import org.codehaus.plexus.classworlds.realm.ClassRealm; -import org.codehaus.plexus.component.annotations.Component; -import org.codehaus.plexus.component.annotations.Requirement; -import org.codehaus.plexus.component.composition.CycleDetectedInComponentGraphException; -import org.codehaus.plexus.component.configurator.ComponentConfigurationException; -import org.codehaus.plexus.component.configurator.ComponentConfigurator; -import org.codehaus.plexus.component.configurator.ConfigurationListener; -import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException; -import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator; -import org.codehaus.plexus.component.repository.ComponentDescriptor; -import org.codehaus.plexus.component.repository.exception.ComponentLifecycleException; -import org.codehaus.plexus.component.repository.exception.ComponentLookupException; -import org.codehaus.plexus.configuration.PlexusConfiguration; -import org.codehaus.plexus.configuration.PlexusConfigurationException; -import org.codehaus.plexus.configuration.xml.XmlPlexusConfiguration; -import org.codehaus.plexus.logging.Logger; -import org.codehaus.plexus.util.IOUtil; -import org.codehaus.plexus.util.ReaderFactory; -import org.codehaus.plexus.util.StringUtils; -import org.codehaus.plexus.util.xml.Xpp3Dom; -import org.sonatype.aether.RepositorySystemSession; -import org.sonatype.aether.graph.DependencyFilter; -import org.sonatype.aether.graph.DependencyNode; -import org.sonatype.aether.repository.RemoteRepository; -import org.sonatype.aether.util.filter.AndDependencyFilter; -import org.sonatype.aether.util.graph.PreorderNodeListGenerator; - -/** - * Provides basic services to manage Maven plugins and their mojos. This component is kept general in its design such - * that the plugins/mojos can be used in arbitrary contexts. In particular, the mojos can be used for ordinary build - * plugins as well as special purpose plugins like reports. - * - * @since 3.0 - * @author Benjamin Bentmann - */ -@Component( role = MavenPluginManager.class ) -public class DefaultMavenPluginManager - implements MavenPluginManager -{ - - @Requirement - private Logger logger; - - @Requirement - private PlexusContainer container; - - @Requirement - private ClassRealmManager classRealmManager; - - @Requirement - private PluginDescriptorCache pluginDescriptorCache; - - @Requirement - private PluginRealmCache pluginRealmCache; - - @Requirement - private PluginDependenciesResolver pluginDependenciesResolver; - - @Requirement - private RuntimeInformation runtimeInformation; - - private PluginDescriptorBuilder builder = new PluginDescriptorBuilder(); - - public synchronized PluginDescriptor getPluginDescriptor( Plugin plugin, List<RemoteRepository> repositories, RepositorySystemSession session ) - throws PluginResolutionException, PluginDescriptorParsingException, InvalidPluginDescriptorException - { - PluginDescriptorCache.Key cacheKey = pluginDescriptorCache.createKey( plugin, repositories, session ); - - PluginDescriptor pluginDescriptor = pluginDescriptorCache.get( cacheKey ); - - if ( pluginDescriptor == null ) - { - org.sonatype.aether.artifact.Artifact artifact = - pluginDependenciesResolver.resolve( plugin, repositories, session ); - - Artifact pluginArtifact = RepositoryUtils.toArtifact( artifact ); - - pluginDescriptor = extractPluginDescriptor( pluginArtifact, plugin ); - - pluginDescriptor.setRequiredMavenVersion( artifact.getProperty( "requiredMavenVersion", null ) ); - - pluginDescriptorCache.put( cacheKey, pluginDescriptor ); - } - - pluginDescriptor.setPlugin( plugin ); - - return pluginDescriptor; - } - - private PluginDescriptor extractPluginDescriptor( Artifact pluginArtifact, Plugin plugin ) - throws PluginDescriptorParsingException, InvalidPluginDescriptorException - { - PluginDescriptor pluginDescriptor = null; - - File pluginFile = pluginArtifact.getFile(); - - try - { - if ( pluginFile.isFile() ) - { - JarFile pluginJar = new JarFile( pluginFile, false ); - try - { - ZipEntry pluginDescriptorEntry = pluginJar.getEntry( getPluginDescriptorLocation() ); - - if ( pluginDescriptorEntry != null ) - { - InputStream is = pluginJar.getInputStream( pluginDescriptorEntry ); - - pluginDescriptor = parsePluginDescriptor( is, plugin, pluginFile.getAbsolutePath() ); - } - } - finally - { - pluginJar.close(); - } - } - else - { - File pluginXml = new File( pluginFile, getPluginDescriptorLocation() ); - - if ( pluginXml.isFile() ) - { - InputStream is = new BufferedInputStream( new FileInputStream( pluginXml ) ); - try - { - pluginDescriptor = parsePluginDescriptor( is, plugin, pluginXml.getAbsolutePath() ); - } - finally - { - IOUtil.close( is ); - } - } - } - - if ( pluginDescriptor == null ) - { - throw new IOException( "No plugin descriptor found at " + getPluginDescriptorLocation() ); - } - } - catch ( IOException e ) - { - throw new PluginDescriptorParsingException( plugin, pluginFile.getAbsolutePath(), e ); - } - - MavenPluginValidator validator = new MavenPluginValidator( pluginArtifact ); - - validator.validate( pluginDescriptor ); - - if ( validator.hasErrors() ) - { - throw new InvalidPluginDescriptorException( "Invalid plugin descriptor for " + plugin.getId() + " (" - + pluginFile + ")", validator.getErrors() ); - } - - pluginDescriptor.setPluginArtifact( pluginArtifact ); - - return pluginDescriptor; - } - - private String getPluginDescriptorLocation() - { - return "META-INF/maven/plugin.xml"; - } - - private PluginDescriptor parsePluginDescriptor( InputStream is, Plugin plugin, String descriptorLocation ) - throws PluginDescriptorParsingException - { - try - { - Reader reader = ReaderFactory.newXmlReader( is ); - - PluginDescriptor pluginDescriptor = builder.build( reader, descriptorLocation ); - - return pluginDescriptor; - } - catch ( IOException e ) - { - throw new PluginDescriptorParsingException( plugin, descriptorLocation, e ); - } - catch ( PlexusConfigurationException e ) - { - throw new PluginDescriptorParsingException( plugin, descriptorLocation, e ); - } - } - - public MojoDescriptor getMojoDescriptor( Plugin plugin, String goal, List<RemoteRepository> repositories, - RepositorySystemSession session ) - throws MojoNotFoundException, PluginResolutionException, PluginDescriptorParsingException, - InvalidPluginDescriptorException - { - PluginDescriptor pluginDescriptor = getPluginDescriptor( plugin, repositories, session ); - - MojoDescriptor mojoDescriptor = pluginDescriptor.getMojo( goal ); - - if ( mojoDescriptor == null ) - { - throw new MojoNotFoundException( goal, pluginDescriptor ); - } - - return mojoDescriptor; - } - - public void checkRequiredMavenVersion( PluginDescriptor pluginDescriptor ) - throws PluginIncompatibleException - { - String requiredMavenVersion = pluginDescriptor.getRequiredMavenVersion(); - if ( StringUtils.isNotBlank( requiredMavenVersion ) ) - { - try - { - if ( !runtimeInformation.isMavenVersion( requiredMavenVersion ) ) - { - throw new PluginIncompatibleException( pluginDescriptor.getPlugin(), "The plugin " - + pluginDescriptor.getId() + " requires Maven version " + requiredMavenVersion ); - } - } - catch ( RuntimeException e ) - { - logger.warn( "Could not verify plugin's Maven prerequisite: " + e.getMessage() ); - } - } - } - - public synchronized void setupPluginRealm( PluginDescriptor pluginDescriptor, MavenSession session, - ClassLoader parent, List<String> imports, DependencyFilter filter ) - throws PluginResolutionException, PluginContainerException - { - Plugin plugin = pluginDescriptor.getPlugin(); - - MavenProject project = session.getCurrentProject(); - - PluginRealmCache.Key cacheKey = - pluginRealmCache.createKey( plugin, parent, imports, filter, project.getRemotePluginRepositories(), - session.getRepositorySession() ); - - PluginRealmCache.CacheRecord cacheRecord = pluginRealmCache.get( cacheKey ); - - if ( cacheRecord != null ) - { - pluginDescriptor.setClassRealm( cacheRecord.realm ); - pluginDescriptor.setArtifacts( new ArrayList<Artifact>( cacheRecord.artifacts ) ); - for ( ComponentDescriptor<?> componentDescriptor : pluginDescriptor.getComponents() ) - { - componentDescriptor.setRealm( cacheRecord.realm ); - } - } - else - { - createPluginRealm( pluginDescriptor, session, parent, imports, filter ); - - cacheRecord = - pluginRealmCache.put( cacheKey, pluginDescriptor.getClassRealm(), pluginDescriptor.getArtifacts() ); - } - - pluginRealmCache.register( project, cacheRecord ); - } - - private void createPluginRealm( PluginDescriptor pluginDescriptor, MavenSession session, ClassLoader parent, - List<String> imports, DependencyFilter filter ) - throws PluginResolutionException, PluginContainerException - { - Plugin plugin = pluginDescriptor.getPlugin(); - - if ( plugin == null ) - { - throw new IllegalArgumentException( "incomplete plugin descriptor, plugin missing" ); - } - - Artifact pluginArtifact = pluginDescriptor.getPluginArtifact(); - - if ( pluginArtifact == null ) - { - throw new IllegalArgumentException( "incomplete plugin descriptor, plugin artifact missing" ); - } - - MavenProject project = session.getCurrentProject(); - - DependencyFilter dependencyFilter = project.getExtensionDependencyFilter(); - dependencyFilter = AndDependencyFilter.newInstance( dependencyFilter, filter ); - - DependencyNode root = - pluginDependenciesResolver.resolve( plugin, RepositoryUtils.toArtifact( pluginArtifact ), dependencyFilter, - project.getRemotePluginRepositories(), session.getRepositorySession() ); - - PreorderNodeListGenerator nlg = new PreorderNodeListGenerator(); - root.accept( nlg ); - - List<Artifact> exposedPluginArtifacts = new ArrayList<Artifact>( nlg.getNodes().size() ); - RepositoryUtils.toArtifacts( exposedPluginArtifacts, Collections.singleton( root ), - Collections.<String> emptyList(), null ); - for ( Iterator<Artifact> it = exposedPluginArtifacts.iterator(); it.hasNext(); ) - { - Artifact artifact = it.next(); - if ( artifact.getFile() == null ) - { - it.remove(); - } - } - - List<org.sonatype.aether.artifact.Artifact> pluginArtifacts = nlg.getArtifacts( true ); - - Map<String, ClassLoader> foreignImports = calcImports( project, parent, imports ); - - ClassRealm pluginRealm = - classRealmManager.createPluginRealm( plugin, parent, null, foreignImports, pluginArtifacts ); - - pluginDescriptor.setClassRealm( pluginRealm ); - pluginDescriptor.setArtifacts( exposedPluginArtifacts ); - - try - { - for ( ComponentDescriptor<?> componentDescriptor : pluginDescriptor.getComponents() ) - { - componentDescriptor.setRealm( pluginRealm ); - container.addComponentDescriptor( componentDescriptor ); - } - - container.discoverComponents( pluginRealm ); - } - catch ( PlexusConfigurationException e ) - { - throw new PluginContainerException( plugin, pluginRealm, "Error in component graph of plugin " - + plugin.getId() + ": " + e.getMessage(), e ); - } - catch ( CycleDetectedInComponentGraphException e ) - { - throw new PluginContainerException( plugin, pluginRealm, "Error in component graph of plugin " - + plugin.getId() + ": " + e.getMessage(), e ); - } - } - - private Map<String, ClassLoader> calcImports( MavenProject project, ClassLoader parent, List<String> imports ) - { - Map<String, ClassLoader> foreignImports = new HashMap<String, ClassLoader>(); - - ClassLoader projectRealm = project.getClassRealm(); - if ( projectRealm != null ) - { - foreignImports.put( "", projectRealm ); - } - else - { - foreignImports.put( "", classRealmManager.getMavenApiRealm() ); - } - - if ( parent != null && imports != null ) - { - for ( String parentImport : imports ) - { - foreignImports.put( parentImport, parent ); - } - } - - return foreignImports; - } - - public <T> T getConfiguredMojo( Class<T> mojoInterface, MavenSession session, MojoExecution mojoExecution ) - throws PluginConfigurationException, PluginContainerException - { - MojoDescriptor mojoDescriptor = mojoExecution.getMojoDescriptor(); - - PluginDescriptor pluginDescriptor = mojoDescriptor.getPluginDescriptor(); - - ClassRealm pluginRealm = pluginDescriptor.getClassRealm(); - - if ( logger.isDebugEnabled() ) - { - logger.debug( "Configuring mojo " + mojoDescriptor.getId() + " from plugin realm " + pluginRealm ); - } - - // We are forcing the use of the plugin realm for all lookups that might occur during - // the lifecycle that is part of the lookup. Here we are specifically trying to keep - // lookups that occur in contextualize calls in line with the right realm. - ClassRealm oldLookupRealm = container.setLookupRealm( pluginRealm ); - - ClassLoader oldClassLoader = Thread.currentThread().getContextClassLoader(); - Thread.currentThread().setContextClassLoader( pluginRealm ); - - try - { - T mojo; - - try - { - mojo = container.lookup( mojoInterface, mojoDescriptor.getRoleHint() ); - } - catch ( ComponentLookupException e ) - { - Throwable cause = e.getCause(); - while ( cause != null && !( cause instanceof LinkageError ) - && !( cause instanceof ClassNotFoundException ) ) - { - cause = cause.getCause(); - } - - if ( ( cause instanceof NoClassDefFoundError ) || ( cause instanceof ClassNotFoundException ) ) - { - ByteArrayOutputStream os = new ByteArrayOutputStream( 1024 ); - PrintStream ps = new PrintStream( os ); - ps.println( "Unable to load the mojo '" + mojoDescriptor.getGoal() + "' in the plugin '" - + pluginDescriptor.getId() + "'. A required class is missing: " + cause.getMessage() ); - pluginRealm.display( ps ); - - throw new PluginContainerException( mojoDescriptor, pluginRealm, os.toString(), cause ); - } - else if ( cause instanceof LinkageError ) - { - ByteArrayOutputStream os = new ByteArrayOutputStream( 1024 ); - PrintStream ps = new PrintStream( os ); - ps.println( "Unable to load the mojo '" + mojoDescriptor.getGoal() + "' in the plugin '" - + pluginDescriptor.getId() + "' due to an API incompatibility: " + e.getClass().getName() - + ": " + cause.getMessage() ); - pluginRealm.display( ps ); - - throw new PluginContainerException( mojoDescriptor, pluginRealm, os.toString(), cause ); - } - - throw new PluginContainerException( mojoDescriptor, pluginRealm, "Unable to load the mojo '" - + mojoDescriptor.getGoal() + "' (or one of its required components) from the plugin '" - + pluginDescriptor.getId() + "'", e ); - } - - if ( mojo instanceof ContextEnabled ) - { - MavenProject project = session.getCurrentProject(); - - Map<String, Object> pluginContext = session.getPluginContext( pluginDescriptor, project ); - - if ( pluginContext != null ) - { - pluginContext.put( "project", project ); - - pluginContext.put( "pluginDescriptor", pluginDescriptor ); - - ( (ContextEnabled) mojo ).setPluginContext( pluginContext ); - } - } - - if ( mojo instanceof Mojo ) - { - ( (Mojo) mojo ).setLog( new DefaultLog( logger ) ); - } - - Xpp3Dom dom = mojoExecution.getConfiguration(); - - PlexusConfiguration pomConfiguration; - - if ( dom == null ) - { - pomConfiguration = new XmlPlexusConfiguration( "configuration" ); - } - else - { - pomConfiguration = new XmlPlexusConfiguration( dom ); - } - - ExpressionEvaluator expressionEvaluator = new PluginParameterExpressionEvaluator( session, mojoExecution ); - - populatePluginFields( mojo, mojoDescriptor, pluginRealm, pomConfiguration, expressionEvaluator ); - - return mojo; - } - finally - { - Thread.currentThread().setContextClassLoader( oldClassLoader ); - container.setLookupRealm( oldLookupRealm ); - } - } - - private void populatePluginFields( Object mojo, MojoDescriptor mojoDescriptor, ClassRealm pluginRealm, - PlexusConfiguration configuration, ExpressionEvaluator expressionEvaluator ) - throws PluginConfigurationException - { - ComponentConfigurator configurator = null; - - String configuratorId = mojoDescriptor.getComponentConfigurator(); - - if ( StringUtils.isEmpty( configuratorId ) ) - { - configuratorId = "basic"; - } - - try - { - // TODO: could the configuration be passed to lookup and the configurator known to plexus via the descriptor - // so that this method could entirely be handled by a plexus lookup? - configurator = container.lookup( ComponentConfigurator.class, configuratorId ); - - ConfigurationListener listener = new DebugConfigurationListener( logger ); - - ValidatingConfigurationListener validator = - new ValidatingConfigurationListener( mojo, mojoDescriptor, listener ); - - logger.debug( "Configuring mojo '" + mojoDescriptor.getId() + "' with " + configuratorId - + " configurator -->" ); - - configurator.configureComponent( mojo, configuration, expressionEvaluator, pluginRealm, validator ); - - logger.debug( "-- end configuration --" ); - - Collection<Parameter> missingParameters = validator.getMissingParameters(); - if ( !missingParameters.isEmpty() ) - { - if ( "basic".equals( configuratorId ) ) - { - throw new PluginParameterException( mojoDescriptor, new ArrayList<Parameter>( missingParameters ) ); - } - else - { - /* - * NOTE: Other configurators like the map-oriented one don't call into the listener, so do it the - * hard way. - */ - validateParameters( mojoDescriptor, configuration, expressionEvaluator ); - } - } - } - catch ( ComponentConfigurationException e ) - { - String message = "Unable to parse configuration of mojo " + mojoDescriptor.getId(); - if ( e.getFailedConfiguration() != null ) - { - message += " for parameter " + e.getFailedConfiguration().getName(); - } - message += ": " + e.getMessage(); - - throw new PluginConfigurationException( mojoDescriptor.getPluginDescriptor(), message, e ); - } - catch ( ComponentLookupException e ) - { - throw new PluginConfigurationException( mojoDescriptor.getPluginDescriptor(), - "Unable to retrieve component configurator " + configuratorId - + " for configuration of mojo " + mojoDescriptor.getId(), e ); - } - catch ( NoClassDefFoundError e ) - { - ByteArrayOutputStream os = new ByteArrayOutputStream( 1024 ); - PrintStream ps = new PrintStream( os ); - ps.println( "A required class was missing during configuration of mojo " + mojoDescriptor.getId() + ": " - + e.getMessage() ); - pluginRealm.display( ps ); - - throw new PluginConfigurationException( mojoDescriptor.getPluginDescriptor(), os.toString(), e ); - } - catch ( LinkageError e ) - { - ByteArrayOutputStream os = new ByteArrayOutputStream( 1024 ); - PrintStream ps = new PrintStream( os ); - ps.println( "An API incompatibility was encountered during configuration of mojo " + mojoDescriptor.getId() - + ": " + e.getClass().getName() + ": " + e.getMessage() ); - pluginRealm.display( ps ); - - throw new PluginConfigurationException( mojoDescriptor.getPluginDescriptor(), os.toString(), e ); - } - finally - { - if ( configurator != null ) - { - try - { - container.release( configurator ); - } - catch ( ComponentLifecycleException e ) - { - logger.debug( "Failed to release mojo configurator - ignoring." ); - } - } - } - } - - private void validateParameters( MojoDescriptor mojoDescriptor, PlexusConfiguration configuration, - ExpressionEvaluator expressionEvaluator ) - throws ComponentConfigurationException, PluginParameterException - { - if ( mojoDescriptor.getParameters() == null ) - { - return; - } - - List<Parameter> invalidParameters = new ArrayList<Parameter>(); - - for ( Parameter parameter : mojoDescriptor.getParameters() ) - { - if ( !parameter.isRequired() ) - { - continue; - } - - Object value = null; - - PlexusConfiguration config = configuration.getChild( parameter.getName(), false ); - if ( config != null ) - { - String expression = config.getValue( null ); - - try - { - value = expressionEvaluator.evaluate( expression ); - - if ( value == null ) - { - value = config.getAttribute( "default-value", null ); - } - } - catch ( ExpressionEvaluationException e ) - { - String msg = - "Error evaluating the expression '" + expression + "' for configuration value '" - + configuration.getName() + "'"; - throw new ComponentConfigurationException( configuration, msg, e ); - } - } - - if ( value == null && ( config == null || config.getChildCount() <= 0 ) ) - { - invalidParameters.add( parameter ); - } - } - - if ( !invalidParameters.isEmpty() ) - { - throw new PluginParameterException( mojoDescriptor, invalidParameters ); - } - } - - public void releaseMojo( Object mojo, MojoExecution mojoExecution ) - { - if ( mojo != null ) - { - try - { - container.release( mojo ); - } - catch ( ComponentLifecycleException e ) - { - String goalExecId = mojoExecution.getGoal(); - - if ( mojoExecution.getExecutionId() != null ) - { - goalExecId += " {execution: " + mojoExecution.getExecutionId() + "}"; - } - - logger.debug( "Error releasing mojo for " + goalExecId, e ); - } - } - } - -} diff --git a/org.eclipse.m2e.maven.runtime/update-jars-pom.xml b/org.eclipse.m2e.maven.runtime/update-jars-pom.xml deleted file mode 100644 index 813cfb93..00000000 --- a/org.eclipse.m2e.maven.runtime/update-jars-pom.xml +++ /dev/null @@ -1,213 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright (c) 2008 Sonatype, Inc. - All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License v1.0 - which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html ---> -<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"> - <modelVersion>4.0.0</modelVersion> - - <!-- - To include new embedded runtime, - - * update <maven.version/> and related properties - * run the command below from CLI - * add ``local-patches.jar'' (without quotes) at the beginning of Bundle-ClassPath manifest attribute - * add ``Require-Bundle: com.ning.async-http-client;bundle-version="1.6.0"'' (without quotes) to the manifest - * right-click on the project in Eclipse, PDE->Update Classpath - * project->clean...->all - - rm -f jars/*; /opt/maven/bin/mvn -e -f update-jars-pom.xml process-classes - --> - - <properties> - <!-- maven core version --> - <maven.version>3.0.2</maven.version> - - <!-- the following MUST match <maven.version/> above. I wish I could make scope=import do this for me --> - <sisu.version>2.0.0</sisu.version> - <classworlds.version>2.4</classworlds.version> - <aether.version>1.11</aether.version> - <sisu-guice.version>2.9.4</sisu-guice.version> - - <!-- below are m2e-specific addons --> - <plexus-build-api.version>0.0.7</plexus-build-api.version> - <wagon-ahc.version>1.2.0</wagon-ahc.version> - - <!-- the following need to be reconciled with maven version used --> - <plexus-utils.version>2.0.6</plexus-utils.version> - </properties> - - <groupId>org.eclipse.m2e</groupId> - <artifactId>org.eclipse.m2e.maven.runtime</artifactId> - <version>0.13.0-SNAPSHOT</version> - <name>Embedded Maven Runtime Bundle</name> - <organization> - <name>Eclipse.org - m2e</name> - <url>www.eclipse.org</url> - </organization> - - <dependencies> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>apache-maven</artifactId> - <version>${maven.version}</version> - <classifier>bin</classifier> - <type>tar.gz</type> - <exclusions> - <exclusion> - <artifactId>wagon-http-lightweight</artifactId> - <groupId>org.apache.maven.wagon</groupId> - </exclusion> - <exclusion> - <artifactId>sisu-inject-plexus</artifactId> - <groupId>org.sonatype.sisu</groupId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.sonatype.sisu.inject</groupId> - <artifactId>guice-plexus-shim</artifactId> - <version>${sisu.version}</version> - <exclusions> - <exclusion> - <groupId>org.sonatype.sisu</groupId> - <artifactId>sisu-guice</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.sonatype.sisu</groupId> - <artifactId>sisu-guice</artifactId> - <version>${sisu-guice.version}</version> - <classifier>no_aop</classifier> - </dependency> - - <dependency> - <groupId>org.sonatype.plexus</groupId> - <artifactId>plexus-build-api</artifactId> - <version>${plexus-build-api.version}</version> - </dependency> - - <dependency> - <groupId>org.sonatype.aether</groupId> - <artifactId>aether-connector-wagon</artifactId> - <version>${aether.version}</version> - <exclusions> - <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-container-default</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.sonatype.aether</groupId> - <artifactId>aether-impl</artifactId> - <version>${aether.version}</version> - </dependency> - <dependency> - <groupId>org.sonatype.aether</groupId> - <artifactId>aether-connector-asynchttpclient</artifactId> - <version>${aether.version}</version> - <exclusions> - <exclusion> - <groupId>com.ning</groupId> - <artifactId>async-http-client</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.sonatype.maven</groupId> - <artifactId>wagon-ahc</artifactId> - <version>${wagon-ahc.version}</version> - <exclusions> - <exclusion> - <groupId>com.ning</groupId> - <artifactId>async-http-client</artifactId> - </exclusion> - </exclusions> - </dependency> - - </dependencies> - - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven</artifactId> - <version>${maven.version}</version> - <scope>import</scope> - </dependency> - - <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-classworlds</artifactId> - <version>${classworlds.version}</version> - </dependency> - <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-utils</artifactId> - <version>${plexus-utils.version}</version> - </dependency> - - </dependencies> - </dependencyManagement> - - <build> - <plugins> - <plugin> - <groupId>org.sonatype.tycho</groupId> - <artifactId>maven-osgi-packaging-plugin</artifactId> - <version>0.11.0-SNAPSHOT</version> - <executions> - <execution> - <phase>process-classes</phase> - <goals> - <goal>generate-bundle</goal> - </goals> - </execution> - </executions> - <configuration> - <packageSources>false</packageSources> - <exportPackages> - org.apache.maven.*, - org.codehaus.plexus.*, - org.sonatype.plexus.*, - org.sonatype.aether.*, - com.google.inject.*, - org.sonatype.maven.wagon.*, - META-INF.plexus, - </exportPackages> - <manifestAttributes> - <Bundle-RequiredExecutionEnvironment>J2SE-1.5, JavaSE-1.6</Bundle-RequiredExecutionEnvironment> - </manifestAttributes> - - <exclusions> - <exclusion> - <groupId>org.apache.maven</groupId> - <artifactId>apache-maven</artifactId> - <classifier>bin</classifier> - </exclusion> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - <exclusion> - <groupId>aopalliance</groupId> - <artifactId>aopalliance</artifactId> - </exclusion> - <exclusion> - <artifactId>sisu-guice</artifactId> - <groupId>org.sonatype.sisu</groupId> - </exclusion> - </exclusions> - </configuration> - </plugin> - </plugins> - </build> -</project> diff --git a/org.eclipse.m2e.model.edit/pom.xml b/org.eclipse.m2e.model.edit/pom.xml index 0a9e6951..dcb96063 100644 --- a/org.eclipse.m2e.model.edit/pom.xml +++ b/org.eclipse.m2e.model.edit/pom.xml @@ -6,14 +6,14 @@ which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> -<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"> +<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"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.m2e</groupId> - <artifactId>org.eclipse.m2e.parent</artifactId> + <artifactId>m2e-core</artifactId> <version>1.0.100-SNAPSHOT</version> - <relativePath>../org.eclipse.m2e.parent</relativePath> </parent> <artifactId>org.eclipse.m2e.model.edit</artifactId> diff --git a/org.eclipse.m2e.parent/.classpath b/org.eclipse.m2e.parent/.classpath deleted file mode 100644 index f5705aef..00000000 --- a/org.eclipse.m2e.parent/.classpath +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="output" path="target-eclipse/classes"/> -</classpath> diff --git a/org.eclipse.m2e.parent/.gitignore b/org.eclipse.m2e.parent/.gitignore deleted file mode 100644 index a74771f1..00000000 --- a/org.eclipse.m2e.parent/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target-eclipse diff --git a/org.eclipse.m2e.parent/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.parent/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 39d2fb04..00000000 --- a/org.eclipse.m2e.parent/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,262 +0,0 @@ -#Wed Jul 02 11:05:28 EDT 2008 -eclipse.preferences.version=1 -org.eclipse.jdt.core.builder.cleanOutputFolder=ignore -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2 -org.eclipse.jdt.core.compiler.compliance=1.4 -org.eclipse.jdt.core.compiler.source=1.3 -org.eclipse.jdt.core.formatter.align_type_members_on_columns=false -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 -org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 -org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 -org.eclipse.jdt.core.formatter.blank_lines_after_imports=2 -org.eclipse.jdt.core.formatter.blank_lines_after_package=1 -org.eclipse.jdt.core.formatter.blank_lines_before_field=1 -org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 -org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 -org.eclipse.jdt.core.formatter.blank_lines_before_method=1 -org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 -org.eclipse.jdt.core.formatter.blank_lines_before_package=1 -org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 -org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=2 -org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=true -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=true -org.eclipse.jdt.core.formatter.comment.format_block_comments=false -org.eclipse.jdt.core.formatter.comment.format_header=false -org.eclipse.jdt.core.formatter.comment.format_html=true -org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true -org.eclipse.jdt.core.formatter.comment.format_line_comments=false -org.eclipse.jdt.core.formatter.comment.format_source_code=true -org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true -org.eclipse.jdt.core.formatter.comment.indent_root_tags=true -org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert -org.eclipse.jdt.core.formatter.comment.line_length=120 -org.eclipse.jdt.core.formatter.compact_else_if=true -org.eclipse.jdt.core.formatter.continuation_indentation=2 -org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 -org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true -org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_empty_lines=false -org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true -org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true -org.eclipse.jdt.core.formatter.indentation.size=2 -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=insert -org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert -org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false -org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false -org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false -org.eclipse.jdt.core.formatter.lineSplit=120 -org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=true -org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=true -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 -org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 -org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true -org.eclipse.jdt.core.formatter.tabulation.char=space -org.eclipse.jdt.core.formatter.tabulation.size=2 -org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true diff --git a/org.eclipse.m2e.parent/run.sh b/org.eclipse.m2e.parent/run.sh deleted file mode 100644 index 8ecfea29..00000000 --- a/org.eclipse.m2e.parent/run.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -$HOME/tycho/bin/mvn clean install -B -e -Dtycho.targetPlatform=/home/j2ee-hudson/eclipse-tp-e33/eclipse - - diff --git a/org.eclipse.m2e.refactoring/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.refactoring/.settings/org.eclipse.jdt.core.prefs index b006c44c..296109e6 100644 --- a/org.eclipse.m2e.refactoring/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.m2e.refactoring/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,4 @@ -#Fri Mar 04 13:28:13 EST 2011 +#Fri Jul 29 16:19:33 MSD 2011 eclipse.preferences.version=1 org.eclipse.jdt.core.codeComplete.argumentPrefixes= org.eclipse.jdt.core.codeComplete.argumentSuffixes= @@ -161,9 +161,12 @@ org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true org.eclipse.jdt.core.formatter.indentation.size=2 +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=insert org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert diff --git a/org.eclipse.m2e.refactoring/pom.xml b/org.eclipse.m2e.refactoring/pom.xml index a402e334..ea914088 100644 --- a/org.eclipse.m2e.refactoring/pom.xml +++ b/org.eclipse.m2e.refactoring/pom.xml @@ -6,14 +6,14 @@ which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> -<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"> +<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"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.m2e</groupId> - <artifactId>org.eclipse.m2e.parent</artifactId> + <artifactId>m2e-core</artifactId> <version>1.0.100-SNAPSHOT</version> - <relativePath>../org.eclipse.m2e.parent</relativePath> </parent> <artifactId>org.eclipse.m2e.refactoring</artifactId> diff --git a/org.eclipse.m2e.scm/pom.xml b/org.eclipse.m2e.scm/pom.xml index d043cc0f..f01fed39 100644 --- a/org.eclipse.m2e.scm/pom.xml +++ b/org.eclipse.m2e.scm/pom.xml @@ -1,16 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright (c) 2008 Sonatype, Inc. All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, - and is available at http://www.eclipse.org/legal/epl-v10.html --> +<!-- + Copyright (c) 2008 Sonatype, Inc. + All rights reserved. This program and the accompanying materials + are made available under the terms of the Eclipse Public License v1.0 + which accompanies this distribution, and is available at + http://www.eclipse.org/legal/epl-v10.html +--> <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"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.m2e</groupId> - <artifactId>org.eclipse.m2e.parent</artifactId> + <artifactId>m2e-core</artifactId> <version>1.0.100-SNAPSHOT</version> - <relativePath>../org.eclipse.m2e.parent</relativePath> </parent> <artifactId>org.eclipse.m2e.scm</artifactId> diff --git a/org.eclipse.m2e.sdk.feature/pom.xml b/org.eclipse.m2e.sdk.feature/pom.xml index 71d648a2..ac224142 100644 --- a/org.eclipse.m2e.sdk.feature/pom.xml +++ b/org.eclipse.m2e.sdk.feature/pom.xml @@ -6,14 +6,14 @@ which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> -<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"> +<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"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.m2e</groupId> - <artifactId>org.eclipse.m2e.parent</artifactId> + <artifactId>m2e-core</artifactId> <version>1.0.100-SNAPSHOT</version> - <relativePath>../org.eclipse.m2e.parent</relativePath> </parent> <artifactId>org.eclipse.m2e.sdk.feature</artifactId> diff --git a/org.eclipse.m2e.site/pom.xml b/org.eclipse.m2e.site/pom.xml index 9d128740..8be7dbd8 100644 --- a/org.eclipse.m2e.site/pom.xml +++ b/org.eclipse.m2e.site/pom.xml @@ -6,14 +6,14 @@ which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> -<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"> +<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"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.m2e</groupId> - <artifactId>org.eclipse.m2e.parent</artifactId> + <artifactId>m2e-core</artifactId> <version>1.0.100-SNAPSHOT</version> - <relativePath>../org.eclipse.m2e.parent</relativePath> </parent> <artifactId>org.eclipse.m2e.site</artifactId> @@ -22,13 +22,13 @@ <name>Maven Integration for Eclipse Update Site</name> <build> - <extensions> - <extension> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-ssh-external</artifactId> - <version>1.0-beta-7</version> - </extension> - </extensions> + <extensions> + <extension> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-ssh-external</artifactId> + <version>1.0-beta-7</version> + </extension> + </extensions> <plugins> <plugin> <groupId>org.eclipse.tycho</groupId> @@ -65,10 +65,10 @@ </configuration> <executions> <execution> - <id>make-assembly</id> - <phase>package</phase> + <id>make-assembly</id> + <phase>package</phase> <goals> - <goal>single</goal> + <goal>single</goal> </goals> </execution> </executions> diff --git a/org.eclipse.m2e.tests.common/pom.xml b/org.eclipse.m2e.tests.common/pom.xml index 7f9ea861..9717e564 100644 --- a/org.eclipse.m2e.tests.common/pom.xml +++ b/org.eclipse.m2e.tests.common/pom.xml @@ -6,31 +6,18 @@ which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> -<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"> +<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"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.m2e</groupId> - <artifactId>org.eclipse.m2e.parent</artifactId> + <artifactId>m2e-core</artifactId> <version>1.0.100-SNAPSHOT</version> - <relativePath>../org.eclipse.m2e.parent</relativePath> </parent> <artifactId>org.eclipse.m2e.tests.common</artifactId> <packaging>eclipse-plugin</packaging> <name>M2E Testing Helpers</name> - - <build> - <sourceDirectory>src</sourceDirectory> - <resources> - <resource> - <directory>src</directory> - <excludes> - <exclude>**/*.java</exclude> - </excludes> - </resource> - </resources> - </build> - </project> diff --git a/org.eclipse.m2e.usagedata/pom.xml b/org.eclipse.m2e.usagedata/pom.xml index bbd1f486..8c209c3f 100644 --- a/org.eclipse.m2e.usagedata/pom.xml +++ b/org.eclipse.m2e.usagedata/pom.xml @@ -1,10 +1,18 @@ -<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"> +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright (c) 2008 Sonatype, Inc. + All rights reserved. This program and the accompanying materials + are made available under the terms of the Eclipse Public License v1.0 + which accompanies this distribution, and is available at + http://www.eclipse.org/legal/epl-v10.html +--> +<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"> <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>org.eclipse.m2e.parent</artifactId> <groupId>org.eclipse.m2e</groupId> + <artifactId>m2e-core</artifactId> <version>1.0.100-SNAPSHOT</version> - <relativePath>../org.eclipse.m2e.parent</relativePath> </parent> <artifactId>org.eclipse.m2e.usagedata</artifactId> <packaging>eclipse-plugin</packaging> diff --git a/org.jboss.netty/.classpath b/org.jboss.netty/.classpath deleted file mode 100644 index 1056dd81..00000000 --- a/org.jboss.netty/.classpath +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry exported="true" kind="lib" path="netty-3.2.4.Final.jar"/> - <classpathentry kind="output" path="bin"/> -</classpath> diff --git a/org.jboss.netty/.gitignore b/org.jboss.netty/.gitignore deleted file mode 100644 index ea8c4bf7..00000000 --- a/org.jboss.netty/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target diff --git a/org.jboss.netty/.project b/org.jboss.netty/.project deleted file mode 100644 index 82516368..00000000 --- a/org.jboss.netty/.project +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.jboss.netty</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.ManifestBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.pde.PluginNature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> diff --git a/org.jboss.netty/META-INF/MANIFEST.MF b/org.jboss.netty/META-INF/MANIFEST.MF deleted file mode 100644 index 521978bb..00000000 --- a/org.jboss.netty/META-INF/MANIFEST.MF +++ /dev/null @@ -1,141 +0,0 @@ -Manifest-Version: 1.0 -Export-Package: org.jboss.netty.bootstrap;version="3.2.4.Final";uses:="org.jboss.netty.channel,org.jboss.netty.util", - org.jboss.netty.buffer;version="3.2.4.Final";uses:="org.jboss.netty.util", - org.jboss.netty.channel;version="3.2.4.Final";uses:="org.jboss.netty.buffer,org.jboss.netty.util,org.jboss.netty.logging", - org.jboss.netty.channel.group;version="3.2.4.Final";uses:="org.jboss.netty.channel,org.jboss.netty.buffer,org.jboss.netty.logging", - org.jboss.netty.channel.local;version="3.2.4.Final";uses:="org.jboss.netty.channel,org.jboss.netty.logging", - org.jboss.netty.channel.socket;version="3.2.4.Final";uses:="org.jboss.netty.channel", - org.jboss.netty.channel.socket.http;version="3.2.4.Final"; - uses:="org.jboss.netty.channel, - org.jboss.netty.channel.socket, - org.jboss.netty.handler.codec.http, - javax.net.ssl, - org.jboss.netty.handler.ssl, - org.jboss.netty.buffer, - org.jboss.netty.logging, - javax.servlet, - org.jboss.netty.channel.local, - javax.servlet.http", - org.jboss.netty.channel.socket.nio;version="3.2.4.Final"; - uses:="org.jboss.netty.logging, - org.jboss.netty.channel.socket, - org.jboss.netty.channel, - org.jboss.netty.util, - org.jboss.netty.buffer", - org.jboss.netty.channel.socket.oio;version="3.2.4.Final"; - uses:="org.jboss.netty.channel, - org.jboss.netty.channel.socket, - org.jboss.netty.util, - org.jboss.netty.buffer, - org.jboss.netty.logging", - org.jboss.netty.container.microcontainer;version="3.2.4.Final";uses:="org.jboss.netty.logging", - org.jboss.netty.container.osgi;version="3.2.4.Final";uses:="org.jboss.netty.logging,org.osgi.framework", - org.jboss.netty.container.spring;version="3.2.4.Final";uses:="org.jboss.netty.logging", - org.jboss.netty.handler.codec.base64;version="3.2.4.Final"; - uses:="org.jboss.netty.buffer, - org.jboss.netty.channel, - org.jboss.netty.handler.codec.oneone, - org.jboss.netty.util", - org.jboss.netty.handler.codec.compression;version="3.2.4.Final";uses:="org.jboss.netty.buffer,org.jboss.netty.channel,org.jboss.netty.handler.codec.oneone", - org.jboss.netty.handler.codec.embedder;version="3.2.4.Final";uses:="org.jboss.netty.channel,org.jboss.netty.buffer", - org.jboss.netty.handler.codec.frame;version="3.2.4.Final";uses:="org.jboss.netty.buffer,org.jboss.netty.channel,org.jboss.netty.handler.codec.oneone", - org.jboss.netty.handler.codec.http;version="3.2.4.Final"; - uses:="org.jboss.netty.buffer, - org.jboss.netty.handler.codec.frame, - org.jboss.netty.channel, - org.jboss.netty.util, - org.jboss.netty.handler.codec.compression, - org.jboss.netty.handler.codec.embedder, - org.jboss.netty.handler.codec.replay, - org.jboss.netty.handler.codec.oneone", - org.jboss.netty.handler.codec.http.websocket;version="3.2.4.Final"; - uses:="org.jboss.netty.buffer, - org.jboss.netty.util, - org.jboss.netty.handler.codec.replay, - org.jboss.netty.handler.codec.frame, - org.jboss.netty.channel, - org.jboss.netty.handler.codec.oneone", - org.jboss.netty.handler.codec.oneone;version="3.2.4.Final";uses:="org.jboss.netty.channel", - org.jboss.netty.handler.codec.protobuf;version="3.2.4.Final"; - uses:="org.jboss.netty.buffer, - org.jboss.netty.channel, - org.jboss.netty.handler.codec.oneone, - com.google.protobuf, - org.jboss.netty.handler.codec.frame", - org.jboss.netty.handler.codec.replay;version="3.2.4.Final";uses:="org.jboss.netty.buffer,org.jboss.netty.channel", - org.jboss.netty.handler.codec.rtsp;version="3.2.4.Final"; - uses:="org.jboss.netty.buffer, - org.jboss.netty.channel, - org.jboss.netty.handler.codec.http, - org.jboss.netty.handler.codec.embedder", - org.jboss.netty.handler.codec.serialization;version="3.2.4.Final"; - uses:="org.jboss.netty.buffer, - org.jboss.netty.handler.codec.replay, - org.jboss.netty.channel, - org.jboss.netty.handler.codec.oneone, - org.jboss.netty.handler.codec.frame", - org.jboss.netty.handler.codec.string;version="3.2.4.Final";uses:="org.jboss.netty.buffer,org.jboss.netty.channel,org.jboss.netty.handler.codec.oneone", - org.jboss.netty.handler.execution;version="3.2.4.Final";uses:="org.jboss.netty.channel,org.jboss.netty.util,org.jboss.netty.logging", - org.jboss.netty.handler.logging;version="3.2.4.Final";uses:="org.jboss.netty.logging,org.jboss.netty.buffer,org.jboss.netty.channel", - org.jboss.netty.handler.queue;version="3.2.4.Final";uses:="org.jboss.netty.channel,org.jboss.netty.buffer", - org.jboss.netty.handler.ssl;version="3.2.4.Final"; - uses:="org.jboss.netty.channel, - javax.net.ssl, - org.jboss.netty.logging, - org.jboss.netty.buffer, - org.jboss.netty.handler.codec.frame", - org.jboss.netty.handler.stream;version="3.2.4.Final";uses:="org.jboss.netty.buffer,org.jboss.netty.channel,org.jboss.netty.logging", - org.jboss.netty.handler.timeout;version="3.2.4.Final";uses:="org.jboss.netty.channel,org.jboss.netty.util", - org.jboss.netty.logging;version="3.2.4.Final"; - uses:="org.apache.commons.logging, - org.jboss.logging, - org.apache.log4j, - org.osgi.service.log, - org.osgi.util.tracker, - org.osgi.framework, - org.slf4j", - org.jboss.netty.util;version="3.2.4.Final";uses:="org.jboss.netty.buffer,org.jboss.netty.channel,org.jboss.netty.logging" -Built-By: trustin -Tool: Bnd-1.15.0 -Bundle-Name: The Netty Project -Created-By: Apache Maven Bundle Plugin -Bundle-BuddyPolicy: registered -Bundle-Vendor: JBoss -Build-Jdk: 1.6.0_23 -Bundle-Version: 3.2.4.qualifier -Eclipse-BuddyPolicy: registered -Bnd-LastModified: 1297082336492 -Bundle-ManifestVersion: 2 -Bundle-Activator: org.jboss.netty.container.osgi.NettyBundleActivator -Bundle-License: http://www.apache.org/licenses/LICENSE-2.0 -Bundle-Description: The Netty project is an effort to provide an async - hronous event-driven network application framework and tools for r - apid development of maintainable high performance and high scalabi - lity protocol servers and clients. In other words, Netty is a NIO - client server framework which enables quick and easy development - of network applications such as protocol servers and clients. It g - reatly simplifies and streamlines network programming such as TCP - and UDP socket server. -Bundle-DocURL: http://www.jboss.org/netty/ -Bundle-SymbolicName: org.jboss.netty -Import-Package: javax.net.ssl;resolution:=optional, - javax.servlet;resolution:=optional, - javax.servlet.http;resolution:=optional, - org.jboss.netty.bootstrap;version="[3.2,4)";resolution:=optional, - org.jboss.netty.buffer;version="[3.2,4)";resolution:=optional, - org.jboss.netty.handler.codec.frame;version="[3.2,4)";resolution:=optional, - org.jboss.netty.handler.codec.http.websocket;version="[3.2,4)";resolution:=optional, - org.jboss.netty.handler.codec.oneone;version="[3.2,4)";resolution:=optional, - org.jboss.netty.handler.codec.protobuf;version="[3.2,4)";resolution:=optional, - org.jboss.netty.handler.codec.serialization;version="[3.2,4)";resolution:=optional, - org.jboss.netty.handler.codec.string;version="[3.2,4)";resolution:=optional, - org.jboss.netty.handler.logging;version="[3.2,4)";resolution:=optional, - org.jboss.netty.handler.timeout;version="[3.2,4)";resolution:=optional, - org.osgi.framework;version="[1.5,2)";resolution:=optional, - org.osgi.service.log;version="[1.3,2)";resolution:=optional, - org.osgi.util.tracker;version="[1.4,2)";resolution:=optional, - org.slf4j;version="[1.5.0,2.0.0)" -Main-Class: org.jboss.netty.util.Version -Bundle-ClassPath: netty-3.2.4.Final.jar -Bundle-RequiredExecutionEnvironment: J2SE-1.5, - JavaSE-1.6 diff --git a/org.jboss.netty/about.html b/org.jboss.netty/about.html deleted file mode 100644 index 1c122189..00000000 --- a/org.jboss.netty/about.html +++ /dev/null @@ -1,48 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> -<title>About</title> -</head> -<body lang="EN-US"> -<h2>About This Content</h2> - -<p>June, 6 2011</p> -<h3>License</h3> - -<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise -indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. -For purposes of the EPL, "Program" will mean the Content.</p> - -<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is -being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was -provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p> - -<h3>Third Party Content</h3> - -<p> -The Content includes items that have been sourced from third parties as set out below. If you -did not receive this Content directly from the Eclipse Foundation, the following is provided -for informational purposes only, and you should look to the Redistributor’s license for -terms and conditions of use. -</p> - -<h4>Netty 3.2.4.Final</h4> -<p> -The plug-in includes software developed by RedHat, Inc., as part of the JBoss project. -Your use of Netty 3.2.4.Final in binary code form contained in the plug-in is subject to the terms and conditions of the -The Apache Software License, Version 2.0 ("ASL"). -A copy of the ASL is available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>. -(a local copy can be found <a href="about_files/LICENSE-2.0.txt">here</a>) -</p> -<p>The original binaries and source are available at the <a href="http://maven.org">Maven Central Repository</a>. - - -</body> -</html>
\ No newline at end of file diff --git a/org.jboss.netty/about_files/LICENSE-2.0.txt b/org.jboss.netty/about_files/LICENSE-2.0.txt deleted file mode 100644 index d6456956..00000000 --- a/org.jboss.netty/about_files/LICENSE-2.0.txt +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed 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. diff --git a/org.jboss.netty/build.properties b/org.jboss.netty/build.properties deleted file mode 100644 index 747e8488..00000000 --- a/org.jboss.netty/build.properties +++ /dev/null @@ -1,15 +0,0 @@ -# -# Copyright (c) 2008-2010 Sonatype, Inc. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# Sonatype, Inc. - initial API and implementation -# - -bin.includes = META-INF/,\ - netty-3.2.4.Final.jar,\ - about.html,\ - about_files/ diff --git a/org.jboss.netty/netty-3.2.4.Final.jar b/org.jboss.netty/netty-3.2.4.Final.jar Binary files differdeleted file mode 100644 index 391ba870..00000000 --- a/org.jboss.netty/netty-3.2.4.Final.jar +++ /dev/null diff --git a/org.jboss.netty/no-source-bundle.txt b/org.jboss.netty/no-source-bundle.txt deleted file mode 100644 index 675ce413..00000000 --- a/org.jboss.netty/no-source-bundle.txt +++ /dev/null @@ -1 +0,0 @@ -marker file used to disable source-bundle profile
\ No newline at end of file diff --git a/org.jboss.netty/pom.xml b/org.jboss.netty/pom.xml deleted file mode 100644 index a0c4eaae..00000000 --- a/org.jboss.netty/pom.xml +++ /dev/null @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright (c) 2010 Sonatype, Inc. - All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License v1.0 - which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html ---> -<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"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.eclipse.m2e</groupId> - <artifactId>org.eclipse.m2e.parent</artifactId> - <version>1.0.100-SNAPSHOT</version> - <relativePath>../org.eclipse.m2e.parent</relativePath> - </parent> - - <artifactId>org.jboss.netty</artifactId> - <packaging>eclipse-plugin</packaging> - - <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-packaging-plugin</artifactId> - <configuration> - <format>'Final-'yyyyMMddHHmm</format> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> -</project> diff --git a/org.eclipse.m2e.parent/pom.xml b/pom.xml index f0c4a0d1..032015ae 100644 --- a/org.eclipse.m2e.parent/pom.xml +++ b/pom.xml @@ -1,10 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright (c) 2008 Sonatype, Inc. All rights reserved. This program - and the accompanying materials are made available under the terms of the - Eclipse Public License v1.0 which accompanies this distribution, and is available - at http://www.eclipse.org/legal/epl-v10.html --> +<!-- + Copyright (c) 2010 Sonatype, Inc. + All rights reserved. This program and the accompanying materials + are made available under the terms of the Eclipse Public License v1.0 + which accompanies this distribution, and is available at + http://www.eclipse.org/legal/epl-v10.html +--> <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"> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <prerequisites> @@ -18,7 +21,7 @@ </parent> <groupId>org.eclipse.m2e</groupId> - <artifactId>org.eclipse.m2e.parent</artifactId> + <artifactId>m2e-core</artifactId> <version>1.0.100-SNAPSHOT</version> <packaging>pom</packaging> @@ -29,18 +32,9 @@ <inceptionYear>2005</inceptionYear> <properties> - <maven.version>3.0</maven.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - - <archetype_common.version>2.0.2.200911171109</archetype_common.version> - <archetype.version>2.0-alpha-4</archetype.version> - - <maven_model_edit.version>1.0.0-SNAPSHOT</maven_model_edit.version> - <maven_pom.version>1.0.0-SNAPSHOT</maven_pom.version> - - <nexus_indexer.version>2.0.5-SNAPSHOT</nexus_indexer.version> - - <maven_scm.version>1.0.0.20080602-2350</maven_scm.version> + + <m2e-maven-runtime.version>1.0.100-SNAPSHOT</m2e-maven-runtime.version> <m2e.site-compressed>http://repository.sonatype.org/service/local/repositories/forge-sites/content-compressed/</m2e.site-compressed> @@ -88,149 +82,78 @@ <url>http://repository.sonatype.org/content/groups/sonatype-public-grid</url> </repository> </repositories> - + <modules> - <module>../org.eclipse.m2e.maven.runtime</module> - <module>../org.jboss.netty</module> - <module>../com.ning.async-http-client</module> - <module>../org.eclipse.m2e.archetype.common</module> - <module>../org.eclipse.m2e.maven.indexer</module> - <module>../org.eclipse.m2e.model.edit</module> + <module>org.eclipse.m2e.model.edit</module> <!-- - <module>../org.eclipse.m2e.cliresolver</module> - <module>../org.eclipse.m2e.cliresolver30</module> + <module>org.eclipse.m2e.cliresolver</module> + <module>org.eclipse.m2e.cliresolver30</module> --> - <module>../org.eclipse.m2e.core</module> - <module>../org.eclipse.m2e.core.ui</module> - <module>../org.eclipse.m2e.launching</module> - <module>../org.eclipse.m2e.jdt</module> - <module>../org.eclipse.m2e.refactoring</module> - <module>../org.eclipse.m2e.editor.xml</module> - <module>../org.eclipse.m2e.editor</module> - <module>../org.eclipse.m2e.lifecyclemapping.defaults</module> - <module>../org.eclipse.m2e.discovery</module> - <module>../org.eclipse.m2e.scm</module> - <module>../org.eclipse.m2e.usagedata</module> + <module>org.eclipse.m2e.core</module> + <module>org.eclipse.m2e.core.ui</module> + <module>org.eclipse.m2e.launching</module> + <module>org.eclipse.m2e.jdt</module> + <module>org.eclipse.m2e.refactoring</module> + <module>org.eclipse.m2e.editor.xml</module> + <module>org.eclipse.m2e.editor</module> + <module>org.eclipse.m2e.lifecyclemapping.defaults</module> + <module>org.eclipse.m2e.discovery</module> + <module>org.eclipse.m2e.scm</module> + <module>org.eclipse.m2e.usagedata</module> <!-- common test helpers --> - <module>../org.eclipse.m2e.tests.common</module> - <module>../org.eclipse.m2e.integration.tests.common</module> + <module>org.eclipse.m2e.tests.common</module> + <module>org.eclipse.m2e.integration.tests.common</module> <!-- Logging --> - <module>../org.eclipse.m2e.logback.appender</module> - <module>../org.eclipse.m2e.logback.configuration</module> + <module>org.eclipse.m2e.logback.appender</module> + <module>org.eclipse.m2e.logback.configuration</module> <!-- features --> - <module>../org.eclipse.m2e.feature</module> - <module>../org.eclipse.m2e.sdk.feature</module> - <module>../org.eclipse.m2e.logback.feature</module> + <module>org.eclipse.m2e.feature</module> + <module>org.eclipse.m2e.sdk.feature</module> + <module>org.eclipse.m2e.logback.feature</module> - <module>../org.eclipse.m2e.site</module> + <module>org.eclipse.m2e.site</module> - <module>../target-platform</module> + <module>target-platform</module> </modules> - - <dependencyManagement> - <dependencies> - <!-- m2eclipse --> - <dependency> - <groupId>org.eclipse.m2e</groupId> - <artifactId>org.eclipse.m2e</artifactId> - <version>${m2eclipse.version}</version> - </dependency> - <dependency> - <groupId>org.eclipse.m2e</groupId> - <artifactId>org.eclipse.m2e.mylyn</artifactId> - <version>${m2eclipse.version}</version> - </dependency> - <dependency> - <groupId>org.eclipse.m2e</groupId> - <artifactId>org.eclipse.m2e.mylyn3</artifactId> - <version>${m2eclipse.version}</version> - </dependency> - <dependency> - <groupId>org.eclipse.m2e</groupId> - <artifactId>org.eclipse.m2e.cliresolver</artifactId> - <version>${m2eclipse.version}</version> - </dependency> - - <!-- components --> - <dependency> - <groupId>org.eclipse.m2e</groupId> - <artifactId>org.eclipse.m2e.maven.runtime</artifactId> - <version>${maven_embedder.version}</version> - </dependency> - <dependency> - <groupId>org.eclipse.m2e</groupId> - <artifactId>org.eclipse.m2e.maven_scm</artifactId> - <version>${maven_scm.version}</version> - </dependency> - <dependency> - <groupId>org.eclipse.m2e</groupId> - <artifactId>org.eclipse.m2e.archetype_common</artifactId> - <version>${archetype_common.version}</version> - </dependency> - <dependency> - <groupId>org.eclipse.m2e</groupId> - <artifactId>org.eclipse.m2e.maven.indexer</artifactId> - <version>${nexus_indexer.version}</version> - </dependency> - <dependency> - <groupId>org.eclipse.m2e</groupId> - <artifactId>org.eclipse.m2e.pom</artifactId> - <version>${maven_pom.version}</version> - </dependency> - <dependency> - <groupId>org.eclipse.m2e</groupId> - <artifactId>org.eclipse.m2e.maven_model_edit</artifactId> - <version>${maven_model_edit.version}</version> - </dependency> - - <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-utils</artifactId> - <version>1.5.15</version> - </dependency> - - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-embedder</artifactId> - <version>${maven.version}</version> - <exclusions> - <exclusion> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - </exclusion> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.apache.maven.archetype</groupId> - <artifactId>archetype-common</artifactId> - <version>${archetype.version}</version> - <exclusions> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - <exclusion> - <artifactId>xml-apis</artifactId> - <groupId>xml-apis</groupId> - </exclusion> - <exclusion> - <groupId>velocity</groupId> - <artifactId>velocity-dep</artifactId> - </exclusion> - </exclusions> - </dependency> - </dependencies> - </dependencyManagement> + + + <dependencies> + <dependency> + <groupId>org.eclipse.m2e</groupId> + <artifactId>com.ning.async-http-client</artifactId> + <version>${m2e-maven-runtime.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.m2e</groupId> + <artifactId>org.eclipse.m2e.archetype.common</artifactId> + <version>${m2e-maven-runtime.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.m2e</groupId> + <artifactId>org.eclipse.m2e.maven.indexer</artifactId> + <version>${m2e-maven-runtime.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.m2e</groupId> + <artifactId>org.eclipse.m2e.maven.runtime</artifactId> + <version>${m2e-maven-runtime.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.m2e</groupId> + <artifactId>org.eclipse.m2e.maven.runtime</artifactId> + <version>${m2e-maven-runtime.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.m2e</groupId> + <artifactId>org.jboss.netty</artifactId> + <version>${m2e-maven-runtime.version}</version> + </dependency> + </dependencies> <build> <plugins> @@ -242,20 +165,12 @@ </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-release-plugin</artifactId> - <configuration> - <tagBase>https://svn.sonatype.org/m2eclipse/tags</tagBase> - </configuration> - </plugin> - - <plugin> <groupId>org.eclipse.tycho</groupId> <artifactId>target-platform-configuration</artifactId> <version>${tycho-version}</version> <configuration> <resolver>p2</resolver> - <pomDependencies>consider</pomDependencies> + <pomDependencies>consider</pomDependencies> <target> <artifact> <groupId>org.eclipse.m2e</groupId> @@ -264,7 +179,6 @@ <classifier>${target.platform}</classifier> </artifact> </target> - <ignoreTychoRepositories>true</ignoreTychoRepositories> </configuration> </plugin> </plugins> @@ -313,12 +227,6 @@ <version>${tycho-version}</version> </plugin> - <!-- important for self-hosting --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-resources-plugin</artifactId> - <version>2.4.3</version> - </plugin> </plugins> </pluginManagement> </build> @@ -337,31 +245,6 @@ </pluginRepositories> <profiles> - <profile> - <id>sun-jvm</id> - <activation> - <property> - <name>java.vendor.url</name> - <value>http://java.sun.com/</value> - </property> - </activation> - <properties> - <tycho.test.jvmArgs>-Xmx800m -XX:MaxPermSize=256m</tycho.test.jvmArgs> - </properties> - </profile> - <profile> - <id>osx</id> - <activation> - <property> - <name>java.vendor.url</name> - <value>http://www.apple.com/</value> - </property> - </activation> - <properties> - <tycho.test.jvmArgs>-Xmx800m -XX:MaxPermSize=256m -Dosgi.ws=cocoa -XstartOnFirstThread</tycho.test.jvmArgs> - <osgi.ws>cocoa</osgi.ws> - </properties> - </profile> <!-- <profile> diff --git a/target-platform/pom.xml b/target-platform/pom.xml index 6cf9c449..15236fc9 100644 --- a/target-platform/pom.xml +++ b/target-platform/pom.xml @@ -11,9 +11,8 @@ <parent> <groupId>org.eclipse.m2e</groupId> - <artifactId>org.eclipse.m2e.parent</artifactId> + <artifactId>m2e-core</artifactId> <version>1.0.100-SNAPSHOT</version> - <relativePath>../org.eclipse.m2e.parent</relativePath> </parent> <artifactId>target-platform</artifactId> |