You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cl...@apache.org on 2014/05/08 10:45:06 UTC
svn commit: r1593206 - in /felix/trunk/ipojo: manipulator/manipulator-it/
manipulator/manipulator/src/main/java/org/apache/felix/ipojo/manipulator/metadata/annotation/registry/
runtime/api/ runtime/composite-it/ runtime/composite/ runtime/core-it/
runt...
Author: clement
Date: Thu May 8 08:45:06 2014
New Revision: 1593206
URL: http://svn.apache.org/r1593206
Log:
Cleanup dependencies (FELIX-4482)
Modified:
felix/trunk/ipojo/manipulator/manipulator-it/pom.xml
felix/trunk/ipojo/manipulator/manipulator/src/main/java/org/apache/felix/ipojo/manipulator/metadata/annotation/registry/MetaAnnotationBindingRegistry.java
felix/trunk/ipojo/runtime/api/pom.xml
felix/trunk/ipojo/runtime/composite-it/pom.xml
felix/trunk/ipojo/runtime/composite/pom.xml
felix/trunk/ipojo/runtime/core-it/ipojo-api-test/pom.xml
felix/trunk/ipojo/runtime/core-it/ipojo-core-declaration-test/pom.xml
felix/trunk/ipojo/runtime/core-it/pom.xml
Modified: felix/trunk/ipojo/manipulator/manipulator-it/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/manipulator-it/pom.xml?rev=1593206&r1=1593205&r2=1593206&view=diff
==============================================================================
--- felix/trunk/ipojo/manipulator/manipulator-it/pom.xml (original)
+++ felix/trunk/ipojo/manipulator/manipulator-it/pom.xml Thu May 8 08:45:06 2014
@@ -227,12 +227,6 @@
<!--<version>1.11.1</version>-->
<version>${project.version}</version>
<scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
Modified: felix/trunk/ipojo/manipulator/manipulator/src/main/java/org/apache/felix/ipojo/manipulator/metadata/annotation/registry/MetaAnnotationBindingRegistry.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/manipulator/src/main/java/org/apache/felix/ipojo/manipulator/metadata/annotation/registry/MetaAnnotationBindingRegistry.java?rev=1593206&r1=1593205&r2=1593206&view=diff
==============================================================================
--- felix/trunk/ipojo/manipulator/manipulator/src/main/java/org/apache/felix/ipojo/manipulator/metadata/annotation/registry/MetaAnnotationBindingRegistry.java (original)
+++ felix/trunk/ipojo/manipulator/manipulator/src/main/java/org/apache/felix/ipojo/manipulator/metadata/annotation/registry/MetaAnnotationBindingRegistry.java Thu May 8 08:45:06 2014
@@ -82,7 +82,12 @@ public class MetaAnnotationBindingRegist
bytes = m_store.read(type.getInternalName().concat(".class"));
} catch (IOException e) {
// Annotation type cannot be read
- m_reporter.trace("Could not read bytecode for @%s", type.getClassName());
+ m_reporter.trace("Could not read bytecode for @%s.", type.getClassName());
+ return emptyList();
+ } catch (IllegalStateException e) {
+ m_reporter.trace("Could not read bytecode for @%s because the bundle is not in a state allowing read " +
+ "operations.",
+ type.getClassName());
return emptyList();
}
AnnotationParser parser = new AnnotationParser();
Modified: felix/trunk/ipojo/runtime/api/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/api/pom.xml?rev=1593206&r1=1593205&r2=1593206&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/api/pom.xml (original)
+++ felix/trunk/ipojo/runtime/api/pom.xml Thu May 8 08:45:06 2014
@@ -114,11 +114,13 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo</artifactId>
<version>1.12.0-SNAPSHOT</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.composite</artifactId>
<version>1.12.0-SNAPSHOT</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -129,6 +131,7 @@
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>4.3.1</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
</project>
Modified: felix/trunk/ipojo/runtime/composite-it/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/composite-it/pom.xml?rev=1593206&r1=1593205&r2=1593206&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/composite-it/pom.xml (original)
+++ felix/trunk/ipojo/runtime/composite-it/pom.xml Thu May 8 08:45:06 2014
@@ -194,24 +194,14 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo</artifactId>
<version>1.12.0-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- </exclusion>
- </exclusions>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.composite</artifactId>
<version>1.12.0-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- </exclusion>
- </exclusions>
+ <scope>provided</scope>
</dependency>
<dependency>
Modified: felix/trunk/ipojo/runtime/composite/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/composite/pom.xml?rev=1593206&r1=1593205&r2=1593206&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/composite/pom.xml (original)
+++ felix/trunk/ipojo/runtime/composite/pom.xml Thu May 8 08:45:06 2014
@@ -56,6 +56,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo</artifactId>
<version>1.12.0-SNAPSHOT</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
<build>
Modified: felix/trunk/ipojo/runtime/core-it/ipojo-api-test/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-api-test/pom.xml?rev=1593206&r1=1593205&r2=1593206&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-api-test/pom.xml (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-api-test/pom.xml Thu May 8 08:45:06 2014
@@ -38,32 +38,12 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.composite</artifactId>
<version>1.12.0-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.ipojo</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.api</artifactId>
<version>1.12.0-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.ipojo</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
Modified: felix/trunk/ipojo/runtime/core-it/ipojo-core-declaration-test/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-declaration-test/pom.xml?rev=1593206&r1=1593205&r2=1593206&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-core-declaration-test/pom.xml (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-declaration-test/pom.xml Thu May 8 08:45:06 2014
@@ -43,24 +43,6 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.api</artifactId>
<version>1.12.0-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.ipojo</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.ipojo.composite</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: felix/trunk/ipojo/runtime/core-it/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/pom.xml?rev=1593206&r1=1593205&r2=1593206&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/pom.xml (original)
+++ felix/trunk/ipojo/runtime/core-it/pom.xml Thu May 8 08:45:06 2014
@@ -233,6 +233,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo</artifactId>
<version>1.12.0-SNAPSHOT</version>
+ <scope>provided</scope>
</dependency>
<dependency>