You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2013/09/27 13:15:45 UTC
svn commit: r1526849 - in /felix/trunk/scrplugin: generator/changelog.txt
generator/src/main/java/org/apache/felix/scrplugin/helper/ClassScanner.java
maven-scr-plugin/changelog.txt maven-scr-plugin/pom.xml
scrtask/changelog.txt scrtask/pom.xml
Author: cziegeler
Date: Fri Sep 27 11:15:44 2013
New Revision: 1526849
URL: http://svn.apache.org/r1526849
Log:
FELIX-4010 : SCR Plugin aborts when scanning a Java 8 class file
Modified:
felix/trunk/scrplugin/generator/changelog.txt
felix/trunk/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/ClassScanner.java
felix/trunk/scrplugin/maven-scr-plugin/changelog.txt
felix/trunk/scrplugin/maven-scr-plugin/pom.xml
felix/trunk/scrplugin/scrtask/changelog.txt
felix/trunk/scrplugin/scrtask/pom.xml
Modified: felix/trunk/scrplugin/generator/changelog.txt
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/generator/changelog.txt?rev=1526849&r1=1526848&r2=1526849&view=diff
==============================================================================
--- felix/trunk/scrplugin/generator/changelog.txt (original)
+++ felix/trunk/scrplugin/generator/changelog.txt Fri Sep 27 11:15:44 2013
@@ -2,7 +2,9 @@ Changes from 1.8.2 to 1.8.0
---------------------------
** Bug
* [FELIX-4192] - SCR Generator fails with a NPE in case a class level Reference doesn't define a referenceInterface
+ * [FELIX-4010] - SCR Plugin aborts when scanning a Java 8 class file
+
Changes from 1.8.0 to 1.7.0
---------------------------
** Improvement
Modified: felix/trunk/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/ClassScanner.java
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/ClassScanner.java?rev=1526849&r1=1526848&r2=1526849&view=diff
==============================================================================
--- felix/trunk/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/ClassScanner.java (original)
+++ felix/trunk/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/ClassScanner.java Fri Sep 27 11:15:44 2013
@@ -419,6 +419,10 @@ public class ClassScanner {
public ClassDescription getDescription(final Class<?> clazz)
throws SCRDescriptorException, SCRDescriptorFailureException {
final String name = clazz.getName();
+ // do don't need to scan classes in the java. or javax. package namespace
+ if ( name.startsWith("java.") || name.startsWith("javax.") ) {
+ return null;
+ }
ClassDescription result = this.allDescriptions.get(name);
if ( result == null ) {
// use scanner first
Modified: felix/trunk/scrplugin/maven-scr-plugin/changelog.txt
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/maven-scr-plugin/changelog.txt?rev=1526849&r1=1526848&r2=1526849&view=diff
==============================================================================
--- felix/trunk/scrplugin/maven-scr-plugin/changelog.txt (original)
+++ felix/trunk/scrplugin/maven-scr-plugin/changelog.txt Fri Sep 27 11:15:44 2013
@@ -2,6 +2,9 @@ Changes from 1.15.0 to 1.14.0
-----------------------------
** Improvements
* [FELIX-4241] - Change default output directory for SCR annotations to ${project.build.directory}/classes
+** Bug
+ * [FELIX-4192] - SCR Generator fails with a NPE in case a class level Reference doesn't define a referenceInterface
+ * [FELIX-4010] - SCR Plugin aborts when scanning a Java 8 class file
Changes from 1.14.0 to 1.13.0
Modified: felix/trunk/scrplugin/maven-scr-plugin/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/maven-scr-plugin/pom.xml?rev=1526849&r1=1526848&r2=1526849&view=diff
==============================================================================
--- felix/trunk/scrplugin/maven-scr-plugin/pom.xml (original)
+++ felix/trunk/scrplugin/maven-scr-plugin/pom.xml Fri Sep 27 11:15:44 2013
@@ -57,7 +57,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.generator</artifactId>
- <version>1.8.0</version>
+ <version>1.8.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
Modified: felix/trunk/scrplugin/scrtask/changelog.txt
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/scrtask/changelog.txt?rev=1526849&r1=1526848&r2=1526849&view=diff
==============================================================================
--- felix/trunk/scrplugin/scrtask/changelog.txt (original)
+++ felix/trunk/scrplugin/scrtask/changelog.txt Fri Sep 27 11:15:44 2013
@@ -1,3 +1,10 @@
+Changes from 1.9.0 to 1.8.0
+---------------------------
+** Bug
+ * [FELIX-4192] - SCR Generator fails with a NPE in case a class level Reference doesn't define a referenceInterface
+ * [FELIX-4010] - SCR Plugin aborts when scanning a Java 8 class file
+
+
Changes from 1.8.0 to 1.7.0
---------------------------
** Improvement
Modified: felix/trunk/scrplugin/scrtask/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/scrtask/pom.xml?rev=1526849&r1=1526848&r2=1526849&view=diff
==============================================================================
--- felix/trunk/scrplugin/scrtask/pom.xml (original)
+++ felix/trunk/scrplugin/scrtask/pom.xml Fri Sep 27 11:15:44 2013
@@ -54,7 +54,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.generator</artifactId>
- <version>1.8.0</version>
+ <version>1.8.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>