Skip to content

Commit 911d0b3

Browse files
authored
Merge pull request #65 from Ben12345rocks/2.7.2
2.7.2
2 parents 1d82bbc + 54c28da commit 911d0b3

27 files changed

+667
-610
lines changed
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
eclipse.preferences.version=1
2+
encoding/<project>=Cp1252
3+
encoding/Resources=Cp1252
4+
encoding/src=Cp1252

AdvancedCore/Resources/version.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
version: '${project.version}'
2+
time: '${timestamp}'

AdvancedCore/pom.xml

Lines changed: 11 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,17 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.Ben12345rocks</groupId>
55
<artifactId>AdvancedCore</artifactId>
6-
<version>2.7.1</version>
6+
<version>2.7.2</version>
77
<packaging>jar</packaging>
88
<name>AdvancedCore</name>
99
<properties>
1010
<maven.compiler.source>1.8</maven.compiler.source>
1111
<maven.compiler.target>1.8</maven.compiler.target>
1212
<!-- github server corresponds to entry in ~/.m2/settings.xml -->
1313
<github.global.server>github</github.global.server>
14+
<project.build.sourceEncoding>Cp1252</project.build.sourceEncoding>
15+
<timestamp>${maven.build.timestamp}</timestamp>
16+
<maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
1417
</properties>
1518
<distributionManagement>
1619
<repository>
@@ -25,7 +28,7 @@
2528
<directory>Resources</directory>
2629
<filtering>true</filtering>
2730
<includes>
28-
<include>plugin.yml</include>
31+
<include>version.yml</include>
2932
</includes>
3033
</resource>
3134
<resource>
@@ -97,41 +100,11 @@
97100
</execution>
98101
</executions>
99102
</plugin>
100-
<plugin>
101-
<artifactId>maven-deploy-plugin</artifactId>
102-
<version>2.8.1</version>
103-
<configuration>
104-
<altDeploymentRepository>
105-
internal.repo::default::file://${project.build.directory}/mvn-repo
106-
</altDeploymentRepository>
107-
</configuration>
108-
</plugin>
109103
<plugin>
110104
<groupId>com.github.github</groupId>
111105
<artifactId>site-maven-plugin</artifactId>
112106
<version>0.12</version>
113107
<executions>
114-
<execution>
115-
<id>repo</id>
116-
<goals>
117-
<goal>site</goal>
118-
</goals>
119-
<phase>deploy</phase>
120-
<configuration>
121-
<message>Maven artifacts for ${project.version}</message>
122-
<noJekyll>true</noJekyll>
123-
<outputDirectory>${project.build.directory}/mvn-repo
124-
</outputDirectory>
125-
<branch>refs/heads/master</branch>
126-
<includes>
127-
<include>**/*</include>
128-
</includes>
129-
<repositoryName>MavenRepo</repositoryName>
130-
<repositoryOwner>Ben12345rocks</repositoryOwner>
131-
<server>github</server>
132-
<merge>true</merge>
133-
</configuration>
134-
</execution>
135108
<execution>
136109
<id>javadoc</id>
137110
<goals>
@@ -157,10 +130,6 @@
157130
</plugins>
158131
</build>
159132
<repositories>
160-
<repository>
161-
<id>dwd-repo</id>
162-
<url>http://ci.dwdg.net/plugin/repository/everything/</url>
163-
</repository>
164133
<repository>
165134
<id>spigot-repo</id>
166135
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
@@ -182,7 +151,10 @@
182151
<id>dmulloy2-repo</id>
183152
<url>http://repo.dmulloy2.net/content/groups/public/</url>
184153
</repository>
185-
154+
<repository>
155+
<id>jitpack.io</id>
156+
<url>https://jitpack.io</url>
157+
</repository>
186158
</repositories>
187159
<dependencies>
188160
<dependency>
@@ -204,9 +176,9 @@
204176
<scope>provided</scope>
205177
</dependency>
206178
<dependency>
207-
<groupId>net.pl3x.bukkit.chatapi</groupId>
179+
<groupId>com.github.Ben12345rocks</groupId>
208180
<artifactId>ChatComponentAPI</artifactId>
209-
<version>1.2</version>
181+
<version>master-SNAPSHOT</version>
210182
<scope>compile</scope>
211183
</dependency>
212184
<dependency>

0 commit comments

Comments
 (0)