Skip to content

Commit 89dd649

Browse files
navidshnavidsh
committed
Clean up in pom.xml files
Signed-off-by: Navid Shakibapour <navid.shakibapour@gmail.com>
1 parent 9caa5cb commit 89dd649

File tree

5 files changed

+40
-32
lines changed

5 files changed

+40
-32
lines changed

‎api/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<dependency>
3232
<groupId>org.osgi</groupId>
3333
<artifactId>org.osgi.annotation.versioning</artifactId>
34-
<version>1.0.0</version>
34+
<version>${osgi-annotation.version}</version>
3535
</dependency>
3636
</dependencies>
3737

@@ -64,7 +64,7 @@
6464
<plugin>
6565
<groupId>biz.aQute.bnd</groupId>
6666
<artifactId>bnd-maven-plugin</artifactId>
67-
<version>3.4.0</version>
67+
<version>${bnd.version}</version>
6868

6969
<executions>
7070
<execution>

‎pom.xml‎

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,27 @@
3232

3333
<checkstyle.version>2.17</checkstyle.version>
3434
<checkstyle.methodNameFormat>^_?[a-z][a-zA-Z0-9]*$|DELETE|GET|HEAD|OPTIONS|PATCH|POST|PUT|TRACE</checkstyle.methodNameFormat>
35-
<cdi-version>1.2</cdi-version>
3635
<autorelease>false</autorelease>
36+
37+
<!-- Versions of API dependencies -->
38+
<osgi-annotation.version>1.0.0</osgi-annotation.version>
39+
<bnd.version>3.4.0</bnd.version>
40+
41+
<!-- Versions of TCK dependencies -->
42+
<maven-compiler-plugin.version>2.3.2</maven-compiler-plugin.version>
43+
<arquillian.version>1.1.13.Final</arquillian.version>
44+
<testng.version>6.10</testng.version>
45+
<jaxrs.version>2.0</jaxrs.version>
46+
<rest-assured.version>3.0.6</rest-assured.version>
47+
<hamcrest-all.version>1.3</hamcrest-all.version>
48+
<java-hamcrest.version>2.0.0.0</java-hamcrest.version>
49+
<servlet.version>3.1.0</servlet.version>
50+
<httpclient.version>4.5.2</httpclient.version>
51+
<jackson.version>2.8.6</jackson.version>
52+
53+
<!-- Versions of SPEC dependencies -->
54+
<asciidoctor-maven.version>1.5.5</asciidoctor-maven.version>
55+
<asciidoctorj-pdf.version>1.5.0-alpha.15</asciidoctorj-pdf.version>
3756
</properties>
3857

3958
<licenses>
@@ -88,15 +107,10 @@
88107

89108
<dependencyManagement>
90109
<dependencies>
91-
<dependency>
92-
<groupId>javax.enterprise</groupId>
93-
<artifactId>cdi-api</artifactId>
94-
<version>${cdi-version}</version>
95-
</dependency>
96110
<dependency>
97111
<groupId>org.jboss.arquillian</groupId>
98112
<artifactId>arquillian-bom</artifactId>
99-
<version>1.1.13.Final</version>
113+
<version>${arquillian.version}</version>
100114
<scope>import</scope>
101115
<type>pom</type>
102116
</dependency>

‎spec/pom.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,8 @@
2727
<packaging>pom</packaging>
2828
<name>MicroProfile OpenAPI Specification</name>
2929
<description>MicroProfile OpenAPI :: Specification</description>
30+
3031
<properties>
31-
<asciidoctor-maven.version>1.5.5</asciidoctor-maven.version>
32-
<asciidoctorj-pdf.version>1.5.0-alpha.15</asciidoctorj-pdf.version>
3332
<license>Apache License v 2.0</license>
3433
<maven.build.timestamp.format>MMMM dd, yyyy</maven.build.timestamp.format>
3534
<revisiondate>${maven.build.timestamp}</revisiondate>
@@ -86,7 +85,7 @@
8685
<sourceDocumentName>microprofile-openapi-spec.adoc</sourceDocumentName>
8786
<sourceHighlighter>coderay</sourceHighlighter>
8887
<attributes>
89-
<license>Apache License v2.0</license>
88+
<license>${license}</license>
9089
</attributes>
9190
</configuration>
9291
</plugin>

