Skip to content

Commit 444cf29

Browse files
committed
[Travis] Remove AWS uploading. Add DBO uploading.
1 parent 14b33f4 commit 444cf29

2 files changed

Lines changed: 24 additions & 80 deletions

File tree

.travis.yml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,15 @@ jdk: oraclejdk7
66
before_install:
77
- "git clone https://github.com/Q0rDev/travis-ci-resources.git target/travis"
88
- "chmod +x target/travis/build.sh"
9-
- "gem install --version 0.8.0 faraday"
10-
- "gem install travis-artifacts"
9+
- "chmod +x target/travis/upload.sh"
1110

1211
# Compile and package JAR and set build properties.
1312
install: ./target/travis/build.sh
1413
script: true
1514

16-
# Push artifacts to AWS.
15+
# Upload to DBO if release build.
1716
after_success:
18-
- travis-artifacts upload --path target/*.jar --target-path artifacts/$TRAVIS_REPO_SLUG/$TRAVIS_BUILD_NUMBER
17+
- "./target/travis/upload.sh"
1918

2019
notifications:
2120
# Disable build status email notifications, until the issue with forks is fixed.
@@ -26,9 +25,8 @@ notifications:
2625

2726
env:
2827
global:
28+
# Nexus Deployment
2929
- secure: "KA1+cNzz2Ud5LzqsdLIS76c2fATzwA0Po4cku4IWKKTTvo8n26HlCr6b9QBsIU578zhyjQXKhebcUWIC8BpGKFhXypmuFLIMVd9ZsiHy7gXbojnRiE4wWwYQHkL2fLO3rnPwQ59PtUGioHS8dZPHHfIXVxqqLl91/MBQmIS7oKY="
3030
- secure: "fi//FRXLIiEDkWBNgGTVvJZDXqQA9HQ1ZCptrOHS2PF1Z0wEL3BtobI4DqgL76WM1nPJVkJ159sYfAPxfeW/INhbUGqO87ImdCSCPXbjEaj0shj+W9/7ydQyCFiqLyxoSI4YIdY6SYkf6wnx9hSiKRrhX91NcZmtTS+mXjkG620="
31-
- "ARTIFACTS_AWS_REGION=us-east-1"
32-
- "ARTIFACTS_S3_BUCKET=q0r-artifacts"
33-
- secure: "FgTF2EHa7GJ/75VXzIBI9CS4L4/Ie8vxrfRtbtHB+tJqGVoK+ezOyDPiLYn5I0lGLeJJtBVJUVv7CTGua/2YQuNXTTZH0ydh+pTASHAAGZbJLIWrnPzw1q2YV9x8TdDHEmjcc2ibmRN1iU7UinFVULoGoQCLtjPKQwjia9NmpiE="
34-
- secure: "a11tG2dif0fWA3HVMIRYV2LL68YWu2NfEuUWbmXAmqjhdzhDz63m+NZyCg2UfVmB5UZ0v5R3tOhiQ18jhrvOGthrdZncgP/1BPg59gHIGkM51AvS2Rsqlsh+mwc0sYi9ZMbBMR4Q6qjlg9fgdMLbrX11sPTNDAroWS4prhysvVI="
31+
# Bukkit
32+
- secure: "b0cMTG7rMKTwqJlYDHWWfmBc0rpsbHUMOgqYRW3yKD4RHiQ2Q6LV7ACV8STBSVBnzM3vS0uziBx4WpzBthvmUqVGleaa9wf8/cd6TzUGZQ6Kp42TleqlynonGwu9mLRjLO39REpP3JMVvGoJhe2pI7x9480Tq3ZzIBzD6mFA0jU="

pom.xml

Lines changed: 18 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -3,50 +3,31 @@
33
<modelVersion>4.0.0</modelVersion>
44

55
<!-- Project information -->
6-
<groupId>ca.q0r</groupId>
7-
<artifactId>MAdvanced</artifactId>
8-
<version>1.7.2-R1.0</version>
96
<name>MAdvanced</name>
10-
<url>http://q0r.ca/</url>
7+
<artifactId>MAdvanced</artifactId>
8+
<packaging>jar</packaging>
9+
<version>1.7.2-R1.0.0-SNAPSHOT</version>
10+
<url>https://github.com/Q0rDev/MAdvanced</url>
1111
<description>Advanced MChat functionality</description>
1212

13-
<properties>
14-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
15-
<buildNumber>b0trvs</buildNumber>
16-
</properties>
13+
<!-- Parent information -->
14+
<parent>
15+
<groupId>ca.q0r</groupId>
16+
<artifactId>q0rdev-parent</artifactId>
17+
<version>1.0.0-SNAPSHOT</version>
18+
</parent>
1719

18-
<!-- Source code -->
19-
<scm>
20-
<developerConnection>scm:git:git@github.com:Q0rDev/${project.name}.git</developerConnection>
21-
<connection>scm:git:git://github.com/Q0rDev/${project.name}.git</connection>
22-
<url>https://github.com/Q0rDev/${project.name}</url>
23-
</scm>
24-
25-
<!-- Continuous integration -->
26-
<ciManagement>
27-
<system>travis</system>
28-
<url>https://travis-ci.org/Q0rDev/${project.name}</url>
29-
</ciManagement>
30-
31-
<!-- Maven repository -->
32-
<distributionManagement>
33-
<repository>
34-
<id>oss-nexus-releases</id>
35-
<name>OSS Releases</name>
36-
<url>https://oss.sonatype.org/content/repositories/releases/</url>
37-
</repository>
38-
<snapshotRepository>
39-
<id>oss-nexus-snapshots</id>
40-
<name>OSS Snapshots</name>
41-
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
42-
</snapshotRepository>
43-
</distributionManagement>
20+
<!-- Issue management -->
21+
<issueManagement>
22+
<system>jira</system>
23+
<url>https://q0rdev.atlassian.net/browse/MADVANCED</url>
24+
</issueManagement>
4425

4526
<!-- Repository locations -->
4627
<repositories>
4728
<repository>
48-
<id>q0r-repo</id>
49-
<url>http://nexus.q0r.ca/content/groups/public</url>
29+
<id>oss-repo</id>
30+
<url>https://oss.sonatype.org/content/groups/public</url>
5031
<releases>
5132
<updatePolicy>always</updatePolicy>
5233
</releases>
@@ -56,47 +37,12 @@
5637
</repository>
5738
</repositories>
5839

59-
<build>
60-
<defaultGoal>clean install</defaultGoal>
61-
<!-- Resources -->
62-
<resources>
63-
<resource>
64-
<targetPath>.</targetPath>
65-
<filtering>true</filtering>
66-
<directory>${basedir}/src/main/resources/</directory>
67-
<includes>
68-
<include>*.yml</include>
69-
</includes>
70-
</resource>
71-
</resources>
72-
<!-- Plugins -->
73-
<plugins>
74-
<!-- Compile plugin -->
75-
<plugin>
76-
<groupId>org.apache.maven.plugins</groupId>
77-
<artifactId>maven-compiler-plugin</artifactId>
78-
<version>3.1</version>
79-
<configuration>
80-
<source>1.6</source>
81-
<target>1.6</target>
82-
<showWarnings>true</showWarnings>
83-
</configuration>
84-
</plugin>
85-
<!-- JAR creation plugin -->
86-
<plugin>
87-
<groupId>org.apache.maven.plugins</groupId>
88-
<artifactId>maven-jar-plugin</artifactId>
89-
<version>2.4</version>
90-
</plugin>
91-
</plugins>
92-
</build>
93-
9440
<!-- Dependencies -->
9541
<dependencies>
9642
<dependency>
9743
<groupId>ca.q0r</groupId>
9844
<artifactId>MChat</artifactId>
99-
<version>1.7.2-R1.0</version>
45+
<version>1.7.2-R1.0.0-SNAPSHOT</version>
10046
<type>jar</type>
10147
<scope>compile</scope>
10248
</dependency>

0 commit comments

Comments
 (0)