Skip to content

Commit 7bceaaa

Browse files
author
ManuReno
committed
Merge branch 'master' into QFJ-855
2 parents ec34f4e + 8e13e44 commit 7bceaaa

File tree

68 files changed

+2697
-531
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+2697
-531
lines changed

‎pom.xml‎

Lines changed: 271 additions & 110 deletions
Original file line numberDiff line numberDiff line change
@@ -1,121 +1,282 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
2-
<modelVersion>4.0.0</modelVersion>
3-
4-
<groupId>org.quickfixj</groupId>
5-
<artifactId>quickfixj-parent</artifactId>
6-
<version>1.7.0-SNAPSHOT</version>
7-
<packaging>pom</packaging>
8-
9-
<name>QuickFIX/J Parent</name>
10-
<description>
11-
The Financial Information eXchange (FIX) protocol is a messaging standard developed
12-
specifically for the real-time electronic exchange of securities transactions.
13-
FIX is a public-domain specification owned and maintained by FIX Protocol, Ltd (FPL).
14-
QuickFIX/J is a full featured messaging engine for the FIX protocol.
15-
It is a 100% Java open source implementation of the popular C++ QuickFIX engine.
16-
</description>
17-
<url>http://www.quickfixj.org</url>
18-
<licenses>
19-
<license>
20-
<name>The QuickFIX Software License, Version 1.0</name>
21-
<url>http://www.quickfixj.org/documentation/license.html</url>
22-
<distribution>repo</distribution>
23-
</license>
24-
</licenses>
2+
<modelVersion>4.0.0</modelVersion>
3+
4+
<groupId>org.quickfixj</groupId>
5+
<artifactId>quickfixj-parent</artifactId>
6+
<version>1.7.0-SNAPSHOT</version>
7+
<packaging>pom</packaging>
8+
9+
<name>QuickFIX/J Parent</name>
10+
<description>
11+
The Financial Information eXchange (FIX) protocol is a messaging standard developed
12+
specifically for the real-time electronic exchange of securities transactions.
13+
FIX is a public-domain specification owned and maintained by FIX Protocol, Ltd (FPL).
14+
QuickFIX/J is a full featured messaging engine for the FIX protocol.
15+
It is a 100% Java open source implementation of the popular C++ QuickFIX engine.
16+
</description>
17+
<url>http://www.quickfixj.org</url>
18+
19+
<licenses>
20+
<license>
21+
<name>The QuickFIX Software License, Version 1.0</name>
22+
<url>http://www.quickfixj.org/documentation/license.html</url>
23+
<distribution>repo</distribution>
24+
</license>
25+
</licenses>
26+
27+
28+
<scm>
29+
<connection>scm:git:git://github.com/quickfix-j/quickfixj.git</connection>
30+
<developerConnection>scm:git:git@github.com:quickfix-j/quickfixj.git</developerConnection>
31+
<url>https://github.com/quickfix-j/quickfixj/</url>
32+
<tag>master</tag>
33+
</scm>
34+
35+
<developers>
36+
<developer>
37+
<id>chrjohn</id>
38+
<name>Christoph John</name>
39+
</developer>
40+
</developers>
41+
42+
<contributors>
43+
<contributor>
44+
<name>Luca Burgazzoli</name>
45+
<url>https://github.com/lburgazzoli</url>
46+
</contributor>
47+
</contributors>
48+
49+
<issueManagement>
50+
<system>JIRA</system>
51+
<url>http://www.quickfixj.org/jira/</url>
52+
</issueManagement>
2553

2654
<prerequisites>
27-
<maven>3.3.3</maven>
55+
<maven>3.3.9</maven>
2856
</prerequisites>
2957

30-
<modules>
31-
<module>quickfixj-codegenerator</module>
32-
<module>quickfixj-dictgenerator</module>
33-
<module>quickfixj-core</module>
34-
<module>quickfixj-messages</module>
35-
<module>quickfixj-examples</module>
36-
<module>quickfixj-all</module>
37-
<module>quickfixj-distribution</module>
38-
</modules>
58+
<modules>
59+
<module>quickfixj-codegenerator</module>
60+
<module>quickfixj-dictgenerator</module>
61+
<module>quickfixj-core</module>
62+
<module>quickfixj-messages</module>
63+
<module>quickfixj-examples</module>
64+
<module>quickfixj-all</module>
65+
<module>quickfixj-distribution</module>
66+
</modules>
3967

