SCR v1.3 support

README.md

@@ -23,19 +23,21 @@ Note that the descriptor files generated from source annotations are overwritten
 -----
 <a name="classpath" id="classpath">*</a> By default the plug-in makes DS Annotation types available to all PDE Plug-in projects in the workspace. However, you must make sure they are also added to your project's "permanent" build path used by external builders outside of the workbench. There are several ways to accomplish that. E.g.,
 
-*A. Additional bundle*: Add bundle _ca.ecliptical.pde.ds.lib_ under _Automated Management of Dependencies_ in your Plug-in Manifest Editor's _Dependencies_ tab.
+*A. Additional bundle*: Add bundle _ca.ecliptical.pde.ds.classpath_ under _Automated Management of Dependencies_ in your Plug-in Manifest Editor's _Dependencies_ tab.
 
 *B. Extra library*: Add the following line to your Plug-in project's build.properties file:
 
-	extra.. = platform:/plugin/ca.ecliptical.pde.ds.lib/annotations.jar
+	extra.. = platform:/plugin/ca.ecliptical.pde.ds.classpath/org.osgi.service.component.annotations-1.3.0.jar
 
 > Or: 
 
-	jars.extra.classpath = platform:/plugin/ca.ecliptical.pde.ds.lib/annotations.jar
+	jars.extra.classpath = platform:/plugin/ca.ecliptical.pde.ds.classpath/org.osgi.service.component.annotations-1.3.0.jar
+
+or any other platform:/ URL pointing to the annotations jar file.
 
 See [PDE documentation](http://help.eclipse.org/luna/index.jsp?topic=%2Forg.eclipse.pde.doc.user%2Freference%2Fpde_feature_generating_build.htm "Feature and Plug-in Build Configuration Properties") for more details.
 
-*C. Import package*: In your Plug-in Manifest Editor's _Dependencies_ tab import package _org.osgi.service.component.annotations_ and mark it as optional. This is the least preferred option as it unnecessarily modifies your bundle's runtime classpath (in META-INF/MANIFEST.MF).
+*C. Import package*: In your Plug-in Manifest Editor's _Dependencies_ tab import package _org.osgi.service.component.annotations_ and mark it as optional. This is the least preferred option as it unnecessarily modifies your bundle's runtime classpath (in META-INF/MANIFEST.MF). Note that in this case, you need to add the correct SCR version annotation package to your target environment.
 
 ## License
 

ca.ecliptical.pde.ds-feature/feature.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
     Copyright (c) 2012, 2015 Ecliptical Software Inc. and others.
     All rights reserved. This program and the accompanying materials
@@ -8,46 +8,40 @@
 
     Contributors:
         Ecliptical Software Inc. - initial API and implementation
- -->
-<feature
-      id="ca.ecliptical.pde.ds"
-      label="%featureName"
-      version="1.2.8.qualifier"
-      provider-name="%providerName"
-      license-feature="ca.ecliptical.license"
-      license-feature-version="1.0.0.qualifier">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipticalsoftware.com/updates/"/>
-      <discovery label="%updateSiteName" url="http://download.eclipticalsoftware.com/updates/"/>
-   </url>
-
-   <plugin
-         id="ca.ecliptical.pde.ds"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="ca.ecliptical.pde.ds.lib"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="ca.ecliptical.pde.ds.classpath"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
+ -->
+<feature
+      id="ca.ecliptical.pde.ds"
+      label="%featureName"
+      version="1.3.0.qualifier"
+      provider-name="%providerName"
+      license-feature="ca.ecliptical.license"
+      license-feature-version="1.0.0.qualifier">
+
+   <description>
+      %description
+   </description>
+
+   <copyright>
+      %copyright
+   </copyright>
+
+   <url>
+      <update label="%updateSiteName" url="http://download.eclipticalsoftware.com/updates/"/>
+      <discovery label="%updateSiteName" url="http://download.eclipticalsoftware.com/updates/"/>
+   </url>
+
+   <plugin
+         id="ca.ecliptical.pde.ds"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="ca.ecliptical.pde.ds.classpath"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>

ca.ecliptical.pde.ds.classpath/.classpath

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry exported="true" kind="lib" path="org.osgi.service.component.annotations-1.3.0.jar"/>
 	<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"/>

ca.ecliptical.pde.ds.classpath/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: ca.ecliptical.pde.ds.classpath;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-Activator: ca.ecliptical.pde.ds.internal.classpath.Activator
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.9.100,4.0.0)",
@@ -11,4 +11,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.9.100,4.0.0)",
  org.eclipse.pde.core;bundle-version="[3.9.1,3.11.0)"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
-Export-Package: ca.ecliptical.pde.ds.classpath;version="1.0.0"
+Export-Package: ca.ecliptical.pde.ds.classpath;version="1.0.0",
+ org.osgi.service.component.annotations;version="1.3.0"
+Bundle-ClassPath: org.osgi.service.component.annotations-1.3.0.jar,
+ .

ca.ecliptical.pde.ds.classpath/build.properties

@@ -7,4 +7,5 @@ bin.includes = META-INF/,\
                annotations.jar,\
                about.html,\
                about_files/,\
-               OSGI-INF/
+               OSGI-INF/,\
+               org.osgi.service.component.annotations-1.3.0.jar

