Skip to content
This repository was archived by the owner on May 28, 2018. It is now read-only.

Commit ad2b152

Browse files
author
Michal Gajdos
committed
Including (sub-)groupIds into list of modules generated by jersey-doc-modulelist-maven-plugin (increased version to 1.0.1).
Change-Id: I307320c51a23e67a9a7fb9ddfa42c0dd2662a3fd Signed-off-by: Michal Gajdos <[email protected]>
1 parent 43e54a7 commit ad2b152

File tree

4 files changed

+250
-39
lines changed

4 files changed

+250
-39
lines changed

‎docs/src/main/docbook/modules.xml‎

Lines changed: 193 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
44
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
55
6-
Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
6+
Copyright (c) 2013-2015 Oracle and/or its affiliates. All rights reserved.
77
88
The contents of this file are subject to the terms of either the GNU
99
General Public License Version 2 only ("GPL") or the Common Development
@@ -168,6 +168,14 @@
168168
</link>
169169
</entry>
170170
<entry>Simple Http Container</entry>
171+
</row>
172+
<row>
173+
<entry>
174+
<link xlink:href="https://jersey.java.net/project-info/&version;/jersey/project/project/jersey-gf-ejb/dependencies.html">
175+
jersey-gf-ejb
176+
</link>
177+
</entry>
178+
<entry>Jersey EJB for GlassFish integration</entry>
171179
</row>
172180
</tbody>
173181
</tgroup>
@@ -312,6 +320,30 @@
312320
</row>
313321
<row>
314322
<entry>
323+
<link xlink:href="https://jersey.java.net/project-info/&version;/jersey/project/project/jersey-cdi1x/dependencies.html">
324+
jersey-cdi1x
325+
</link>
326+
</entry>
327+
<entry>Jersey CDI 1.1 integration</entry>
328+
</row>
329+
<row>
330+
<entry>
331+
<link xlink:href="https://jersey.java.net/project-info/&version;/jersey/project/project/jersey-cdi1x-ban-custom-hk2-binding/dependencies.html">
332+
jersey-cdi1x-ban-custom-hk2-binding
333+
</link>
334+
</entry>
335+
<entry>Jersey CDI integration - this module disables custom HK2 bindings</entry>
336+
</row>
337+
<row>
338+
<entry>
339+
<link xlink:href="https://jersey.java.net/project-info/&version;/jersey/project/project/jersey-cdi1x-transaction/dependencies.html">
340+
jersey-cdi1x-transaction
341+
</link>
342+
</entry>
343+
<entry>Jersey CDI 1.x Transactional Support</entry>
344+
</row>
345+
<row>
346+
<entry>
315347
<link xlink:href="https://jersey.java.net/project-info/&version;/jersey/project/jersey-declarative-linking/dependencies.html">
316348
jersey-declarative-linking
317349
</link>
@@ -384,6 +416,38 @@
384416
</row>
385417
<row>
386418
<entry>
419+
<link xlink:href="https://jersey.java.net/project-info/&version;/jersey/project/project/jersey-rx-client/dependencies.html">
420+
jersey-rx-client
421+
</link>
422+
</entry>
423+
<entry>Jersey Reactive Client extension implementation.</entry>
424+
</row>
425+
<row>
426+
<entry>
427+
<link xlink:href="https://jersey.java.net/project-info/&version;/jersey/project/project/jersey-rx-client-guava/dependencies.html">
428+
jersey-rx-client-guava
429+
</link>
430+
</entry>
431+
<entry>Jersey Reactive Client - Guava (ListenableFuture) provider.</entry>
432+
</row>
433+
<row>
434+
<entry>
435+
<link xlink:href="https://jersey.java.net/project-info/&version;/jersey/project/project/jersey-rx-client-jsr166e/dependencies.html">
436+
jersey-rx-client-jsr166e
437+
</link>
438+
</entry>
439+
<entry>Jersey Reactive Client - JSR-166e, pre-Java 8, (CompletableFuture) provider.</entry>
440+
</row>
441+
<row>
442+
<entry>
443+
<link xlink:href="https://jersey.java.net/project-info/&version;/jersey/project/project/jersey-rx-client-rxjava/dependencies.html">
444+
jersey-rx-client-rxjava
445+
</link>
446+
</entry>
447+
<entry>Jersey Reactive Client - RxJava (Observable) provider.</entry>
448+
</row>
449+
<row>
450+
<entry>
387451
<link xlink:href="https://jersey.java.net/project-info/&version;/jersey/project/jersey-servlet-portability/dependencies.html">
388452
jersey-servlet-portability
389453
</link>
@@ -407,6 +471,14 @@
407471
<entry>A doclet that generates a resourcedoc xml file: this file contains the javadoc documentation
408472
of resource classes, so that this can be used for extending generated wadl with useful
409473
documentation.</entry>
474+
</row>
475+
<row>
476+
<entry>
477+
<link xlink:href="https://jersey.java.net/project-info/&version;/jersey/project/project/jersey-weld2-se/dependencies.html">
478+
jersey-weld2-se
479+
</link>
480+
</entry>
481+
<entry>WELD 2.x SE support</entry>
410482
</row>
411483
</tbody>
412484
</tgroup>
@@ -429,6 +501,62 @@
429501
</link>
430502
</entry>
431503
<entry>Jersey Test Framework Core</entry>
504+
</row>
505+
<row>
506+
<entry>
507+
<link xlink:href="https://jersey.java.net/project-info/&version;/jersey/project/project/jersey-test-framework-provider-bundle/dependencies.html">
508+
jersey-test-framework-provider-bundle
509+
</link>
510+
</entry>
511+
<entry>Jersey Test Framework Providers Bundle</entry>
512+
</row>
513+
<row>
514+
<entry>
515+
<link xlink:href="https://jersey.java.net/project-info/&version;/jersey/project/project/jersey-test-framework-provider-external/dependencies.html">
516+
jersey-test-framework-provider-external
517+
</link>
518+
</entry>
519+
<entry>Jersey Test Framework - External container</entry>
520+
</row>
521+
<row>
522+
<entry>
523+
<link xlink:href="https://jersey.java.net/project-info/&version;/jersey/project/project/jersey-test-framework-provider-grizzly2/dependencies.html">
524+
jersey-test-framework-provider-grizzly2
525+
</link>
526+
</entry>
527+
<entry>Jersey Test Framework - Grizzly2 container</entry>
528+
</row>
529+
<row>
530+
<entry>
531+
<link xlink:href="https://jersey.java.net/project-info/&version;/jersey/project/project/jersey-test-framework-provider-inmemory/dependencies.html">
532+
jersey-test-framework-provider-inmemory
533+
</link>
534+
</entry>
535+
<entry>Jersey Test Framework - InMemory container</entry>
536+
</row>
537+
<row>
538+
<entry>
539+
<link xlink:href="https://jersey.java.net/project-info/&version;/jersey/project/project/jersey-test-framework-provider-jdk-http/dependencies.html">
540+
jersey-test-framework-provider-jdk-http
541+
</link>
542+
</entry>
543+
<entry>Jersey Test Framework - JDK HTTP container</entry>
544+
</row>
545+
<row>
546+
<entry>
547+
<link xlink:href="https://jersey.java.net/project-info/&version;/jersey/project/project/jersey-test-framework-provider-jetty/dependencies.html">
548+
jersey-test-framework-provider-jetty
549+
</link>
550+
</entry>
551+
<entry>Jersey Test Framework - Jetty HTTP container</entry>
552+
</row>
553+
<row>
554+
<entry>
555+
<link xlink:href="https://jersey.java.net/project-info/&version;/jersey/project/project/jersey-test-framework-provider-simple/dependencies.html">
556+
jersey-test-framework-provider-simple
557+
</link>
558+
</entry>
559+
<entry>Jersey Test Framework - Simple HTTP container</entry>
432560
</row>
433561
</tbody>
434562
</tgroup>
@@ -516,22 +644,6 @@
516644
<tbody>
517645
<row>
518646
<entry>
519-
<link xlink:href="https://jersey.java.net/project-info/&version;/jersey/project/project/jersey-gf-cdi/dependencies.html">
520-
jersey-gf-cdi
521-
</link>
522-
</entry>
523-
<entry>Jersey CDI for GlassFish integration</entry>
524-
</row>
525-
<row>
526-
<entry>
527-
<link xlink:href="https://jersey.java.net/project-info/&version;/jersey/project/project/jersey-gf-cdi-ban-custom-hk2-binding/dependencies.html">
528-
jersey-gf-cdi-ban-custom-hk2-binding
529-
</link>
530-
</entry>
531-
<entry>Jersey CDI for GlassFish integration - this module disables custom HK2 binding</entry>
532-
</row>
533-
<row>
534-
<entry>
535647
<link xlink:href="https://jersey.java.net/project-info/&version;/jersey/project/project/jersey-gf-ejb/dependencies.html">
536648
jersey-gf-ejb
537649
</link>
@@ -600,6 +712,22 @@
600712
<tbody>
601713
<row>
602714
<entry>
715+
<link xlink:href="https://jersey.java.net/project-info/&version;/jersey/project/osgi-helloworld-webapp/additional-bundle/dependencies.html">
716+
additional-bundle
717+
</link>
718+
</entry>
719+
<entry>OSGi Helloworld Webapp - additional bundle</entry>
720+
</row>
721+
<row>
722+
<entry>
723+
<link xlink:href="https://jersey.java.net/project-info/&version;/jersey/project/osgi-helloworld-webapp/alternate-version-bundle/dependencies.html">
724+
alternate-version-bundle
725+
</link>
726+
</entry>
727+
<entry>OSGi Helloworld Webapp - alternate version bundle</entry>
728+
</row>
729+
<row>
730+
<entry>
603731
<link xlink:href="https://jersey.java.net/project-info/&version;/jersey/project/assemblies/dependencies.html">
604732
assemblies
605733
</link>
@@ -640,6 +768,14 @@
640768
</row>
641769
<row>
642770
<entry>
771+
<link xlink:href="https://jersey.java.net/project-info/&version;/jersey/project/osgi-http-service/bundle/dependencies.html">
772+
bundle
773+
</link>
774+
</entry>
775+
<entry>OSGi HttpService example bundle</entry>
776+
</row>
777+
<row>
778+
<entry>
643779
<link xlink:href="https://jersey.java.net/project-info/&version;/jersey/project/webapp-example-parent/cdi-webapp/dependencies.html">
644780
cdi-webapp
645781
</link>
@@ -728,6 +864,22 @@
728864
</row>
729865
<row>
730866
<entry>
867+
<link xlink:href="https://jersey.java.net/project-info/&version;/jersey/project/osgi-helloworld-webapp/functional-test/dependencies.html">
868+
functional-test
869+
</link>
870+
</entry>
871+
<entry>Jersey examples</entry>
872+
</row>
873+
<row>
874+
<entry>
875+
<link xlink:href="https://jersey.java.net/project-info/&version;/jersey/project/osgi-http-service/functional-test/dependencies.html">
876+
functional-test
877+
</link>
878+
</entry>
879+
<entry>OSGi HttpService example</entry>
880+
</row>
881+
<row>
882+
<entry>
731883
<link xlink:href="https://jersey.java.net/project-info/&version;/jersey/project/groovy/dependencies.html">
732884
groovy
733885
</link>
@@ -784,6 +936,14 @@
784936
</row>
785937
<row>
786938
<entry>
939+
<link xlink:href="https://jersey.java.net/project-info/&version;/jersey/project/helloworld-weld/dependencies.html">
940+
helloworld-weld
941+
</link>
942+
</entry>
943+
<entry>Jersey annotated resource class "Hello world" example with Weld support.</entry>
944+
</row>
945+
<row>
946+
<entry>
787947
<link xlink:href="https://jersey.java.net/project-info/&version;/jersey/project/http-patch/dependencies.html">
788948
http-patch
789949
</link>
@@ -890,6 +1050,14 @@
8901050
</row>
8911051
<row>
8921052
<entry>
1053+
<link xlink:href="https://jersey.java.net/project-info/&version;/jersey/project/osgi-helloworld-webapp/lib-bundle/dependencies.html">
1054+
lib-bundle
1055+
</link>
1056+
</entry>
1057+
<entry>OSGi Helloworld Webapp - lib bundle</entry>
1058+
</row>
1059+
<row>
1060+
<entry>
8931061
<link xlink:href="https://jersey.java.net/project-info/&version;/jersey/project/webapp-example-parent/managed-beans-webapp/dependencies.html">
8941062
managed-beans-webapp
8951063
</link>
@@ -1099,6 +1267,14 @@
10991267
</row>
11001268
<row>
11011269
<entry>
1270+
<link xlink:href="https://jersey.java.net/project-info/&version;/jersey/project/osgi-helloworld-webapp/war-bundle/dependencies.html">
1271+
war-bundle
1272+
</link>
1273+
</entry>
1274+
<entry>OSGi Helloworld Webapp WAR bundle</entry>
1275+
</row>
1276+
<row>
1277+
<entry>
11021278
<link xlink:href="https://jersey.java.net/project-info/&version;/jersey/project/webapp-example-parent/dependencies.html">
11031279
webapp-example-parent
11041280
</link>

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@
184184
<plugin>
185185
<groupId>org.glassfish.jersey.tools.plugins</groupId>
186186
<artifactId>jersey-doc-modulelist-maven-plugin</artifactId>
187-
<version>1.0</version>
187+
<version>1.0.1</version>
188188
</plugin>
189189
<plugin>
190190
<groupId>org.apache.maven.plugins</groupId>

