diff --git a/org.eclipse.m2e.archetype.common/.classpath b/org.eclipse.m2e.archetype.common/.classpath deleted file mode 100644 index 558b50a9d..000000000 --- a/org.eclipse.m2e.archetype.common/.classpath +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/org.eclipse.m2e.archetype.common/.project b/org.eclipse.m2e.archetype.common/.project deleted file mode 100644 index 414c3637b..000000000 --- a/org.eclipse.m2e.archetype.common/.project +++ /dev/null @@ -1,28 +0,0 @@ - - - org.eclipse.m2e.archetype.common - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/org.eclipse.m2e.archetype.common/.settings/org.eclipse.core.resources.prefs b/org.eclipse.m2e.archetype.common/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index db326978a..000000000 --- a/org.eclipse.m2e.archetype.common/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,3 +0,0 @@ -eclipse.preferences.version=1 -encoding//src/main/resources=UTF-8 -encoding/=UTF-8 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 aa34c0246..000000000 --- a/org.eclipse.m2e.archetype.common/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,9 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning -org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=1.8 diff --git a/org.eclipse.m2e.archetype.common/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.m2e.archetype.common/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1c..000000000 --- a/org.eclipse.m2e.archetype.common/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/org.eclipse.m2e.archetype.common/.settings/org.eclipse.pde.prefs b/org.eclipse.m2e.archetype.common/.settings/org.eclipse.pde.prefs deleted file mode 100644 index 46057578f..000000000 --- a/org.eclipse.m2e.archetype.common/.settings/org.eclipse.pde.prefs +++ /dev/null @@ -1,35 +0,0 @@ -compilers.f.unresolved-features=1 -compilers.f.unresolved-plugins=1 -compilers.incompatible-environment=1 -compilers.p.build=1 -compilers.p.build.bin.includes=1 -compilers.p.build.encodings=2 -compilers.p.build.java.compiler=2 -compilers.p.build.java.compliance=1 -compilers.p.build.missing.output=2 -compilers.p.build.output.library=1 -compilers.p.build.source.library=1 -compilers.p.build.src.includes=1 -compilers.p.deprecated=1 -compilers.p.discouraged-class=1 -compilers.p.exec-env-too-low=1 -compilers.p.internal=1 -compilers.p.missing-packages=2 -compilers.p.missing-version-export-package=2 -compilers.p.missing-version-import-package=2 -compilers.p.missing-version-require-bundle=2 -compilers.p.no-required-att=0 -compilers.p.no.automatic.module=1 -compilers.p.not-externalized-att=2 -compilers.p.service.component.without.lazyactivation=1 -compilers.p.unknown-attribute=1 -compilers.p.unknown-class=1 -compilers.p.unknown-element=1 -compilers.p.unknown-identifier=1 -compilers.p.unknown-resource=1 -compilers.p.unresolved-ex-points=1 -compilers.p.unresolved-import=2 -compilers.s.create-docs=false -compilers.s.doc-folder=doc -compilers.s.open-tags=1 -eclipse.preferences.version=1 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 f4d0496e5..000000000 --- a/org.eclipse.m2e.archetype.common/META-INF/MANIFEST.MF +++ /dev/null @@ -1,15 +0,0 @@ -Manifest-Version: 1.0 -Automatic-Module-Name: org.eclipse.m2e.archetype.common -Bundle-Description: Maven Integration for Eclipse provides tight integ - ration for Maven into the IDE -Bundle-ManifestVersion: 2 -Bundle-Name: M2E Maven Archetype Common -Bundle-SymbolicName: org.eclipse.m2e.archetype.common -Bundle-Vendor: Eclipse.org - m2e -Bundle-Version: 3.3.0.20230605-1716 -Eclipse-ExtensibleAPI: true -Export-Package: META-INF.plexus;x-internal:=true -Import-Package: org.slf4j;resolution:=optional;version="[1.7.0,3.0.0)" -Require-Bundle: org.eclipse.m2e.maven.runtime;bundle-version="[3.0.0,4 - .0.0)",com.ibm.icu - diff --git a/org.eclipse.m2e.archetype.common/META-INF/p2.inf b/org.eclipse.m2e.archetype.common/META-INF/p2.inf deleted file mode 100644 index 05f5571cb..000000000 --- a/org.eclipse.m2e.archetype.common/META-INF/p2.inf +++ /dev/null @@ -1,14 +0,0 @@ -requires.0.namespace = osgi.bundle -requires.0.name = org.eclipse.m2e.archetype.archetype-catalog - -requires.1.namespace = osgi.bundle -requires.1.name = org.eclipse.m2e.archetype.archetype-common - -requires.2.namespace = osgi.bundle -requires.2.name = org.eclipse.m2e.archetype.archetype-descriptor - -requires.3.namespace = osgi.bundle -requires.3.name = org.eclipse.m2e.archetype.jdom2 - -requires.4.namespace = osgi.bundle -requires.4.name = org.eclipse.m2e.archetype.maven-artifact-transfer \ 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 89b529978..000000000 --- a/org.eclipse.m2e.archetype.common/about.html +++ /dev/null @@ -1,128 +0,0 @@ - - - - -About - - -

About This Content

- -

November 30, 2017

-

License

- -

- 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. -

- -

Third Party Content

- -

-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. -

- -

Archetype 2.0-alpha-4

-

-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.

- - -

Apache Commons Collections 3.2, Apache Commons I/O 1.3.2, Apache Commons Lang 2.1

-

-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.

- - - -

dom4j 2.1.3

-

-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.

- - -

jchardet 1.0

-

-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 1.0

-

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. -

- - - -

Jakarta-Oro 2.0.8

-

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) -

- - - -

Apache Velocity 1.5

-

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.

- - - -

Plexus Velocity 1.1.3

-

-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 17daa5b49..000000000 --- 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 5f8cd4012..7fc578205 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 f4528d09c..b0d83d039 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 6d7984dee..bb11ff1ac 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"/> + + + + + + - - - - - - - - - - diff --git a/pom.xml b/pom.xml index bf80aac6b..709e9609c 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,6 @@ org.eclipse.m2e.maven.runtime - org.eclipse.m2e.archetype.common org.eclipse.m2e.model.edit org.eclipse.m2e.core org.eclipse.m2e.core.ui diff --git a/target-platform/target-platform.target b/target-platform/target-platform.target index c1fae7f64..d99b3d410 100644 --- a/target-platform/target-platform.target +++ b/target-platform/target-platform.target @@ -12,6 +12,10 @@ + + + + @@ -106,17 +110,32 @@ - + org.apache.maven.archetype - archetype-catalog + archetype-common 3.2.1 jar + + + + + org.apache.maven.archetype - archetype-common + archetype-catalog 3.2.1 jar @@ -132,21 +151,14 @@ 0.13.1 jar - - org.jdom - jdom2 - 2.0.6.1 - jar -