홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Thomas Vachuska
5064bac2 1 parent e5428c59

Bumping version of onos-maven-plugin to 1.11-SNAPSHOT. 

Moving ONOS dependency to be on release version 1.10.
Cleaned up a few pom.xml files from redundant plugin configuration.

Change-Id: I9cc31731dc26dd97292911f9a64795f2865e386d
Inline Side-by-side
Showing 11 changed files with 6 additions and 103 deletions
...@@ -190,29 +190,6 @@ ...@@ -190,29 +190,6 @@
190 <plugin> 190 <plugin>
191 <groupId>org.onosproject</groupId> 191 <groupId>org.onosproject</groupId>
192 <artifactId>onos-maven-plugin</artifactId> 192 <artifactId>onos-maven-plugin</artifactId>
193 - <executions>
194 - <execution>
195 - <id>cfg</id>
196 - <phase>generate-resources</phase>
197 - <goals>
198 - <goal>cfg</goal>
199 - </goals>
200 - </execution>
201 - <execution>
202 - <id>swagger</id>
203 - <phase>generate-resources</phase>
204 - <goals>
205 - <goal>swagger</goal>
206 - </goals>
207 - </execution>
208 - <execution>
209 - <id>app</id>
210 - <phase>package</phase>
211 - <goals>
212 - <goal>app</goal>
213 - </goals>
214 - </execution>
215 - </executions>
216 </plugin> 193 </plugin>
217 </plugins> 194 </plugins>
218 </build> 195 </build>
......
...@@ -163,29 +163,6 @@ ...@@ -163,29 +163,6 @@
163 <plugin> 163 <plugin>
164 <groupId>org.onosproject</groupId> 164 <groupId>org.onosproject</groupId>
165 <artifactId>onos-maven-plugin</artifactId> 165 <artifactId>onos-maven-plugin</artifactId>
166 - <executions>
167 - <execution>
168 - <id>cfg</id>
169 - <phase>generate-resources</phase>
170 - <goals>
171 - <goal>cfg</goal>
172 - </goals>
173 - </execution>
174 - <execution>
175 - <id>swagger</id>
176 - <phase>generate-sources</phase>
177 - <goals>
178 - <goal>swagger</goal>
179 - </goals>
180 - </execution>
181 - <execution>
182 - <id>app</id>
183 - <phase>package</phase>
184 - <goals>
185 - <goal>app</goal>
186 - </goals>
187 - </execution>
188 - </executions>
189 </plugin> 166 </plugin>
190 </plugins> 167 </plugins>
191 </build> 168 </build>
......
...@@ -61,11 +61,6 @@ ...@@ -61,11 +61,6 @@
61 </dependency> 61 </dependency>
62 <dependency> 62 <dependency>
63 <groupId>org.onosproject</groupId> 63 <groupId>org.onosproject</groupId>
64 - <artifactId>onlab-junit</artifactId>
65 - <scope>test</scope>
66 - </dependency>
67 - <dependency>
68 - <groupId>org.onosproject</groupId>
69 <artifactId>onlab-osgi</artifactId> 64 <artifactId>onlab-osgi</artifactId>
70 <classifier>tests</classifier> 65 <classifier>tests</classifier>
71 <scope>test</scope> 66 <scope>test</scope>
......
...@@ -179,29 +179,6 @@ ...@@ -179,29 +179,6 @@
179 <plugin> 179 <plugin>
180 <groupId>org.onosproject</groupId> 180 <groupId>org.onosproject</groupId>
181 <artifactId>onos-maven-plugin</artifactId> 181 <artifactId>onos-maven-plugin</artifactId>
182 - <executions>
183 - <execution>
184 - <id>cfg</id>
185 - <phase>generate-resources</phase>
186 - <goals>
187 - <goal>cfg</goal>
188 - </goals>
189 - </execution>
190 - <execution>
191 - <id>swagger</id>
192 - <phase>generate-sources</phase>
193 - <goals>
194 - <goal>swagger</goal>
195 - </goals>
196 - </execution>
197 - <execution>
198 - <id>app</id>
199 - <phase>package</phase>
200 - <goals>
201 - <goal>app</goal>
202 - </goals>
203 - </execution>
204 - </executions>
205 </plugin> 182 </plugin>
206 183
207 <plugin> 184 <plugin>
......
...@@ -105,29 +105,6 @@ ...@@ -105,29 +105,6 @@
105 <plugin> 105 <plugin>
106 <groupId>org.onosproject</groupId> 106 <groupId>org.onosproject</groupId>
107 <artifactId>onos-maven-plugin</artifactId> 107 <artifactId>onos-maven-plugin</artifactId>
108 - <executions>
109 - <execution>
110 - <id>cfg</id>
111 - <phase>generate-resources</phase>
112 - <goals>
113 - <goal>cfg</goal>
114 - </goals>
115 - </execution>
116 - <execution>
117 - <id>swagger</id>
118 - <phase>generate-sources</phase>
119 - <goals>
120 - <goal>swagger</goal>
121 - </goals>
122 - </execution>
123 - <execution>
124 - <id>app</id>
125 - <phase>package</phase>
126 - <goals>
127 - <goal>app</goal>
128 - </goals>
129 - </execution>
130 - </executions>
131 </plugin> 108 </plugin>
132 </plugins> 109 </plugins>
133 </build> 110 </build>
......
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
118 <plugin> 118 <plugin>
119 <groupId>org.onosproject</groupId> 119 <groupId>org.onosproject</groupId>
120 <artifactId>onos-maven-plugin</artifactId> 120 <artifactId>onos-maven-plugin</artifactId>
121 - <version>1.9</version> 121 + <version>1.10</version>
122 <executions> 122 <executions>
123 <execution> 123 <execution>
124 <id>cfg</id> 124 <id>cfg</id>
......
...@@ -193,7 +193,7 @@ ...@@ -193,7 +193,7 @@
193 <plugin> 193 <plugin>
194 <groupId>org.onosproject</groupId> 194 <groupId>org.onosproject</groupId>
195 <artifactId>onos-maven-plugin</artifactId> 195 <artifactId>onos-maven-plugin</artifactId>
196 - <version>1.9</version> 196 + <version>1.10</version>
197 <executions> 197 <executions>
198 <execution> 198 <execution>
199 <id>cfg</id> 199 <id>cfg</id>
......
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
118 <plugin> 118 <plugin>
119 <groupId>org.onosproject</groupId> 119 <groupId>org.onosproject</groupId>
120 <artifactId>onos-maven-plugin</artifactId> 120 <artifactId>onos-maven-plugin</artifactId>
121 - <version>1.9</version> 121 + <version>1.10</version>
122 <executions> 122 <executions>
123 <execution> 123 <execution>
124 <id>cfg</id> 124 <id>cfg</id>
......
...@@ -119,7 +119,7 @@ ...@@ -119,7 +119,7 @@
119 <plugin> 119 <plugin>
120 <groupId>org.onosproject</groupId> 120 <groupId>org.onosproject</groupId>
121 <artifactId>onos-maven-plugin</artifactId> 121 <artifactId>onos-maven-plugin</artifactId>
122 - <version>1.9</version> 122 + <version>1.10</version>
123 <executions> 123 <executions>
124 <execution> 124 <execution>
125 <id>cfg</id> 125 <id>cfg</id>
......
...@@ -119,7 +119,7 @@ ...@@ -119,7 +119,7 @@
119 <plugin> 119 <plugin>
120 <groupId>org.onosproject</groupId> 120 <groupId>org.onosproject</groupId>
121 <artifactId>onos-maven-plugin</artifactId> 121 <artifactId>onos-maven-plugin</artifactId>
122 - <version>1.9</version> 122 + <version>1.10</version>
123 <executions> 123 <executions>
124 <execution> 124 <execution>
125 <id>cfg</id> 125 <id>cfg</id>
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
25 25
26 <groupId>org.onosproject</groupId> 26 <groupId>org.onosproject</groupId>
27 <artifactId>onos-maven-plugin</artifactId> 27 <artifactId>onos-maven-plugin</artifactId>
28 - <version>1.10</version> 28 + <version>1.11-SNAPSHOT</version>
29 <packaging>maven-plugin</packaging> 29 <packaging>maven-plugin</packaging>
30 30
31 <description>Maven plugin for packaging ONOS applications or generating 31 <description>Maven plugin for packaging ONOS applications or generating
......