홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Jian Li
Committed by Gerrit Code Review
11599162 1 parent 2c0ae12d

Bump up Karaf to 3.0.5 

This commit bumps up karaf to 3.0.5.
This commit also bumps up the jetty to 8.1.18.v20150929.

Change-Id: I52849c38b535205db8c4e00e799b332f63b7e3f2
Inline Side-by-side
Showing 25 changed files with 77 additions and 69 deletions
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
76 <dependency> 76 <dependency>
77 <groupId>org.apache.karaf.shell</groupId> 77 <groupId>org.apache.karaf.shell</groupId>
78 <artifactId>org.apache.karaf.shell.console</artifactId> 78 <artifactId>org.apache.karaf.shell.console</artifactId>
79 - <version>3.0.3</version> 79 + <version>3.0.5</version>
80 </dependency> 80 </dependency>
81 <dependency> 81 <dependency>
82 <groupId>org.onosproject</groupId> 82 <groupId>org.onosproject</groupId>
......
...@@ -18,7 +18,6 @@ package org.onosproject.net.flowobjective.impl.composition; ...@@ -18,7 +18,6 @@ package org.onosproject.net.flowobjective.impl.composition;
18 import com.google.common.collect.Maps; 18 import com.google.common.collect.Maps;
19 import com.google.common.collect.Sets; 19 import com.google.common.collect.Sets;
20 import org.apache.felix.scr.annotations.Activate; 20 import org.apache.felix.scr.annotations.Activate;
21 -import org.apache.felix.scr.annotations.Component;
22 import org.apache.felix.scr.annotations.Deactivate; 21 import org.apache.felix.scr.annotations.Deactivate;
23 import org.apache.felix.scr.annotations.Reference; 22 import org.apache.felix.scr.annotations.Reference;
24 import org.apache.felix.scr.annotations.ReferenceCardinality; 23 import org.apache.felix.scr.annotations.ReferenceCardinality;
...@@ -64,7 +63,7 @@ import static com.google.common.base.Preconditions.checkNotNull; ...@@ -64,7 +63,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
64 import static java.util.concurrent.Executors.newFixedThreadPool; 63 import static java.util.concurrent.Executors.newFixedThreadPool;
65 import static org.onlab.util.Tools.groupedThreads; 64 import static org.onlab.util.Tools.groupedThreads;
66 import static org.onosproject.security.AppGuard.checkPermission; 65 import static org.onosproject.security.AppGuard.checkPermission;
67 -import static org.onosproject.security.AppPermission.Type.*; 66 +import static org.onosproject.security.AppPermission.Type.FLOWRULE_WRITE;
68 67
69 68
70 /** 69 /**
...@@ -79,7 +78,7 @@ import static org.onosproject.security.AppPermission.Type.*; ...@@ -79,7 +78,7 @@ import static org.onosproject.security.AppPermission.Type.*;
79 * Therefore, it is safest to use this component in a single instance scenario. 78 * Therefore, it is safest to use this component in a single instance scenario.
80 * This comment will be removed when a distributed implementation is available. 79 * This comment will be removed when a distributed implementation is available.
81 */ 80 */
82 -@Component(immediate = true, enabled = false) 81 +//@Component(immediate = true, enabled = false)
83 @Service 82 @Service
84 public class FlowObjectiveCompositionManager implements FlowObjectiveService { 83 public class FlowObjectiveCompositionManager implements FlowObjectiveService {
85 84
......
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
16 package org.onosproject.app.impl; 16 package org.onosproject.app.impl;
17 17
18 import org.apache.karaf.features.Feature; 18 import org.apache.karaf.features.Feature;
19 +import org.apache.karaf.features.FeaturesListener;
19 import org.apache.karaf.features.Repository; 20 import org.apache.karaf.features.Repository;
20 21
21 import java.net.URI; 22 import java.net.URI;
...@@ -163,6 +164,13 @@ public class FeaturesServiceAdapter implements org.apache.karaf.features.Feature ...@@ -163,6 +164,13 @@ public class FeaturesServiceAdapter implements org.apache.karaf.features.Feature
163 164
164 @Override 165 @Override
165 public void refreshRepository(URI uri) throws Exception { 166 public void refreshRepository(URI uri) throws Exception {
167 + }
166 168
169 + @Override
170 + public void registerListener(FeaturesListener featuresListener) {
171 + }
172 +
173 + @Override
174 + public void unregisterListener(FeaturesListener featuresListener) {
167 } 175 }
168 } 176 }
......
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
16 package org.onosproject.store.cluster.messaging.impl; 16 package org.onosproject.store.cluster.messaging.impl;
17 17
18 import org.apache.felix.scr.annotations.Activate; 18 import org.apache.felix.scr.annotations.Activate;
19 -import org.apache.felix.scr.annotations.Component;
20 import org.apache.felix.scr.annotations.Deactivate; 19 import org.apache.felix.scr.annotations.Deactivate;
21 import org.apache.felix.scr.annotations.Reference; 20 import org.apache.felix.scr.annotations.Reference;
22 import org.apache.felix.scr.annotations.ReferenceCardinality; 21 import org.apache.felix.scr.annotations.ReferenceCardinality;
...@@ -31,7 +30,7 @@ import org.slf4j.LoggerFactory; ...@@ -31,7 +30,7 @@ import org.slf4j.LoggerFactory;
31 /** 30 /**
32 * IOLoop based MessagingService. 31 * IOLoop based MessagingService.
33 */ 32 */
34 -@Component(immediate = true, enabled = false) 33 +//@Component(immediate = true, enabled = false)
35 @Service 34 @Service
36 public class IOLoopMessagingManager extends IOLoopMessaging { 35 public class IOLoopMessagingManager extends IOLoopMessaging {
37 36
......
...@@ -15,25 +15,13 @@ ...@@ -15,25 +15,13 @@
15 */ 15 */
16 package org.onosproject.store.device.impl; 16 package org.onosproject.store.device.impl;
17 17
18 -import static com.google.common.base.Preconditions.checkArgument; 18 +import com.google.common.collect.ImmutableList;
19 -import static com.google.common.base.Verify.verify; 19 +import com.google.common.collect.Iterables;
20 -import static org.onosproject.net.DefaultAnnotations.merge; 20 +import com.google.common.collect.Lists;
21 -import static org.slf4j.LoggerFactory.getLogger; 21 +import com.google.common.collect.Maps;
22 - 22 +import com.google.common.collect.Sets;
23 -import java.util.Collection; 23 +import com.google.common.util.concurrent.Futures;
24 -import java.util.Collections;
25 -import java.util.List;
26 -import java.util.Map;
27 -import java.util.Objects;
28 -import java.util.Optional;
29 -import java.util.Set;
30 -import java.util.Map.Entry;
31 -import java.util.concurrent.TimeUnit;
32 -import java.util.concurrent.atomic.AtomicReference;
33 -import java.util.stream.Collectors;
34 -
35 import org.apache.felix.scr.annotations.Activate; 24 import org.apache.felix.scr.annotations.Activate;
36 -import org.apache.felix.scr.annotations.Component;
37 import org.apache.felix.scr.annotations.Deactivate; 25 import org.apache.felix.scr.annotations.Deactivate;
38 import org.apache.felix.scr.annotations.Reference; 26 import org.apache.felix.scr.annotations.Reference;
39 import org.apache.felix.scr.annotations.ReferenceCardinality; 27 import org.apache.felix.scr.annotations.ReferenceCardinality;
...@@ -51,6 +39,7 @@ import org.onosproject.net.DefaultAnnotations; ...@@ -51,6 +39,7 @@ import org.onosproject.net.DefaultAnnotations;
51 import org.onosproject.net.DefaultDevice; 39 import org.onosproject.net.DefaultDevice;
52 import org.onosproject.net.DefaultPort; 40 import org.onosproject.net.DefaultPort;
53 import org.onosproject.net.Device; 41 import org.onosproject.net.Device;
42 +import org.onosproject.net.Device.Type;
54 import org.onosproject.net.DeviceId; 43 import org.onosproject.net.DeviceId;
55 import org.onosproject.net.MastershipRole; 44 import org.onosproject.net.MastershipRole;
56 import org.onosproject.net.OchPort; 45 import org.onosproject.net.OchPort;
...@@ -58,7 +47,6 @@ import org.onosproject.net.OduCltPort; ...@@ -58,7 +47,6 @@ import org.onosproject.net.OduCltPort;
58 import org.onosproject.net.OmsPort; 47 import org.onosproject.net.OmsPort;
59 import org.onosproject.net.Port; 48 import org.onosproject.net.Port;
60 import org.onosproject.net.PortNumber; 49 import org.onosproject.net.PortNumber;
61 -import org.onosproject.net.Device.Type;
62 import org.onosproject.net.device.DefaultPortStatistics; 50 import org.onosproject.net.device.DefaultPortStatistics;
63 import org.onosproject.net.device.DeviceClockService; 51 import org.onosproject.net.device.DeviceClockService;
64 import org.onosproject.net.device.DeviceDescription; 52 import org.onosproject.net.device.DeviceDescription;
...@@ -80,34 +68,47 @@ import org.onosproject.store.serializers.custom.DistributedStoreSerializers; ...@@ -80,34 +68,47 @@ import org.onosproject.store.serializers.custom.DistributedStoreSerializers;
80 import org.onosproject.store.service.DistributedSet; 68 import org.onosproject.store.service.DistributedSet;
81 import org.onosproject.store.service.EventuallyConsistentMap; 69 import org.onosproject.store.service.EventuallyConsistentMap;
82 import org.onosproject.store.service.EventuallyConsistentMapEvent; 70 import org.onosproject.store.service.EventuallyConsistentMapEvent;
71 +import org.onosproject.store.service.EventuallyConsistentMapListener;
83 import org.onosproject.store.service.Serializer; 72 import org.onosproject.store.service.Serializer;
84 import org.onosproject.store.service.SetEvent; 73 import org.onosproject.store.service.SetEvent;
85 import org.onosproject.store.service.SetEventListener; 74 import org.onosproject.store.service.SetEventListener;
86 -import org.onosproject.store.service.WallClockTimestamp;
87 -
88 -import static org.onosproject.store.service.EventuallyConsistentMapEvent.Type.PUT;
89 -import static org.onosproject.store.service.EventuallyConsistentMapEvent.Type.REMOVE;
90 -
91 -import org.onosproject.store.service.EventuallyConsistentMapListener;
92 import org.onosproject.store.service.StorageService; 75 import org.onosproject.store.service.StorageService;
76 +import org.onosproject.store.service.WallClockTimestamp;
93 import org.slf4j.Logger; 77 import org.slf4j.Logger;
94 78
95 -import static org.onosproject.net.device.DeviceEvent.Type.*; 79 +import java.util.Collection;
80 +import java.util.Collections;
81 +import java.util.List;
82 +import java.util.Map;
83 +import java.util.Map.Entry;
84 +import java.util.Objects;
85 +import java.util.Optional;
86 +import java.util.Set;
87 +import java.util.concurrent.TimeUnit;
88 +import java.util.concurrent.atomic.AtomicReference;
89 +import java.util.stream.Collectors;
90 +
91 +import static com.google.common.base.Preconditions.checkArgument;
92 +import static com.google.common.base.Verify.verify;
93 +import static org.onosproject.net.DefaultAnnotations.merge;
94 +import static org.onosproject.net.device.DeviceEvent.Type.DEVICE_ADDED;
95 +import static org.onosproject.net.device.DeviceEvent.Type.DEVICE_AVAILABILITY_CHANGED;
96 +import static org.onosproject.net.device.DeviceEvent.Type.DEVICE_REMOVED;
97 +import static org.onosproject.net.device.DeviceEvent.Type.DEVICE_UPDATED;
98 +import static org.onosproject.net.device.DeviceEvent.Type.PORT_ADDED;
99 +import static org.onosproject.net.device.DeviceEvent.Type.PORT_STATS_UPDATED;
100 +import static org.onosproject.net.device.DeviceEvent.Type.PORT_UPDATED;
96 import static org.onosproject.store.device.impl.GossipDeviceStoreMessageSubjects.DEVICE_INJECTED; 101 import static org.onosproject.store.device.impl.GossipDeviceStoreMessageSubjects.DEVICE_INJECTED;
97 import static org.onosproject.store.device.impl.GossipDeviceStoreMessageSubjects.DEVICE_REMOVE_REQ; 102 import static org.onosproject.store.device.impl.GossipDeviceStoreMessageSubjects.DEVICE_REMOVE_REQ;
98 import static org.onosproject.store.device.impl.GossipDeviceStoreMessageSubjects.PORT_INJECTED; 103 import static org.onosproject.store.device.impl.GossipDeviceStoreMessageSubjects.PORT_INJECTED;
99 - 104 +import static org.onosproject.store.service.EventuallyConsistentMapEvent.Type.PUT;
100 -import com.google.common.collect.ImmutableList; 105 +import static org.onosproject.store.service.EventuallyConsistentMapEvent.Type.REMOVE;
101 -import com.google.common.collect.Iterables; 106 +import static org.slf4j.LoggerFactory.getLogger;
102 -import com.google.common.collect.Lists;
103 -import com.google.common.collect.Maps;
104 -import com.google.common.collect.Sets;
105 -import com.google.common.util.concurrent.Futures;
106 107
107 /** 108 /**
108 * Manages the inventory of devices using a {@code EventuallyConsistentMap}. 109 * Manages the inventory of devices using a {@code EventuallyConsistentMap}.
109 */ 110 */
110 -@Component(immediate = true, enabled = false) 111 +//@Component(immediate = true, enabled = false)
111 @Service 112 @Service
112 public class ECDeviceStore 113 public class ECDeviceStore
113 extends AbstractStore<DeviceEvent, DeviceStoreDelegate> 114 extends AbstractStore<DeviceEvent, DeviceStoreDelegate>
......
...@@ -23,7 +23,6 @@ import com.google.common.collect.SetMultimap; ...@@ -23,7 +23,6 @@ import com.google.common.collect.SetMultimap;
23 import com.google.common.collect.Sets; 23 import com.google.common.collect.Sets;
24 import org.apache.commons.lang3.RandomUtils; 24 import org.apache.commons.lang3.RandomUtils;
25 import org.apache.felix.scr.annotations.Activate; 25 import org.apache.felix.scr.annotations.Activate;
26 -import org.apache.felix.scr.annotations.Component;
27 import org.apache.felix.scr.annotations.Deactivate; 26 import org.apache.felix.scr.annotations.Deactivate;
28 import org.apache.felix.scr.annotations.Reference; 27 import org.apache.felix.scr.annotations.Reference;
29 import org.apache.felix.scr.annotations.ReferenceCardinality; 28 import org.apache.felix.scr.annotations.ReferenceCardinality;
...@@ -90,7 +89,9 @@ import static org.onosproject.net.Link.State.INACTIVE; ...@@ -90,7 +89,9 @@ import static org.onosproject.net.Link.State.INACTIVE;
90 import static org.onosproject.net.Link.Type.DIRECT; 89 import static org.onosproject.net.Link.Type.DIRECT;
91 import static org.onosproject.net.Link.Type.INDIRECT; 90 import static org.onosproject.net.Link.Type.INDIRECT;
92 import static org.onosproject.net.LinkKey.linkKey; 91 import static org.onosproject.net.LinkKey.linkKey;
93 -import static org.onosproject.net.link.LinkEvent.Type.*; 92 +import static org.onosproject.net.link.LinkEvent.Type.LINK_ADDED;
93 +import static org.onosproject.net.link.LinkEvent.Type.LINK_REMOVED;
94 +import static org.onosproject.net.link.LinkEvent.Type.LINK_UPDATED;
94 import static org.onosproject.store.link.impl.GossipLinkStoreMessageSubjects.LINK_ANTI_ENTROPY_ADVERTISEMENT; 95 import static org.onosproject.store.link.impl.GossipLinkStoreMessageSubjects.LINK_ANTI_ENTROPY_ADVERTISEMENT;
95 import static org.slf4j.LoggerFactory.getLogger; 96 import static org.slf4j.LoggerFactory.getLogger;
96 97
...@@ -98,7 +99,7 @@ import static org.slf4j.LoggerFactory.getLogger; ...@@ -98,7 +99,7 @@ import static org.slf4j.LoggerFactory.getLogger;
98 * Manages inventory of infrastructure links in distributed data store 99 * Manages inventory of infrastructure links in distributed data store
99 * that uses optimistic replication and gossip based techniques. 100 * that uses optimistic replication and gossip based techniques.
100 */ 101 */
101 -@Component(immediate = true, enabled = false) 102 +//@Component(immediate = true, enabled = false)
102 @Service 103 @Service
103 public class GossipLinkStore 104 public class GossipLinkStore
104 extends AbstractStore<LinkEvent, LinkStoreDelegate> 105 extends AbstractStore<LinkEvent, LinkStoreDelegate>
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
16 --> 16 -->
17 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" 17 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
18 name="onos-@FEATURE-VERSION"> 18 name="onos-@FEATURE-VERSION">
19 - <repository>mvn:org.apache.karaf.features/standard/3.0.3/xml/features</repository> 19 + <repository>mvn:org.apache.karaf.features/standard/3.0.5/xml/features</repository>
20 20
21 <feature name="onos-thirdparty-base" version="@FEATURE-VERSION" 21 <feature name="onos-thirdparty-base" version="@FEATURE-VERSION"
22 description="ONOS 3rd party dependencies"> 22 description="ONOS 3rd party dependencies">
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
117 description="ONOS GUI console components"> 117 description="ONOS GUI console components">
118 <feature>onos-api</feature> 118 <feature>onos-api</feature>
119 <feature>onos-thirdparty-web</feature> 119 <feature>onos-thirdparty-web</feature>
120 - <bundle>mvn:org.eclipse.jetty/jetty-websocket/8.1.15.v20140411</bundle> 120 + <bundle>mvn:org.eclipse.jetty/jetty-websocket/8.1.18.v20150929</bundle>
121 <bundle>mvn:org.onosproject/onlab-rest/@ONOS-VERSION</bundle> 121 <bundle>mvn:org.onosproject/onlab-rest/@ONOS-VERSION</bundle>
122 <bundle>mvn:org.onosproject/onos-gui/@ONOS-VERSION</bundle> 122 <bundle>mvn:org.onosproject/onos-gui/@ONOS-VERSION</bundle>
123 </feature> 123 </feature>
......
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
83 <openflowj.version>0.9.1.onos</openflowj.version> 83 <openflowj.version>0.9.1.onos</openflowj.version>
84 <onos-maven-plugin.version>1.8-SNAPSHOT</onos-maven-plugin.version> 84 <onos-maven-plugin.version>1.8-SNAPSHOT</onos-maven-plugin.version>
85 <osgi.version>4.3.1</osgi.version> 85 <osgi.version>4.3.1</osgi.version>
86 - <karaf.version>3.0.3</karaf.version> 86 + <karaf.version>3.0.5</karaf.version>
87 <jersey.version>1.19</jersey.version> 87 <jersey.version>1.19</jersey.version>
88 <jackson.version>2.6.4</jackson.version> 88 <jackson.version>2.6.4</jackson.version>
89 <slf4j.version>1.7.6</slf4j.version> 89 <slf4j.version>1.7.6</slf4j.version>
......
...@@ -12,9 +12,9 @@ RUN echo debconf shared/accepted-oracle-license-v1-1 select true | debconf-set-s ...@@ -12,9 +12,9 @@ RUN echo debconf shared/accepted-oracle-license-v1-1 select true | debconf-set-s
12 ENV HOME /root 12 ENV HOME /root
13 ENV JAVA_HOME /usr/lib/jvm/java-8-oracle 13 ENV JAVA_HOME /usr/lib/jvm/java-8-oracle
14 ENV ONOS_ROOT /src/onos 14 ENV ONOS_ROOT /src/onos
15 -ENV KARAF_VERSION 3.0.3 15 +ENV KARAF_VERSION 3.0.5
16 -ENV KARAF_ROOT /root/onos/apache-karaf-3.0.3 16 +ENV KARAF_ROOT /root/onos/apache-karaf-3.0.5
17 -ENV KARAF_LOG /root/onos/apache-karaf-3.0.3/data/log/karaf.log 17 +ENV KARAF_LOG /root/onos/apache-karaf-3.0.5/data/log/karaf.log
18 ENV BUILD_NUMBER docker 18 ENV BUILD_NUMBER docker
19 ENV PATH $PATH:$KARAF_ROOT/bin 19 ENV PATH $PATH:$KARAF_ROOT/bin
20 20
......
...@@ -5,7 +5,7 @@ export ONOS_ROOT=${ONOS_ROOT:-~/onos} ...@@ -5,7 +5,7 @@ export ONOS_ROOT=${ONOS_ROOT:-~/onos}
5 5
6 # M2 repository and Karaf gold bits 6 # M2 repository and Karaf gold bits
7 export M2_REPO=${M2_REPO:-~/.m2/repository} 7 export M2_REPO=${M2_REPO:-~/.m2/repository}
8 -export KARAF_VERSION=${KARAF_VERSION:-3.0.3} 8 +export KARAF_VERSION=${KARAF_VERSION:-3.0.5}
9 export KARAF_ZIP=${KARAF_ZIP:-~/Downloads/apache-karaf-$KARAF_VERSION.zip} 9 export KARAF_ZIP=${KARAF_ZIP:-~/Downloads/apache-karaf-$KARAF_VERSION.zip}
10 export KARAF_TAR=${KARAF_TAR:-~/Downloads/apache-karaf-$KARAF_VERSION.tar.gz} 10 export KARAF_TAR=${KARAF_TAR:-~/Downloads/apache-karaf-$KARAF_VERSION.tar.gz}
11 export KARAF_DIST=$(basename $KARAF_ZIP .zip) 11 export KARAF_DIST=$(basename $KARAF_ZIP .zip)
......
...@@ -18,7 +18,7 @@ fi ...@@ -18,7 +18,7 @@ fi
18 18
19 export MAVEN=${MAVEN:-~/Applications/apache-maven-3.3.9} 19 export MAVEN=${MAVEN:-~/Applications/apache-maven-3.3.9}
20 20
21 -export KARAF_VERSION=${KARAF_VERSION:-3.0.3} 21 +export KARAF_VERSION=${KARAF_VERSION:-3.0.5}
22 export KARAF_ROOT=${KARAF_ROOT:-~/Applications/apache-karaf-$KARAF_VERSION} 22 export KARAF_ROOT=${KARAF_ROOT:-~/Applications/apache-karaf-$KARAF_VERSION}
23 export KARAF_LOG=$KARAF_ROOT/data/log/karaf.log 23 export KARAF_LOG=$KARAF_ROOT/data/log/karaf.log
24 24
......
...@@ -14,8 +14,8 @@ export JAVA_HOME=/usr/lib/jvm/java-8-oracle ...@@ -14,8 +14,8 @@ export JAVA_HOME=/usr/lib/jvm/java-8-oracle
14 14
15 cd; mkdir Downloads Applications 15 cd; mkdir Downloads Applications
16 cd Downloads 16 cd Downloads
17 -wget http://download.nextag.com/apache/karaf/3.0.3/apache-karaf-3.0.3.tar.gz 17 +wget http://download.nextag.com/apache/karaf/3.0.5/apache-karaf-3.0.5.tar.gz
18 wget http://archive.apache.org/dist/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz 18 wget http://archive.apache.org/dist/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz
19 -tar -zxvf apache-karaf-3.0.3.tar.gz -C ../Applications/ 19 +tar -zxvf apache-karaf-3.0.5.tar.gz -C ../Applications/
20 tar -zxvf apache-maven-3.3.9-bin.tar.gz -C ../Applications/ 20 tar -zxvf apache-maven-3.3.9-bin.tar.gz -C ../Applications/
21 21
......
...@@ -27,7 +27,7 @@ if ( ! $?MAVEN ) then ...@@ -27,7 +27,7 @@ if ( ! $?MAVEN ) then
27 setenv MAVEN $HOME/Applications/apache-maven-3.3.9 27 setenv MAVEN $HOME/Applications/apache-maven-3.3.9
28 endif 28 endif
29 if ( ! $?KARAF_VERSION ) then 29 if ( ! $?KARAF_VERSION ) then
30 - setenv KARAF_VERSION 3.0.3 30 + setenv KARAF_VERSION 3.0.5
31 endif 31 endif
32 if ( ! $?KARAF_ROOT ) then 32 if ( ! $?KARAF_ROOT ) then
33 setenv KARAF_ROOT $HOME/Applications/apache-karaf-$KARAF_VERSION 33 setenv KARAF_ROOT $HOME/Applications/apache-karaf-$KARAF_VERSION
......
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
112 <plugin> 112 <plugin>
113 <groupId>org.onosproject</groupId> 113 <groupId>org.onosproject</groupId>
114 <artifactId>onos-maven-plugin</artifactId> 114 <artifactId>onos-maven-plugin</artifactId>
115 - <version>1.5</version> 115 + <version>1.7</version>
116 <executions> 116 <executions>
117 <execution> 117 <execution>
118 <id>cfg</id> 118 <id>cfg</id>
......
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
80 <dependency> 80 <dependency>
81 <groupId>org.apache.karaf.shell</groupId> 81 <groupId>org.apache.karaf.shell</groupId>
82 <artifactId>org.apache.karaf.shell.console</artifactId> 82 <artifactId>org.apache.karaf.shell.console</artifactId>
83 - <version>3.0.3</version> 83 + <version>3.0.5</version>
84 <scope>provided</scope> 84 <scope>provided</scope>
85 </dependency> 85 </dependency>
86 </dependencies> 86 </dependencies>
......
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
127 <dependency> 127 <dependency>
128 <groupId>org.apache.karaf.shell</groupId> 128 <groupId>org.apache.karaf.shell</groupId>
129 <artifactId>org.apache.karaf.shell.console</artifactId> 129 <artifactId>org.apache.karaf.shell.console</artifactId>
130 - <version>3.0.3</version> 130 + <version>3.0.5</version>
131 <scope>provided</scope> 131 <scope>provided</scope>
132 </dependency> 132 </dependency>
133 </dependencies> 133 </dependencies>
...@@ -205,7 +205,7 @@ ...@@ -205,7 +205,7 @@
205 <plugin> 205 <plugin>
206 <groupId>org.onosproject</groupId> 206 <groupId>org.onosproject</groupId>
207 <artifactId>onos-maven-plugin</artifactId> 207 <artifactId>onos-maven-plugin</artifactId>
208 - <version>1.5</version> 208 + <version>1.7</version>
209 <executions> 209 <executions>
210 <execution> 210 <execution>
211 <id>cfg</id> 211 <id>cfg</id>
......
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
112 <plugin> 112 <plugin>
113 <groupId>org.onosproject</groupId> 113 <groupId>org.onosproject</groupId>
114 <artifactId>onos-maven-plugin</artifactId> 114 <artifactId>onos-maven-plugin</artifactId>
115 - <version>1.5</version> 115 + <version>1.7</version>
116 <executions> 116 <executions>
117 <execution> 117 <execution>
118 <id>cfg</id> 118 <id>cfg</id>
......
...@@ -113,7 +113,7 @@ ...@@ -113,7 +113,7 @@
113 <plugin> 113 <plugin>
114 <groupId>org.onosproject</groupId> 114 <groupId>org.onosproject</groupId>
115 <artifactId>onos-maven-plugin</artifactId> 115 <artifactId>onos-maven-plugin</artifactId>
116 - <version>1.5</version> 116 + <version>1.7</version>
117 <executions> 117 <executions>
118 <execution> 118 <execution>
119 <id>cfg</id> 119 <id>cfg</id>
......
...@@ -113,7 +113,7 @@ ...@@ -113,7 +113,7 @@
113 <plugin> 113 <plugin>
114 <groupId>org.onosproject</groupId> 114 <groupId>org.onosproject</groupId>
115 <artifactId>onos-maven-plugin</artifactId> 115 <artifactId>onos-maven-plugin</artifactId>
116 - <version>1.5</version> 116 + <version>1.7</version>
117 <executions> 117 <executions>
118 <execution> 118 <execution>
119 <id>cfg</id> 119 <id>cfg</id>
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
14 14
15 # Clean up onos runtime directories 15 # Clean up onos runtime directories
16 # TODO don't hardcode karaf version 16 # TODO don't hardcode karaf version
17 -rm -rf /opt/onos/apache-karaf-3.0.3/ 17 +rm -rf /opt/onos/apache-karaf-3.0.5/
18 rm -rf /opt/onos/var/* 18 rm -rf /opt/onos/var/*
19 rm -rf /opt/onos/config 19 rm -rf /opt/onos/config
20 rm -rf /opt/onos/options 20 rm -rf /opt/onos/options
......
...@@ -21,7 +21,7 @@ pre-start script ...@@ -21,7 +21,7 @@ pre-start script
21 [ -d /opt/onos ] && mkdir /opt/onos/config 2>/dev/null && chown $ONOS_USER.$ONOS_USER /opt/onos/config 21 [ -d /opt/onos ] && mkdir /opt/onos/config 2>/dev/null && chown $ONOS_USER.$ONOS_USER /opt/onos/config
22 # TODO make karaf version configurable 22 # TODO make karaf version configurable
23 [ -d /opt/onos ] && [ ! -h /opt/onos/log ] \ 23 [ -d /opt/onos ] && [ ! -h /opt/onos/log ] \
24 - && ln -s /opt/onos/apache-karaf-3.0.3/data/log /opt/onos/log || : 24 + && ln -s /opt/onos/apache-karaf-3.0.5/data/log /opt/onos/log || :
25 end script 25 end script
26 26
27 pre-stop script 27 pre-stop script
......
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
65 <plugin> 65 <plugin>
66 <groupId>org.apache.karaf.tooling</groupId> 66 <groupId>org.apache.karaf.tooling</groupId>
67 <artifactId>karaf-maven-plugin</artifactId> 67 <artifactId>karaf-maven-plugin</artifactId>
68 - <version>3.0.3</version> 68 + <version>3.0.5</version>
69 69
70 <executions> 70 <executions>
71 <execution> 71 <execution>
......
...@@ -36,7 +36,7 @@ class ONOS( Controller ): ...@@ -36,7 +36,7 @@ class ONOS( Controller ):
36 #self.checkListening() 36 #self.checkListening()
37 37
38 self.onosDir = onosDir 38 self.onosDir = onosDir
39 - self.karafDir = onosDir + 'apache-karaf-3.0.3/' 39 + self.karafDir = onosDir + 'apache-karaf-3.0.5/'
40 self.instanceDir = self.karafDir 40 self.instanceDir = self.karafDir
41 41
42 # add default modules 42 # add default modules
......
...@@ -68,17 +68,17 @@ ...@@ -68,17 +68,17 @@
68 <dependency> 68 <dependency>
69 <groupId>org.eclipse.jetty</groupId> 69 <groupId>org.eclipse.jetty</groupId>
70 <artifactId>jetty-server</artifactId> 70 <artifactId>jetty-server</artifactId>
71 - <version>8.1.17.v20150415</version> 71 + <version>8.1.18.v20150929</version>
72 </dependency> 72 </dependency>
73 <dependency> 73 <dependency>
74 <groupId>org.eclipse.jetty</groupId> 74 <groupId>org.eclipse.jetty</groupId>
75 <artifactId>jetty-servlet</artifactId> 75 <artifactId>jetty-servlet</artifactId>
76 - <version>8.1.17.v20150415</version> 76 + <version>8.1.18.v20150929</version>
77 </dependency> 77 </dependency>
78 <dependency> 78 <dependency>
79 <groupId>org.eclipse.jetty</groupId> 79 <groupId>org.eclipse.jetty</groupId>
80 <artifactId>jetty-websocket</artifactId> 80 <artifactId>jetty-websocket</artifactId>
81 - <version>8.1.17.v20150415</version> 81 + <version>8.1.18.v20150929</version>
82 </dependency> 82 </dependency>
83 </dependencies> 83 </dependencies>
84 84
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
39 <dependency> 39 <dependency>
40 <groupId>org.eclipse.jetty</groupId> 40 <groupId>org.eclipse.jetty</groupId>
41 <artifactId>jetty-websocket</artifactId> 41 <artifactId>jetty-websocket</artifactId>
42 - <version>8.1.17.v20150415</version> 42 + <version>8.1.18.v20150929</version>
43 </dependency> 43 </dependency>
44 <dependency> 44 <dependency>
45 <groupId>javax.servlet</groupId> 45 <groupId>javax.servlet</groupId>
......