홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
HIGUCHI Yuta
Committed by Gerrit Code Review
9caa3a06 1 parent fd430b66

Update archetype-resources 

- Update dependency and plugin version to sync with ONOS-3703 changes
- Add rest uitab uitopo to onos-archetypes-test script
  Confirmed followign passed
   mvn -amd -pl :onos-archetypes clean install && onos-archetypes-test
- Specify UTF-8 to eliminate build time warning
- Add onos-maven-plugin to plugin dependency to generate swagger.json

Change-Id: I1fdc893a42eea3e464941f1d840ad03bccea0668
Inline Side-by-side
Showing 24 changed files with 86 additions and 51 deletions
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <!-- 2 <!--
3 - ~ Copyright 2014 Open Networking Laboratory 3 + ~ Copyright 2016 Open Networking Laboratory
4 ~ 4 ~
5 ~ Licensed under the Apache License, Version 2.0 (the "License"); 5 ~ Licensed under the Apache License, Version 2.0 (the "License");
6 ~ you may not use this file except in compliance with the License. 6 ~ you may not use this file except in compliance with the License.
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
26 <url>http://onosproject.org</url> 26 <url>http://onosproject.org</url>
27 27
28 <properties> 28 <properties>
29 + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
29 <onos.version>1.5.0-SNAPSHOT</onos.version> 30 <onos.version>1.5.0-SNAPSHOT</onos.version>
30 </properties> 31 </properties>
31 32
...@@ -42,7 +43,7 @@ ...@@ -42,7 +43,7 @@
42 <plugin> 43 <plugin>
43 <groupId>org.apache.felix</groupId> 44 <groupId>org.apache.felix</groupId>
44 <artifactId>maven-bundle-plugin</artifactId> 45 <artifactId>maven-bundle-plugin</artifactId>
45 - <version>2.5.3</version> 46 + <version>3.0.1</version>
46 <extensions>true</extensions> 47 <extensions>true</extensions>
47 </plugin> 48 </plugin>
48 <plugin> 49 <plugin>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 #set( $symbol_dollar = '$' ) 2 #set( $symbol_dollar = '$' )
3 #set( $symbol_escape = '\' ) 3 #set( $symbol_escape = '\' )
4 /* 4 /*
5 - * Copyright 2014 Open Networking Laboratory 5 + * Copyright 2016 Open Networking Laboratory
6 * 6 *
7 * Licensed under the Apache License, Version 2.0 (the "License"); 7 * Licensed under the Apache License, Version 2.0 (the "License");
8 * you may not use this file except in compliance with the License. 8 * you may not use this file except in compliance with the License.
......
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <!-- 2 <!--
3 - ~ Copyright 2014 Open Networking Laboratory 3 + ~ Copyright 2016 Open Networking Laboratory
4 ~ 4 ~
5 ~ Licensed under the Apache License, Version 2.0 (the "License"); 5 ~ Licensed under the Apache License, Version 2.0 (the "License");
6 ~ you may not use this file except in compliance with the License. 6 ~ you may not use this file except in compliance with the License.
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
26 <url>http://onosproject.org</url> 26 <url>http://onosproject.org</url>
27 27
28 <properties> 28 <properties>
29 + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
29 <onos.version>1.5.0-SNAPSHOT</onos.version> 30 <onos.version>1.5.0-SNAPSHOT</onos.version>
30 <!-- Uncomment to generate ONOS app from this module. 31 <!-- Uncomment to generate ONOS app from this module.
31 <onos.app.name>org.foo.app</onos.app.name> 32 <onos.app.name>org.foo.app</onos.app.name>
...@@ -49,7 +50,7 @@ ...@@ -49,7 +50,7 @@
49 <dependency> 50 <dependency>
50 <groupId>junit</groupId> 51 <groupId>junit</groupId>
51 <artifactId>junit</artifactId> 52 <artifactId>junit</artifactId>
52 - <version>4.11</version> 53 + <version>4.12</version>
53 <scope>test</scope> 54 <scope>test</scope>
54 </dependency> 55 </dependency>
55 56
...@@ -64,7 +65,7 @@ ...@@ -64,7 +65,7 @@
64 <dependency> 65 <dependency>
65 <groupId>org.apache.felix</groupId> 66 <groupId>org.apache.felix</groupId>
66 <artifactId>org.apache.felix.scr.annotations</artifactId> 67 <artifactId>org.apache.felix.scr.annotations</artifactId>
67 - <version>1.9.8</version> 68 + <version>1.9.12</version>
68 <scope>provided</scope> 69 <scope>provided</scope>
69 </dependency> 70 </dependency>
70 </dependencies> 71 </dependencies>
...@@ -74,7 +75,7 @@ ...@@ -74,7 +75,7 @@
74 <plugin> 75 <plugin>
75 <groupId>org.apache.felix</groupId> 76 <groupId>org.apache.felix</groupId>
76 <artifactId>maven-bundle-plugin</artifactId> 77 <artifactId>maven-bundle-plugin</artifactId>
77 - <version>2.5.3</version> 78 + <version>3.0.1</version>
78 <extensions>true</extensions> 79 <extensions>true</extensions>
79 </plugin> 80 </plugin>
80 <plugin> 81 <plugin>
...@@ -89,7 +90,7 @@ ...@@ -89,7 +90,7 @@
89 <plugin> 90 <plugin>
90 <groupId>org.apache.felix</groupId> 91 <groupId>org.apache.felix</groupId>
91 <artifactId>maven-scr-plugin</artifactId> 92 <artifactId>maven-scr-plugin</artifactId>
92 - <version>1.20.0</version> 93 + <version>1.21.0</version>
93 <executions> 94 <executions>
94 <execution> 95 <execution>
95 <id>generate-scr-srcdescriptor</id> 96 <id>generate-scr-srcdescriptor</id>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 #set( $symbol_dollar = '$' ) 2 #set( $symbol_dollar = '$' )
3 #set( $symbol_escape = '\' ) 3 #set( $symbol_escape = '\' )
4 /* 4 /*
5 - * Copyright 2014 Open Networking Laboratory 5 + * Copyright 2016 Open Networking Laboratory
6 * 6 *
7 * Licensed under the Apache License, Version 2.0 (the "License"); 7 * Licensed under the Apache License, Version 2.0 (the "License");
8 * you may not use this file except in compliance with the License. 8 * you may not use this file except in compliance with the License.
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 #set( $symbol_dollar = '$' ) 2 #set( $symbol_dollar = '$' )
3 #set( $symbol_escape = '\' ) 3 #set( $symbol_escape = '\' )
4 /* 4 /*
5 - * Copyright 2014 Open Networking Laboratory 5 + * Copyright 2016 Open Networking Laboratory
6 * 6 *
7 * Licensed under the Apache License, Version 2.0 (the "License"); 7 * Licensed under the Apache License, Version 2.0 (the "License");
8 * you may not use this file except in compliance with the License. 8 * you may not use this file except in compliance with the License.
......
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <!-- 2 <!--
3 - ~ Copyright 2014 Open Networking Laboratory 3 + ~ Copyright 2016 Open Networking Laboratory
4 ~ 4 ~
5 ~ Licensed under the Apache License, Version 2.0 (the "License"); 5 ~ Licensed under the Apache License, Version 2.0 (the "License");
6 ~ you may not use this file except in compliance with the License. 6 ~ you may not use this file except in compliance with the License.
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
26 <url>http://onosproject.org</url> 26 <url>http://onosproject.org</url>
27 27
28 <properties> 28 <properties>
29 + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
29 <onos.version>1.5.0-SNAPSHOT</onos.version> 30 <onos.version>1.5.0-SNAPSHOT</onos.version>
30 </properties> 31 </properties>
31 32
...@@ -45,7 +46,7 @@ ...@@ -45,7 +46,7 @@
45 <dependency> 46 <dependency>
46 <groupId>junit</groupId> 47 <groupId>junit</groupId>
47 <artifactId>junit</artifactId> 48 <artifactId>junit</artifactId>
48 - <version>4.11</version> 49 + <version>4.12</version>
49 <scope>test</scope> 50 <scope>test</scope>
50 </dependency> 51 </dependency>
51 52
...@@ -73,7 +74,7 @@ ...@@ -73,7 +74,7 @@
73 <dependency> 74 <dependency>
74 <groupId>org.apache.felix</groupId> 75 <groupId>org.apache.felix</groupId>
75 <artifactId>org.apache.felix.scr.annotations</artifactId> 76 <artifactId>org.apache.felix.scr.annotations</artifactId>
76 - <version>1.9.8</version> 77 + <version>1.9.12</version>
77 <scope>provided</scope> 78 <scope>provided</scope>
78 </dependency> 79 </dependency>
79 <dependency> 80 <dependency>
...@@ -89,7 +90,7 @@ ...@@ -89,7 +90,7 @@
89 <plugin> 90 <plugin>
90 <groupId>org.apache.felix</groupId> 91 <groupId>org.apache.felix</groupId>
91 <artifactId>maven-bundle-plugin</artifactId> 92 <artifactId>maven-bundle-plugin</artifactId>
92 - <version>2.5.3</version> 93 + <version>3.0.1</version>
93 <extensions>true</extensions> 94 <extensions>true</extensions>
94 </plugin> 95 </plugin>
95 <plugin> 96 <plugin>
...@@ -104,7 +105,7 @@ ...@@ -104,7 +105,7 @@
104 <plugin> 105 <plugin>
105 <groupId>org.apache.felix</groupId> 106 <groupId>org.apache.felix</groupId>
106 <artifactId>maven-scr-plugin</artifactId> 107 <artifactId>maven-scr-plugin</artifactId>
107 - <version>1.20.0</version> 108 + <version>1.21.0</version>
108 <executions> 109 <executions>
109 <execution> 110 <execution>
110 <id>generate-scr-srcdescriptor</id> 111 <id>generate-scr-srcdescriptor</id>
......
1 /* 1 /*
2 - * Copyright 2014 Open Networking Laboratory 2 + * Copyright 2016 Open Networking Laboratory
3 * 3 *
4 * Licensed under the Apache License, Version 2.0 (the "License"); 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License. 5 * you may not use this file except in compliance with the License.
......
1 <!-- 1 <!--
2 - ~ Copyright 2014 Open Networking Laboratory 2 + ~ Copyright 2016 Open Networking Laboratory
3 ~ 3 ~
4 ~ Licensed under the Apache License, Version 2.0 (the "License"); 4 ~ Licensed under the Apache License, Version 2.0 (the "License");
5 ~ you may not use this file except in compliance with the License. 5 ~ you may not use this file except in compliance with the License.
......
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <!-- 2 <!--
3 - ~ Copyright 2014-2015 Open Networking Laboratory 3 + ~ Copyright 2014-2016 Open Networking Laboratory
4 ~ 4 ~
5 ~ Licensed under the Apache License, Version 2.0 (the "License"); 5 ~ Licensed under the Apache License, Version 2.0 (the "License");
6 ~ you may not use this file except in compliance with the License. 6 ~ you may not use this file except in compliance with the License.
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
26 <url>http://onosproject.org</url> 26 <url>http://onosproject.org</url>
27 27
28 <properties> 28 <properties>
29 + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
29 <onos.version>1.5.0-SNAPSHOT</onos.version> 30 <onos.version>1.5.0-SNAPSHOT</onos.version>
30 31
31 <web.context>/onos/${artifactId}</web.context> 32 <web.context>/onos/${artifactId}</web.context>
...@@ -53,7 +54,7 @@ ...@@ -53,7 +54,7 @@
53 <dependency> 54 <dependency>
54 <groupId>junit</groupId> 55 <groupId>junit</groupId>
55 <artifactId>junit</artifactId> 56 <artifactId>junit</artifactId>
56 - <version>4.11</version> 57 + <version>4.12</version>
57 <scope>test</scope> 58 <scope>test</scope>
58 </dependency> 59 </dependency>
59 60
...@@ -101,13 +102,13 @@ ...@@ -101,13 +102,13 @@
101 <dependency> 102 <dependency>
102 <groupId>com.fasterxml.jackson.core</groupId> 103 <groupId>com.fasterxml.jackson.core</groupId>
103 <artifactId>jackson-databind</artifactId> 104 <artifactId>jackson-databind</artifactId>
104 - <version>2.4.2</version> 105 + <version>2.6.4</version>
105 <scope>provided</scope> 106 <scope>provided</scope>
106 </dependency> 107 </dependency>
107 <dependency> 108 <dependency>
108 <groupId>com.fasterxml.jackson.core</groupId> 109 <groupId>com.fasterxml.jackson.core</groupId>
109 <artifactId>jackson-annotations</artifactId> 110 <artifactId>jackson-annotations</artifactId>
110 - <version>2.4.2</version> 111 + <version>2.6.4</version>
111 <scope>provided</scope> 112 <scope>provided</scope>
112 </dependency> 113 </dependency>
113 114
...@@ -120,7 +121,7 @@ ...@@ -120,7 +121,7 @@
120 <dependency> 121 <dependency>
121 <groupId>org.apache.felix</groupId> 122 <groupId>org.apache.felix</groupId>
122 <artifactId>org.apache.felix.scr.annotations</artifactId> 123 <artifactId>org.apache.felix.scr.annotations</artifactId>
123 - <version>1.9.8</version> 124 + <version>1.9.12</version>
124 <scope>provided</scope> 125 <scope>provided</scope>
125 </dependency> 126 </dependency>
126 <dependency> 127 <dependency>
...@@ -136,7 +137,7 @@ ...@@ -136,7 +137,7 @@
136 <plugin> 137 <plugin>
137 <groupId>org.apache.felix</groupId> 138 <groupId>org.apache.felix</groupId>
138 <artifactId>maven-bundle-plugin</artifactId> 139 <artifactId>maven-bundle-plugin</artifactId>
139 - <version>2.5.3</version> 140 + <version>3.0.1</version>
140 <extensions>true</extensions> 141 <extensions>true</extensions>
141 <configuration> 142 <configuration>
142 <instructions> 143 <instructions>
...@@ -185,7 +186,7 @@ ...@@ -185,7 +186,7 @@
185 <plugin> 186 <plugin>
186 <groupId>org.apache.felix</groupId> 187 <groupId>org.apache.felix</groupId>
187 <artifactId>maven-scr-plugin</artifactId> 188 <artifactId>maven-scr-plugin</artifactId>
188 - <version>1.20.0</version> 189 + <version>1.21.0</version>
189 <executions> 190 <executions>
190 <execution> 191 <execution>
191 <id>generate-scr-srcdescriptor</id> 192 <id>generate-scr-srcdescriptor</id>
...@@ -201,6 +202,34 @@ ...@@ -201,6 +202,34 @@
201 </supportedProjectTypes> 202 </supportedProjectTypes>
202 </configuration> 203 </configuration>
203 </plugin> 204 </plugin>
205 + <plugin>
206 + <groupId>org.onosproject</groupId>
207 + <artifactId>onos-maven-plugin</artifactId>
208 + <version>1.5</version>
209 + <executions>
210 + <execution>
211 + <id>cfg</id>
212 + <phase>generate-resources</phase>
213 + <goals>
214 + <goal>cfg</goal>
215 + </goals>
216 + </execution>
217 + <execution>
218 + <id>swagger</id>
219 + <phase>generate-sources</phase>
220 + <goals>
221 + <goal>swagger</goal>
222 + </goals>
223 + </execution>
224 + <execution>
225 + <id>app</id>
226 + <phase>package</phase>
227 + <goals>
228 + <goal>app</goal>
229 + </goals>
230 + </execution>
231 + </executions>
232 + </plugin>
204 </plugins> 233 </plugins>
205 </build> 234 </build>
206 235
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 #set( $symbol_dollar = '$' ) 2 #set( $symbol_dollar = '$' )
3 #set( $symbol_escape = '\' ) 3 #set( $symbol_escape = '\' )
4 /* 4 /*
5 - * Copyright 2014-2015 Open Networking Laboratory 5 + * Copyright 2014-2016 Open Networking Laboratory
6 * 6 *
7 * Licensed under the Apache License, Version 2.0 (the "License"); 7 * Licensed under the Apache License, Version 2.0 (the "License");
8 * you may not use this file except in compliance with the License. 8 * you may not use this file except in compliance with the License.
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 #set( $symbol_dollar = '$' ) 2 #set( $symbol_dollar = '$' )
3 #set( $symbol_escape = '\' ) 3 #set( $symbol_escape = '\' )
4 /* 4 /*
5 - * Copyright 2014-2015 Open Networking Laboratory 5 + * Copyright 2014-2016 Open Networking Laboratory
6 * 6 *
7 * Licensed under the Apache License, Version 2.0 (the "License"); 7 * Licensed under the Apache License, Version 2.0 (the "License");
8 * you may not use this file except in compliance with the License. 8 * you may not use this file except in compliance with the License.
......
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <!-- 2 <!--
3 - ~ Copyright 2014-2015 Open Networking Laboratory 3 + ~ Copyright 2014-2016 Open Networking Laboratory
4 ~ 4 ~
5 ~ Licensed under the Apache License, Version 2.0 (the "License"); 5 ~ Licensed under the Apache License, Version 2.0 (the "License");
6 ~ you may not use this file except in compliance with the License. 6 ~ you may not use this file except in compliance with the License.
......
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <!-- 2 <!--
3 - ~ Copyright 2015 Open Networking Laboratory 3 + ~ Copyright 2016 Open Networking Laboratory
4 ~ 4 ~
5 ~ Licensed under the Apache License, Version 2.0 (the "License"); 5 ~ Licensed under the Apache License, Version 2.0 (the "License");
6 ~ you may not use this file except in compliance with the License. 6 ~ you may not use this file except in compliance with the License.
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
26 <url>http://onosproject.org</url> 26 <url>http://onosproject.org</url>
27 27
28 <properties> 28 <properties>
29 + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
29 <onos.version>1.5.0-SNAPSHOT</onos.version> 30 <onos.version>1.5.0-SNAPSHOT</onos.version>
30 <!-- Uncomment to generate ONOS app from this module. 31 <!-- Uncomment to generate ONOS app from this module.
31 <onos.app.name>org.foo.app</onos.app.name> 32 <onos.app.name>org.foo.app</onos.app.name>
...@@ -49,7 +50,7 @@ ...@@ -49,7 +50,7 @@
49 <dependency> 50 <dependency>
50 <groupId>junit</groupId> 51 <groupId>junit</groupId>
51 <artifactId>junit</artifactId> 52 <artifactId>junit</artifactId>
52 - <version>4.11</version> 53 + <version>4.12</version>
53 <scope>test</scope> 54 <scope>test</scope>
54 </dependency> 55 </dependency>
55 56
...@@ -64,7 +65,7 @@ ...@@ -64,7 +65,7 @@
64 <dependency> 65 <dependency>
65 <groupId>org.apache.felix</groupId> 66 <groupId>org.apache.felix</groupId>
66 <artifactId>org.apache.felix.scr.annotations</artifactId> 67 <artifactId>org.apache.felix.scr.annotations</artifactId>
67 - <version>1.9.8</version> 68 + <version>1.9.12</version>
68 <scope>provided</scope> 69 <scope>provided</scope>
69 </dependency> 70 </dependency>
70 </dependencies> 71 </dependencies>
...@@ -74,7 +75,7 @@ ...@@ -74,7 +75,7 @@
74 <plugin> 75 <plugin>
75 <groupId>org.apache.felix</groupId> 76 <groupId>org.apache.felix</groupId>
76 <artifactId>maven-bundle-plugin</artifactId> 77 <artifactId>maven-bundle-plugin</artifactId>
77 - <version>2.5.3</version> 78 + <version>3.0.1</version>
78 <extensions>true</extensions> 79 <extensions>true</extensions>
79 </plugin> 80 </plugin>
80 <plugin> 81 <plugin>
...@@ -89,7 +90,7 @@ ...@@ -89,7 +90,7 @@
89 <plugin> 90 <plugin>
90 <groupId>org.apache.felix</groupId> 91 <groupId>org.apache.felix</groupId>
91 <artifactId>maven-scr-plugin</artifactId> 92 <artifactId>maven-scr-plugin</artifactId>
92 - <version>1.20.0</version> 93 + <version>1.21.0</version>
93 <executions> 94 <executions>
94 <execution> 95 <execution>
95 <id>generate-scr-srcdescriptor</id> 96 <id>generate-scr-srcdescriptor</id>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 #set( $symbol_dollar = '$' ) 2 #set( $symbol_dollar = '$' )
3 #set( $symbol_escape = '\' ) 3 #set( $symbol_escape = '\' )
4 /* 4 /*
5 - * Copyright 2014,2015 Open Networking Laboratory 5 + * Copyright 2016 Open Networking Laboratory
6 * 6 *
7 * Licensed under the Apache License, Version 2.0 (the "License"); 7 * Licensed under the Apache License, Version 2.0 (the "License");
8 * you may not use this file except in compliance with the License. 8 * you may not use this file except in compliance with the License.
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 #set( $symbol_dollar = '$' ) 2 #set( $symbol_dollar = '$' )
3 #set( $symbol_escape = '\' ) 3 #set( $symbol_escape = '\' )
4 /* 4 /*
5 - * Copyright 2014,2015 Open Networking Laboratory 5 + * Copyright 2016 Open Networking Laboratory
6 * 6 *
7 * Licensed under the Apache License, Version 2.0 (the "License"); 7 * Licensed under the Apache License, Version 2.0 (the "License");
8 * you may not use this file except in compliance with the License. 8 * you may not use this file except in compliance with the License.
......
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 2
3 <!-- 3 <!--
4 - ~ Copyright 2015 Open Networking Laboratory 4 + ~ Copyright 2016 Open Networking Laboratory
5 ~ 5 ~
6 ~ Licensed under the Apache License, Version 2.0 (the "License"); 6 ~ Licensed under the Apache License, Version 2.0 (the "License");
7 ~ you may not use this file except in compliance with the License. 7 ~ you may not use this file except in compliance with the License.
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
27 <url>http://onosproject.org</url> 27 <url>http://onosproject.org</url>
28 28
29 <properties> 29 <properties>
30 + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
30 <onos.version>1.5.0-SNAPSHOT</onos.version> 31 <onos.version>1.5.0-SNAPSHOT</onos.version>
31 <!-- Uncomment to generate ONOS app from this module. 32 <!-- Uncomment to generate ONOS app from this module.
32 <onos.app.name>org.foo.app</onos.app.name> 33 <onos.app.name>org.foo.app</onos.app.name>
...@@ -50,7 +51,7 @@ ...@@ -50,7 +51,7 @@
50 <dependency> 51 <dependency>
51 <groupId>junit</groupId> 52 <groupId>junit</groupId>
52 <artifactId>junit</artifactId> 53 <artifactId>junit</artifactId>
53 - <version>4.11</version> 54 + <version>4.12</version>
54 <scope>test</scope> 55 <scope>test</scope>
55 </dependency> 56 </dependency>
56 57
...@@ -65,7 +66,7 @@ ...@@ -65,7 +66,7 @@
65 <dependency> 66 <dependency>
66 <groupId>org.apache.felix</groupId> 67 <groupId>org.apache.felix</groupId>
67 <artifactId>org.apache.felix.scr.annotations</artifactId> 68 <artifactId>org.apache.felix.scr.annotations</artifactId>
68 - <version>1.9.8</version> 69 + <version>1.9.12</version>
69 <scope>provided</scope> 70 <scope>provided</scope>
70 </dependency> 71 </dependency>
71 </dependencies> 72 </dependencies>
...@@ -75,7 +76,7 @@ ...@@ -75,7 +76,7 @@
75 <plugin> 76 <plugin>
76 <groupId>org.apache.felix</groupId> 77 <groupId>org.apache.felix</groupId>
77 <artifactId>maven-bundle-plugin</artifactId> 78 <artifactId>maven-bundle-plugin</artifactId>
78 - <version>2.5.3</version> 79 + <version>3.0.1</version>
79 <extensions>true</extensions> 80 <extensions>true</extensions>
80 </plugin> 81 </plugin>
81 <plugin> 82 <plugin>
...@@ -90,7 +91,7 @@ ...@@ -90,7 +91,7 @@
90 <plugin> 91 <plugin>
91 <groupId>org.apache.felix</groupId> 92 <groupId>org.apache.felix</groupId>
92 <artifactId>maven-scr-plugin</artifactId> 93 <artifactId>maven-scr-plugin</artifactId>
93 - <version>1.20.0</version> 94 + <version>1.21.0</version>
94 <executions> 95 <executions>
95 <execution> 96 <execution>
96 <id>generate-scr-srcdescriptor</id> 97 <id>generate-scr-srcdescriptor</id>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 #set( $symbol_dollar = '$' ) 2 #set( $symbol_dollar = '$' )
3 #set( $symbol_escape = '\' ) 3 #set( $symbol_escape = '\' )
4 /* 4 /*
5 - * Copyright 2014,2015 Open Networking Laboratory 5 + * Copyright 2016 Open Networking Laboratory
6 * 6 *
7 * Licensed under the Apache License, Version 2.0 (the "License"); 7 * Licensed under the Apache License, Version 2.0 (the "License");
8 * you may not use this file except in compliance with the License. 8 * you may not use this file except in compliance with the License.
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 #set( $symbol_dollar = '$' ) 2 #set( $symbol_dollar = '$' )
3 #set( $symbol_escape = '\' ) 3 #set( $symbol_escape = '\' )
4 /* 4 /*
5 - * Copyright 2014,2015 Open Networking Laboratory 5 + * Copyright 2016 Open Networking Laboratory
6 * 6 *
7 * Licensed under the Apache License, Version 2.0 (the "License"); 7 * Licensed under the Apache License, Version 2.0 (the "License");
8 * you may not use this file except in compliance with the License. 8 * you may not use this file except in compliance with the License.
......
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 2
3 <!-- 3 <!--
4 - ~ Copyright 2015 Open Networking Laboratory 4 + ~ Copyright 2016 Open Networking Laboratory
5 ~ 5 ~
6 ~ Licensed under the Apache License, Version 2.0 (the "License"); 6 ~ Licensed under the Apache License, Version 2.0 (the "License");
7 ~ you may not use this file except in compliance with the License. 7 ~ you may not use this file except in compliance with the License.
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
27 <url>http://onosproject.org</url> 27 <url>http://onosproject.org</url>
28 28
29 <properties> 29 <properties>
30 + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
30 <onos.version>1.5.0-SNAPSHOT</onos.version> 31 <onos.version>1.5.0-SNAPSHOT</onos.version>
31 <!-- Uncomment to generate ONOS app from this module. 32 <!-- Uncomment to generate ONOS app from this module.
32 <onos.app.name>org.foo.app</onos.app.name> 33 <onos.app.name>org.foo.app</onos.app.name>
...@@ -50,7 +51,7 @@ ...@@ -50,7 +51,7 @@
50 <dependency> 51 <dependency>
51 <groupId>junit</groupId> 52 <groupId>junit</groupId>
52 <artifactId>junit</artifactId> 53 <artifactId>junit</artifactId>
53 - <version>4.11</version> 54 + <version>4.12</version>
54 <scope>test</scope> 55 <scope>test</scope>
55 </dependency> 56 </dependency>
56 57
...@@ -65,7 +66,7 @@ ...@@ -65,7 +66,7 @@
65 <dependency> 66 <dependency>
66 <groupId>org.apache.felix</groupId> 67 <groupId>org.apache.felix</groupId>
67 <artifactId>org.apache.felix.scr.annotations</artifactId> 68 <artifactId>org.apache.felix.scr.annotations</artifactId>
68 - <version>1.9.8</version> 69 + <version>1.9.12</version>
69 <scope>provided</scope> 70 <scope>provided</scope>
70 </dependency> 71 </dependency>
71 </dependencies> 72 </dependencies>
...@@ -75,7 +76,7 @@ ...@@ -75,7 +76,7 @@
75 <plugin> 76 <plugin>
76 <groupId>org.apache.felix</groupId> 77 <groupId>org.apache.felix</groupId>
77 <artifactId>maven-bundle-plugin</artifactId> 78 <artifactId>maven-bundle-plugin</artifactId>
78 - <version>2.5.3</version> 79 + <version>3.0.1</version>
79 <extensions>true</extensions> 80 <extensions>true</extensions>
80 </plugin> 81 </plugin>
81 <plugin> 82 <plugin>
...@@ -90,7 +91,7 @@ ...@@ -90,7 +91,7 @@
90 <plugin> 91 <plugin>
91 <groupId>org.apache.felix</groupId> 92 <groupId>org.apache.felix</groupId>
92 <artifactId>maven-scr-plugin</artifactId> 93 <artifactId>maven-scr-plugin</artifactId>
93 - <version>1.20.0</version> 94 + <version>1.21.0</version>
94 <executions> 95 <executions>
95 <execution> 96 <execution>
96 <id>generate-scr-srcdescriptor</id> 97 <id>generate-scr-srcdescriptor</id>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 #set( $symbol_dollar = '$' ) 2 #set( $symbol_dollar = '$' )
3 #set( $symbol_escape = '\' ) 3 #set( $symbol_escape = '\' )
4 /* 4 /*
5 - * Copyright 2014,2015 Open Networking Laboratory 5 + * Copyright 2016 Open Networking Laboratory
6 * 6 *
7 * Licensed under the Apache License, Version 2.0 (the "License"); 7 * Licensed under the Apache License, Version 2.0 (the "License");
8 * you may not use this file except in compliance with the License. 8 * you may not use this file except in compliance with the License.
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 #set( $symbol_dollar = '$' ) 2 #set( $symbol_dollar = '$' )
3 #set( $symbol_escape = '\' ) 3 #set( $symbol_escape = '\' )
4 /* 4 /*
5 - * Copyright 2014,2015 Open Networking Laboratory 5 + * Copyright 2016 Open Networking Laboratory
6 * 6 *
7 * Licensed under the Apache License, Version 2.0 (the "License"); 7 * Licensed under the Apache License, Version 2.0 (the "License");
8 * you may not use this file except in compliance with the License. 8 * you may not use this file except in compliance with the License.
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 #set( $symbol_dollar = '$' ) 2 #set( $symbol_dollar = '$' )
3 #set( $symbol_escape = '\' ) 3 #set( $symbol_escape = '\' )
4 /* 4 /*
5 - * Copyright 2014,2015 Open Networking Laboratory 5 + * Copyright 2016 Open Networking Laboratory
6 * 6 *
7 * Licensed under the Apache License, Version 2.0 (the "License"); 7 * Licensed under the Apache License, Version 2.0 (the "License");
8 * you may not use this file except in compliance with the License. 8 * you may not use this file except in compliance with the License.
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 #set( $symbol_dollar = '$' ) 2 #set( $symbol_dollar = '$' )
3 #set( $symbol_escape = '\' ) 3 #set( $symbol_escape = '\' )
4 /* 4 /*
5 - * Copyright 2014,2015 Open Networking Laboratory 5 + * Copyright 2016 Open Networking Laboratory
6 * 6 *
7 * Licensed under the Apache License, Version 2.0 (the "License"); 7 * Licensed under the Apache License, Version 2.0 (the "License");
8 * you may not use this file except in compliance with the License. 8 * you may not use this file except in compliance with the License.
......
...@@ -22,7 +22,7 @@ export AROOT=/tmp/foo ...@@ -22,7 +22,7 @@ export AROOT=/tmp/foo
22 export ARCHETYPE_OPTS="-DarchetypeGroupId=org.onosproject -DarchetypeVersion=1.5.0-SNAPSHOT" 22 export ARCHETYPE_OPTS="-DarchetypeGroupId=org.onosproject -DarchetypeVersion=1.5.0-SNAPSHOT"
23 23
24 mkdir -p $AROOT 24 mkdir -p $AROOT
25 -for an in api bundle cli ui; do 25 +for an in api bundle cli rest ui uitab uitopo; do
26 cd $AROOT 26 cd $AROOT
27 rm -fr $AROOT/foo-$an 27 rm -fr $AROOT/foo-$an
28 mvn archetype:generate $ARCHETYPE_OPTS \ 28 mvn archetype:generate $ARCHETYPE_OPTS \
......