Skip to content

Commit 3ae142b

Browse files
committed
[pme-alignment] Align to other 7.4 projects
1 parent 8bb3997 commit 3ae142b

File tree

4 files changed

+19
-14
lines changed

4 files changed

+19
-14
lines changed

components/fabric8-apm/pom.xml

+6-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,12 @@
4444

4545
<dependency>
4646
<groupId>org.ow2.asm</groupId>
47-
<artifactId>asm-all</artifactId>
47+
<artifactId>asm</artifactId>
48+
<version>${asm.version}</version>
49+
</dependency>
50+
<dependency>
51+
<groupId>org.ow2.asm</groupId>
52+
<artifactId>asm-util</artifactId>
4853
<version>${asm.version}</version>
4954
</dependency>
5055
<dependency>

components/fabric8-karaf/fabric8-karaf-checks/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
<dependency>
5757
<groupId>org.ops4j.pax.web</groupId>
5858
<artifactId>pax-web-spi</artifactId>
59-
<version>4.2.6</version>
59+
<version>7.3.3</version>
6060
<optional>true</optional>
6161
</dependency>
6262

pom.xml

+11-11
Original file line numberDiff line numberDiff line change
@@ -83,22 +83,22 @@
8383
<properties>
8484

8585
<!-- upstream vs redhat versions of dependencies goes here -->
86-
<activemq.version>5.11.0.redhat-630377</activemq.version>
86+
<activemq.version>5.11.0.redhat-630396</activemq.version>
8787
<arquillian-cube.version>1.9.0</arquillian-cube.version>
8888
<camel.version>2.21.0.fuse-730051</camel.version>
8989
<cxf.version>3.2.7.fuse-730018</cxf.version>
9090
<cxf.plugin.version>3.2.7.fuse-730018</cxf.plugin.version>
9191

92-
<commons.collections.version>3.2.2</commons.collections.version>
93-
<version.fuse-karaf>7.3.0.fuse-730068</version.fuse-karaf>
92+
<commons.collections.version>3.2.2.redhat-2</commons.collections.version>
93+
<version.fuse-karaf>7.4.0.fuse-740019</version.fuse-karaf>
9494
<hibernate-validator.version>5.3.5.Final-redhat-2</hibernate-validator.version>
9595
<hibernate-core.version>5.3.10.Final-redhat-00001</hibernate-core.version>
9696
<javax.el-api.version>3.0.0</javax.el-api.version>
97-
<jansi.version>1.11</jansi.version>
97+
<jansi.version>1.18</jansi.version>
9898
<jolokia.version>1.5.0.redhat-1</jolokia.version>
99-
<jgroups.version>3.6.13.Final</jgroups.version>
99+
<jgroups.version>3.6.10.Final-redhat-1</jgroups.version>
100100
<jsonschema2pojo.version>1.0.0</jsonschema2pojo.version>
101-
<snakeyaml.version>1.19</snakeyaml.version>
101+
<snakeyaml.version>1.23</snakeyaml.version>
102102
<swagger.jaxrs.version>1.5.18.fuse70-1-redhat-1</swagger.jaxrs.version>
103103
<vertx.version>3.5.0</vertx.version>
104104
<weld.version>2.3.5.Final</weld.version>
@@ -121,7 +121,7 @@
121121
<aether.version>1.0.0.v20140518</aether.version>
122122
<archetype-packaging.version>2.4</archetype-packaging.version>
123123
<arquillian.version>1.1.12.Final</arquillian.version>
124-
<asm.version>5.0.4</asm.version>
124+
<asm.version>7.1</asm.version>
125125
<assertj.core.version>2.4.1</assertj.core.version>
126126
<artemis.version>2.7.0.redhat-00056</artemis.version>
127127
<buildnumber.plugin.version>1.3</buildnumber.plugin.version>
@@ -133,7 +133,7 @@
133133
<docker.maven.plugin.version>0.23.0.fuse-730009</docker.maven.plugin.version>
134134
<dropwizard-metrics.version>3.1.2</dropwizard-metrics.version>
135135
<exec-maven-plugin.version>1.5.0</exec-maven-plugin.version>
136-
<felix-scr-annotations.version>1.9.12</felix-scr-annotations.version>
136+
<felix-scr-annotations.version>1.12.0</felix-scr-annotations.version>
137137
<felix-scr-plugin.version>1.21.0</felix-scr-plugin.version>
138138
<guava.version>19.0</guava.version>
139139
<httpclient.version>4.5.5</httpclient.version>
@@ -168,7 +168,7 @@
168168
<mvel.version>2.4.0.Final</mvel.version>
169169
<osgi.version>4.3.1</osgi.version>
170170
<osgi-compendium.version>4.3.1</osgi-compendium.version>
171-
<pax.url.version>2.5.1</pax.url.version>
171+
<pax.url.version>2.6.1</pax.url.version>
172172
<plexus-utils.version>3.0.22</plexus-utils.version>
173173
<phantomjsdriver.version>1.2.0</phantomjsdriver.version>
174174
<qpid-proton-j.version>0.31.0.redhat-00001</qpid-proton-j.version>
@@ -184,10 +184,10 @@
184184
<spring-cloud-kubernetes.version>0.1.6.fuse-730020</spring-cloud-kubernetes.version>
185185
<sundrio.plugin.version>0.16.5</sundrio.plugin.version>
186186
<tomcat-embed.version>8.0.36.redhat-35</tomcat-embed.version>
187-
<validation-api.version>1.1.0.Final</validation-api.version>
187+
<validation-api.version>1.1.0.Final-redhat-1</validation-api.version>
188188
<zookeeper.version>3.4.9</zookeeper.version>
189189
<commons-codec.version>1.11</commons-codec.version>
190-
<commons-lang3.version>3.7</commons-lang3.version>
190+
<commons-lang3.version>3.8</commons-lang3.version>
191191

192192
<!-- OSGi bundles properties -->
193193
<fuse.osgi.bundle.name>${project.name}</fuse.osgi.bundle.name>

tooling/migration/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<dependency>
3535
<groupId>org.apache.felix</groupId>
3636
<artifactId>org.apache.felix.utils</artifactId>
37-
<version>1.6.0</version>
37+
<version>1.11.2</version>
3838
</dependency>
3939

4040
<dependency>

0 commit comments

Comments
 (0)