November 30, 2017
-- 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 2.0 ("EPL"). A copy of the EPL is - available at http://www.eclipse.org/legal/epl-2.0. - For purposes of the EPL, "Program" will mean the Content. -
- -- 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 http://www.eclipse.org. -
- --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. -
- --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 http://maven.apache.org/license.html. -(a local copy can be found here) -
-The original binaries are available at the Maven Central Repository.
- - --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 http://www.apache.org/licenses/LICENSE-2.0. -(a local copy can be found here) -
-The original binaries are available at the Maven Central Repository.
- - - --Your use of dom4j 2.1.3 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 here. -
-The original binaries are available at the Maven Central Repository.
- - --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 http://www.mozilla.org/MPL/MPL-1.1.html. -(a local copy can be found here) -
-The original binaries are available at the Maven Central Repository.
- - -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 jdom-LICENSE.txt. -
- - - -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 http://www.apache.org/licenses/LICENSE-1.1. -(a local copy can be found here) -
- - - -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 LICENSE-2.0.txt -and is also available at -http://www.apache.org/licenses/LICENSE-2.0.txt.
- - - --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 http://www.apache.org/licenses/LICENSE-2.0. -(a local copy can be found here) -
-The original binaries are available at the Maven Central Repository.
- - - - - \ No newline at end of file diff --git a/org.eclipse.m2e.archetype.common/build.properties b/org.eclipse.m2e.archetype.common/build.properties deleted file mode 100644 index 17daa5b49c..0000000000 --- a/org.eclipse.m2e.archetype.common/build.properties +++ /dev/null @@ -1,5 +0,0 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - .,\ - about.html diff --git a/org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF b/org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF index 5f8cd40127..7fc578205b 100644 --- a/org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF @@ -33,7 +33,6 @@ Require-Bundle: org.eclipse.m2e.core;bundle-version="[2.0.0,3.0.0)", org.eclipse.core.runtime;bundle-version="3.5.0", org.eclipse.m2e.model.edit;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, org.eclipse.m2e.maven.runtime;bundle-version="[3.8.6,4.0.0)", - org.eclipse.m2e.archetype.common;bundle-version="[3.2.1,4.0.0)", org.eclipse.ui.console;bundle-version="3.4.0", org.eclipse.ui.ide;bundle-version="3.18.0", org.eclipse.core.filesystem;bundle-version="1.2.1", @@ -43,7 +42,14 @@ Require-Bundle: org.eclipse.m2e.core;bundle-version="[2.0.0,3.0.0)", org.eclipse.core.filebuffers, org.eclipse.ui, org.eclipse.ui.navigator -Import-Package: org.eclipse.compare.rangedifferencer, +Import-Package: org.apache.maven.archetype.catalog;provider=m2e;version="[3.2.1,4.0.0)", + org.apache.maven.archetype.catalog.io.xpp3;provider=m2e;version="[3.2.1,4.0.0)", + org.apache.maven.archetype.common;provider=m2e;version="[3.2.1,4.0.0)", + org.apache.maven.archetype.exception;provider=m2e;version="[3.2.1,4.0.0)", + org.apache.maven.archetype.metadata;provider=m2e;version="[3.2.1,4.0.0)", + org.apache.maven.archetype.source;provider=m2e;version="[3.2.1,4.0.0)", + org.apache.maven.shared.transfer.artifact;provider=m2e;version="[0.13.1,1.0.0)", + org.eclipse.compare.rangedifferencer, org.eclipse.ltk.core.refactoring, org.slf4j;version="[1.7.0,3.0.0)" Service-Component: OSGI-INF/component.xml, diff --git a/org.eclipse.m2e.feature/build.properties b/org.eclipse.m2e.feature/build.properties index f4528d09c0..b0d83d0390 100644 --- a/org.eclipse.m2e.feature/build.properties +++ b/org.eclipse.m2e.feature/build.properties @@ -13,3 +13,4 @@ bin.includes = feature.xml,\ feature.properties,\ p2.inf +pom.model.property.tycho.baseline.skip = true diff --git a/org.eclipse.m2e.feature/feature.xml b/org.eclipse.m2e.feature/feature.xml index 6d7984deea..bb11ff1ac5 100644 --- a/org.eclipse.m2e.feature/feature.xml +++ b/org.eclipse.m2e.feature/feature.xml @@ -26,7 +26,33 @@ id="org.eclipse.m2e.archetype.common" download-size="0" install-size="0" - version="0.0.0"/> + version="0.0.0" + fragment="true" + unpack="false"/> + +