ca.ecliptical.pde.ds.classpath/src/ca/ecliptical/pde/ds/internal/classpath/DSAnnotationClasspathContributor.java

@@ -56,7 +56,7 @@ public List<IClasspathEntry> getInitialEntries(BundleDescription project) {
 					if (autoClasspath) {
 						Bundle bundle = ctx.getBundle();
 						try {
-							URL fileURL = FileLocator.toFileURL(bundle.getEntry("annotations.jar")); //$NON-NLS-1$
+							URL fileURL = FileLocator.toFileURL(bundle.getEntry("org.osgi.service.component.annotations-1.3.0.jar")); //$NON-NLS-1$
 							if ("file".equals(fileURL.getProtocol())) { //$NON-NLS-1$
 								URL srcFileURL = FileLocator.toFileURL(bundle.getEntry("annotationssrc.zip")); //$NON-NLS-1$
 								IPath srcPath = "file".equals(srcFileURL.getProtocol()) ? new Path(srcFileURL.getPath()) : null; //$NON-NLS-1$

ca.ecliptical.pde.ds.lib/META-INF/MANIFEST.MF

@@ -1,10 +1,10 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: ca.ecliptical.pde.ds.lib
-Bundle-Version: 1.0.0.v20141223-1920
-Bundle-ClassPath: annotations.jar
-Bundle-Vendor: %Bundle-Vendor
-Export-Package: org.osgi.service.component.annotations;version="1.2.0"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Import-Package: org.osgi.service.component.annotations;version="[1.2.0,1.3.0)"
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name
+Bundle-SymbolicName: ca.ecliptical.pde.ds.lib
+Bundle-Version: 1.3.1.qualifier
+Bundle-ClassPath: annotations.jar
+Bundle-Vendor: %Bundle-Vendor
+Export-Package: org.osgi.service.component.annotations;version="1.3.0"
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Import-Package: org.osgi.service.component.annotations;version="[1.3.0,1.4.0)"

ca.ecliptical.pde.ds/META-INF/MANIFEST.MF

@@ -1,25 +1,25 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: ca.ecliptical.pde.ds;singleton:=true
-Bundle-Version: 1.2.8.qualifier
-Bundle-Activator: ca.ecliptical.pde.internal.ds.Activator
-Bundle-Vendor: %Bundle-Vendor
-Require-Bundle: org.eclipse.ui;bundle-version="[3.105.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.9.0,4.0.0)",
- org.eclipse.pde.ui;bundle-version="[3.8.0,3.9.0)",
- org.eclipse.jdt.core;bundle-version="[3.9.0,4.0.0)",
- org.eclipse.pde.ds.core;bundle-version="[1.0.300,1.1.0)",
- org.eclipse.core.resources;bundle-version="[3.8.100,4.0.0)",
- org.eclipse.jface.text;bundle-version="[3.8.100,4.0.0)",
- org.eclipse.ltk.core.refactoring;bundle-version="[3.6.100,4.0.0)",
- org.eclipse.core.expressions;bundle-version="[3.4.501,4.0.0)",
- org.eclipse.core.filebuffers;bundle-version="[3.5.300,4.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.9.2,4.0.0)",
- org.eclipse.jdt.ui;bundle-version="[3.9.2,4.0.0)"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ActivationPolicy: lazy
-Export-Package: ca.ecliptical.pde.internal.ds;x-internal:=true
-Import-Package: ca.ecliptical.pde.ds.classpath;version="[1.0.0,2.0.0)",
- org.osgi.service.component;version="[1.2.0,2.0.0)",
- org.osgi.service.component.annotations;version="[1.2.0,2.0.0)"
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name
+Bundle-SymbolicName: ca.ecliptical.pde.ds;singleton:=true
+Bundle-Version: 1.3.2.qualifier
+Bundle-Activator: ca.ecliptical.pde.internal.ds.Activator
+Bundle-Vendor: %Bundle-Vendor
+Require-Bundle: org.eclipse.ui;bundle-version="[3.105.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.9.0,4.0.0)",
+ org.eclipse.pde.ui;bundle-version="[3.8.0,3.9.0)",
+ org.eclipse.jdt.core;bundle-version="[3.9.0,4.0.0)",
+ org.eclipse.pde.ds.core;bundle-version="[1.0.300,1.1.0)",
+ org.eclipse.core.resources;bundle-version="[3.8.100,4.0.0)",
+ org.eclipse.jface.text;bundle-version="[3.8.100,4.0.0)",
+ org.eclipse.ltk.core.refactoring;bundle-version="[3.6.100,4.0.0)",
+ org.eclipse.core.expressions;bundle-version="[3.4.501,4.0.0)",
+ org.eclipse.core.filebuffers;bundle-version="[3.5.300,4.0.0)",
+ org.eclipse.ui.ide;bundle-version="[3.9.2,4.0.0)",
+ org.eclipse.jdt.ui;bundle-version="[3.9.2,4.0.0)"
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-ActivationPolicy: lazy
+Export-Package: ca.ecliptical.pde.internal.ds;x-internal:=true
+Import-Package: ca.ecliptical.pde.ds.classpath;version="[1.0.0,2.0.0)",
+ org.osgi.service.component;version="[1.2.0,2.0.0)",
+ org.osgi.service.component.annotations;version="[1.3.0,2.0.0)"