4068
<properties>
4169
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4270
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
43-
<jdkLevel>1.6</jdkLevel>
44-
<slf4j.version>1.7.12</slf4j.version>
71+
<jdkLevel>1.7</jdkLevel>
72+
<slf4j.version>1.7.18</slf4j.version>
4573
<mainClass/>
46-
</properties>
47-
48-
<build>
49-
<pluginManagement>
50-
<plugins>
51-
<plugin>
52-
<artifactId>maven-resources-plugin</artifactId>
53-
<version>2.7</version>
54-
</plugin>
55-
<plugin>
56-
<artifactId>maven-compiler-plugin</artifactId>
57-
<version>3.3</version>
58-
<configuration>
59-
<source>${jdkLevel}</source>
60-
<target>${jdkLevel}</target>
61-
</configuration>
62-
63-
</plugin>
64-
<plugin>
65-
<artifactId>maven-jar-plugin</artifactId>
66-
<version>2.6</version>
67-
<configuration>
68-
<archive>
69-
<manifest>
70-
<mainClass>${mainClass}</mainClass>
71-
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
72-
</manifest>
73-
</archive>
74-
</configuration>
75-
</plugin>
76-
<plugin>
77-
<artifactId>maven-surefire-plugin</artifactId>
78-
<version>2.18.1</version>
79-
</plugin>
80-
<plugin>
81-
<artifactId>maven-pmd-plugin</artifactId>
82-
<version>3.4</version>
83-
<configuration>
84-
<targetJdk>${jdkLevel}</targetJdk>
85-
</configuration>
86-
</plugin>
87-
<plugin>
88-
<artifactId>maven-source-plugin</artifactId>
89-
<version>2.4</version>
90-
<executions>
91-
<execution>
92-
<id>attach-sources</id>
93-
<phase>package</phase>
94-
<goals>
95-
<goal>jar-no-fork</goal>
96-
</goals>
97-
</execution>
98-
</executions>
99-
</plugin>
100-
<plugin>
101-
<artifactId>maven-shade-plugin</artifactId>
102-
<version>2.3</version>
103-
</plugin>
104-
<plugin>
105-
<artifactId>maven-assembly-plugin</artifactId>
106-
<version>2.5.4</version>
107-
</plugin>
108-
</plugins>
109-
</pluginManagement>
110-
111-
<plugins>
112-
<!-- enable bundle packaging -->
113-
<plugin>
114-
<groupId>org.apache.felix</groupId>
115-
<artifactId>maven-bundle-plugin</artifactId>
116-
<version>2.5.3</version>
117-
<extensions>true</extensions>
118-
</plugin>
119-
</plugins>
120-
</build>
74+
75+
<maven-resources-plugin-version>2.7</maven-resources-plugin-version>
76+
<maven-compiler-plugin-version>3.5.1</maven-compiler-plugin-version>
77+
<maven-jar-plugin-version>2.6</maven-jar-plugin-version>
78+
<maven-surefire-plugin-version>2.19.1</maven-surefire-plugin-version>
79+
<maven-pmd-plugin-version>3.6</maven-pmd-plugin-version>
80+
<maven-source-plugin-version>2.4</maven-source-plugin-version>
81+
<maven-javadoc-plugin-version>2.10.3</maven-javadoc-plugin-version>
82+
<maven-shade-plugin-version>2.4.3</maven-shade-plugin-version>
83+
<maven-assembly-plugin-version>2.6</maven-assembly-plugin-version>
84+
<maven-bundle-plugin-version>3.0.1</maven-bundle-plugin-version>
85+
<maven-gpg-plugin-version>1.6</maven-gpg-plugin-version>
86+
<maven-deploy-plugin-version>2.8.2</maven-deploy-plugin-version>
87+
<nexus-staging-maven-plugin-version>1.6.6</nexus-staging-maven-plugin-version>
88+
</properties>
89+
90+
<build>
91+
<pluginManagement>
92+
<plugins>
93+
<plugin>
94+
<groupId>org.apache.maven.plugins</groupId>
95+
<artifactId>maven-deploy-plugin</artifactId>
96+
<version>${maven-deploy-plugin-version}</version>
97+
</plugin>
98+
<plugin>
99+
<groupId>org.apache.maven.plugins</groupId>
100+
<artifactId>maven-resources-plugin</artifactId>
101+
<version>${maven-resources-plugin-version}</version>
102+
</plugin>
103+
<plugin>
104+
<groupId>org.apache.maven.plugins</groupId>
105+
<artifactId>maven-compiler-plugin</artifactId>
106+
<version>${maven-compiler-plugin-version}</version>
107+
<configuration>
108+
<source>${jdkLevel}</source>
109+
<target>${jdkLevel}</target>
110+
</configuration>
111+
</plugin>
112+
<plugin>
113+
<groupId>org.apache.maven.plugins</groupId>
114+
<artifactId>maven-jar-plugin</artifactId>
115+
<version>${maven-jar-plugin-version}</version>
116+
<configuration>
117+
<archive>
118+
<manifest>
119+
<mainClass>${mainClass}</mainClass>
120+
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
121+
</manifest>
122+
</archive>
123+
</configuration>
124+
</plugin>
125+
<plugin>
126+
<groupId>org.apache.maven.plugins</groupId>
127+
<artifactId>maven-surefire-plugin</artifactId>
128+
<version>${maven-surefire-plugin-version}</version>
129+
</plugin>
130+
<plugin>
131+
<groupId>org.apache.maven.plugins</groupId>
132+
<artifactId>maven-pmd-plugin</artifactId>
133+
<version>${maven-pmd-plugin-version}</version>
134+
<configuration>
135+
<targetJdk>${jdkLevel}</targetJdk>
136+
</configuration>
137+
</plugin>
138+
<plugin>
139+
<groupId>org.apache.maven.plugins</groupId>
140+
<artifactId>maven-source-plugin</artifactId>
141+
<version>${maven-source-plugin-version}</version>
142+
<executions>
143+
<execution>
144+
<id>attach-sources</id>
145+
<phase>package</phase>
146+
<goals>
147+
<goal>jar-no-fork</goal>
148+
</goals>
149+
</execution>
150+
</executions>
151+
</plugin>
152+
<plugin>
153+
<groupId>org.apache.maven.plugins</groupId>
154+
<artifactId>maven-javadoc-plugin</artifactId>
155+
<version>${maven-javadoc-plugin-version}</version>
156+
<executions>
157+
<execution>
158+
<id>attach-javadocs</id>
159+
<goals>
160+
<goal>jar</goal>
161+
</goals>
162+
<configuration>
163+
<additionalparam>-Xdoclint:none</additionalparam>
164+
</configuration>
165+
</execution>
166+
</executions>
167+
</plugin>
168+
<plugin>
169+
<groupId>org.apache.maven.plugins</groupId>
170+
<artifactId>maven-shade-plugin</artifactId>
171+
<version>${maven-shade-plugin-version}</version>
172+
</plugin>
173+
<plugin>
174+
<groupId>org.apache.maven.plugins</groupId>
175+
<artifactId>maven-assembly-plugin</artifactId>
176+
<version>${maven-assembly-plugin-version}</version>
177+
</plugin>
178+
<plugin>
179+
<groupId>org.apache.maven.plugins</groupId>
180+
<artifactId>maven-gpg-plugin</artifactId>
181+
<version>${maven-gpg-plugin-version}</version>
182+
<executions>
183+
<execution>
184+
<id>sign-artifacts</id>
185+
<phase>verify</phase>
186+
<goals>
187+
<goal>sign</goal>
188+
</goals>
189+
</execution>
190+
</executions>
191+
</plugin>
192+
<plugin>
193+
<groupId>org.sonatype.plugins</groupId>
194+
<artifactId>nexus-staging-maven-plugin</artifactId>
195+
<version>${nexus-staging-maven-plugin-version}</version>
196+
<extensions>true</extensions>
197+
<configuration>
198+
<serverId>ossrh</serverId>
199+
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
200+
<autoReleaseAfterClose>true</autoReleaseAfterClose>
201+
</configuration>
202+
</plugin>
203+
<plugin>
204+
<groupId>org.apache.felix</groupId>
205+
<artifactId>maven-bundle-plugin</artifactId>
206+
<version>${maven-bundle-plugin-version}</version>
207+
<extensions>true</extensions>
208+
<executions>
209+
<!--
210+
This execution makes sure that the manifest is available
211+
when the tests are executed
212+
-->
213+
<execution>
214+
<goals>
215+
<goal>manifest</goal>
216+
</goals>
217+
</execution>
218+
</executions>
219+
</plugin>
220+
</plugins>
221+
</pluginManagement>
222+
223+
<plugins>
224+
<!-- enable bundle packaging -->
225+
<plugin>
226+
<groupId>org.apache.felix</groupId>
227+
<artifactId>maven-bundle-plugin</artifactId>
228+
</plugin>
229+
</plugins>
230+
</build>
231+
232+
<profiles>
233+
<profile>
234+
<id>release</id>
235+
<activation>
236+
<activeByDefault>false</activeByDefault>
237+
</activation>
238+
<build>
239+
<plugins>
240+
<plugin>
241+
<groupId>org.apache.maven.plugins</groupId>
242+
<artifactId>maven-source-plugin</artifactId>
243+
</plugin>
244+
<plugin>
245+
<groupId>org.apache.maven.plugins</groupId>
246+
<artifactId>maven-javadoc-plugin</artifactId>
247+
</plugin>
248+
<plugin>
249+
<groupId>org.sonatype.plugins</groupId>
250+
<artifactId>nexus-staging-maven-plugin</artifactId>
251+
</plugin>
252+
</plugins>
253+
</build>
254+
</profile>
255+
<profile>
256+
<id>sign</id>
257+
<activation>
258+
<activeByDefault>false</activeByDefault>
259+
</activation>
260+
<build>
261+
<plugins>
262+
<plugin>
263+
<groupId>org.apache.maven.plugins</groupId>
264+
<artifactId>maven-gpg-plugin</artifactId>
265+
</plugin>
266+
</plugins>
267+
</build>
268+
</profile>
269+
</profiles>
270+
271+
<distributionManagement>
272+
<snapshotRepository>
273+
<id>ossrh</id>
274+
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
275+
</snapshotRepository>
276+
<repository>
277+
<id>ossrh</id>
278+
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
279+
</repository>
280+
</distributionManagement>
281+
121282
</project>

0 commit comments

Comments
 (0)