Skip to content

Commit 40ed7c7

Browse files
committed
Merge pull request #120 from surevine/issue-87
Output jar files without version numbers. Fixes #87.
2 parents 3d558f0 + 820bcc3 commit 40ed7c7

3 files changed

Lines changed: 48 additions & 3 deletions

File tree

.travis.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,12 @@ 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

pom.xml

Lines changed: 37 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,13 @@
141141
<url>file:${project.basedir}/repo</url>
142142
</repository>
143143
</repositories>
144+
<pluginRepositories>
145+
<pluginRepository>
146+
<id>evgenyg</id>
147+
<name>Evgeny Goldin repo</name>
148+
<url>http://evgenyg.artifactoryonline.com/evgenyg/repo/com/github/goldin/</url>
149+
</pluginRepository>
150+
</pluginRepositories>
144151
<build>
145152
<plugins>
146153
<plugin>
@@ -212,7 +219,7 @@
212219
</manifest>
213220
</archive>
214221
<descriptorRefs>
215-
<descriptorRef>jar-with-dependencies</descriptorRef>
222+
<descriptorRef>${project.build.withDependencies}</descriptorRef>
216223
</descriptorRefs>
217224
</configuration>
218225
<executions>
@@ -225,9 +232,38 @@
225232
</execution>
226233
</executions>
227234
</plugin>
235+
<plugin>
236+
<groupId>com.github.goldin</groupId>
237+
<artifactId>copy-maven-plugin</artifactId>
238+
<version>0.2.5</version>
239+
<executions>
240+
<execution>
241+
<id>create-archive</id>
242+
<phase>package</phase>
243+
<goals>
244+
<goal>copy</goal>
245+
</goals>
246+
<configuration>
247+
<resources>
248+
<resource>
249+
<targetPath>${project.build.directory}</targetPath>
250+
<file>target/${project.build.finalName}.jar</file>
251+
<destFileName>${project.artifactId}.jar</destFileName>
252+
</resource>
253+
<resource>
254+
<targetPath>${project.build.directory}</targetPath>
255+
<file>${project.build.directory}/${project.build.finalName}-${project.build.withDependencies}.jar</file>
256+
<destFileName>${project.artifactId}-${project.build.withDependencies}.jar</destFileName>
257+
</resource>
258+
</resources>
259+
</configuration>
260+
</execution>
261+
</executions>
262+
</plugin>
228263
</plugins>
229264
</build>
230265
<properties>
231266
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
267+
<project.build.withDependencies>jar-with-dependencies</project.build.withDependencies>
232268
</properties>
233269
</project>

src/test/resources/log4j.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
log4j.rootLogger=INFO, CONSOLE
1+
log4j.rootLogger=ERROR, CONSOLE
22

33
log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
44
log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
@@ -19,4 +19,4 @@ log4j.logger.jdbc.sqlonly=INFO
1919
log4j.logger.jdbc.sqltiming=FATAL
2020
log4j.logger.jdbc.audit=FATAL
2121
log4j.logger.jdbc.resultset=FATAL
22-
log4j.logger.jdbc.connection=FATAL
22+
log4j.logger.jdbc.connection=FATAL

0 commit comments

Comments
 (0)