Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[POM] Small Travis-CI related fixes.
  • Loading branch information
MiracleM4n committed Mar 24, 2014
1 parent 37d4687 commit 4cb6f4f
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Expand Up @@ -3,12 +3,12 @@ language: java
jdk: oraclejdk7

# Compile and package JAR and set build properties.
install: mvn package -Dbuild.number=b$TRAVIS_BUILD_NUMBERtrvs
install: mvn package -DbuildNumber=b${TRAVIS_BUILD_NUMBER}trvs
after_success:
# Get files for use with build, namely the custom Maven settings.xml.
- "git clone https://github.com/Q0rDev/travis-ci-resources.git target/travis"
# Check if commit is not a pull request, if git repo is official, and if branch is master. If checks pass, deploy artifacts to Maven repository.
- "[[ $TRAVIS_PULL_REQUEST == false ]] && [[ $TRAVIS_REPO_SLUG == Q0rDev/MChat ]] && [[ $TRAVIS_BRANCH == master ]] && mvn deploy --settings target/travis/settings.xml"
- "[[ $TRAVIS_PULL_REQUEST == false ]] && [[ $TRAVIS_REPO_SLUG == Q0rDev/MChat ]] && [[ $TRAVIS_BRANCH == master ]] && mvn deploy --settings target/travis/settings.xml && "

notifications:
# Disable build status email notifications, until the issue with forks is fixed.
Expand Down
9 changes: 5 additions & 4 deletions pom.xml
Expand Up @@ -12,7 +12,7 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<build.number>b0jnks</build.number>
<buildNumber>b0trvs</buildNumber>
</properties>

<!-- Source code -->
Expand Down Expand Up @@ -77,7 +77,7 @@
</repositories>

<build>
<defaultGoal>package</defaultGoal>
<defaultGoal>clean install</defaultGoal>
<!-- Resources -->
<resources>
<resource>
Expand All @@ -95,17 +95,18 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<version>3.1</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
<showWarnings>true</showWarnings>
</configuration>
</plugin>
<!-- JAR creation plugin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.3.2</version>
<version>2.4</version>
</plugin>
</plugins>
</build>
Expand Down

0 comments on commit 4cb6f4f

Please sign in to comment.