Skip to content

Commit 0acd7e5

Browse files
committed
fixed API doc generation
1 parent eeda18c commit 0acd7e5

File tree

4 files changed

+38
-54
lines changed

4 files changed

+38
-54
lines changed

example/pom.xml

-8
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,6 @@
1919

2020
<build>
2121
<plugins>
22-
<plugin>
23-
<groupId>org.apache.maven.plugins</groupId>
24-
<artifactId>maven-compiler-plugin</artifactId>
25-
<configuration>
26-
<source>1.5</source>
27-
<target>1.5</target>
28-
</configuration>
29-
</plugin>
3022
<plugin>
3123
<groupId>org.codehaus.mojo</groupId>
3224
<artifactId>exec-maven-plugin</artifactId>

jansi-website/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.fusesource.jansi</groupId>
2424
<artifactId>jansi-project</artifactId>
25-
<version>1.12</version>
25+
<version>1.14-SNAPSHOT</version>
2626
</parent>
2727

2828
<artifactId>jansi-website</artifactId>
@@ -80,7 +80,7 @@
8080
<dependency>
8181
<groupId>org.fusesource.jansi</groupId>
8282
<artifactId>jansi</artifactId>
83-
<version>1.12-SNAPSHOT</version>
83+
<version>${project.version}</version>
8484
<classifier>javadoc</classifier>
8585
<scope>test</scope>
8686
</dependency>

jansi/pom.xml

-13
Original file line numberDiff line numberDiff line change
@@ -121,14 +121,6 @@
121121
</includes>
122122
</configuration>
123123
</plugin>
124-
<plugin>
125-
<groupId>org.apache.maven.plugins</groupId>
126-
<artifactId>maven-compiler-plugin</artifactId>
127-
<configuration>
128-
<source>1.5</source>
129-
<target>1.5</target>
130-
</configuration>
131-
</plugin>
132124

133125
<plugin>
134126
<groupId>org.apache.felix</groupId>
@@ -168,11 +160,6 @@
168160
<plugin>
169161
<groupId>org.apache.maven.plugins</groupId>
170162
<artifactId>maven-javadoc-plugin</artifactId>
171-
172-
<configuration>
173-
<encoding>${project.build.sourceEncoding}</encoding>
174-
</configuration>
175-
176163
<executions>
177164
<execution>
178165
<id>attach-javadocs</id>

pom.xml

+36-31
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151

5252
<issueManagement>
5353
<system>jira</system>
54-
<url>http://fusesource.com/issues/browse/${forge-project-id-uc}</url>
54+
<url>https://github.com/fusesource/${forge-project-id}/issues</url>
5555
</issueManagement>
5656

5757
<mailingLists>
@@ -80,11 +80,10 @@
8080
</licenses>
8181

8282
<scm>
83-
<connection>scm:git:git://github.com/fusesource/${forge-project-id}.git</connection>
84-
<!-- Work around for issue: http://jira.codehaus.org/browse/SCM-444 -->
85-
<developerConnection>scm:git:ssh://[email protected]:fusesources/jansi.git</developerConnection>
86-
<url>http://github.com/fusesource/{forge-project-id}.git</url>
87-
<tag>HEAD</tag>
83+
<connection>scm:git:https://github.com/fusesource/${forge-project-id}.git</connection>
84+
<developerConnection>scm:git:https://github.com/fusesource/${forge-project-id}.git</developerConnection>
85+
<url>https://github.com/fusesource/${forge-project-id}/tree/${project.scm.tag}</url>
86+
<tag>master</tag>
8887
</scm>
8988

9089
<distributionManagement>
@@ -118,11 +117,41 @@
118117
<version>1.9</version>
119118
</extension>
120119
</extensions>
120+
121+
<pluginManagement>
122+
<plugins>
123+
<plugin>
124+
<groupId>org.apache.maven.plugins</groupId>
125+
<artifactId>maven-compiler-plugin</artifactId>
126+
<configuration>
127+
<source>1.5</source>
128+
<target>1.5</target>
129+
</configuration>
130+
</plugin>
131+
<plugin>
132+
<groupId>org.apache.maven.plugins</groupId>
133+
<artifactId>maven-javadoc-plugin</artifactId>
134+
<version>2.7</version>
135+
<configuration>
136+
<doctitle>${project.name} API Reference (${project.version})</doctitle>
137+
<windowtitle>${project.name} API Reference (${project.version})</windowtitle>
138+
<links>
139+
<link>http://download.oracle.com/javase/6/docs/api</link>
140+
</links>
141+
<encoding>UTF-8</encoding>
142+
<locale>en_US</locale>
143+
<linksource>true</linksource>
144+
<excludePackageNames>*.internal</excludePackageNames>
145+
</configuration>
146+
</plugin>
147+
</plugins>
148+
</pluginManagement>
149+
121150
<plugins>
122151
<plugin>
123152
<groupId>org.apache.maven.plugins</groupId>
124153
<artifactId>maven-site-plugin</artifactId>
125-
<version>3.0</version>
154+
<version>3.3</version>
126155
<executions>
127156
<execution>
128157
<id>attach-descriptor</id>
@@ -159,7 +188,6 @@
159188
<plugin>
160189
<groupId>org.apache.maven.plugins</groupId>
161190
<artifactId>maven-javadoc-plugin</artifactId>
162-
<version>2.7</version>
163191
<configuration>
164192
<charset>UTF-8</charset>
165193
<docencoding>UTF-8</docencoding>
@@ -177,16 +205,6 @@
177205
</resourcesArtifact>
178206
</resourcesArtifacts>
179207
-->
180-
181-
<doctitle>${project.name} API Reference (${project.version})</doctitle>
182-
<windowtitle>${project.name} API Reference (${project.version})</windowtitle>
183-
<links>
184-
<link>http://download.oracle.com/javase/6/docs/api</link>
185-
</links>
186-
<encoding>UTF-8</encoding>
187-
<locale>en_US</locale>
188-
<linksource>true</linksource>
189-
<excludePackageNames>*.internal</excludePackageNames>
190208
</configuration>
191209

192210
</plugin>
@@ -256,8 +274,6 @@
256274
<releases><enabled>true</enabled></releases>
257275
</repository>
258276
</repositories>
259-
260-
261277
</profile>
262278

263279
<profile>
@@ -267,7 +283,6 @@
267283
<plugin>
268284
<groupId>org.apache.maven.plugins</groupId>
269285
<artifactId>maven-javadoc-plugin</artifactId>
270-
<version>2.7</version>
271286

272287
<executions>
273288
<execution>
@@ -295,16 +310,6 @@
295310
</resourcesArtifact>
296311
</resourcesArtifacts>
297312
-->
298-
299-
<doctitle>${project.name} API Reference (${project.version})</doctitle>
300-
<windowtitle>${project.name} API Reference (${project.version})</windowtitle>
301-
<links>
302-
<link>http://download.oracle.com/javase/6/docs/api</link>
303-
</links>
304-
<encoding>UTF-8</encoding>
305-
<locale>en_US</locale>
306-
<linksource>true</linksource>
307-
<excludePackageNames>*.internal</excludePackageNames>
308313
</configuration>
309314
</plugin>
310315

0 commit comments

Comments
 (0)