some pom file fixes
Change-Id: Iffdb6eeb6954551d0b11e8da237b86e905d4e714
Showing
8 changed files
with
56 additions
and
17 deletions
| ... | @@ -18,18 +18,20 @@ | ... | @@ -18,18 +18,20 @@ |
| 18 | 18 | ||
| 19 | <dependencies> | 19 | <dependencies> |
| 20 | <dependency> | 20 | <dependency> |
| 21 | - <groupId>org.codehaus.jackson</groupId> | 21 | + <groupId>org.codehaus.jackson</groupId> |
| 22 | - <artifactId>jackson-core-asl</artifactId> | 22 | + <artifactId>jackson-core-asl</artifactId> |
| 23 | </dependency> | 23 | </dependency> |
| 24 | <dependency> | 24 | <dependency> |
| 25 | - <groupId>org.codehaus.jackson</groupId> | 25 | + <groupId>org.codehaus.jackson</groupId> |
| 26 | - <artifactId>jackson-mapper-asl</artifactId> | 26 | + <artifactId>jackson-mapper-asl</artifactId> |
| 27 | </dependency> | 27 | </dependency> |
| 28 | <dependency> | 28 | <dependency> |
| 29 | <groupId>com.fasterxml.jackson.core</groupId> | 29 | <groupId>com.fasterxml.jackson.core</groupId> |
| 30 | <artifactId>jackson-annotations</artifactId> | 30 | <artifactId>jackson-annotations</artifactId> |
| 31 | - <version>2.4.2</version> | 31 | + </dependency> |
| 32 | - <scope>provided</scope> | 32 | + <dependency> |
| 33 | + <groupId>org.onlab.onos</groupId> | ||
| 34 | + <artifactId>onlab-misc</artifactId> | ||
| 33 | </dependency> | 35 | </dependency> |
| 34 | </dependencies> | 36 | </dependencies> |
| 35 | 37 | ... | ... |
| ... | @@ -41,5 +41,17 @@ | ... | @@ -41,5 +41,17 @@ |
| 41 | <groupId>org.apache.karaf.shell</groupId> | 41 | <groupId>org.apache.karaf.shell</groupId> |
| 42 | <artifactId>org.apache.karaf.shell.console</artifactId> | 42 | <artifactId>org.apache.karaf.shell.console</artifactId> |
| 43 | </dependency> | 43 | </dependency> |
| 44 | + <dependency> | ||
| 45 | + <groupId>org.onlab.onos</groupId> | ||
| 46 | + <artifactId>onlab-misc</artifactId> | ||
| 47 | + </dependency> | ||
| 48 | + <dependency> | ||
| 49 | + <groupId>com.google.guava</groupId> | ||
| 50 | + <artifactId>guava</artifactId> | ||
| 51 | + </dependency> | ||
| 52 | + <dependency> | ||
| 53 | + <groupId>org.osgi</groupId> | ||
| 54 | + <artifactId>org.osgi.core</artifactId> | ||
| 55 | + </dependency> | ||
| 44 | </dependencies> | 56 | </dependencies> |
| 45 | </project> | 57 | </project> | ... | ... |
| ... | @@ -16,4 +16,14 @@ | ... | @@ -16,4 +16,14 @@ |
| 16 | 16 | ||
| 17 | <description>ONOS simple Mobility app</description> | 17 | <description>ONOS simple Mobility app</description> |
| 18 | 18 | ||
| 19 | + <dependencies> | ||
| 20 | + <dependency> | ||
| 21 | + <groupId>com.google.guava</groupId> | ||
| 22 | + <artifactId>guava</artifactId> | ||
| 23 | + </dependency> | ||
| 24 | + <dependency> | ||
| 25 | + <groupId>org.onlab.onos</groupId> | ||
| 26 | + <artifactId>onlab-misc</artifactId> | ||
| 27 | + </dependency> | ||
| 28 | + </dependencies> | ||
| 19 | </project> | 29 | </project> | ... | ... |
| ... | @@ -53,6 +53,15 @@ | ... | @@ -53,6 +53,15 @@ |
| 53 | <groupId>org.apache.felix</groupId> | 53 | <groupId>org.apache.felix</groupId> |
| 54 | <artifactId>org.apache.felix.scr.annotations</artifactId> | 54 | <artifactId>org.apache.felix.scr.annotations</artifactId> |
| 55 | </dependency> | 55 | </dependency> |
| 56 | + <dependency> | ||
| 57 | + <groupId>com.google.guava</groupId> | ||
| 58 | + <artifactId>guava-testlib</artifactId> | ||
| 59 | + <scope>test</scope> | ||
| 60 | + </dependency> | ||
| 61 | + <dependency> | ||
| 62 | + <groupId>org.apache.commons</groupId> | ||
| 63 | + <artifactId>commons-lang3</artifactId> | ||
| 64 | + </dependency> | ||
| 56 | </dependencies> | 65 | </dependencies> |
| 57 | 66 | ||
| 58 | <build> | 67 | <build> | ... | ... |
| ... | @@ -34,6 +34,10 @@ | ... | @@ -34,6 +34,10 @@ |
| 34 | <groupId>com.hazelcast</groupId> | 34 | <groupId>com.hazelcast</groupId> |
| 35 | <artifactId>hazelcast</artifactId> | 35 | <artifactId>hazelcast</artifactId> |
| 36 | </dependency> | 36 | </dependency> |
| 37 | + <dependency> | ||
| 38 | + <groupId>org.apache.commons</groupId> | ||
| 39 | + <artifactId>commons-lang3</artifactId> | ||
| 40 | + </dependency> | ||
| 37 | </dependencies> | 41 | </dependencies> |
| 38 | 42 | ||
| 39 | <build> | 43 | <build> | ... | ... |
| ... | @@ -23,11 +23,6 @@ | ... | @@ -23,11 +23,6 @@ |
| 23 | </dependency> | 23 | </dependency> |
| 24 | <dependency> | 24 | <dependency> |
| 25 | <groupId>org.onlab.onos</groupId> | 25 | <groupId>org.onlab.onos</groupId> |
| 26 | - <artifactId>onos-core-serializers</artifactId> | ||
| 27 | - <version>${project.version}</version> | ||
| 28 | - </dependency> | ||
| 29 | - <dependency> | ||
| 30 | - <groupId>org.onlab.onos</groupId> | ||
| 31 | <artifactId>onos-core-hz-common</artifactId> | 26 | <artifactId>onos-core-hz-common</artifactId> |
| 32 | <version>${project.version}</version> | 27 | <version>${project.version}</version> |
| 33 | </dependency> | 28 | </dependency> | ... | ... |
| ... | @@ -25,6 +25,15 @@ | ... | @@ -25,6 +25,15 @@ |
| 25 | <groupId>org.apache.felix</groupId> | 25 | <groupId>org.apache.felix</groupId> |
| 26 | <artifactId>org.apache.felix.scr.annotations</artifactId> | 26 | <artifactId>org.apache.felix.scr.annotations</artifactId> |
| 27 | </dependency> | 27 | </dependency> |
| 28 | + <dependency> | ||
| 29 | + <groupId>com.esotericsoftware</groupId> | ||
| 30 | + <artifactId>kryo</artifactId> | ||
| 31 | + </dependency> | ||
| 32 | + <dependency> | ||
| 33 | + <groupId>com.google.guava</groupId> | ||
| 34 | + <artifactId>guava-testlib</artifactId> | ||
| 35 | + <scope>test</scope> | ||
| 36 | + </dependency> | ||
| 28 | </dependencies> | 37 | </dependencies> |
| 29 | 38 | ||
| 30 | <build> | 39 | <build> | ... | ... |
| ... | @@ -290,6 +290,10 @@ | ... | @@ -290,6 +290,10 @@ |
| 290 | </dependency> | 290 | </dependency> |
| 291 | <dependency> | 291 | <dependency> |
| 292 | <groupId>org.slf4j</groupId> | 292 | <groupId>org.slf4j</groupId> |
| 293 | + <artifactId>slf4j-api</artifactId> | ||
| 294 | + </dependency> | ||
| 295 | + <dependency> | ||
| 296 | + <groupId>org.slf4j</groupId> | ||
| 293 | <artifactId>slf4j-jdk14</artifactId> | 297 | <artifactId>slf4j-jdk14</artifactId> |
| 294 | </dependency> | 298 | </dependency> |
| 295 | </dependencies> | 299 | </dependencies> |
| ... | @@ -440,9 +444,6 @@ | ... | @@ -440,9 +444,6 @@ |
| 440 | <version>3.2</version> | 444 | <version>3.2</version> |
| 441 | <configuration> | 445 | <configuration> |
| 442 | <excludes> | 446 | <excludes> |
| 443 | - <exclude>**/datastore/serializers/**</exclude> | ||
| 444 | - <exclude>**/edu/stanford/**</exclude> | ||
| 445 | - <exclude>**/net/floodlightcontroller/**</exclude> | ||
| 446 | </excludes> | 447 | </excludes> |
| 447 | <rulesets> | 448 | <rulesets> |
| 448 | <ruleset>onos/pmd.xml</ruleset> | 449 | <ruleset>onos/pmd.xml</ruleset> |
| ... | @@ -551,9 +552,6 @@ | ... | @@ -551,9 +552,6 @@ |
| 551 | <version>3.2</version> | 552 | <version>3.2</version> |
| 552 | <configuration> | 553 | <configuration> |
| 553 | <excludes> | 554 | <excludes> |
| 554 | - <exclude>**/datastore/serializers/**</exclude> | ||
| 555 | - <exclude>**/edu/stanford/**</exclude> | ||
| 556 | - <exclude>**/net/floodlightcontroller/**</exclude> | ||
| 557 | </excludes> | 555 | </excludes> |
| 558 | <rulesets> | 556 | <rulesets> |
| 559 | <ruleset>onos/pmd.xml</ruleset> | 557 | <ruleset>onos/pmd.xml</ruleset> | ... | ... |
-
Please register or login to post a comment