#19: Feature/Plugin Provider, Name and Id should be cleaned up (#25)

lastnpe · Nov 14, 2017 · cb33a07 · cb33a07
1 parent 3919028
commit cb33a07
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/eclipse-external-annotations-m2e-plugin.core/META-INF/MANIFEST.MF b/eclipse-external-annotations-m2e-plugin.core/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Maven Integration for Eclipse Settings
-Bundle-SymbolicName: eclipse-external-annotations-m2e-plugin.core;singleton:=true
+Bundle-Name: eclipse-external-annotations-m2e-plugin
+Bundle-SymbolicName: org.lastnpe.m2e.core;singleton:=true
 Bundle-Version: 1.0.0.qualifier
-Bundle-Vendor: Sylvain LAURENT & Michael Vorburger.ch
+Bundle-Vendor: lastnpe.org
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.jdt.core,
  org.eclipse.m2e.maven.runtime;bundle-version="[1.6.0,1.9.0)",

diff --git a/eclipse-external-annotations-m2e-plugin.core/pom.xml b/eclipse-external-annotations-m2e-plugin.core/pom.xml
@@ -9,7 +9,7 @@
  <version>1.0.0-SNAPSHOT</version>
  </parent>
 
- <artifactId>eclipse-external-annotations-m2e-plugin.core</artifactId>
+ <artifactId>org.lastnpe.m2e.core</artifactId>
  <packaging>eclipse-plugin</packaging>
 
 

diff --git a/eclipse-external-annotations-m2e-plugin.feature/feature.xml b/eclipse-external-annotations-m2e-plugin.feature/feature.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
- id="eclipse_external_annotations_m2e_plugin.feature"
+ id="org.lastnpe.m2e.feature"
  label="eclipse-external-annotations-m2e-plugin"
  version="1.0.0.qualifier"
- plugin="eclipse-external-annotations-m2e-plugin.core">
+ provider-name="lastnpe.org"
+ plugin="org.lastnpe.m2e.core">
 
  <description url="https://github.com/lastnpe/eclipse-external-annotations-m2e-plugin">
  Integration Eclipse null analysis with Maven:
@@ -14,7 +15,7 @@
  </description>
 
  <copyright url="http://www.example.com/copyright">
- Sylvain LAURENT &amp; Michael Vorburger.ch, 2016
+ lastnpe.org
  </copyright>
 
  <license url="https://www.eclipse.org/org/documents/epl-v10.php">
@@ -242,7 +243,7 @@ any resulting litigation.
  </requires>
 
  <plugin
- id="eclipse-external-annotations-m2e-plugin.core"
+ id="org.lastnpe.m2e.core"
  download-size="0"
  install-size="0"
  version="0.0.0"

diff --git a/eclipse-external-annotations-m2e-plugin.feature/pom.xml b/eclipse-external-annotations-m2e-plugin.feature/pom.xml
@@ -9,8 +9,7 @@
  <version>1.0.0-SNAPSHOT</version>
  </parent>
 
- <groupId>org.lastnpe.m2e.feature</groupId>
- <artifactId>eclipse_external_annotations_m2e_plugin.feature</artifactId>
+ <artifactId>org.lastnpe.m2e.feature</artifactId>
  <packaging>eclipse-feature</packaging>
 
  <build>

diff --git a/eclipse-external-annotations-m2e-plugin.site/category.xml b/eclipse-external-annotations-m2e-plugin.site/category.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
- <feature url="features/eclipse-external-annotations-m2e-plugin.feature_1.0.0.qualifier.jar" id="eclipse_external_annotations_m2e_plugin.feature"
+ <feature url="features/org.lastnpe.m2e.feature_1.0.0.qualifier.jar" id="org.lastnpe.m2e.feature"
  version="1.0.0.qualifier">
  <category name="lastnpe.org" />
  </feature>
@@ -9,7 +9,7 @@
  See https://github.com/lastnpe/eclipse-external-annotations-m2e-plugin
 
  Allows to configure the path to external annotations for the Maven Dependencies and JRE containers.
- See http://help.eclipse.org/mars/topic/org.eclipse.jdt.doc.user/tasks/task-using_external_null_annotations.htm
+ See http://help.eclipse.org/oxygen/topic/org.eclipse.jdt.doc.user/tasks/task-using_external_null_annotations.htm
  </description>
  </category-def>
 </site>
diff --git a/eclipse-external-annotations-m2e-plugin.site/pom.xml b/eclipse-external-annotations-m2e-plugin.site/pom.xml
@@ -10,7 +10,7 @@
  </parent>
 
 
- <artifactId>eclipse-external-annotations-m2e-plugin.site</artifactId>
+ <artifactId>site</artifactId>
  <packaging>eclipse-repository</packaging>
 
 </project>