Skip to content

Commit 0ee3ac8

Browse files
committed
Merge from mavencentral
2 parents b90ebd3 + 1c5fc8e commit 0ee3ac8

File tree

3 files changed

+94
-60
lines changed

3 files changed

+94
-60
lines changed

buildnumber.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
#maven.buildNumber.plugin properties file
2-
#Sun May 11 21:40:21 CEST 2014
3-
buildNumber=107
1+
#maven.buildNumber properties file
2+
#Mon May 12 19:05:03 CEST 2014
3+
buildNumber=136

nbactions.xml

Lines changed: 0 additions & 26 deletions
This file was deleted.

pom.xml

Lines changed: 91 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,34 @@
1111
<url>http://pravian.net/</url>
1212
<description>A commons library for Bukkit.</description>
1313

14+
<parent>
15+
<groupId>org.sonatype.oss</groupId>
16+
<artifactId>oss-parent</artifactId>
17+
<version>9</version>
18+
</parent>
19+
20+
<licenses>
21+
<license>
22+
<name>The Apache Software License, Version 2.0</name>
23+
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
24+
</license>
25+
</licenses>
26+
27+
<developers>
28+
<developer>
29+
<name>Jerom van der Sar</name>
30+
<email>jerom@pravian.net</email>
31+
<organization>Pravian Systems</organization>
32+
<organizationUrl>http://pravian.net</organizationUrl>
33+
</developer>
34+
</developers>
35+
36+
<scm>
37+
<connection>scm:git:git@github.com:Pravian/BukkitLib.git</connection>
38+
<developerConnection>scm:git:git@github.com:Pravian/BukkitLib.git</developerConnection>
39+
<url>git@github.com:Pravian/BukkitLib.git</url>
40+
</scm>
41+
1442
<properties>
1543
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1644
<app.buildversion>${project.version}</app.buildversion>
@@ -26,14 +54,6 @@
2654
</repository>
2755
</repositories>
2856

29-
<!-- Dummy SCM -->
30-
<scm>
31-
<connection>scm:svn:http://127.0.0.1/svn/my-project</connection>
32-
<developerConnection>scm:svn:https://127.0.0.1/svn/my-project</developerConnection>
33-
<tag>HEAD</tag>
34-
<url>http://127.0.0.1/websvn/my-project</url>
35-
</scm>
36-
3757
<dependencies>
3858
<dependency>
3959
<groupId>org.bukkit</groupId>
@@ -49,18 +69,75 @@
4969
</dependency>
5070
</dependencies>
5171

52-
5372
<distributionManagement>
73+
<snapshotRepository>
74+
<id>ossrh</id>
75+
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
76+
</snapshotRepository>
5477
<repository>
55-
<id>projects-ftp</id>
56-
<url>ftp://projects.pravian.net/var/www/html/repo/</url>
78+
<id>ossrh</id>
79+
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
5780
</repository>
5881
</distributionManagement>
5982

60-
83+
<profiles>
84+
<profile>
85+
<id>release</id>
86+
<build>
87+
<plugins>
88+
<!-- GPG sign plugin -->
89+
<plugin>
90+
<groupId>org.apache.maven.plugins</groupId>
91+
<artifactId>maven-gpg-plugin</artifactId>
92+
<version>1.5</version>
93+
<executions>
94+
<execution>
95+
<id>sign-artifacts</id>
96+
<phase>verify</phase>
97+
<goals>
98+
<goal>sign</goal>
99+
</goals>
100+
</execution>
101+
</executions>
102+
</plugin>
103+
104+
<!-- Javadoc plugin -->
105+
<plugin>
106+
<groupId>org.apache.maven.plugins</groupId>
107+
<artifactId>maven-javadoc-plugin</artifactId>
108+
<version>2.9.1</version>
109+
<executions>
110+
<execution>
111+
<id>attach-javadocs</id>
112+
<goals>
113+
<goal>jar</goal>
114+
</goals>
115+
</execution>
116+
</executions>
117+
</plugin>
118+
119+
<!-- Source plugin -->
120+
<plugin>
121+
<groupId>org.apache.maven.plugins</groupId>
122+
<artifactId>maven-source-plugin</artifactId>
123+
<version>2.2.1</version>
124+
<executions>
125+
<execution>
126+
<id>attach-sources</id>
127+
<goals>
128+
<goal>jar-no-fork</goal>
129+
</goals>
130+
</execution>
131+
</executions>
132+
</plugin>
133+
</plugins>
134+
</build>
135+
</profile>
136+
</profiles>
61137

62138
<build>
63139
<plugins>
140+
<!-- Compiler plugin -->
64141
<plugin>
65142
<groupId>org.apache.maven.plugins</groupId>
66143
<artifactId>maven-compiler-plugin</artifactId>
@@ -73,6 +150,7 @@
73150
</configuration>
74151
</plugin>
75152

153+
<!-- Buildnumber plugin -->
76154
<plugin>
77155
<groupId>org.codehaus.mojo</groupId>
78156
<artifactId>buildnumber-maven-plugin</artifactId>
@@ -96,6 +174,7 @@
96174
</configuration>
97175
</plugin>
98176

177+
<!-- Jar plugin -->
99178
<plugin>
100179
<groupId>org.apache.maven.plugins</groupId>
101180
<artifactId>maven-jar-plugin</artifactId>
@@ -106,17 +185,6 @@
106185
</archive>
107186
</configuration>
108187
</plugin>
109-
110-
<plugin>
111-
<groupId>org.apache.maven.plugins</groupId>
112-
<artifactId>maven-javadoc-plugin</artifactId>
113-
<version>2.9.1</version>
114-
<configuration>
115-
<links>
116-
<link>http://jd.bukkit.org/dev/apidocs/</link>
117-
</links>
118-
</configuration>
119-
</plugin>
120188
</plugins>
121189

122190
<resources>
@@ -125,13 +193,5 @@
125193
<filtering>true</filtering>
126194
</resource>
127195
</resources>
128-
129-
<extensions>
130-
<extension>
131-
<groupId>org.apache.maven.wagon</groupId>
132-
<artifactId>wagon-ftp</artifactId>
133-
<version>1.0-beta-6</version>
134-
</extension>
135-
</extensions>
136196
</build>
137197
</project>

0 commit comments

Comments
 (0)