홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Jian Li
Committed by Gerrit Code Review
e4583fd8 1 parent 746956f2

[ONOS-3702] Clean up pom.xml dependency, bump up omitted dependency 

Change-Id: Ieb6dc7a5b3ee8d52eefd79c182b9d759b5d324d7
Inline Side-by-side
Showing 12 changed files with 21 additions and 27 deletions
...@@ -57,7 +57,6 @@ ...@@ -57,7 +57,6 @@
57 <dependency> 57 <dependency>
58 <groupId>com.google.guava</groupId> 58 <groupId>com.google.guava</groupId>
59 <artifactId>guava</artifactId> 59 <artifactId>guava</artifactId>
60 - <version>18.0</version>
61 </dependency> 60 </dependency>
62 61
63 <dependency> 62 <dependency>
...@@ -102,19 +101,16 @@ ...@@ -102,19 +101,16 @@
102 <dependency> 101 <dependency>
103 <groupId>com.sun.jersey.jersey-test-framework</groupId> 102 <groupId>com.sun.jersey.jersey-test-framework</groupId>
104 <artifactId>jersey-test-framework-core</artifactId> 103 <artifactId>jersey-test-framework-core</artifactId>
105 - <version>1.19</version>
106 </dependency> 104 </dependency>
107 105
108 <dependency> 106 <dependency>
109 <groupId>org.easymock</groupId> 107 <groupId>org.easymock</groupId>
110 <artifactId>easymock</artifactId> 108 <artifactId>easymock</artifactId>
111 - <version>3.2</version>
112 </dependency> 109 </dependency>
113 110
114 <dependency> 111 <dependency>
115 <groupId>com.sun.jersey.jersey-test-framework</groupId> 112 <groupId>com.sun.jersey.jersey-test-framework</groupId>
116 <artifactId>jersey-test-framework-grizzly2</artifactId> 113 <artifactId>jersey-test-framework-grizzly2</artifactId>
117 - <version>1.19</version>
118 </dependency> 114 </dependency>
119 115
120 <dependency> 116 <dependency>
...@@ -128,7 +124,6 @@ ...@@ -128,7 +124,6 @@
128 <plugin> 124 <plugin>
129 <groupId>org.apache.felix</groupId> 125 <groupId>org.apache.felix</groupId>
130 <artifactId>maven-bundle-plugin</artifactId> 126 <artifactId>maven-bundle-plugin</artifactId>
131 - <version>2.5.3</version>
132 <extensions>true</extensions> 127 <extensions>true</extensions>
133 <configuration> 128 <configuration>
134 <instructions> 129 <instructions>
......
...@@ -57,13 +57,13 @@ ...@@ -57,13 +57,13 @@
57 <dependency> 57 <dependency>
58 <groupId>org.slf4j</groupId> 58 <groupId>org.slf4j</groupId>
59 <artifactId>slf4j-api</artifactId> 59 <artifactId>slf4j-api</artifactId>
60 - <version>1.7.7</version> 60 + <version>1.7.13</version>
61 </dependency> 61 </dependency>
62 62
63 <dependency> 63 <dependency>
64 <groupId>org.slf4j</groupId> 64 <groupId>org.slf4j</groupId>
65 <artifactId>slf4j-jdk14</artifactId> 65 <artifactId>slf4j-jdk14</artifactId>
66 - <version>1.7.7</version> 66 + <version>1.7.13</version>
67 </dependency> 67 </dependency>
68 68
69 <dependency> 69 <dependency>
...@@ -74,17 +74,17 @@ ...@@ -74,17 +74,17 @@
74 <dependency> 74 <dependency>
75 <groupId>com.fasterxml.jackson.core</groupId> 75 <groupId>com.fasterxml.jackson.core</groupId>
76 <artifactId>jackson-core</artifactId> 76 <artifactId>jackson-core</artifactId>
77 - <version>2.4.4</version> 77 + <version>2.7.0</version>
78 </dependency> 78 </dependency>
79 <dependency> 79 <dependency>
80 <groupId>com.fasterxml.jackson.core</groupId> 80 <groupId>com.fasterxml.jackson.core</groupId>
81 <artifactId>jackson-databind</artifactId> 81 <artifactId>jackson-databind</artifactId>
82 - <version>2.4.4</version> 82 + <version>2.7.0</version>
83 </dependency> 83 </dependency>
84 <dependency> 84 <dependency>
85 <groupId>com.google.guava</groupId> 85 <groupId>com.google.guava</groupId>
86 <artifactId>guava</artifactId> 86 <artifactId>guava</artifactId>
87 - <version>18.0</version> 87 + <version>19.0</version>
88 </dependency> 88 </dependency>
89 </dependencies> 89 </dependencies>
90 90
......
...@@ -73,7 +73,6 @@ ...@@ -73,7 +73,6 @@
73 <dependency> 73 <dependency>
74 <groupId>org.apache.felix</groupId> 74 <groupId>org.apache.felix</groupId>
75 <artifactId>org.apache.felix.scr.annotations</artifactId> 75 <artifactId>org.apache.felix.scr.annotations</artifactId>
76 - <version>1.9.8</version>
77 <scope>provided</scope> 76 <scope>provided</scope>
78 </dependency> 77 </dependency>
79 78
......
...@@ -78,7 +78,6 @@ ...@@ -78,7 +78,6 @@
78 <dependency> 78 <dependency>
79 <groupId>org.apache.felix</groupId> 79 <groupId>org.apache.felix</groupId>
80 <artifactId>org.apache.felix.scr.annotations</artifactId> 80 <artifactId>org.apache.felix.scr.annotations</artifactId>
81 - <version>1.9.8</version>
82 <scope>provided</scope> 81 <scope>provided</scope>
83 </dependency> 82 </dependency>
84 </dependencies> 83 </dependencies>
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
22 <artifactId>onos-apps</artifactId> 22 <artifactId>onos-apps</artifactId>
23 <groupId>org.onosproject</groupId> 23 <groupId>org.onosproject</groupId>
24 <version>1.5.0-SNAPSHOT</version> 24 <version>1.5.0-SNAPSHOT</version>
25 + <relativePath>../pom.xml</relativePath>
25 </parent> 26 </parent>
26 27
27 <groupId>org.onosproject</groupId> 28 <groupId>org.onosproject</groupId>
...@@ -71,7 +72,6 @@ ...@@ -71,7 +72,6 @@
71 <dependency> 72 <dependency>
72 <groupId>org.apache.felix</groupId> 73 <groupId>org.apache.felix</groupId>
73 <artifactId>org.apache.felix.scr.annotations</artifactId> 74 <artifactId>org.apache.felix.scr.annotations</artifactId>
74 - <version>1.9.8</version>
75 <scope>provided</scope> 75 <scope>provided</scope>
76 </dependency> 76 </dependency>
77 </dependencies> 77 </dependencies>
......
...@@ -51,7 +51,6 @@ ...@@ -51,7 +51,6 @@
51 <dependency> 51 <dependency>
52 <groupId>org.apache.felix</groupId> 52 <groupId>org.apache.felix</groupId>
53 <artifactId>org.apache.felix.scr.annotations</artifactId> 53 <artifactId>org.apache.felix.scr.annotations</artifactId>
54 - <version>1.9.8</version>
55 </dependency> 54 </dependency>
56 <dependency> 55 <dependency>
57 <groupId>org.apache.felix</groupId> 56 <groupId>org.apache.felix</groupId>
......
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
86 <karaf.version>3.0.5</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.7.0</jackson.version> 88 <jackson.version>2.7.0</jackson.version>
89 - <slf4j.version>1.7.6</slf4j.version> 89 + <slf4j.version>1.7.13</slf4j.version>
90 <guava.version>19.0</guava.version> 90 <guava.version>19.0</guava.version>
91 <commons.io.version>2.4</commons.io.version> 91 <commons.io.version>2.4</commons.io.version>
92 <!-- TODO argLine was originally added maven-surfire-plugin configuration 92 <!-- TODO argLine was originally added maven-surfire-plugin configuration
......
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
54 <plugin> 54 <plugin>
55 <groupId>org.apache.maven.plugins</groupId> 55 <groupId>org.apache.maven.plugins</groupId>
56 <artifactId>maven-shade-plugin</artifactId> 56 <artifactId>maven-shade-plugin</artifactId>
57 - <version>2.3</version> 57 + <version>2.4.2</version>
58 <configuration> 58 <configuration>
59 <artifactSet> 59 <artifactSet>
60 <excludes> 60 <excludes>
......
...@@ -20,23 +20,23 @@ ...@@ -20,23 +20,23 @@
20 <dependency> 20 <dependency>
21 <groupId>com.google.guava</groupId> 21 <groupId>com.google.guava</groupId>
22 <artifactId>guava</artifactId> 22 <artifactId>guava</artifactId>
23 - <version>18.0</version> 23 + <version>19.0</version>
24 </dependency> 24 </dependency>
25 <dependency> 25 <dependency>
26 <groupId>org.onosproject</groupId> 26 <groupId>org.onosproject</groupId>
27 <artifactId>onlab-misc</artifactId> 27 <artifactId>onlab-misc</artifactId>
28 - <version>1.4.0-SNAPSHOT</version> 28 + <version>1.5.0-SNAPSHOT</version>
29 </dependency> 29 </dependency>
30 <dependency> 30 <dependency>
31 <groupId>commons-collections</groupId> 31 <groupId>commons-collections</groupId>
32 <artifactId>commons-collections</artifactId> 32 <artifactId>commons-collections</artifactId>
33 - <version>3.2.1</version> 33 + <version>3.2.2</version>
34 <optional>true</optional> 34 <optional>true</optional>
35 </dependency> 35 </dependency>
36 <dependency> 36 <dependency>
37 <groupId>org.slf4j</groupId> 37 <groupId>org.slf4j</groupId>
38 <artifactId>slf4j-jdk14</artifactId> 38 <artifactId>slf4j-jdk14</artifactId>
39 - <version>1.7.12</version> 39 + <version>1.7.13</version>
40 </dependency> 40 </dependency>
41 </dependencies> 41 </dependencies>
42 <build> 42 <build>
...@@ -44,7 +44,9 @@ ...@@ -44,7 +44,9 @@
44 <plugin> 44 <plugin>
45 <groupId>org.apache.maven.plugins</groupId> 45 <groupId>org.apache.maven.plugins</groupId>
46 <artifactId>maven-compiler-plugin</artifactId> 46 <artifactId>maven-compiler-plugin</artifactId>
47 - <version>3.3</version> 47 + <!-- TODO: update once following issue is fixed. -->
48 + <!-- https://jira.codehaus.org/browse/MCOMPILER-205 -->
49 + <version>2.5.1</version>
48 <configuration> 50 <configuration>
49 <source>1.8</source> 51 <source>1.8</source>
50 <target>1.8</target> 52 <target>1.8</target>
...@@ -53,7 +55,7 @@ ...@@ -53,7 +55,7 @@
53 <plugin> 55 <plugin>
54 <groupId>org.apache.maven.plugins</groupId> 56 <groupId>org.apache.maven.plugins</groupId>
55 <artifactId>maven-shade-plugin</artifactId> 57 <artifactId>maven-shade-plugin</artifactId>
56 - <version>2.3</version> 58 + <version>2.4.2</version>
57 <executions> 59 <executions>
58 <execution> 60 <execution>
59 <phase>package</phase> 61 <phase>package</phase>
......
...@@ -43,12 +43,12 @@ ...@@ -43,12 +43,12 @@
43 <dependency> 43 <dependency>
44 <groupId>com.google.guava</groupId> 44 <groupId>com.google.guava</groupId>
45 <artifactId>guava</artifactId> 45 <artifactId>guava</artifactId>
46 - <version>18.0</version> 46 + <version>19.0</version>
47 </dependency> 47 </dependency>
48 <dependency> 48 <dependency>
49 <groupId>com.google.guava</groupId> 49 <groupId>com.google.guava</groupId>
50 <artifactId>guava-testlib</artifactId> 50 <artifactId>guava-testlib</artifactId>
51 - <version>18.0</version> 51 + <version>19.0</version>
52 <scope>test</scope> 52 <scope>test</scope>
53 </dependency> 53 </dependency>
54 <dependency> 54 <dependency>
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
83 <plugin> 83 <plugin>
84 <groupId>org.apache.maven.plugins</groupId> 84 <groupId>org.apache.maven.plugins</groupId>
85 <artifactId>maven-shade-plugin</artifactId> 85 <artifactId>maven-shade-plugin</artifactId>
86 - <version>2.3</version> 86 + <version>2.4.2</version>
87 <configuration> 87 <configuration>
88 <transformers> 88 <transformers>
89 <transformer 89 <transformer
......
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
51 <plugin> 51 <plugin>
52 <groupId>org.apache.maven.plugins</groupId> 52 <groupId>org.apache.maven.plugins</groupId>
53 <artifactId>maven-shade-plugin</artifactId> 53 <artifactId>maven-shade-plugin</artifactId>
54 - <version>2.3</version> 54 + <version>2.4.2</version>
55 <configuration> 55 <configuration>
56 <filters> 56 <filters>
57 <filter> 57 <filter>
......
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
87 <plugin> 87 <plugin>
88 <groupId>org.apache.maven.plugins</groupId> 88 <groupId>org.apache.maven.plugins</groupId>
89 <artifactId>maven-shade-plugin</artifactId> 89 <artifactId>maven-shade-plugin</artifactId>
90 - <version>2.3</version> 90 + <version>2.4.2</version>
91 <configuration> 91 <configuration>
92 <transformers> 92 <transformers>
93 <transformer 93 <transformer
......