Release Preparation:
- update changelogs
- bump version to run the final tests)
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1645899 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/ipojo/manipulator/annotations/changelog.txt b/ipojo/manipulator/annotations/changelog.txt
index 984d6a6..fec2dea 100644
--- a/ipojo/manipulator/annotations/changelog.txt
+++ b/ipojo/manipulator/annotations/changelog.txt
@@ -1,3 +1,12 @@
+Changes from the 1.12.0 to 1.12.1
+---------------------------------
+
+** Bug
+ * [FELIX-4612] - @PostRegistration is not being called
+ * [FELIX-4620] - Warning should be removed when @Configuration is used
+ * [FELIX-4668] - Can not use @Stereotype annotated annotation from another bundle (unless its package is included or re-exported)
+ * [FELIX-4725] - Inner Class Manipulation uses the wrong 'access level'
+
Changes from the 1.11.2 to 1.12.0
---------------------------------
diff --git a/ipojo/manipulator/bnd-ipojo-plugin/changelog.txt b/ipojo/manipulator/bnd-ipojo-plugin/changelog.txt
index 71d0b45..aed77ee 100644
--- a/ipojo/manipulator/bnd-ipojo-plugin/changelog.txt
+++ b/ipojo/manipulator/bnd-ipojo-plugin/changelog.txt
@@ -1,3 +1,12 @@
+Changes from the 1.12.0 to 1.12.1
+---------------------------------
+
+** Bug
+ * [FELIX-4612] - @PostRegistration is not being called
+ * [FELIX-4620] - Warning should be removed when @Configuration is used
+ * [FELIX-4668] - Can not use @Stereotype annotated annotation from another bundle (unless its package is included or re-exported)
+ * [FELIX-4725] - Inner Class Manipulation uses the wrong 'access level'
+
Changes from the 1.11.2 to 1.12.0
---------------------------------
diff --git a/ipojo/manipulator/changelog.txt b/ipojo/manipulator/changelog.txt
index 4237b92..b8de1f5 100644
--- a/ipojo/manipulator/changelog.txt
+++ b/ipojo/manipulator/changelog.txt
@@ -1,3 +1,12 @@
+Changes from the 1.12.0 to 1.12.1
+---------------------------------
+
+** Bug
+ * [FELIX-4612] - @PostRegistration is not being called
+ * [FELIX-4620] - Warning should be removed when @Configuration is used
+ * [FELIX-4668] - Can not use @Stereotype annotated annotation from another bundle (unless its package is included or re-exported)
+ * [FELIX-4725] - Inner Class Manipulation uses the wrong 'access level'
+
Changes from the 1.11.2 to 1.12.0
---------------------------------
diff --git a/ipojo/manipulator/ipojo-ant-task/changelog.txt b/ipojo/manipulator/ipojo-ant-task/changelog.txt
index 726b827..1755347 100644
--- a/ipojo/manipulator/ipojo-ant-task/changelog.txt
+++ b/ipojo/manipulator/ipojo-ant-task/changelog.txt
@@ -1,3 +1,12 @@
+Changes from the 1.12.0 to 1.12.1
+---------------------------------
+
+** Bug
+ * [FELIX-4612] - @PostRegistration is not being called
+ * [FELIX-4620] - Warning should be removed when @Configuration is used
+ * [FELIX-4668] - Can not use @Stereotype annotated annotation from another bundle (unless its package is included or re-exported)
+ * [FELIX-4725] - Inner Class Manipulation uses the wrong 'access level'
+
Changes from the 1.11.2 to 1.12.0
---------------------------------
diff --git a/ipojo/manipulator/ipojo-ant-task/pom.xml b/ipojo/manipulator/ipojo-ant-task/pom.xml
index 753d268..a25e688 100644
--- a/ipojo/manipulator/ipojo-ant-task/pom.xml
+++ b/ipojo/manipulator/ipojo-ant-task/pom.xml
@@ -34,7 +34,7 @@
</description>
<properties>
- <ipojo.import.packages>[1.12.0,2.0.0)</ipojo.import.packages>
+ <ipojo.import.packages>[1.12.1,2.0.0)</ipojo.import.packages>
</properties>
<dependencies>
diff --git a/ipojo/manipulator/manipulator/changelog.txt b/ipojo/manipulator/manipulator/changelog.txt
index 1c09359..a78c45c 100644
--- a/ipojo/manipulator/manipulator/changelog.txt
+++ b/ipojo/manipulator/manipulator/changelog.txt
@@ -1,3 +1,12 @@
+Changes from the 1.12.0 to 1.12.1
+---------------------------------
+
+** Bug
+ * [FELIX-4612] - @PostRegistration is not being called
+ * [FELIX-4620] - Warning should be removed when @Configuration is used
+ * [FELIX-4668] - Can not use @Stereotype annotated annotation from another bundle (unless its package is included or re-exported)
+ * [FELIX-4725] - Inner Class Manipulation uses the wrong 'access level'
+
Changes from the 1.11.2 to 1.12.0
---------------------------------
diff --git a/ipojo/manipulator/manipulator/pom.xml b/ipojo/manipulator/manipulator/pom.xml
index 59074ec..2a39f0a 100644
--- a/ipojo/manipulator/manipulator/pom.xml
+++ b/ipojo/manipulator/manipulator/pom.xml
@@ -34,7 +34,7 @@
</description>
<properties>
- <ipojo.import.packages>[1.12.0,2.0.0)</ipojo.import.packages>
+ <ipojo.import.packages>[1.12.1,2.0.0)</ipojo.import.packages>
</properties>
<dependencies>
diff --git a/ipojo/manipulator/maven-ipojo-plugin/changelog.txt b/ipojo/manipulator/maven-ipojo-plugin/changelog.txt
index 9a724f8..614f178 100644
--- a/ipojo/manipulator/maven-ipojo-plugin/changelog.txt
+++ b/ipojo/manipulator/maven-ipojo-plugin/changelog.txt
@@ -1,3 +1,12 @@
+Changes from the 1.12.0 to 1.12.1
+---------------------------------
+
+** Bug
+ * [FELIX-4612] - @PostRegistration is not being called
+ * [FELIX-4620] - Warning should be removed when @Configuration is used
+ * [FELIX-4668] - Can not use @Stereotype annotated annotation from another bundle (unless its package is included or re-exported)
+ * [FELIX-4725] - Inner Class Manipulation uses the wrong 'access level'
+
Changes from the 1.11.2 to 1.12.0
---------------------------------
diff --git a/ipojo/manipulator/online-manipulator/changelog.txt b/ipojo/manipulator/online-manipulator/changelog.txt
index 5b53cf1..54a513f 100644
--- a/ipojo/manipulator/online-manipulator/changelog.txt
+++ b/ipojo/manipulator/online-manipulator/changelog.txt
@@ -1,3 +1,12 @@
+Changes from the 1.12.0 to 1.12.1
+---------------------------------
+
+** Bug
+ * [FELIX-4612] - @PostRegistration is not being called
+ * [FELIX-4620] - Warning should be removed when @Configuration is used
+ * [FELIX-4668] - Can not use @Stereotype annotated annotation from another bundle (unless its package is included or re-exported)
+ * [FELIX-4725] - Inner Class Manipulation uses the wrong 'access level'
+
Changes from the 1.11.2 to 1.12.0
---------------------------------
diff --git a/ipojo/manipulator/online-manipulator/pom.xml b/ipojo/manipulator/online-manipulator/pom.xml
index 4c75874..7bb9221 100644
--- a/ipojo/manipulator/online-manipulator/pom.xml
+++ b/ipojo/manipulator/online-manipulator/pom.xml
@@ -37,7 +37,7 @@
</url>
<properties>
- <ipojo.import.packages>[1.12.0,2.0.0)</ipojo.import.packages>
+ <ipojo.import.packages>[1.12.1,2.0.0)</ipojo.import.packages>
<ipojo.manipulator.version>${project.version}</ipojo.manipulator.version>
</properties>
diff --git a/ipojo/runtime/api/changelog.txt b/ipojo/runtime/api/changelog.txt
index 4af9123..6a130a6 100644
--- a/ipojo/runtime/api/changelog.txt
+++ b/ipojo/runtime/api/changelog.txt
@@ -1,3 +1,16 @@
+Changes from 1.12.0 to 1.12.1
+-----------------------------
+
+** Bug
+ * [FELIX-3836] - NPE when calling InstanceDescription.getDescription()
+ * [FELIX-4565] - Occasional ArrayIndexOutOfBoundException in iPOJO's ProvidedServiceHandler
+ * [FELIX-4646] - @Context(Context.Source.INSTANCE) does not inject bundle context
+ * [FELIX-4713] - Error in ProvidedServiceHandler.checkProvidedService : only the first service is checked
+ * [FELIX-4715] - instance bundle context injection does not works
+ * [FELIX-4716] - Bundle org.apache.felix.ipojo physically contains OSGi API classes
+ * [FELIX-4717] - Cannot use the stream API on injected collections
+ * [FELIX-4728] - InstanceManager concurrency issue
+
Changes from 1.11.2 to 1.12.0
-----------------------------
diff --git a/ipojo/runtime/api/pom.xml b/ipojo/runtime/api/pom.xml
index f42c5ce..c5e6f09 100644
--- a/ipojo/runtime/api/pom.xml
+++ b/ipojo/runtime/api/pom.xml
@@ -125,7 +125,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.manipulator</artifactId>
- <version>1.12.0</version>
+ <version>1.12.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
diff --git a/ipojo/runtime/changelog.txt b/ipojo/runtime/changelog.txt
index c403dbb..96c9be5 100644
--- a/ipojo/runtime/changelog.txt
+++ b/ipojo/runtime/changelog.txt
@@ -1,3 +1,16 @@
+Changes from 1.12.0 to 1.12.1
+-----------------------------
+
+** Bug
+ * [FELIX-3836] - NPE when calling InstanceDescription.getDescription()
+ * [FELIX-4565] - Occasional ArrayIndexOutOfBoundException in iPOJO's ProvidedServiceHandler
+ * [FELIX-4646] - @Context(Context.Source.INSTANCE) does not inject bundle context
+ * [FELIX-4713] - Error in ProvidedServiceHandler.checkProvidedService : only the first service is checked
+ * [FELIX-4715] - instance bundle context injection does not works
+ * [FELIX-4716] - Bundle org.apache.felix.ipojo physically contains OSGi API classes
+ * [FELIX-4717] - Cannot use the stream API on injected collections
+ * [FELIX-4728] - InstanceManager concurrency issue
+
Changes from 1.11.2 to 1.12.0
-----------------------------
diff --git a/ipojo/runtime/composite-it/pom.xml b/ipojo/runtime/composite-it/pom.xml
index 5232a21..b371dc6 100644
--- a/ipojo/runtime/composite-it/pom.xml
+++ b/ipojo/runtime/composite-it/pom.xml
@@ -213,7 +213,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.configadmin</artifactId>
- <version>1.6.0</version>
+ <version>1.8.0</version>
<scope>test</scope>
</dependency>
diff --git a/ipojo/runtime/composite/changelog.txt b/ipojo/runtime/composite/changelog.txt
index a63b2df..639323f 100644
--- a/ipojo/runtime/composite/changelog.txt
+++ b/ipojo/runtime/composite/changelog.txt
@@ -1,3 +1,16 @@
+Changes from 1.12.0 to 1.12.1
+-----------------------------
+
+** Bug
+ * [FELIX-3836] - NPE when calling InstanceDescription.getDescription()
+ * [FELIX-4565] - Occasional ArrayIndexOutOfBoundException in iPOJO's ProvidedServiceHandler
+ * [FELIX-4646] - @Context(Context.Source.INSTANCE) does not inject bundle context
+ * [FELIX-4713] - Error in ProvidedServiceHandler.checkProvidedService : only the first service is checked
+ * [FELIX-4715] - instance bundle context injection does not works
+ * [FELIX-4716] - Bundle org.apache.felix.ipojo physically contains OSGi API classes
+ * [FELIX-4717] - Cannot use the stream API on injected collections
+ * [FELIX-4728] - InstanceManager concurrency issue
+
Changes from 1.11.2 to 1.12.0
-----------------------------
diff --git a/ipojo/runtime/composite/pom.xml b/ipojo/runtime/composite/pom.xml
index 037da0e..0613611 100644
--- a/ipojo/runtime/composite/pom.xml
+++ b/ipojo/runtime/composite/pom.xml
@@ -30,7 +30,7 @@
<version>1.12.1-SNAPSHOT</version>
<properties>
- <ipojo.package.version>1.12.0</ipojo.package.version>
+ <ipojo.package.version>1.12.1</ipojo.package.version>
</properties>
<description>
@@ -50,7 +50,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.manipulator</artifactId>
- <version>1.12.0</version>
+ <version>1.12.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
diff --git a/ipojo/runtime/core-it/pom.xml b/ipojo/runtime/core-it/pom.xml
index 4aacbfd..8615c0d 100644
--- a/ipojo/runtime/core-it/pom.xml
+++ b/ipojo/runtime/core-it/pom.xml
@@ -38,9 +38,9 @@
<exam.version>3.0.1</exam.version>
<url.version>1.5.1</url.version>
- <felix.version>4.2.0</felix.version>
- <equinox.version>3.9.1.v20130814-1242</equinox.version>
- <knoperflerfish.version>7.0.1</knoperflerfish.version>
+ <felix.version>4.4.1</felix.version>
+ <equinox.version>3.10.0.v20140606-1445</equinox.version>
+ <knoperflerfish.version>7.1.2</knoperflerfish.version>
<manipulator.version>1.12.1-SNAPSHOT</manipulator.version>
</properties>
@@ -245,7 +245,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.configadmin</artifactId>
- <version>1.6.0</version>
+ <version>1.8.0</version>
<scope>test</scope>
</dependency>
diff --git a/ipojo/runtime/core/changelog.txt b/ipojo/runtime/core/changelog.txt
index 6e10010..0d7fa86 100644
--- a/ipojo/runtime/core/changelog.txt
+++ b/ipojo/runtime/core/changelog.txt
@@ -1,3 +1,16 @@
+Changes from 1.12.0 to 1.12.1
+-----------------------------
+
+** Bug
+ * [FELIX-3836] - NPE when calling InstanceDescription.getDescription()
+ * [FELIX-4565] - Occasional ArrayIndexOutOfBoundException in iPOJO's ProvidedServiceHandler
+ * [FELIX-4646] - @Context(Context.Source.INSTANCE) does not inject bundle context
+ * [FELIX-4713] - Error in ProvidedServiceHandler.checkProvidedService : only the first service is checked
+ * [FELIX-4715] - instance bundle context injection does not works
+ * [FELIX-4716] - Bundle org.apache.felix.ipojo physically contains OSGi API classes
+ * [FELIX-4717] - Cannot use the stream API on injected collections
+ * [FELIX-4728] - InstanceManager concurrency issue
+
Changes from 1.11.2 to 1.12.0
-----------------------------
diff --git a/ipojo/runtime/core/pom.xml b/ipojo/runtime/core/pom.xml
index 884e345..4efe307 100644
--- a/ipojo/runtime/core/pom.xml
+++ b/ipojo/runtime/core/pom.xml
@@ -53,9 +53,12 @@
1.12.0:
* change in the manipulator (frame / java 8 support). Despite it's not really an API change, it breaks
the compatibility.
+
+ 1.12.1:
+ * small changes in the API
-->
- <ipojo.package.version>1.12.0</ipojo.package.version>
- <ipojo.extender.version>1.12.0</ipojo.extender.version>
+ <ipojo.package.version>1.12.1</ipojo.package.version>
+ <ipojo.extender.version>1.12.1</ipojo.extender.version>
</properties>
<description>
@@ -93,7 +96,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.annotations</artifactId>
- <version>1.12.0</version>
+ <version>1.12.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
diff --git a/ipojo/runtime/core/src/test/java/org/apache/felix/ipojo/InstanceManagerTest.java b/ipojo/runtime/core/src/test/java/org/apache/felix/ipojo/InstanceManagerTest.java
index 2d5675d..1b195dd 100644
--- a/ipojo/runtime/core/src/test/java/org/apache/felix/ipojo/InstanceManagerTest.java
+++ b/ipojo/runtime/core/src/test/java/org/apache/felix/ipojo/InstanceManagerTest.java
@@ -46,6 +46,7 @@
public void testConcurrencyOfMethodId() throws InterruptedException, ConfigurationException, ClassNotFoundException {
ExecutorService executor = Executors.newFixedThreadPool(CALLERS);
final AtomicInteger counter = new AtomicInteger();
+ final AtomicInteger error = new AtomicInteger();
ComponentFactory factory = mock(ComponentFactory.class);
when(factory.loadClass(anyString())).thenReturn(MyComponent.class);
@@ -77,6 +78,7 @@
counter.getAndIncrement();
} else {
System.out.println("No method object for " + args[0]);
+ error.incrementAndGet();
}
}
@@ -85,6 +87,7 @@
counter.getAndDecrement();
} else {
System.out.println("No method object");
+ error.incrementAndGet();
}
}
@@ -119,7 +122,7 @@
startSignal.countDown(); // let all threads proceed
assertThat(doneSignal.await(1, TimeUnit.MINUTES)).isTrue();
- assertThat(counter.get()).isEqualTo(0);
+ assertThat(error.get()).isEqualTo(0);
}
private class Caller implements Runnable {
diff --git a/ipojo/runtime/distributions/ten-minutes-tutorial/pom.xml b/ipojo/runtime/distributions/ten-minutes-tutorial/pom.xml
index 77b54b1..fba030f 100644
--- a/ipojo/runtime/distributions/ten-minutes-tutorial/pom.xml
+++ b/ipojo/runtime/distributions/ten-minutes-tutorial/pom.xml
@@ -38,7 +38,7 @@
<description>This project builds the 10 minutes tutorial package</description>
<properties>
- <ipojo.manipulator.version>1.12.0</ipojo.manipulator.version>
+ <ipojo.manipulator.version>1.12.1-SNAPSHOT</ipojo.manipulator.version>
<bnd.version>1.50.0</bnd.version>
</properties>
diff --git a/ipojo/runtime/ipojo-gogo-commands/changelog.txt b/ipojo/runtime/ipojo-gogo-commands/changelog.txt
index 6430646..d1c7cfc 100644
--- a/ipojo/runtime/ipojo-gogo-commands/changelog.txt
+++ b/ipojo/runtime/ipojo-gogo-commands/changelog.txt
@@ -1,3 +1,16 @@
+Changes from 1.12.0 to 1.12.1
+-----------------------------
+
+** Bug
+ * [FELIX-3836] - NPE when calling InstanceDescription.getDescription()
+ * [FELIX-4565] - Occasional ArrayIndexOutOfBoundException in iPOJO's ProvidedServiceHandler
+ * [FELIX-4646] - @Context(Context.Source.INSTANCE) does not inject bundle context
+ * [FELIX-4713] - Error in ProvidedServiceHandler.checkProvidedService : only the first service is checked
+ * [FELIX-4715] - instance bundle context injection does not works
+ * [FELIX-4716] - Bundle org.apache.felix.ipojo physically contains OSGi API classes
+ * [FELIX-4717] - Cannot use the stream API on injected collections
+ * [FELIX-4728] - InstanceManager concurrency issue
+
Changes from 1.11.2 to 1.12.0
-----------------------------
diff --git a/ipojo/runtime/karaf-feature/changelog.txt b/ipojo/runtime/karaf-feature/changelog.txt
index 6e10010..0d7fa86 100644
--- a/ipojo/runtime/karaf-feature/changelog.txt
+++ b/ipojo/runtime/karaf-feature/changelog.txt
@@ -1,3 +1,16 @@
+Changes from 1.12.0 to 1.12.1
+-----------------------------
+
+** Bug
+ * [FELIX-3836] - NPE when calling InstanceDescription.getDescription()
+ * [FELIX-4565] - Occasional ArrayIndexOutOfBoundException in iPOJO's ProvidedServiceHandler
+ * [FELIX-4646] - @Context(Context.Source.INSTANCE) does not inject bundle context
+ * [FELIX-4713] - Error in ProvidedServiceHandler.checkProvidedService : only the first service is checked
+ * [FELIX-4715] - instance bundle context injection does not works
+ * [FELIX-4716] - Bundle org.apache.felix.ipojo physically contains OSGi API classes
+ * [FELIX-4717] - Cannot use the stream API on injected collections
+ * [FELIX-4728] - InstanceManager concurrency issue
+
Changes from 1.11.2 to 1.12.0
-----------------------------