‎spec/src/main/asciidoc/microprofile-openapi-spec.adoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -578,7 +578,7 @@ this interface and register it using the `mp.openapi.model.reader` configuration
578578
key, where the value is the fully qualified name of the reader class.
579579

580580
.Sample META-INF/microprofile-config.properties
581-
[code,property]
581+
[source,property]
582582
----
583583
mp.openapi.model.reader=com.mypackage.MyModelReader
584584
----
@@ -609,7 +609,7 @@ this interface and register it using the `mp.openapi.filter` configuration
609609
key, where the value is the fully qualified name of the filter class.
610610

611611
.Sample META-INF/microprofile-config.properties
612-
[code,property]
612+
[source,property]
613613
----
614614
mp.openapi.filter=com.mypackage.MyFilter
615615
----

‎tck/pom.xml‎

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -27,20 +27,15 @@
2727
<name>MicroProfile OpenAPI TCK</name>
2828
<description>MicroProfile OpenAPI :: TCK</description>
2929

30-
<properties>
31-
<arquillian.version>1.1.13.Final</arquillian.version>
32-
<testng.version>6.11</testng.version>
33-
</properties>
34-
3530
<build>
3631
<plugins>
3732
<plugin>
3833
<groupId>org.apache.maven.plugins</groupId>
3934
<artifactId>maven-compiler-plugin</artifactId>
40-
<version>2.3.2</version>
35+
<version>${maven-compiler-plugin.version}</version>
4136
<configuration>
42-
<source>1.8</source>
43-
<target>1.8</target>
37+
<source>${maven.compiler.source}</source>
38+
<target>${maven.compiler.target}</target>
4439
</configuration>
4540
</plugin>
4641

@@ -88,14 +83,14 @@
8883
<dependency>
8984
<groupId>org.eclipse.microprofile.openapi</groupId>
9085
<artifactId>microprofile-openapi-api</artifactId>
91-
<version>1.0-SNAPSHOT</version>
86+
<version>${project.version}</version>
9287
<scope>provided</scope>
9388
</dependency>
9489

9590
<dependency>
9691
<groupId>org.testng</groupId>
9792
<artifactId>testng</artifactId>
98-
<version>6.10</version>
93+
<version>${testng.version}</version>
9994
</dependency>
10095

10196
<dependency>
@@ -107,49 +102,49 @@
107102
<dependency>
108103
<groupId>javax.ws.rs</groupId>
109104
<artifactId>javax.ws.rs-api</artifactId>
110-
<version>2.0</version>
105+
<version>${jaxrs.version}</version>
111106
</dependency>
112107

113108
<dependency>
114109
<groupId>io.rest-assured</groupId>
115110
<artifactId>rest-assured</artifactId>
116-
<version>3.0.6</version>
111+
<version>${rest-assured.version}</version>
117112
</dependency>
118113

119114
<dependency>
120115
<groupId>org.hamcrest</groupId>
121116
<artifactId>hamcrest-all</artifactId>
122-
<version>1.3</version>
117+
<version>${hamcrest-all.version}</version>
123118
</dependency>
124119

125120
<dependency>
126121
<groupId>org.hamcrest</groupId>
127122
<artifactId>java-hamcrest</artifactId>
128-
<version>2.0.0.0</version>
123+
<version>${java-hamcrest.version}</version>
129124
</dependency>
130125

131126
<dependency>
132127
<groupId>javax.servlet</groupId>
133128
<artifactId>javax.servlet-api</artifactId>
134-
<version>3.1.0</version>
129+
<version>${servlet.version}</version>
135130
</dependency>
136131

137132
<dependency>
138133
<groupId>org.apache.httpcomponents</groupId>
139134
<artifactId>httpclient</artifactId>
140-
<version>4.5.2</version>
135+
<version>${httpclient.version}</version>
141136
</dependency>
142137

143138
<dependency>
144139
<groupId>com.fasterxml.jackson.core</groupId>
145140
<artifactId>jackson-databind</artifactId>
146-
<version>2.8.6</version>
141+
<version>${jackson.version}</version>
147142
</dependency>
148143

149144
<dependency>
150145
<groupId>com.fasterxml.jackson.dataformat</groupId>
151146
<artifactId>jackson-dataformat-yaml</artifactId>
152-
<version>2.8.6</version>
147+
<version>${jackson.version}</version>
153148
</dependency>
154149
</dependencies>
155150
<profiles>

0 commit comments

Comments
 (0)