Skip to content

Commit 4263c55

Browse files
lloydwatkinlloydwatkin
committed
Merge pull request #240 from garethf/issues/239
Issues/239
2 parents b7ca5e5 + 2345d71 commit 4263c55

2 files changed

Lines changed: 99 additions & 140 deletions

File tree

‎.travis.yml‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,4 @@ jdk:
33
- oraclejdk7
44
- openjdk6
55
- openjdk7
6-
7-
8-
env:
9-
global:
10-
- MAVEN_URL=http://apache.mirrors.pair.com/maven/maven-3/3.0.5/binaries/apache-maven-3.0.5-bin.tar.gz
11-
install:
12-
- wget -O - $MAVEN_URL | sudo tar xvz -C /usr/local
13-
- sudo rm /usr/local/maven
14-
- sudo ln -s /usr/local/apache-maven-3.0.5 /usr/local/maven
6+

‎pom.xml‎

Lines changed: 98 additions & 131 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<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+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
34
<modelVersion>4.0.0</modelVersion>
45
<groupId>org.buddycloud</groupId>
56
<artifactId>channelserver</artifactId>
@@ -11,9 +12,9 @@
1112
</scm>
1213
<dependencies>
1314
<dependency>
14-
<groupId>org.xbill</groupId>
15-
<artifactId>dnsjava</artifactId>
16-
<version>2.1.6</version>
15+
<groupId>org.xbill</groupId>
16+
<artifactId>dnsjava</artifactId>
17+
<version>2.1.6</version>
1718
</dependency>
1819
<dependency>
1920
<groupId>junit</groupId>
@@ -98,41 +99,41 @@
9899
<scope>test</scope>
99100
</dependency>
100101
<dependency>
101-
<groupId>org.hsqldb</groupId>
102-
<artifactId>hsqldb</artifactId>
103-
<version>2.2.8</version>
102+
<groupId>org.hsqldb</groupId>
103+
<artifactId>hsqldb</artifactId>
104+
<version>2.2.8</version>
104105
</dependency>
105106
<dependency>
106-
<groupId>commons-collections</groupId>
107-
<artifactId>commons-collections</artifactId>
108-
<version>3.2.1</version>
107+
<groupId>commons-collections</groupId>
108+
<artifactId>commons-collections</artifactId>
109+
<version>3.2.1</version>
109110
</dependency>
110111
<dependency>
111-
<groupId>nl.jqno.equalsverifier</groupId>
112-
<artifactId>equalsverifier</artifactId>
113-
<version>1.1.3</version>
114-
<scope>test</scope>
112+
<groupId>nl.jqno.equalsverifier</groupId>
113+
<artifactId>equalsverifier</artifactId>
114+
<version>1.1.3</version>
115+
<scope>test</scope>
115116
</dependency>
116117
<dependency>
117-
<groupId>proxool</groupId>
118-
<artifactId>proxool</artifactId>
119-
<version>0.8.3</version>
118+
<groupId>proxool</groupId>
119+
<artifactId>proxool</artifactId>
120+
<version>0.8.3</version>
120121
</dependency>
121122
<dependency>
122-
<groupId>commons-lang</groupId>
123-
<artifactId>commons-lang</artifactId>
124-
<version>2.6</version>
123+
<groupId>commons-lang</groupId>
124+
<artifactId>commons-lang</artifactId>
125+
<version>2.6</version>
125126
</dependency>
126127
<dependency>
127128
<groupId>org.lazyluke</groupId>
128129
<artifactId>log4jdbc-remix</artifactId>
129130
<version>0.2.3</version>
130-
</dependency>
131-
<dependency>
131+
</dependency>
132+
<dependency>
132133
<groupId>joda-time</groupId>
133134
<artifactId>joda-time</artifactId>
134135
<version>2.3</version>
135-
</dependency>
136+
</dependency>
136137
<dependency>
137138
<groupId>net.xeoh</groupId>
138139
<artifactId>jspf.core</artifactId>
@@ -146,130 +147,96 @@
146147
<url>file:${project.basedir}/repo</url>
147148
</repository>
148149
</repositories>
149-
<pluginRepositories>
150-
<pluginRepository>
151-
<id>evgenyg</id>
152-
<name>Evgeny Goldin repo</name>
153-
<url>http://evgenyg.artifactoryonline.com/evgenyg/repo/com/github/goldin/</url>
154-
</pluginRepository>
155-
</pluginRepositories>
156150
<build>
157-
<plugins>
158-
<plugin>
159-
<!-- Extended Maven antrun plugin -->
160-
<!-- https://maven-antrun-extended-plugin.dev.java.net/ -->
161-
<groupId>org.jvnet.maven-antrun-extended-plugin</groupId>
162-
<artifactId>maven-antrun-extended-plugin</artifactId>
163-
<executions>
164-
<execution>
151+
<plugins>
152+
<plugin>
153+
<!-- Extended Maven antrun plugin -->
154+
<!-- https://maven-antrun-extended-plugin.dev.java.net/ -->
155+
<groupId>org.jvnet.maven-antrun-extended-plugin</groupId>
156+
<artifactId>maven-antrun-extended-plugin</artifactId>
157+
<executions>
158+
<execution>
165159
<id>test-reports</id>
166160
<phase>test</phase>
167161
<configuration>
168-
<tasks unless="maven.test.skip">
169-
<junitreport todir="target/surefire-reports">
170-
<fileset dir="target/surefire-reports">
171-
<include name="**/*.xml"/>
172-
</fileset>
173-
<report format="noframes" todir="target/surefire-reports"/>
174-
</junitreport>
175-
</tasks>
162+
<tasks unless="maven.test.skip">
163+
<junitreport todir="target/surefire-reports">
164+
<fileset dir="target/surefire-reports">
165+
<include name="**/*.xml" />
166+
</fileset>
167+
<report format="noframes"
168+
todir="target/surefire-reports" />
169+
</junitreport>
170+
</tasks>
176171
</configuration>
177172
<goals>
178-
<goal>run</goal>
173+
<goal>run</goal>
179174
</goals>
180-
</execution>
181-
</executions>
182-
<dependencies>
183-
<dependency>
175+
</execution>
176+
</executions>
177+
<dependencies>
178+
<dependency>
184179
<groupId>org.apache.ant</groupId>
185180
<artifactId>ant-junit</artifactId>
186181
<version>1.8.0</version>
187-
</dependency>
188-
<dependency>
182+
</dependency>
183+
<dependency>
189184
<groupId>org.apache.ant</groupId>
190185
<artifactId>ant-trax</artifactId>
191186
<version>1.8.0</version>
192-
</dependency>
193-
</dependencies>
194-
</plugin>
195-
<plugin>
196-
<groupId>org.apache.maven.plugins</groupId>
197-
<artifactId>maven-surefire-plugin</artifactId>
198-
<version>2.5</version>
199-
<configuration>
200-
<argLine>-Duser.timezone=UTC -XX:MaxPermSize=1024m -Xmx1024m</argLine>
201-
<skipTests>false</skipTests>
202-
<testFailureIgnore>true</testFailureIgnore>
203-
<forkMode>once</forkMode>
204-
<includes>
205-
<include>**/*Test.java</include>
206-
</includes>
207-
<useFile>false</useFile>
208-
</configuration>
209-
</plugin>
210-
<plugin>
211-
<groupId>org.apache.maven.plugins</groupId>
212-
<artifactId>maven-compiler-plugin</artifactId>
213-
<version>2.5.1</version>
214-
<configuration>
215-
<source>1.6</source>
216-
<target>1.6</target>
217-
</configuration>
218-
</plugin>
219-
<plugin>
220-
<artifactId>maven-assembly-plugin</artifactId>
221-
<configuration>
222-
<archive>
223-
<manifest>
224-
<mainClass>org.buddycloud.channelserver.Main</mainClass>
225-
</manifest>
226-
</archive>
227-
<descriptorRefs>
228-
<descriptorRef>${project.build.withDependencies}</descriptorRef>
229-
</descriptorRefs>
230-
</configuration>
231-
<executions>
232-
<execution>
233-
<id>jar-with-dependencies</id>
234-
<phase>package</phase>
235-
<goals>
236-
<goal>single</goal>
237-
</goals>
238-
</execution>
239-
</executions>
240-
</plugin>
241-
<plugin>
242-
<groupId>com.github.goldin</groupId>
243-
<artifactId>copy-maven-plugin</artifactId>
244-
<version>0.2.5</version>
245-
<executions>
187+
</dependency>
188+
</dependencies>
189+
</plugin>
190+
<plugin>
191+
<groupId>org.apache.maven.plugins</groupId>
192+
<artifactId>maven-surefire-plugin</artifactId>
193+
<version>2.5</version>
194+
<configuration>
195+
<argLine>-Duser.timezone=UTC -XX:MaxPermSize=1024m -Xmx1024m</argLine>
196+
<skipTests>false</skipTests>
197+
<testFailureIgnore>true</testFailureIgnore>
198+
<forkMode>once</forkMode>
199+
<includes>
200+
<include>**/*Test.java</include>
201+
</includes>
202+
<useFile>false</useFile>
203+
</configuration>
204+
</plugin>
205+
<plugin>
206+
<groupId>org.apache.maven.plugins</groupId>
207+
<artifactId>maven-compiler-plugin</artifactId>
208+
<version>2.5.1</version>
209+
<configuration>
210+
<source>1.6</source>
211+
<target>1.6</target>
212+
</configuration>
213+
</plugin>
214+
<plugin>
215+
<groupId>org.apache.maven.plugins</groupId>
216+
<artifactId>maven-shade-plugin</artifactId>
217+
<version>2.3</version>
218+
<configuration>
219+
<outputFile>${project.build.directory}/${project.build.finalName}-${project.build.withDependencies}.jar</outputFile>
220+
<transformers>
221+
<transformer
222+
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
223+
<mainClass>org.buddycloud.channelserver.Main</mainClass>
224+
</transformer>
225+
</transformers>
226+
</configuration>
227+
<executions>
246228
<execution>
247-
<id>create-archive</id>
248-
<phase>package</phase>
249-
<goals>
250-
<goal>copy</goal>
251-
</goals>
252-
<configuration>
253-
<resources>
254-
<resource>
255-
<targetPath>${project.build.directory}</targetPath>
256-
<file>target/${project.build.finalName}.jar</file>
257-
<destFileName>${project.artifactId}.jar</destFileName>
258-
</resource>
259-
<resource>
260-
<targetPath>${project.build.directory}</targetPath>
261-
<file>${project.build.directory}/${project.build.finalName}-${project.build.withDependencies}.jar</file>
262-
<destFileName>${project.artifactId}-${project.build.withDependencies}.jar</destFileName>
263-
</resource>
264-
</resources>
265-
</configuration>
229+
<phase>package</phase>
230+
<goals>
231+
<goal>shade</goal>
232+
</goals>
266233
</execution>
267-
</executions>
268-
</plugin>
269-
</plugins>
234+
</executions>
235+
</plugin>
236+
</plugins>
270237
</build>
271238
<properties>
272-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
273-
<project.build.withDependencies>jar-with-dependencies</project.build.withDependencies>
239+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
240+
<project.build.withDependencies>jar-with-dependencies</project.build.withDependencies>
274241
</properties>
275242
</project>

0 commit comments

Comments
 (0)