Skip to content

Commit 00c01db

Browse files
authored
Merge pull request #700 from eed3si9n/wip/maven
Update Maven plugin setup
2 parents 41fe0b3 + 71ce045 commit 00c01db

File tree

2 files changed

+61
-15
lines changed

2 files changed

+61
-15
lines changed

mvn-scalaxb/pom.xml

Lines changed: 59 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,11 @@
55
<parent>
66
<groupId>org.sonatype.oss</groupId>
77
<artifactId>oss-parent</artifactId>
8-
<version>7</version>
8+
<version>9</version>
99
</parent>
10-
1110
<groupId>org.scalaxb</groupId>
1211
<artifactId>scalaxb-maven-plugin</artifactId>
13-
<version>1.12.2</version>
12+
<version>1.12.3</version>
1413
<packaging>maven-plugin</packaging>
1514

1615
<name>scalaxb Maven Plugin</name>
@@ -102,6 +101,12 @@
102101
<version>3.0.24</version>
103102
</dependency>
104103

104+
<dependency>
105+
<groupId>log4j</groupId>
106+
<artifactId>log4j</artifactId>
107+
<version>1.2.17</version>
108+
</dependency>
109+
105110
<dependency>
106111
<groupId>junit</groupId>
107112
<artifactId>junit</artifactId>
@@ -145,32 +150,78 @@
145150
<plugin>
146151
<groupId>org.apache.maven.plugins</groupId>
147152
<artifactId>maven-plugin-plugin</artifactId>
148-
<version>3.3</version>
153+
<version>3.6.0</version>
149154
<configuration>
150155
<goalPrefix>scalaxb</goalPrefix>
151156
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
152157
<extractors>
153158
<!-- scalaxb mojo uses annotations -->
154159
<extractor>java-annotations</extractor>
155-
<!-- generated help mojo uses javadoc tags -->
156-
<extractor>java</extractor>
157160
</extractors>
158161
</configuration>
159162
<executions>
160163
<execution>
161164
<id>mojo-descriptor</id>
165+
<phase>process-classes</phase>
162166
<goals>
163167
<goal>descriptor</goal>
164168
</goals>
165169
</execution>
170+
</executions>
171+
</plugin>
172+
173+
<plugin>
174+
<groupId>org.apache.maven.plugins</groupId>
175+
<artifactId>maven-source-plugin</artifactId>
176+
<version>2.2.1</version>
177+
<executions>
166178
<execution>
167-
<id>generated-helpmojo</id>
179+
<id>attach-sources</id>
168180
<goals>
169-
<goal>helpmojo</goal>
181+
<goal>jar-no-fork</goal>
170182
</goals>
171183
</execution>
172184
</executions>
173185
</plugin>
186+
187+
<plugin>
188+
<groupId>org.apache.maven.plugins</groupId>
189+
<artifactId>maven-javadoc-plugin</artifactId>
190+
<version>2.9.1</version>
191+
<executions>
192+
<execution>
193+
<id>attach-javadocs</id>
194+
<goals>
195+
<goal>jar</goal>
196+
</goals>
197+
</execution>
198+
</executions>
199+
</plugin>
200+
201+
<plugin>
202+
<groupId>org.apache.maven.plugins</groupId>
203+
<artifactId>maven-gpg-plugin</artifactId>
204+
<version>1.5</version>
205+
<executions>
206+
<execution>
207+
<id>sign-artifacts</id>
208+
<phase>verify</phase>
209+
<goals>
210+
<goal>sign</goal>
211+
</goals>
212+
</execution>
213+
</executions>
214+
</plugin>
215+
216+
<plugin>
217+
<groupId>org.sonatype.central</groupId>
218+
<artifactId>central-publishing-maven-plugin</artifactId>
219+
<version>0.9.0</version>
220+
<extensions>true</extensions>
221+
<configuration>
222+
<publishingServerId>central</publishingServerId>
223+
</configuration>
224+
</plugin>
174225
</plugins>
175226

176227
<pluginManagement>

mvn-scalaxb/publish

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,7 @@ setup() {
2626
2727
<servers>
2828
<server>
29-
<id>sonatype-nexus-staging</id>
30-
<username>$username</username>
31-
<password>$password</password>
32-
</server>
33-
<server>
34-
<id>sonatype-nexus-snapshots</id>
29+
<id>central</id>
3530
<username>$username</username>
3631
<password>$password</password>
3732
</server>
@@ -48,4 +43,4 @@ init() {
4843
}
4944

5045
init
51-
mvn -s "$SETTINGS" deploy -Pit,sonatype-oss-release "$@"
46+
mvn -s "$SETTINGS" deploy -Pit,central "$@"

0 commit comments

Comments
 (0)