Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Enlarge critical section to cover processNextTransaction()
[controller.git]
/
karaf
/
karaf-parent
/
pom.xml
diff --git
a/karaf/karaf-parent/pom.xml
b/karaf/karaf-parent/pom.xml
index 958f2b884cf2075b8b9a62a72f176439ada6bb5f..64616ae569ab939c2f87714e3131e80db99c1968 100644
(file)
--- a/
karaf/karaf-parent/pom.xml
+++ b/
karaf/karaf-parent/pom.xml
@@
-11,7
+11,7
@@
and is available at http://www.eclipse.org/legal/epl-v10.html
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent</artifactId>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent</artifactId>
- <version>1.
5
.0-SNAPSHOT</version>
+ <version>1.
7
.0-SNAPSHOT</version>
<relativePath/>
</parent>
<modelVersion>4.0.0</modelVersion>
<relativePath/>
</parent>
<modelVersion>4.0.0</modelVersion>
@@
-21,9
+21,15
@@
and is available at http://www.eclipse.org/legal/epl-v10.html
<packaging>pom</packaging>
<properties>
<packaging>pom</packaging>
<properties>
- <branding.version>1.
1
.0-SNAPSHOT</branding.version>
- <karaf.resources.version>1.
5
.0-SNAPSHOT</karaf.resources.version>
+ <branding.version>1.
3
.0-SNAPSHOT</branding.version>
+ <karaf.resources.version>1.
7
.0-SNAPSHOT</karaf.resources.version>
<karaf.localFeature>standard</karaf.localFeature>
<karaf.localFeature>standard</karaf.localFeature>
+ <!-- Karaf Maven plugin 3.023 reinstalls already installed
+ boot features to container, which could be observed
+ in huge logs and seems like loop in build, even if it
+ is not.
+ -->
+ <karaf.maven.version>3.0.1</karaf.maven.version>
</properties>
<dependencyManagement>
<dependencies>
</properties>
<dependencyManagement>
<dependencies>
@@
-57,6
+63,13
@@
and is available at http://www.eclipse.org/legal/epl-v10.html
<classifier>features</classifier>
<scope>runtime</scope>
</dependency>
<classifier>features</classifier>
<scope>runtime</scope>
</dependency>
+ <!-- karaf region dependency -->
+ <dependency>
+ <groupId>org.apache.karaf.region</groupId>
+ <artifactId>org.apache.karaf.region.persist</artifactId>
+ <version>${karaf.version}</version>
+ <scope>runtime</scope>
+ </dependency>
<!-- ODL Branding -->
<dependency>
<groupId>org.opendaylight.controller</groupId>
<!-- ODL Branding -->
<dependency>
<groupId>org.opendaylight.controller</groupId>
@@
-180,7
+193,7
@@
and is available at http://www.eclipse.org/legal/epl-v10.html
<plugin>
<groupId>org.apache.karaf.tooling</groupId>
<artifactId>karaf-maven-plugin</artifactId>
<plugin>
<groupId>org.apache.karaf.tooling</groupId>
<artifactId>karaf-maven-plugin</artifactId>
- <version>${karaf.version}</version>
+ <version>${karaf.
maven.
version}</version>
<extensions>true</extensions>
<configuration>
<!-- no startupFeatures -->
<extensions>true</extensions>
<configuration>
<!-- no startupFeatures -->