From 6ada5acafe48e9fe4d9ba42343c9007b9e80f71b Mon Sep 17 00:00:00 2001 From: Doug Schaefer Date: Tue, 21 Nov 2017 11:52:55 -0500 Subject: [PATCH] Releng clean up, especially names, and pomless. Also added source bundles to the repo. Change-Id: I18a86922452c1459969c1ab3b2239e588e48d4d7 --- .mvn/extensions.xml | 8 ++++ .../META-INF/MANIFEST.MF | 5 ++- .../build.properties | 3 +- .../plugin.properties | 10 +++++ .../org.eclipse.tools.templates.core/pom.xml | 37 ------------------- .../META-INF/MANIFEST.MF | 3 +- .../build.properties | 3 +- .../plugin.properties | 10 +++++ .../pom.xml | 37 ------------------- .../META-INF/MANIFEST.MF | 4 +- .../build.properties | 3 +- .../plugin.properties | 10 +++++ .../org.eclipse.tools.templates.ui/pom.xml | 37 ------------------- bundles/pom.xml | 15 ++++++++ repo/category.xml | 13 ++++++- 15 files changed, 78 insertions(+), 120 deletions(-) create mode 100644 .mvn/extensions.xml create mode 100644 bundles/org.eclipse.tools.templates.core/plugin.properties delete mode 100644 bundles/org.eclipse.tools.templates.core/pom.xml create mode 100644 bundles/org.eclipse.tools.templates.freemarker/plugin.properties delete mode 100644 bundles/org.eclipse.tools.templates.freemarker/pom.xml create mode 100644 bundles/org.eclipse.tools.templates.ui/plugin.properties delete mode 100644 bundles/org.eclipse.tools.templates.ui/pom.xml create mode 100644 bundles/pom.xml diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml new file mode 100644 index 00000000000..9d93c39fd93 --- /dev/null +++ b/.mvn/extensions.xml @@ -0,0 +1,8 @@ + + + + org.eclipse.tycho.extras + tycho-pomless + 1.0.0 + + diff --git a/bundles/org.eclipse.tools.templates.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.tools.templates.core/META-INF/MANIFEST.MF index 7f278de091f..2e46e0bd901 100644 --- a/bundles/org.eclipse.tools.templates.core/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.tools.templates.core/META-INF/MANIFEST.MF @@ -1,12 +1,13 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: Templates Core +Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.tools.templates.core Bundle-Version: 1.1.0.qualifier Bundle-Activator: org.eclipse.tools.templates.core.internal.Activator -Bundle-Vendor: Eclipse CDT Require-Bundle: org.eclipse.core.runtime, org.eclipse.core.resources Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.tools.templates.core +Bundle-Localization: plugin +Bundle-Vendor: %providerName diff --git a/bundles/org.eclipse.tools.templates.core/build.properties b/bundles/org.eclipse.tools.templates.core/build.properties index 17daa5b49ca..d944674ba0b 100644 --- a/bundles/org.eclipse.tools.templates.core/build.properties +++ b/bundles/org.eclipse.tools.templates.core/build.properties @@ -2,4 +2,5 @@ source.. = src/ output.. = bin/ bin.includes = META-INF/,\ .,\ - about.html + about.html,\ + plugin.properties diff --git a/bundles/org.eclipse.tools.templates.core/plugin.properties b/bundles/org.eclipse.tools.templates.core/plugin.properties new file mode 100644 index 00000000000..12de019fa36 --- /dev/null +++ b/bundles/org.eclipse.tools.templates.core/plugin.properties @@ -0,0 +1,10 @@ +################################################################################# +# Copyright (c) 2017 QNX Software Systems and others. +# 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 +################################################################################# + +pluginName=Template Engine Core +providerName=Eclipse CDT diff --git a/bundles/org.eclipse.tools.templates.core/pom.xml b/bundles/org.eclipse.tools.templates.core/pom.xml deleted file mode 100644 index 155cbc71b9b..00000000000 --- a/bundles/org.eclipse.tools.templates.core/pom.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - 4.0.0 - - - org.eclipse.tools.templates - parent - 1.0.0-SNAPSHOT - ../../pom.xml - - - 1.1.0-SNAPSHOT - org.eclipse.tools.templates.core - eclipse-plugin - - - - - org.eclipse.tycho - tycho-source-plugin - ${tycho-version} - - - plugin-source - none - - - attach-source - none - - - - - - diff --git a/bundles/org.eclipse.tools.templates.freemarker/META-INF/MANIFEST.MF b/bundles/org.eclipse.tools.templates.freemarker/META-INF/MANIFEST.MF index 7b62b334b19..dc45d52e72e 100644 --- a/bundles/org.eclipse.tools.templates.freemarker/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.tools.templates.freemarker/META-INF/MANIFEST.MF @@ -1,6 +1,6 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: Eclipse Tools +Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.tools.templates.freemarker Bundle-Version: 1.0.0.qualifier Bundle-Activator: org.eclipse.tools.templates.freemarker.internal.Activator @@ -11,3 +11,4 @@ Require-Bundle: org.eclipse.core.runtime, Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.tools.templates.freemarker +Bundle-Vendor: %providerName diff --git a/bundles/org.eclipse.tools.templates.freemarker/build.properties b/bundles/org.eclipse.tools.templates.freemarker/build.properties index 17daa5b49ca..d944674ba0b 100644 --- a/bundles/org.eclipse.tools.templates.freemarker/build.properties +++ b/bundles/org.eclipse.tools.templates.freemarker/build.properties @@ -2,4 +2,5 @@ source.. = src/ output.. = bin/ bin.includes = META-INF/,\ .,\ - about.html + about.html,\ + plugin.properties diff --git a/bundles/org.eclipse.tools.templates.freemarker/plugin.properties b/bundles/org.eclipse.tools.templates.freemarker/plugin.properties new file mode 100644 index 00000000000..edb92f51b34 --- /dev/null +++ b/bundles/org.eclipse.tools.templates.freemarker/plugin.properties @@ -0,0 +1,10 @@ +################################################################################# +# Copyright (c) 2017 QNX Software Systems and others. +# 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 +################################################################################# + +pluginName=Template Engine Freemarker Support +providerName=Eclipse CDT diff --git a/bundles/org.eclipse.tools.templates.freemarker/pom.xml b/bundles/org.eclipse.tools.templates.freemarker/pom.xml deleted file mode 100644 index e8578e7e605..00000000000 --- a/bundles/org.eclipse.tools.templates.freemarker/pom.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - 4.0.0 - - - org.eclipse.tools.templates - parent - 1.0.0-SNAPSHOT - ../../pom.xml - - - 1.0.0-SNAPSHOT - org.eclipse.tools.templates.freemarker - eclipse-plugin - - - - - org.eclipse.tycho - tycho-source-plugin - ${tycho-version} - - - plugin-source - none - - - attach-source - none - - - - - - diff --git a/bundles/org.eclipse.tools.templates.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.tools.templates.ui/META-INF/MANIFEST.MF index c29bfb822fa..667a95e2e84 100644 --- a/bundles/org.eclipse.tools.templates.ui/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.tools.templates.ui/META-INF/MANIFEST.MF @@ -1,6 +1,6 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: Ui +Bundle-Name: Template Engine UI Bundle-SymbolicName: org.eclipse.tools.templates.ui;singleton:=true Bundle-Version: 1.1.1.qualifier Bundle-Activator: org.eclipse.tools.templates.ui.internal.Activator @@ -13,3 +13,5 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.tools.templates.ui, org.eclipse.tools.templates.ui.internal +Bundle-Vendor: Eclipse CDT +Bundle-Localization: plugin diff --git a/bundles/org.eclipse.tools.templates.ui/build.properties b/bundles/org.eclipse.tools.templates.ui/build.properties index 1d37c1db0f3..4edb1cf2735 100644 --- a/bundles/org.eclipse.tools.templates.ui/build.properties +++ b/bundles/org.eclipse.tools.templates.ui/build.properties @@ -4,4 +4,5 @@ bin.includes = META-INF/,\ .,\ about.html,\ plugin.xml,\ - schema/ + schema/,\ + plugin.properties diff --git a/bundles/org.eclipse.tools.templates.ui/plugin.properties b/bundles/org.eclipse.tools.templates.ui/plugin.properties new file mode 100644 index 00000000000..a708a5750be --- /dev/null +++ b/bundles/org.eclipse.tools.templates.ui/plugin.properties @@ -0,0 +1,10 @@ +################################################################################# +# Copyright (c) 2017 QNX Software Systems and others. +# 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 +################################################################################# + +pluginName=Template Engine UI +providerName=Eclipse CDT diff --git a/bundles/org.eclipse.tools.templates.ui/pom.xml b/bundles/org.eclipse.tools.templates.ui/pom.xml deleted file mode 100644 index f8400656356..00000000000 --- a/bundles/org.eclipse.tools.templates.ui/pom.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - 4.0.0 - - - org.eclipse.tools.templates - parent - 1.0.0-SNAPSHOT - ../../pom.xml - - - 1.1.1-SNAPSHOT - org.eclipse.tools.templates.ui - eclipse-plugin - - - - - org.eclipse.tycho - tycho-source-plugin - ${tycho-version} - - - plugin-source - none - - - attach-source - none - - - - - - diff --git a/bundles/pom.xml b/bundles/pom.xml new file mode 100644 index 00000000000..e12a5fa4e41 --- /dev/null +++ b/bundles/pom.xml @@ -0,0 +1,15 @@ + + + 4.0.0 + + + org.eclipse.tools.templates + parent + 1.0.0-SNAPSHOT + + + bundle-parent + pom + diff --git a/repo/category.xml b/repo/category.xml index e74270a3fdb..63b1ea6bc91 100644 --- a/repo/category.xml +++ b/repo/category.xml @@ -3,11 +3,20 @@ + + + - + - + + + + + + +