‎tools/jersey-doc-modulelist-maven-plugin/pom.xml‎

Lines changed: 34 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -43,42 +43,65 @@
4343
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4444
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
4545
<modelVersion>4.0.0</modelVersion>
46+
4647
<groupId>org.glassfish.jersey.tools.plugins</groupId>
4748
<artifactId>jersey-doc-modulelist-maven-plugin</artifactId>
4849
<packaging>maven-plugin</packaging>
49-
<version>1.0</version>
50+
<version>1.0.1</version>
5051
<name>jersey-doc-modulelist-maven-plugin</name>
52+
5153
<description>
5254
Walks through the dependency tree and creates the categorized list of maven modules in the
5355
docbook format.
5456
</description>
55-
<url>http://maven.apache.org</url>
57+
5658
<dependencies>
5759
<dependency>
5860
<groupId>org.apache.maven</groupId>
5961
<artifactId>maven-plugin-api</artifactId>
60-
<version>3.0.3</version>
62+
<version>${maven.version}</version>
6163
</dependency>
6264
<dependency>
6365
<groupId>org.apache.maven</groupId>
6466
<artifactId>maven-core</artifactId>
65-
<version>3.0.3</version>
67+
<version>${maven.version}</version>
6668
</dependency>
6769
<dependency>
6870
<groupId>org.apache.maven</groupId>
6971
<artifactId>maven-artifact</artifactId>
70-
<version>3.0.3</version>
71-
</dependency>
72-
<dependency>
73-
<groupId>junit</groupId>
74-
<artifactId>junit</artifactId>
75-
<version>3.8.1</version>
76-
<scope>test</scope>
72+
<version>${maven.version}</version>
7773
</dependency>
7874
<dependency>
7975
<groupId>org.apache.maven.shared</groupId>
8076
<artifactId>maven-dependency-tree</artifactId>
8177
<version>2.0</version>
8278
</dependency>
8379
</dependencies>
80+
81+
<build>
82+
<plugins>
83+
<plugin>
84+
<groupId>org.apache.maven.plugins</groupId>
85+
<artifactId>maven-compiler-plugin</artifactId>
86+
<version>3.1</version>
87+
<inherited>true</inherited>
88+
<configuration>
89+
<source>${java.version}</source>
90+
<target>${java.version}</target>
91+
<compilerArguments>
92+
<!--<Werror />-->
93+
<!-- TODO work towards eliminating all warnings in order to be able to enable the -Xlint option -->
94+
<!--Xlint/-->
95+
</compilerArguments>
96+
<showWarnings>false</showWarnings>
97+
<fork>false</fork>
98+
</configuration>
99+
</plugin>
100+
</plugins>
101+
</build>
102+
103+
<properties>
104+
<java.version>1.7</java.version>
105+
<maven.version>3.1.1</maven.version>
106+
</properties>
84107
</project>

0 commit comments

Comments
 (0)