[TASK] Updated pom to match file names

This commit is contained in:
JKetelaar
2016-05-23 17:53:30 +02:00
parent 7dd135caeb
commit b8b22cede2
3 changed files with 20 additions and 11 deletions
+7
View File
@@ -0,0 +1,7 @@
#!/bin/sh
if [ "$TRAVIS_BRANCH" == "master" ]; then
mvn -U package
else
mvn -Dversion="$TRAVIS_COMMIT" -U package
fi
+1
View File
@@ -2,3 +2,4 @@ mvn install:install-file -DgroupId=${project.groupId} -DartifactId=${project.art
:: mvn install:install-file -DgroupId=org.parabot -DartifactId=client -Dversion=2.4.1.1 -Dpackaging=jar -Dfile=../target/Parabot-V2.4.1.1-jar-with-dependencies.jar -DlocalRepositoryPath=../../Maven-Repository :: mvn install:install-file -DgroupId=org.parabot -DartifactId=client -Dversion=2.4.1.1 -Dpackaging=jar -Dfile=../target/Parabot-V2.4.1.1-jar-with-dependencies.jar -DlocalRepositoryPath=../../Maven-Repository
:: mvn install:install-file -DgroupId=org.parabot -DartifactId=client -Dversion=2.4.3 -Dpackaging=jar -Dfile=../target/Parabot-V2.4.3-jar-with-dependencies.jar -DlocalRepositoryPath=../../Maven-Repository :: mvn install:install-file -DgroupId=org.parabot -DartifactId=client -Dversion=2.4.3 -Dpackaging=jar -Dfile=../target/Parabot-V2.4.3-jar-with-dependencies.jar -DlocalRepositoryPath=../../Maven-Repository
:: mvn install:install-file -DgroupId=org.parabot -DartifactId=client -Dversion=2.5 -Dpackaging=jar -Dfile=../target/final/Parabot-V2.5-jar-with-dependencies.jar -DlocalRepositoryPath=../../Maven-Repository
+12 -11
View File
@@ -12,6 +12,7 @@
<properties> <properties>
<jdk.version>1.7</jdk.version> <jdk.version>1.7</jdk.version>
<build.version></build.version>
</properties> </properties>
<name>Parabot client</name> <name>Parabot client</name>
@@ -75,7 +76,7 @@
</dependencies> </dependencies>
<build> <build>
<finalName>Parabot-V${version}</finalName> <finalName>Parabot-V${version}${build.version}</finalName>
<resources> <resources>
<resource> <resource>
<directory>src/main/resources</directory> <directory>src/main/resources</directory>
@@ -84,14 +85,14 @@
<resource> <resource>
<directory>deploy</directory> <directory>deploy</directory>
<filtering>true</filtering> <filtering>true</filtering>
<!--<excludes>--> <excludes>
<!--<exclude>deploy.bat</exclude>--> <exclude>deploy.bat</exclude>
<!--<exclude>package.bat</exclude>--> <exclude>package.bat</exclude>
<!--<exclude>clean.bat</exclude>--> <exclude>clean.bat</exclude>
<!--</excludes>--> </excludes>
<includes> <!--<includes>-->
<include>deploy.bat</include> <!--<include>deploy.bat</include>-->
</includes> <!--</includes>-->
</resource> </resource>
</resources> </resources>
@@ -120,7 +121,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId> <artifactId>maven-assembly-plugin</artifactId>
<version>2.4.1</version> <version>${version}</version>
<configuration> <configuration>
<descriptorRefs> <descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef> <descriptorRef>jar-with-dependencies</descriptorRef>
@@ -130,7 +131,7 @@
<mainClass>org.parabot.Landing</mainClass> <mainClass>org.parabot.Landing</mainClass>
</manifest> </manifest>
</archive> </archive>
<outputDirectory>${project.build.directory}/final/</outputDirectory> <appendAssemblyId>false</appendAssemblyId>
</configuration> </configuration>
<executions> <executions>
<execution> <execution>