[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
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1451485 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/scrplugin/maven-scr-plugin/changelog.txt b/scrplugin/maven-scr-plugin/changelog.txt
index 4031d69..91b47ad 100644
--- a/scrplugin/maven-scr-plugin/changelog.txt
+++ b/scrplugin/maven-scr-plugin/changelog.txt
@@ -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
diff --git a/scrplugin/maven-scr-plugin/pom.xml b/scrplugin/maven-scr-plugin/pom.xml
index ca9cabe..761e989 100644
--- a/scrplugin/maven-scr-plugin/pom.xml
+++ b/scrplugin/maven-scr-plugin/pom.xml
@@ -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>
diff --git a/scrplugin/maven-scr-plugin/src/it/basic-build-it/pom.xml b/scrplugin/maven-scr-plugin/src/it/basic-build-it/pom.xml
index b0cc0a9..bb28490 100644
--- a/scrplugin/maven-scr-plugin/src/it/basic-build-it/pom.xml
+++ b/scrplugin/maven-scr-plugin/src/it/basic-build-it/pom.xml
@@ -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>
diff --git a/scrplugin/maven-scr-plugin/src/it/external-annotations-it/pom.xml b/scrplugin/maven-scr-plugin/src/it/external-annotations-it/pom.xml
index 372f107..0e2a125 100644
--- a/scrplugin/maven-scr-plugin/src/it/external-annotations-it/pom.xml
+++ b/scrplugin/maven-scr-plugin/src/it/external-annotations-it/pom.xml
@@ -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>
diff --git a/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/mojo/SCRDescriptorMojo.java b/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/mojo/SCRDescriptorMojo.java
index 663d9c5..d5ee484 100644
--- a/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/mojo/SCRDescriptorMojo.java
+++ b/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/mojo/SCRDescriptorMojo.java
@@ -86,7 +86,7 @@
* @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"