Skip to content

2.7.2 #65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BenCodez merged 15 commits into from
May 4, 2017
Merged

2.7.2 #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
18f0a4f
Temp removal of something (test)
BenCodez May 1, 2017
11ab151
set encoding
BenCodez May 1, 2017
2948632
Use different craftbukkit handle
BenCodez May 1, 2017
3b6ba1c
Don't use old repo
BenCodez May 1, 2017
a4a65b0
Update README.md
BenCodez May 1, 2017
2075368
General improvements
BenCodez May 2, 2017
c0f5dce
Bug fixes
BenCodez May 2, 2017
34ef122
Add build information
BenCodez May 2, 2017
46c1de7
Fix typo
BenCodez May 2, 2017
c84ff9f
Fix typo
BenCodez May 2, 2017
639032e
Bug fixes, update version number
BenCodez May 2, 2017
5932163
Bug fix
BenCodez May 3, 2017
f4e9170
Bug fix
BenCodez May 3, 2017
39587f6
Modify code for testing.
BenCodez May 4, 2017
54c28da
Code cleanup
BenCodez May 4, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions AdvancedCore/.settings/org.eclipse.core.resources.prefs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
eclipse.preferences.version=1
encoding/<project>=Cp1252
encoding/Resources=Cp1252
encoding/src=Cp1252
2 changes: 2 additions & 0 deletions AdvancedCore/Resources/version.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
version: '${project.version}'
time: '${timestamp}'
50 changes: 11 additions & 39 deletions AdvancedCore/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,17 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.Ben12345rocks</groupId>
<artifactId>AdvancedCore</artifactId>
<version>2.7.1</version>
<version>2.7.2</version>
<packaging>jar</packaging>
<name>AdvancedCore</name>
<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<!-- github server corresponds to entry in ~/.m2/settings.xml -->
<github.global.server>github</github.global.server>
<project.build.sourceEncoding>Cp1252</project.build.sourceEncoding>
<timestamp>${maven.build.timestamp}</timestamp>
<maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
</properties>
<distributionManagement>
<repository>
Expand All @@ -25,7 +28,7 @@
<directory>Resources</directory>
<filtering>true</filtering>
<includes>
<include>plugin.yml</include>
<include>version.yml</include>
</includes>
</resource>
<resource>
Expand Down Expand Up @@ -97,41 +100,11 @@
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.8.1</version>
<configuration>
<altDeploymentRepository>
internal.repo::default::file://${project.build.directory}/mvn-repo
</altDeploymentRepository>
</configuration>
</plugin>
<plugin>
<groupId>com.github.github</groupId>
<artifactId>site-maven-plugin</artifactId>
<version>0.12</version>
<executions>
<execution>
<id>repo</id>
<goals>
<goal>site</goal>
</goals>
<phase>deploy</phase>
<configuration>
<message>Maven artifacts for ${project.version}</message>
<noJekyll>true</noJekyll>
<outputDirectory>${project.build.directory}/mvn-repo
</outputDirectory>
<branch>refs/heads/master</branch>
<includes>
<include>**/*</include>
</includes>
<repositoryName>MavenRepo</repositoryName>
<repositoryOwner>Ben12345rocks</repositoryOwner>
<server>github</server>
<merge>true</merge>
</configuration>
</execution>
<execution>
<id>javadoc</id>
<goals>
Expand All @@ -157,10 +130,6 @@
</plugins>
</build>
<repositories>
<repository>
<id>dwd-repo</id>
<url>http://ci.dwdg.net/plugin/repository/everything/</url>
</repository>
<repository>
<id>spigot-repo</id>
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
Expand All @@ -182,7 +151,10 @@
<id>dmulloy2-repo</id>
<url>http://repo.dmulloy2.net/content/groups/public/</url>
</repository>

<repository>
<id>jitpack.io</id>
<url>https://jitpack.io</url>
</repository>
</repositories>
<dependencies>
<dependency>
Expand All @@ -204,9 +176,9 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.pl3x.bukkit.chatapi</groupId>
<groupId>com.github.Ben12345rocks</groupId>
<artifactId>ChatComponentAPI</artifactId>
<version>1.2</version>
<version>master-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down
Loading