Author: cziegeler
Date: Fri Mar 1 06:55:26 2013
New Revision: 1451485
URL: http://svn.apache.org/r1451485
Log:
[FELIX-3943] - Maven Plugin should require latest SCR annotations
[FELIX-3942] - IT Tests should use newer version of annotations
[FELIX-3941] - Dependency to annotations should not be in the plugin
Modified:
felix/trunk/scrplugin/maven-scr-plugin/changelog.txt
felix/trunk/scrplugin/maven-scr-plugin/pom.xml
felix/trunk/scrplugin/maven-scr-plugin/src/it/basic-build-it/pom.xml
felix/trunk/scrplugin/maven-scr-plugin/src/it/external-annotations-it/pom.xml
felix/trunk/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/mojo/SCRDescriptorMojo.java
Modified: felix/trunk/scrplugin/maven-scr-plugin/changelog.txt
URL:
http://svn.apache.org/viewvc/felix/trunk/scrplugin/maven-scr-plugin/changelog.txt?rev=1451485&r1=1451484&r2=1451485&view=diff
==============================================================================
--- felix/trunk/scrplugin/maven-scr-plugin/changelog.txt (original)
+++ felix/trunk/scrplugin/maven-scr-plugin/changelog.txt Fri Mar 1 06:55:26
2013
@@ -1,3 +1,14 @@
+Changes from 1.11.0 to 1.10.0
+----------------------------
+** Improvement
+ * [FELIX-3943] - Maven Plugin should require latest SCR annotations
+** Task
+ * [FELIX-3942] - IT Tests should use newer version of annotations
+** Bug
+ * [FELIX-3917] - bind/unbind methods are not generated
+ * [FELIX-3941] - Dependency to annotations should not be in the plugin
+
+
Changes from 1.10.0 to 1.9.0
----------------------------
** Improvement
Modified: felix/trunk/scrplugin/maven-scr-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/scrplugin/maven-scr-plugin/pom.xml?rev=1451485&r1=1451484&r2=1451485&view=diff
==============================================================================
--- felix/trunk/scrplugin/maven-scr-plugin/pom.xml (original)
+++ felix/trunk/scrplugin/maven-scr-plugin/pom.xml Fri Mar 1 06:55:26 2013
@@ -57,13 +57,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.generator</artifactId>
- <version>1.4.1-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr.annotations</artifactId>
- <version>1.7.0</version>
+ <version>1.5.0</version>
<scope>compile</scope>
</dependency>
<dependency>
Modified: felix/trunk/scrplugin/maven-scr-plugin/src/it/basic-build-it/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/scrplugin/maven-scr-plugin/src/it/basic-build-it/pom.xml?rev=1451485&r1=1451484&r2=1451485&view=diff
==============================================================================
--- felix/trunk/scrplugin/maven-scr-plugin/src/it/basic-build-it/pom.xml
(original)
+++ felix/trunk/scrplugin/maven-scr-plugin/src/it/basic-build-it/pom.xml Fri
Mar 1 06:55:26 2013
@@ -92,7 +92,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
- <version>1.7.0</version>
+ <version>1.9.0</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified:
felix/trunk/scrplugin/maven-scr-plugin/src/it/external-annotations-it/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/scrplugin/maven-scr-plugin/src/it/external-annotations-it/pom.xml?rev=1451485&r1=1451484&r2=1451485&view=diff
==============================================================================
---
felix/trunk/scrplugin/maven-scr-plugin/src/it/external-annotations-it/pom.xml
(original)
+++
felix/trunk/scrplugin/maven-scr-plugin/src/it/external-annotations-it/pom.xml
Fri Mar 1 06:55:26 2013
@@ -92,7 +92,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
- <version>1.7.0</version>
+ <version>1.9.0</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified:
felix/trunk/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/mojo/SCRDescriptorMojo.java
URL:
http://svn.apache.org/viewvc/felix/trunk/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/mojo/SCRDescriptorMojo.java?rev=1451485&r1=1451484&r2=1451485&view=diff
==============================================================================
---
felix/trunk/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/mojo/SCRDescriptorMojo.java
(original)
+++
felix/trunk/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/mojo/SCRDescriptorMojo.java
Fri Mar 1 06:55:26 2013
@@ -86,7 +86,7 @@ public class SCRDescriptorMojo extends A
* @see #checkAnnotationArtifact(Artifact)
*/
private static final ArtifactVersion SCR_ANN_MIN_VERSION = new
DefaultArtifactVersion(
- "1.6.9");
+ "1.9.0");
/**
* @parameter expression="${project.build.directory}/scr-plugin-generated"
