You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by rw...@apache.org on 2014/04/17 10:10:04 UTC
svn commit: r1588158 - in /stanbol/branches/release-0.12:
commons/solr/defaults/
commons/stanboltools/datafileprovider/src/main/java/org/apache/stanbol/commons/stanboltools/datafileprovider/impl/
commons/stanboltools/offline/ commons/web/base/src/main/...
Author: rwesten
Date: Thu Apr 17 08:10:03 2014
New Revision: 1588158
URL: http://svn.apache.org/r1588158
Log:
updated versios as listed for STANBOL-1322 in the 0.12 branch. This als includes necessary code and build file changes
Removed:
stanbol/branches/release-0.12/enhancer/generic/nlp/src/main/java/org/apache/stanbol/enhancer/nlp/model/SpanTypeEnum.java
Modified:
stanbol/branches/release-0.12/commons/solr/defaults/pom.xml
stanbol/branches/release-0.12/commons/stanboltools/datafileprovider/src/main/java/org/apache/stanbol/commons/stanboltools/datafileprovider/impl/MainDataFileProvider.java
stanbol/branches/release-0.12/commons/stanboltools/offline/pom.xml
stanbol/branches/release-0.12/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/writers/JsonLdSerializerProvider.java
stanbol/branches/release-0.12/data/defaultconfig/pom.xml
stanbol/branches/release-0.12/enhancer/defaults/pom.xml
stanbol/branches/release-0.12/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/ValueTypeParserRegistry.java
stanbol/branches/release-0.12/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/ValueTypeSerializerRegistry.java
stanbol/branches/release-0.12/entityhub/defaults/pom.xml
stanbol/branches/release-0.12/entityhub/generic/servicesapi/pom.xml
stanbol/branches/release-0.12/entityhub/model/sesame/pom.xml
stanbol/branches/release-0.12/integration-tests/src/test/java/org/apache/stanbol/it/OsgiConsoleTest.java
stanbol/branches/release-0.12/launchers/bundlelists/osgiframework/src/main/bundles/list.xml
stanbol/branches/release-0.12/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml
stanbol/branches/release-0.12/parent/pom.xml
Modified: stanbol/branches/release-0.12/commons/solr/defaults/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/commons/solr/defaults/pom.xml?rev=1588158&r1=1588157&r2=1588158&view=diff
==============================================================================
--- stanbol/branches/release-0.12/commons/solr/defaults/pom.xml (original)
+++ stanbol/branches/release-0.12/commons/solr/defaults/pom.xml Thu Apr 17 08:10:03 2014
@@ -59,10 +59,6 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- </plugin>
- <plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<configuration>
Modified: stanbol/branches/release-0.12/commons/stanboltools/datafileprovider/src/main/java/org/apache/stanbol/commons/stanboltools/datafileprovider/impl/MainDataFileProvider.java
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/commons/stanboltools/datafileprovider/src/main/java/org/apache/stanbol/commons/stanboltools/datafileprovider/impl/MainDataFileProvider.java?rev=1588158&r1=1588157&r2=1588158&view=diff
==============================================================================
--- stanbol/branches/release-0.12/commons/stanboltools/datafileprovider/src/main/java/org/apache/stanbol/commons/stanboltools/datafileprovider/impl/MainDataFileProvider.java (original)
+++ stanbol/branches/release-0.12/commons/stanboltools/datafileprovider/src/main/java/org/apache/stanbol/commons/stanboltools/datafileprovider/impl/MainDataFileProvider.java Thu Apr 17 08:10:03 2014
@@ -48,6 +48,7 @@ import org.osgi.framework.ServiceReferen
import org.osgi.service.cm.ConfigurationException;
import org.osgi.service.component.ComponentContext;
import org.osgi.util.tracker.ServiceTracker;
+import org.osgi.util.tracker.ServiceTrackerCustomizer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -79,8 +80,23 @@ public class MainDataFileProvider implem
/** List of past events, up to maxEvents in size */
private final List<DataFileProviderEvent> events = new LinkedList<DataFileProviderEvent>();
- /** Tracks providers to which we can delegate */
+ /**
+ * Tracks providers to which we can delegate. <i>NOTE:</i> this tracker is
+ * lazily opened by {@link #getSortedServiceRefs()} as this can not be
+ * done during {@link #activate(ComponentContext) activation} as it would
+ * result in <code>org.osgi.framework.ServiceException:
+ * ServiceFactory.getService() resulted in a cycle.</code>
+ * @see #providersTrackerOpen
+ * @see #getSortedServiceRefs()
+ */
private ServiceTracker providersTracker;
+ /**
+ * Used to track if {@link ServiceTracker#open()} was already called on
+ * {@link #providersTracker}
+ * @see #providersTracker
+ * @see #getSortedServiceRefs()
+ */
+ private boolean providersTrackerOpen = false; //used for lazily open the tracker
@Activate
protected void activate(ComponentContext ctx) throws ConfigurationException {
@@ -99,9 +115,11 @@ public class MainDataFileProvider implem
throw new ConfigurationException(DATA_FILES_FOLDER_PROP, "The configured DataFile directory "+dataFilesFolder+" does already exists but is not a directory!");
} //else exists and is a directory!
maxEvents = requireProperty(ctx.getProperties(), MAX_EVENTS_PROP, Integer.class).intValue();
-
providersTracker = new ServiceTracker(ctx.getBundleContext(), DataFileProvider.class.getName(), null);
- providersTracker.open();
+ providersTrackerOpen = false;
+ //NOTE: do not call apen in activate as this do cause a
+ //org.osgi.framework.ServiceException: ServiceFactory.getService() resulted in a cycle.
+ //providersTracker.open();
log.info("Activated, max.events {}, data files folder {}",
maxEvents, dataFilesFolder.getAbsolutePath());
}
@@ -109,7 +127,10 @@ public class MainDataFileProvider implem
@Deactivate
protected void deactivate(ComponentContext ctx) {
if(providersTracker != null) {
- providersTracker.close();
+ synchronized (providersTracker) {
+ providersTrackerOpen = false;
+ providersTracker.close();
+ }
providersTracker = null;
}
}
@@ -162,8 +183,7 @@ public class MainDataFileProvider implem
// ordered by service ranking
if(dataFile == null) {
// Sort providers by service ranking
- final List<ServiceReference> refs = Arrays.asList(providersTracker.getServiceReferences());
- Collections.sort(refs);
+ final List<ServiceReference> refs = getSortedServiceRefs();
for(ServiceReference ref: refs) {
final Object o = providersTracker.getService(ref);
if(o == this) {
@@ -224,6 +244,28 @@ public class MainDataFileProvider implem
return result;
}
+ /**
+ * Getter for the sorted list of service References. THis also lazily
+ * opens the {@link ServiceTracker} on the first call.
+ * @return the sorted list of service references
+ */
+ private List<ServiceReference> getSortedServiceRefs() {
+ ServiceTracker providersTracker = this.providersTracker;
+ if(providersTracker == null){ //already deactivated
+ return Collections.emptyList();
+ }
+ if(!providersTrackerOpen){ //check if we need to open the service tracker
+ synchronized (providersTracker) { //sync
+ if(!providersTrackerOpen){ //and check again
+ providersTracker.open(); //we need to open it
+ }
+ }
+ }
+ final List<ServiceReference> refs = Arrays.asList(providersTracker.getServiceReferences());
+ Collections.sort(refs);
+ return refs;
+ }
+
@SuppressWarnings("unchecked")
@Override
public boolean isAvailable(String bundleSymbolicName, String filename, Map<String,String> comments) {
@@ -233,7 +275,7 @@ public class MainDataFileProvider implem
// ordered by service ranking
if(dataFile == null) {
// Sort providers by service ranking
- final List<ServiceReference> refs = Arrays.asList(providersTracker.getServiceReferences());
+ final List<ServiceReference> refs = getSortedServiceRefs();
Collections.sort(refs);
for(ServiceReference ref: refs) {
final Object o = providersTracker.getService(ref);
Modified: stanbol/branches/release-0.12/commons/stanboltools/offline/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/commons/stanboltools/offline/pom.xml?rev=1588158&r1=1588157&r2=1588158&view=diff
==============================================================================
--- stanbol/branches/release-0.12/commons/stanboltools/offline/pom.xml (original)
+++ stanbol/branches/release-0.12/commons/stanboltools/offline/pom.xml Thu Apr 17 08:10:03 2014
@@ -46,10 +46,6 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<configuration>
Modified: stanbol/branches/release-0.12/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/writers/JsonLdSerializerProvider.java
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/writers/JsonLdSerializerProvider.java?rev=1588158&r1=1588157&r2=1588158&view=diff
==============================================================================
--- stanbol/branches/release-0.12/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/writers/JsonLdSerializerProvider.java (original)
+++ stanbol/branches/release-0.12/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/writers/JsonLdSerializerProvider.java Thu Apr 17 08:10:03 2014
@@ -35,6 +35,9 @@ import org.apache.clerezza.rdf.core.Type
import org.apache.clerezza.rdf.core.UriRef;
import org.apache.clerezza.rdf.core.serializedform.SerializingProvider;
import org.apache.clerezza.rdf.core.serializedform.SupportedFormat;
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.ConfigurationPolicy;
+import org.apache.felix.scr.annotations.Service;
import org.apache.stanbol.commons.jsonld.JsonLd;
import org.apache.stanbol.commons.jsonld.JsonLdCommon;
import org.apache.stanbol.commons.jsonld.JsonLdProperty;
@@ -49,10 +52,9 @@ import org.slf4j.LoggerFactory;
* Implements a <a href="http://json-ld.org/">JSON-LD</a> serialization of a Clerezza
* {@link TripleCollection}.<br>
*
- * @scr.component immediate="true"
- * @scr.service
- * interface="org.apache.clerezza.rdf.core.serializedform.SerializingProvider"
*/
+@Component(immediate=true,policy=ConfigurationPolicy.OPTIONAL)
+@Service
@SupportedFormat({JsonLdSerializerProvider.JSON_LD, APPLICATION_JSON})
public class JsonLdSerializerProvider implements SerializingProvider {
Modified: stanbol/branches/release-0.12/data/defaultconfig/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/data/defaultconfig/pom.xml?rev=1588158&r1=1588157&r2=1588158&view=diff
==============================================================================
--- stanbol/branches/release-0.12/data/defaultconfig/pom.xml (original)
+++ stanbol/branches/release-0.12/data/defaultconfig/pom.xml Thu Apr 17 08:10:03 2014
@@ -52,10 +52,6 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- </plugin>
- <plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<configuration>
Modified: stanbol/branches/release-0.12/enhancer/defaults/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/enhancer/defaults/pom.xml?rev=1588158&r1=1588157&r2=1588158&view=diff
==============================================================================
--- stanbol/branches/release-0.12/enhancer/defaults/pom.xml (original)
+++ stanbol/branches/release-0.12/enhancer/defaults/pom.xml Thu Apr 17 08:10:03 2014
@@ -54,10 +54,6 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- </plugin>
- <plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<configuration>
Modified: stanbol/branches/release-0.12/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/ValueTypeParserRegistry.java
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/ValueTypeParserRegistry.java?rev=1588158&r1=1588157&r2=1588158&view=diff
==============================================================================
--- stanbol/branches/release-0.12/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/ValueTypeParserRegistry.java (original)
+++ stanbol/branches/release-0.12/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/ValueTypeParserRegistry.java Thu Apr 17 08:10:03 2014
@@ -179,19 +179,21 @@ public class ValueTypeParserRegistry {
@Override
public Object addingService(ServiceReference reference) {
ValueTypeParser<?> service = (ValueTypeParser<?>)bc.getService(reference);
- parserLock.writeLock().lock();
- try {
- List<ServiceReference> refs = valueTypeParserRefs.get(service.getType());
- if(refs == null){
- refs = new ArrayList<ServiceReference>(2);
- valueTypeParserRefs.put(service.getType(), refs);
+ if(service != null){
+ parserLock.writeLock().lock();
+ try {
+ List<ServiceReference> refs = valueTypeParserRefs.get(service.getType());
+ if(refs == null){
+ refs = new ArrayList<ServiceReference>(2);
+ valueTypeParserRefs.put(service.getType(), refs);
+ }
+ refs.add(reference);
+ if(refs.size() > 1){
+ Collections.sort(refs);
+ }
+ } finally {
+ parserLock.writeLock().unlock();
}
- refs.add(reference);
- if(refs.size() > 1){
- Collections.sort(refs);
- }
- } finally {
- parserLock.writeLock().unlock();
}
return service;
}
Modified: stanbol/branches/release-0.12/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/ValueTypeSerializerRegistry.java
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/ValueTypeSerializerRegistry.java?rev=1588158&r1=1588157&r2=1588158&view=diff
==============================================================================
--- stanbol/branches/release-0.12/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/ValueTypeSerializerRegistry.java (original)
+++ stanbol/branches/release-0.12/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/ValueTypeSerializerRegistry.java Thu Apr 17 08:10:03 2014
@@ -168,19 +168,21 @@ public class ValueTypeSerializerRegistry
@Override
public Object addingService(ServiceReference reference) {
ValueTypeSerializer<?> service = (ValueTypeSerializer<?>)bc.getService(reference);
- serializerLock.writeLock().lock();
- try {
- List<ServiceReference> refs = valueTypeSerializerRefs.get(service.getType());
- if(refs == null){
- refs = new ArrayList<ServiceReference>(2);
- valueTypeSerializerRefs.put(service.getType(), refs);
+ if(service != null){
+ serializerLock.writeLock().lock();
+ try {
+ List<ServiceReference> refs = valueTypeSerializerRefs.get(service.getType());
+ if(refs == null){
+ refs = new ArrayList<ServiceReference>(2);
+ valueTypeSerializerRefs.put(service.getType(), refs);
+ }
+ refs.add(reference);
+ if(refs.size() > 1){
+ Collections.sort(refs);
+ }
+ } finally {
+ serializerLock.writeLock().unlock();
}
- refs.add(reference);
- if(refs.size() > 1){
- Collections.sort(refs);
- }
- } finally {
- serializerLock.writeLock().unlock();
}
return service;
}
Modified: stanbol/branches/release-0.12/entityhub/defaults/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/entityhub/defaults/pom.xml?rev=1588158&r1=1588157&r2=1588158&view=diff
==============================================================================
--- stanbol/branches/release-0.12/entityhub/defaults/pom.xml (original)
+++ stanbol/branches/release-0.12/entityhub/defaults/pom.xml Thu Apr 17 08:10:03 2014
@@ -52,10 +52,10 @@
</instructions>
</configuration>
</plugin>
- <plugin>
+ <!-- <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
- </plugin>
+ </plugin> -->
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
Modified: stanbol/branches/release-0.12/entityhub/generic/servicesapi/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/entityhub/generic/servicesapi/pom.xml?rev=1588158&r1=1588157&r2=1588158&view=diff
==============================================================================
--- stanbol/branches/release-0.12/entityhub/generic/servicesapi/pom.xml (original)
+++ stanbol/branches/release-0.12/entityhub/generic/servicesapi/pom.xml Thu Apr 17 08:10:03 2014
@@ -78,10 +78,10 @@
</instructions>
</configuration>
</plugin>
- <plugin>
+ <!--<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
- </plugin>
+ </plugin> -->
</plugins>
</build>
Modified: stanbol/branches/release-0.12/entityhub/model/sesame/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/entityhub/model/sesame/pom.xml?rev=1588158&r1=1588157&r2=1588158&view=diff
==============================================================================
--- stanbol/branches/release-0.12/entityhub/model/sesame/pom.xml (original)
+++ stanbol/branches/release-0.12/entityhub/model/sesame/pom.xml Thu Apr 17 08:10:03 2014
@@ -73,10 +73,10 @@
</instructions>
</configuration>
</plugin>
- <plugin>
+ <!-- <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
- </plugin>
+ </plugin> -->
</plugins>
</build>
Modified: stanbol/branches/release-0.12/integration-tests/src/test/java/org/apache/stanbol/it/OsgiConsoleTest.java
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/integration-tests/src/test/java/org/apache/stanbol/it/OsgiConsoleTest.java?rev=1588158&r1=1588157&r2=1588158&view=diff
==============================================================================
--- stanbol/branches/release-0.12/integration-tests/src/test/java/org/apache/stanbol/it/OsgiConsoleTest.java (original)
+++ stanbol/branches/release-0.12/integration-tests/src/test/java/org/apache/stanbol/it/OsgiConsoleTest.java Thu Apr 17 08:10:03 2014
@@ -28,7 +28,7 @@ public class OsgiConsoleTest extends Sta
"bundles",
"components",
"configMgr",
- "config",
+ //"config", No longer available with Felix Webconsole 4.2.2
"licenses",
"logs",
"memoryusage",
Modified: stanbol/branches/release-0.12/launchers/bundlelists/osgiframework/src/main/bundles/list.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/launchers/bundlelists/osgiframework/src/main/bundles/list.xml?rev=1588158&r1=1588157&r2=1588158&view=diff
==============================================================================
--- stanbol/branches/release-0.12/launchers/bundlelists/osgiframework/src/main/bundles/list.xml (original)
+++ stanbol/branches/release-0.12/launchers/bundlelists/osgiframework/src/main/bundles/list.xml Thu Apr 17 08:10:03 2014
@@ -32,37 +32,37 @@
<bundle>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr</artifactId>
- <version>1.6.0</version>
+ <version>1.8.2</version>
</bundle>
<bundle>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.configadmin</artifactId>
- <version>1.2.8</version>
+ <version>1.8.0</version>
</bundle>
<bundle>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.metatype</artifactId>
- <version>1.0.4</version>
+ <version>1.0.10</version>
</bundle>
<bundle>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.eventadmin</artifactId>
- <version>1.2.14</version>
+ <version>1.3.2</version>
</bundle>
<bundle>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.dependencymanager</artifactId>
- <version>3.0.0</version>
+ <version>3.1.0</version>
</bundle>
<bundle>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.dependencymanager.runtime</artifactId>
- <version>3.0.0</version>
+ <version>3.1.0</version>
</bundle>
<!-- bundle>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.deploymentadmin</artifactId>
- <version>0.9.0</version>
+ <version>0.9.6</version>
</bundle -->
<bundle>
<groupId>org.apache.felix</groupId>
@@ -72,12 +72,12 @@
<!-- bundle> OSGi Command Line Shell support (replaced by org.apache.felix.shell)
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.gogo.runtime</artifactId>
- <version>0.10.0</version>
+ <version>0.12.0</version>
</bundle -->
<!-- <bundle>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.commons.osgi</artifactId>
- <version>2.1.0</version>
+ <version>2.2.0</version>
</bundle> -->
</startLevel>
@@ -121,7 +121,7 @@
<bundle>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.whiteboard</artifactId>
- <version>2.2.1</version>
+ <version>2.2.2</version>
</bundle>
</startLevel>
@@ -135,7 +135,7 @@
<bundle>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.webconsole</artifactId>
- <version>4.0.0</version>
+ <version>4.2.2</version>
</bundle>
<bundle>
<groupId>org.apache.felix</groupId>
@@ -165,7 +165,7 @@
<bundle>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.webconsole.plugins.event</artifactId>
- <version>1.0.2</version>
+ <version>1.1.0</version>
</bundle>
<bundle>
<groupId>org.apache.felix</groupId>
Modified: stanbol/branches/release-0.12/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml?rev=1588158&r1=1588157&r2=1588158&view=diff
==============================================================================
--- stanbol/branches/release-0.12/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml (original)
+++ stanbol/branches/release-0.12/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml Thu Apr 17 08:10:03 2014
@@ -45,12 +45,12 @@
<bundle>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.installer.core</artifactId>
- <version>3.4.4</version>
+ <version>3.5.0</version>
</bundle>
<bundle>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.installer.factory.configuration</artifactId>
- <version>1.0.8</version>
+ <version>1.0.12</version>
</bundle>
<bundle>
<groupId>org.apache.stanbol</groupId>
@@ -74,7 +74,7 @@
<bundle>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.settings</artifactId>
- <version>1.2.2</version>
+ <version>1.3.0</version>
</bundle>
<bundle>
<groupId>org.apache.sling</groupId>
Modified: stanbol/branches/release-0.12/parent/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/parent/pom.xml?rev=1588158&r1=1588157&r2=1588158&view=diff
==============================================================================
--- stanbol/branches/release-0.12/parent/pom.xml (original)
+++ stanbol/branches/release-0.12/parent/pom.xml Thu Apr 17 08:10:03 2014
@@ -182,7 +182,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
- <version>1.7.4</version>
+ <version>1.16.0</version>
<!-- slf4j impl is needed when QDox inspects/loads classes that use a
static field for the logger, so that those classes can be loaded. -->
<dependencies>
@@ -292,7 +292,7 @@
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>maven-launchpad-plugin</artifactId>
- <version>2.2.0</version>
+ <version>2.3.0</version>
<extensions>true</extensions>
</plugin>
<!-- generates version number of dependencies suitable for introspection
@@ -549,17 +549,17 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr</artifactId>
- <version>1.6.0</version>
+ <version>1.8.2</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
- <version>1.6.0</version>
+ <version>1.9.8</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.configadmin</artifactId>
- <version>1.2.8</version>
+ <version>1.8.0</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -570,13 +570,13 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.jetty</artifactId>
- <version>2.2.1</version>
+ <version>2.2.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.whiteboard</artifactId>
- <version>2.2.1</version>
+ <version>2.2.2</version>
<scope>test</scope>
</dependency>
@@ -1425,13 +1425,13 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.launchpad.base</artifactId>
- <version>2.4.0</version>
+ <version>2.5.0</version>
<classifier>app</classifier>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.launchpad.base</artifactId>
- <version>2.4.0</version>
+ <version>2.5.0</version>
<classifier>webapp</classifier>
<type>war</type>
</dependency>
@@ -1453,7 +1453,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.installer.core</artifactId>
- <version>3.4.4</version>
+ <version>3.5.0</version>
</dependency>
<!-- Apache James -->