Package change & CI branch stuff #13

Merged
NorbiPeti merged 1 commit from dev into master 2019-01-20 21:47:35 +00:00
2 changed files with 20 additions and 2 deletions
Showing only changes of commit a8d6c7ba78 - Show all commits

20
pom.xml
View file

@ -63,6 +63,9 @@
</build> </build>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<branch>
master
</branch>
</properties> </properties>
<repositories> <repositories>
@ -118,7 +121,7 @@
<dependency> <dependency>
<groupId>com.github.TBMCPlugins.ButtonCore</groupId> <groupId>com.github.TBMCPlugins.ButtonCore</groupId>
<artifactId>ButtonCore</artifactId> <artifactId>ButtonCore</artifactId>
<version>master-SNAPSHOT</version> <version>${branch}-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<!-- https://mvnrepository.com/artifact/org.shredzone.acme4j/acme4j-client --> <!-- https://mvnrepository.com/artifact/org.shredzone.acme4j/acme4j-client -->
@ -139,4 +142,19 @@
<version>1.60</version> <version>1.60</version>
</dependency> </dependency>
</dependencies> </dependencies>
<profiles>
<profile>
<id>ci</id>
<activation>
<property>
<name>env.TRAVIS_BRANCH</name>
</property>
</activation>
<properties>
<!-- Override only if necessary -->
<branch>${env.TRAVIS_BRANCH}</branch>
</properties>
</profile>
</profiles>
</project> </project>

View file

@ -1,6 +1,6 @@
package buttondevteam.website.page; package buttondevteam.website.page;
import buttondevteam.lib.PluginUpdater; import buttondevteam.component.updater.PluginUpdater;
import buttondevteam.lib.TBMCCoreAPI; import buttondevteam.lib.TBMCCoreAPI;
import buttondevteam.website.io.IOHelper; import buttondevteam.website.io.IOHelper;
import buttondevteam.website.io.Response; import buttondevteam.website.io.Response;