diff options
| -rwxr-xr-x | dblib/features/pom.xml | 5 | ||||
| -rw-r--r-- | dblib/provider/src/main/java/org/openecomp/sdnc/sli/resource/dblib/factory/AbstractResourceManagerFactory.java | 19 | ||||
| -rwxr-xr-x | pom.xml | 2 | ||||
| -rwxr-xr-x | rootpom/pom.xml | 22 |
4 files changed, 33 insertions, 15 deletions
diff --git a/dblib/features/pom.xml b/dblib/features/pom.xml index b6793d8..995a1c5 100755 --- a/dblib/features/pom.xml +++ b/dblib/features/pom.xml @@ -37,6 +37,11 @@ <scope>runtime</scope> </dependency> + <dependency> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-jdbc</artifactId> + <version>${tomcat-jdbc.version}</version> + </dependency> <!-- dependency for opendaylight-karaf-empty for use by testing --> <dependency> diff --git a/dblib/provider/src/main/java/org/openecomp/sdnc/sli/resource/dblib/factory/AbstractResourceManagerFactory.java b/dblib/provider/src/main/java/org/openecomp/sdnc/sli/resource/dblib/factory/AbstractResourceManagerFactory.java index 29ec061..0f58a3f 100644 --- a/dblib/provider/src/main/java/org/openecomp/sdnc/sli/resource/dblib/factory/AbstractResourceManagerFactory.java +++ b/dblib/provider/src/main/java/org/openecomp/sdnc/sli/resource/dblib/factory/AbstractResourceManagerFactory.java @@ -69,9 +69,9 @@ public abstract class AbstractResourceManagerFactory { ds = CachedDataSourceFactory.createDataSource(config); return ds; } finally { - synchronized(activeTasks){ + synchronized(activeTasks) { activeTasks.remove(this); - if(activeTasks.isEmpty()){ + if (activeTasks.isEmpty()) { final Runnable closure = new Runnable() { public void run() { @@ -79,20 +79,23 @@ public abstract class AbstractResourceManagerFactory { Thread.sleep(300); } catch (Exception e) { } - synchronized(activeTasks){ + synchronized(activeTasks) { activeTasks.notifyAll(); } } }; - if(LOGGER.isDebugEnabled()) - LOGGER.debug("Completed CachedDataSource.Call and notifyAll from "+ds.getDbConnectionName()); + if (LOGGER.isDebugEnabled()) { + LOGGER.debug("Completed CachedDataSource.Call and notifyAll from " + ds.getDbConnectionName()); + } Thread worker = new Thread(closure); worker.setDaemon(true); worker.start(); } else { - if(LOGGER.isDebugEnabled()) - if(ds != null) - LOGGER.debug("Completed CachedDataSource.Call from "+ds.getDbConnectionName()); + if (LOGGER.isDebugEnabled()) { + if (ds != null) { + LOGGER.debug("Completed CachedDataSource.Call from " + ds.getDbConnectionName()); + } + } } } } @@ -13,7 +13,7 @@ <parent> <groupId>org.openecomp.sdnc.core</groupId> <artifactId>root</artifactId> - <version>1.1.0</version> + <version>1.1.1</version> <relativePath>rootpom/pom.xml</relativePath> </parent> diff --git a/rootpom/pom.xml b/rootpom/pom.xml index 4ace6f4..84dbc43 100755 --- a/rootpom/pom.xml +++ b/rootpom/pom.xml @@ -157,7 +157,7 @@ <packaging>pom</packaging> <groupId>org.openecomp.sdnc.core</groupId> <artifactId>root</artifactId> - <version>1.1.0</version> + <version>1.1.1</version> <dependencyManagement> @@ -506,16 +506,26 @@ <artifactId>maven-site-plugin</artifactId> <version>3.6</version> <dependencies> - <dependency><!-- add support for ssh/scp --> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-ssh</artifactId> - <version>1.0</version> - </dependency> <dependency> <groupId>org.apache.maven.wagon</groupId> <artifactId>wagon-webdav-jackrabbit</artifactId> <version>2.10</version> </dependency> + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-core</artifactId> + <version>1.7</version> + </dependency> + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-sink-api</artifactId> + <version>1.7</version> + </dependency> + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-logging-api</artifactId> + <version>1.7</version> + </dependency> </dependencies> <executions> <execution> |