You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2018/10/30 13:41:44 UTC
[juneau] branch master updated: Add {@property} tags in javadocs.
This is an automated email from the ASF dual-hosted git repository.
jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
The following commit(s) were added to refs/heads/master by this push:
new 659c9a3 Add {@property} tags in javadocs.
659c9a3 is described below
commit 659c9a3426c03b4ff6e38349173cb2d821a81327
Author: JamesBognar <ja...@apache.org>
AuthorDate: Tue Oct 30 09:41:30 2018 -0400
Add {@property} tags in javadocs.
---
juneau-build-all.sh | 5 +-
juneau-build-javadoc.sh | 10 +--
juneau-build.sh | 3 +-
juneau-doc/juneau-doc.jar | Bin 19983 -> 21102 bytes
.../apache/juneau/doc/internal/PropertyTag.java | 84 +++++++++++++++++++++
juneau-doc/src/main/javadoc/overview.html | 82 ++++++++++----------
.../Topics/01.Introduction/02.Components.html | 6 +-
.../main/resources/Topics/02.juneau-marshall.html | 6 +-
.../resources/Topics/03.juneau-marshall-rdf.html | 6 +-
.../src/main/resources/Topics/04.juneau-dto.html | 6 +-
.../src/main/resources/Topics/05.juneau-svl.html | 6 +-
.../main/resources/Topics/06.juneau-config.html | 6 +-
.../resources/Topics/07.juneau-rest-server.html | 6 +-
.../Topics/08.juneau-rest-server-jaxrs.html | 6 +-
.../resources/Topics/09.juneau-rest-client.html | 6 +-
.../Topics/10.juneau-microservice-server.html | 6 +-
.../resources/Topics/11.juneau-examples-core.html | 6 +-
.../resources/Topics/12.juneau-examples-rest.html | 4 +-
juneau-build.sh => juneau-env.sh | 6 +-
pom.xml | 19 ++++-
20 files changed, 184 insertions(+), 95 deletions(-)
diff --git a/juneau-build-all.sh b/juneau-build-all.sh
index 414fadd..2f67582 100755
--- a/juneau-build-all.sh
+++ b/juneau-build-all.sh
@@ -11,10 +11,9 @@
# * specific language governing permissions and limitations under the License. *
# ***************************************************************************************************************************
-. ~/.profile
-set -e
+. juneau-env.sh
mvn clean install
-mvn javadoc:aggregate
+. juneau-build-javadoc.sh
echo '*******************************************************************************'
echo '***** SUCCESS *****************************************************************'
diff --git a/juneau-build-javadoc.sh b/juneau-build-javadoc.sh
index 70907ab..2fb8afd 100755
--- a/juneau-build-javadoc.sh
+++ b/juneau-build-javadoc.sh
@@ -11,8 +11,7 @@
# * specific language governing permissions and limitations under the License. *
# ***************************************************************************************************************************
-. ~/.profile
-set -e
+. juneau-env.sh
cd juneau-doc
java -cp juneau-doc.jar org.apache.juneau.doc.internal.DocGenerator
@@ -24,9 +23,10 @@ cd juneau-doc
java -cp juneau-doc.jar org.apache.juneau.doc.internal.DocLinkTester
cd ..
-rm -rf ../juneau-website/content/site/apidocs_preview
-mkdir ../juneau-website/content/site/apidocs_preview
-cp -r ./target/site/apidocs/* ../juneau-website/content/site/apidocs_preview
+rm -rf ../juneau-website/content/site/apidocs-$JUNEAU_VERSION
+mkdir ../juneau-website/content/site/apidocs-$JUNEAU_VERSION
+cp -r ./target/site/apidocs/* ../juneau-website/content/site/apidocs-$JUNEAU_VERSION
+find ../juneau-website/content/site/apidocs-$JUNEAU_VERSION -type f -name '*.html' -exec sed -i '' s/-SNAPSHOT// {} +
echo '*******************************************************************************'
echo '***** SUCCESS *****************************************************************'
diff --git a/juneau-build.sh b/juneau-build.sh
index 11b418b..84793a3 100755
--- a/juneau-build.sh
+++ b/juneau-build.sh
@@ -11,8 +11,7 @@
# * specific language governing permissions and limitations under the License. *
# ***************************************************************************************************************************
-. ~/.profile
-set -e
+. juneau-env.sh
mvn clean install
echo '*******************************************************************************'
diff --git a/juneau-doc/juneau-doc.jar b/juneau-doc/juneau-doc.jar
index d235e7f..9d9b35c 100644
Binary files a/juneau-doc/juneau-doc.jar and b/juneau-doc/juneau-doc.jar differ
diff --git a/juneau-doc/src/main/java/org/apache/juneau/doc/internal/PropertyTag.java b/juneau-doc/src/main/java/org/apache/juneau/doc/internal/PropertyTag.java
new file mode 100644
index 0000000..667d492
--- /dev/null
+++ b/juneau-doc/src/main/java/org/apache/juneau/doc/internal/PropertyTag.java
@@ -0,0 +1,84 @@
+// ***************************************************************************************************************************
+// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file *
+// * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file *
+// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance *
+// * with the License. You may obtain a copy of the License at *
+// * *
+// * http://www.apache.org/licenses/LICENSE-2.0 *
+// * *
+// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an *
+// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the *
+// * specific language governing permissions and limitations under the License. *
+// ***************************************************************************************************************************
+package org.apache.juneau.doc.internal;
+
+
+import com.sun.tools.doclets.Taglet;
+import com.sun.javadoc.*;
+
+import java.util.Map;
+
+/**
+ * Implements the <code>{@property link}</code> tag that simply resolves system properties.
+ */
+public class PropertyTag implements Taglet {
+
+ private static final String NAME = "property";
+
+ @Override
+ public String getName() {
+ return NAME;
+ }
+
+ @Override
+ public boolean inField() {
+ return true;
+ }
+
+ @Override
+ public boolean inConstructor() {
+ return true;
+ }
+
+ @Override
+ public boolean inMethod() {
+ return true;
+ }
+
+ @Override
+ public boolean inOverview() {
+ return true;
+ }
+
+ @Override
+ public boolean inPackage() {
+ return true;
+ }
+
+ @Override
+ public boolean inType() {
+ return true;
+ }
+
+ @Override
+ public boolean isInlineTag() {
+ return true;
+ }
+
+ @SuppressWarnings({ "javadoc", "rawtypes", "unchecked" })
+ public static void register(Map tagletMap) {
+ PropertyTag tag = new PropertyTag();
+ tagletMap.put(tag.getName(), tag);
+ }
+
+ @Override
+ public String toString(Tag tag) {
+ String s = System.getProperty(tag.text());
+ return s == null ? tag.text() : s;
+ }
+
+ @Override
+ public String toString(Tag[] tags) {
+ return null;
+ }
+}
\ No newline at end of file
diff --git a/juneau-doc/src/main/javadoc/overview.html b/juneau-doc/src/main/javadoc/overview.html
index 1a9e391..a1ae12a 100644
--- a/juneau-doc/src/main/javadoc/overview.html
+++ b/juneau-doc/src/main/javadoc/overview.html
@@ -698,18 +698,18 @@
</table>
<p>
- The current version of Juneau is <code>7.2.0</code>.
+ The current version of Juneau is <code>{@property juneauVersion}</code>.
The easiest way to pull in the library is through the following maven dependency:
</p>
<p class='bpcode w800'>
<xt><dependency></xt>
<xt><groupId></xt>org.apache.juneau<xt></groupId></xt>
<xt><artifactId></xt>juneau-all<xt></artifactId></xt>
- <xt><version></xt>7.2.0<xt></version></xt>
+ <xt><version></xt>{@property juneauVersion}<xt></version></xt>
<xt></dependency></xt>
</p>
<p>
- If you would like to work with the bleeding-edge code, you can access the <code>7.2.0-SNAPSHOT</code>
+ If you would like to work with the bleeding-edge code, you can access the <code>{@property juneauVersionNext}-SNAPSHOT</code>
version through the following repository:
</p>
<p class='bpcode w800'>
@@ -739,18 +739,18 @@
<xt><dependency></xt>
<xt><groupId></xt>org.apache.juneau<xt></groupId></xt>
<xt><artifactId></xt>juneau-marshall<xt></artifactId></xt>
- <xt><version></xt>7.2.0<xt></version></xt>
+ <xt><version></xt>{@property juneauVersion}<xt></version></xt>
<xt></dependency></xt>
</p>
<h5 class='figure'>Java Library</h5>
<p class='bpcode w500'>
- juneau-marshall-7.2.0.jar
+ juneau-marshall-{@property juneauVersion}.jar
</p>
<h5 class='figure'>OSGi Module</h5>
<p class='bpcode w500'>
- org.apache.juneau.marshall_7.2.0.jar
+ org.apache.juneau.marshall_{@property juneauVersion}.jar
</p>
<p>
@@ -9661,16 +9661,16 @@
<xt><dependency></xt>
<xt><groupId></xt>org.apache.juneau<xt></groupId></xt>
<xt><artifactId></xt>juneau-marshall-rdf<xt></artifactId></xt>
- <xt><version></xt>7.2.0<xt></version></xt>
+ <xt><version></xt>{@property juneauVersion}<xt></version></xt>
<xt></dependency></xt>
</p>
<h5 class='figure'>Java Library</h5>
<p class='bpcode w500'>
- juneau-marshall-rdf-7.2.0.jar
+ juneau-marshall-rdf-{@property juneauVersion}.jar
</p>
<h5 class='figure'>OSGi Module</h5>
<p class='bpcode w500'>
- org.apache.juneau.marshall.rdf_7.2.0.jar
+ org.apache.juneau.marshall.rdf_{@property juneauVersion}.jar
</p>
<p>
The <code>juneau-marshall-rdf</code> library provides additional serializers and parsers for RDF.
@@ -10276,16 +10276,16 @@
<xt><dependency></xt>
<xt><groupId></xt>org.apache.juneau<xt></groupId></xt>
<xt><artifactId></xt>juneau-dto<xt></artifactId></xt>
- <xt><version></xt>7.2.0<xt></version></xt>
+ <xt><version></xt>{@property juneauVersion}<xt></version></xt>
<xt></dependency></xt>
</p>
<h5 class='figure'>Java Library</h5>
<p class='bpcode w500'>
- juneau-dto-7.2.0.jar
+ juneau-dto-{@property juneauVersion}.jar
</p>
<h5 class='figure'>OSGi Module</h5>
<p class='bpcode w500'>
- org.apache.juneau.dto_7.2.0.jar
+ org.apache.juneau.dto_{@property juneauVersion}.jar
</p>
<p>
The <code>juneau-dto</code> library contains several predefined POJOs for generating commonly-used document types.
@@ -10801,18 +10801,18 @@
<xt><dependency></xt>
<xt><groupId></xt>org.apache.juneau<xt></groupId></xt>
<xt><artifactId></xt>juneau-svl<xt></artifactId></xt>
- <xt><version></xt>7.2.0<xt></version></xt>
+ <xt><version></xt>{@property juneauVersion}<xt></version></xt>
<xt></dependency></xt>
</p>
<h5 class='figure'>Java Library</h5>
<p class='bpcode w500'>
- juneau-svl-7.2.0.jar
+ juneau-svl-{@property juneauVersion}.jar
</p>
<h5 class='figure'>OSGi Module</h5>
<p class='bpcode w500'>
- org.apache.juneau.svl_7.2.0.jar
+ org.apache.juneau.svl_{@property juneauVersion}.jar
</p>
<!-- ==================================================================================================== -->
@@ -11134,18 +11134,18 @@
<xt><dependency></xt>
<xt><groupId></xt>org.apache.juneau<xt></groupId></xt>
<xt><artifactId></xt>juneau-config<xt></artifactId></xt>
- <xt><version></xt>7.2.0<xt></version></xt>
+ <xt><version></xt>{@property juneauVersion}<xt></version></xt>
<xt></dependency></xt>
</p>
<h5 class='figure'>Java Library</h5>
<p class='bpcode w500'>
- juneau-config-7.2.0.jar
+ juneau-config-{@property juneauVersion}.jar
</p>
<h5 class='figure'>OSGi Module</h5>
<p class='bpcode w500'>
- org.apache.juneau.config_7.2.0.jar
+ org.apache.juneau.config_{@property juneauVersion}.jar
</p>
<!-- ==================================================================================================== -->
@@ -12667,18 +12667,18 @@
<xt><dependency></xt>
<xt><groupId></xt>org.apache.juneau<xt></groupId></xt>
<xt><artifactId></xt>juneau-rest-server<xt></artifactId></xt>
- <xt><version></xt>7.2.0<xt></version></xt>
+ <xt><version></xt>{@property juneauVersion}<xt></version></xt>
<xt></dependency></xt>
</p>
<h5 class='figure'>Java Library</h5>
<p class='bpcode w500'>
- juneau-rest-server-7.2.0.jar
+ juneau-rest-server-{@property juneauVersion}.jar
</p>
<h5 class='figure'>OSGi Module</h5>
<p class='bpcode w500'>
- org.apache.juneau.rest.server_7.2.0.jar
+ org.apache.juneau.rest.server_{@property juneauVersion}.jar
</p>
<p>
@@ -13255,9 +13255,6 @@
children={
HelloWorldResource.<jk>class</jk>,
PetStoreResource.<jk>class</jk>,
- RequestEchoResource.<jk>class</jk>,
- AddressBookResource.<jk>class</jk>,
- SampleRrpcServlet.<jk>class</jk>,
PhotosResource.<jk>class</jk>,
DtoExamples.<jk>class</jk>,
SqlQueryResource.<jk>class</jk>,
@@ -14799,9 +14796,6 @@
children={
HelloWorldResource.<jk>class</jk>,
PetStoreResource.<jk>class</jk>,
- RequestEchoResource.<jk>class</jk>,
- AddressBookResource.<jk>class</jk>,
- SampleRrpcServlet.<jk>class</jk>,
DtoExamples.<jk>class</jk>,
PhotosResource.<jk>class</jk>,
SqlQueryResource.<jk>class</jk>,
@@ -21177,18 +21171,18 @@
<xt><dependency></xt>
<xt><groupId></xt>org.apache.juneau<xt></groupId></xt>
<xt><artifactId></xt>juneau-rest-server-jaxrs<xt></artifactId></xt>
- <xt><version></xt>7.2.0<xt></version></xt>
+ <xt><version></xt>{@property juneauVersion}<xt></version></xt>
<xt></dependency></xt>
</p>
<h5 class='figure'>Java Library</h5>
<p class='bpcode w500'>
- juneau-rest-server-jaxrs-7.2.0.jar
+ juneau-rest-server-jaxrs-{@property juneauVersion}.jar
</p>
<h5 class='figure'>OSGi Module</h5>
<p class='bpcode w500'>
- org.apache.juneau.rest.server_7.2.0.jar
+ org.apache.juneau.rest.server_{@property juneauVersion}.jar
</p>
<p>
@@ -21274,18 +21268,18 @@
<xt><dependency></xt>
<xt><groupId></xt>org.apache.juneau<xt></groupId></xt>
<xt><artifactId></xt>juneau-rest-client<xt></artifactId></xt>
- <xt><version></xt>7.2.0<xt></version></xt>
+ <xt><version></xt>{@property juneauVersion}<xt></version></xt>
<xt></dependency></xt>
</p>
<h5 class='figure'>Java Library</h5>
<p class='bpcode w500'>
- juneau-rest-client-7.2.0.jar
+ juneau-rest-client-{@property juneauVersion}.jar
</p>
<h5 class='figure'>OSGi Module</h5>
<p class='bpcode w500'>
- org.apache.juneau.rest.client_7.2.0.jar
+ org.apache.juneau.rest.client_{@property juneauVersion}.jar
</p>
<p>
@@ -23274,18 +23268,18 @@
<xt><dependency></xt>
<xt><groupId></xt>org.apache.juneau<xt></groupId></xt>
<xt><artifactId></xt>juneau-microservice-server<xt></artifactId></xt>
- <xt><version></xt>7.2.0<xt></version></xt>
+ <xt><version></xt>{@property juneauVersion}<xt></version></xt>
<xt></dependency></xt>
</p>
<h5 class='figure'>Java Library</h5>
<p class='bpcode w500'>
- juneau-microservice-server-7.2.0.jar
+ juneau-microservice-server-{@property juneauVersion}.jar
</p>
<h5 class='figure'>OSGi Module</h5>
<p class='bpcode w500'>
- org.apache.juneau.microservice.server_7.2.0.jar
+ org.apache.juneau.microservice.server_{@property juneauVersion}.jar
</p>
<h5 class='figure'>Microservice Starter Project</h5>
@@ -24129,7 +24123,7 @@
<div class='topic'><!-- START: 11 - juneau-examples-core -->
<h5 class='figure'>Archive File</h5>
<p class='bpcode w500'>
- juneau-examples-core-7.2.0.zip
+ juneau-examples-core-{@property juneauVersion}.zip
</p>
<p>
@@ -24137,12 +24131,12 @@
</p>
<p>
The project project can be loaded into your workspace by importing the
- <code>juneau-examples-core-7.2.0.zip</code> file.
+ <code>juneau-examples-core-{@property juneauVersion}.zip</code> file.
</p>
<h5 class='topic'>juneau-examples-core install instructions</h5>
<p>
- Download the <code>juneau-examples-core-7.2.0.zip</code> file from the downloads page
+ Download the <code>juneau-examples-core-{@property juneauVersion}.zip</code> file from the downloads page
(located in the binaries) and import it into your workspace as an existing project:
</p>
<img class='bordered' src='doc-files/juneau-examples-core.1.png' style='width:512px'>
@@ -24167,7 +24161,7 @@
<div class='topic'><!-- START: 12 - juneau-examples-rest -->
<h5 class='figure'>Archive File</h5>
<p class='bpcode w500'>
- juneau-examples-rest-7.2.0.zip
+ juneau-examples-rest-{@property juneauVersion}.zip
</p>
<p>
@@ -24181,7 +24175,7 @@
<h5 class='topic'>juneau-examples-rest install instructions</h5>
<p>
- Download the <code>juneau-examples-rest-7.2.0.zip</code> file from the downloads page
+ Download the <code>juneau-examples-rest-{@property juneauVersion}.zip</code> file from the downloads page
(located in the binaries) and import it into your workspace as an existing project:
</p>
<img class='bordered' src='doc-files/juneau-examples-rest.1.png' style='width:524px'>
@@ -26150,7 +26144,7 @@
<li><p><a class='doclink' href='#7.0.0'>7.0.0 (Oct 25, 2017)</a></p>
<li><p><a class='doclink' href='#7.0.1'>7.0.1 (Dec 24, 2017)</a></p>
<li><p><a class='doclink' href='#7.1.0'>7.1.0 (Mar 08, 2018)</a></p>
-<li><p><a class='doclink' href='#7.2.0'>7.2.0 (Sept 25, 2018)</a></p>
+<li><p><a class='doclink' href='#7.2.0'>7.2.1 (Sept 25, 2018)</a></p>
<li><p><a class='doclink' href='#7.2.1'>7.2.1 (Oct 23, 2018)</a></p>
</ul>
@@ -31474,10 +31468,10 @@
<!-- ==================================================================================================== -->
-<h3 class='topic' onclick='toggle(this)'><a href='#7.2.0' id='7.2.0'>7.2.0 (Sept 25, 2018)</a></h3>
+<h3 class='topic' onclick='toggle(this)'><a href='#7.2.0' id='7.2.0'>7.2.1 (Sept 25, 2018)</a></h3>
<div class='topic'><!-- START: 7.2.0 -->
<p>
- 7.2.0 is a major release that introduces several significant new features:
+ 7.2.1 is a major release that introduces several significant new features:
</p>
<ul class='spaced-list'>
<li>OpenAPI part serializing and parsing with full support for OpenAPI validation of input and output in the REST servlet and client APIs.
diff --git a/juneau-doc/src/main/resources/Topics/01.Introduction/02.Components.html b/juneau-doc/src/main/resources/Topics/01.Introduction/02.Components.html
index 3b10c29..1074a26 100644
--- a/juneau-doc/src/main/resources/Topics/01.Introduction/02.Components.html
+++ b/juneau-doc/src/main/resources/Topics/01.Introduction/02.Components.html
@@ -199,18 +199,18 @@ Components
</table>
<p>
- The current version of Juneau is <code>7.2.1</code>.
+ The current version of Juneau is <code>{@property juneauVersion}</code>.
The easiest way to pull in the library is through the following maven dependency:
</p>
<p class='bpcode w800'>
<xt><dependency></xt>
<xt><groupId></xt>org.apache.juneau<xt></groupId></xt>
<xt><artifactId></xt>juneau-all<xt></artifactId></xt>
- <xt><version></xt>7.2.1<xt></version></xt>
+ <xt><version></xt>{@property juneauVersion}<xt></version></xt>
<xt></dependency></xt>
</p>
<p>
- If you would like to work with the bleeding-edge code, you can access the <code>7.2.1-SNAPSHOT</code>
+ If you would like to work with the bleeding-edge code, you can access the <code>{@property juneauVersionNext}-SNAPSHOT</code>
version through the following repository:
</p>
<p class='bpcode w800'>
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall.html b/juneau-doc/src/main/resources/Topics/02.juneau-marshall.html
index d7408a1..8c183bf 100644
--- a/juneau-doc/src/main/resources/Topics/02.juneau-marshall.html
+++ b/juneau-doc/src/main/resources/Topics/02.juneau-marshall.html
@@ -20,18 +20,18 @@ juneau-marshall
<xt><dependency></xt>
<xt><groupId></xt>org.apache.juneau<xt></groupId></xt>
<xt><artifactId></xt>juneau-marshall<xt></artifactId></xt>
- <xt><version></xt>7.2.1<xt></version></xt>
+ <xt><version></xt>{@property juneauVersion}<xt></version></xt>
<xt></dependency></xt>
</p>
<h5 class='figure'>Java Library</h5>
<p class='bpcode w500'>
- juneau-marshall-7.2.1.jar
+ juneau-marshall-{@property juneauVersion}.jar
</p>
<h5 class='figure'>OSGi Module</h5>
<p class='bpcode w500'>
- org.apache.juneau.marshall_7.2.1.jar
+ org.apache.juneau.marshall_{@property juneauVersion}.jar
</p>
<p>
diff --git a/juneau-doc/src/main/resources/Topics/03.juneau-marshall-rdf.html b/juneau-doc/src/main/resources/Topics/03.juneau-marshall-rdf.html
index 8b1987b..8bbc3b6 100644
--- a/juneau-doc/src/main/resources/Topics/03.juneau-marshall-rdf.html
+++ b/juneau-doc/src/main/resources/Topics/03.juneau-marshall-rdf.html
@@ -20,16 +20,16 @@ juneau-marshall-rdf
<xt><dependency></xt>
<xt><groupId></xt>org.apache.juneau<xt></groupId></xt>
<xt><artifactId></xt>juneau-marshall-rdf<xt></artifactId></xt>
- <xt><version></xt>7.2.1<xt></version></xt>
+ <xt><version></xt>{@property juneauVersion}<xt></version></xt>
<xt></dependency></xt>
</p>
<h5 class='figure'>Java Library</h5>
<p class='bpcode w500'>
- juneau-marshall-rdf-7.2.1.jar
+ juneau-marshall-rdf-{@property juneauVersion}.jar
</p>
<h5 class='figure'>OSGi Module</h5>
<p class='bpcode w500'>
- org.apache.juneau.marshall.rdf_7.2.1.jar
+ org.apache.juneau.marshall.rdf_{@property juneauVersion}.jar
</p>
<p>
The <code>juneau-marshall-rdf</code> library provides additional serializers and parsers for RDF.
diff --git a/juneau-doc/src/main/resources/Topics/04.juneau-dto.html b/juneau-doc/src/main/resources/Topics/04.juneau-dto.html
index 3c64e57..90b8d9e 100644
--- a/juneau-doc/src/main/resources/Topics/04.juneau-dto.html
+++ b/juneau-doc/src/main/resources/Topics/04.juneau-dto.html
@@ -20,16 +20,16 @@ juneau-dto
<xt><dependency></xt>
<xt><groupId></xt>org.apache.juneau<xt></groupId></xt>
<xt><artifactId></xt>juneau-dto<xt></artifactId></xt>
- <xt><version></xt>7.2.1<xt></version></xt>
+ <xt><version></xt>{@property juneauVersion}<xt></version></xt>
<xt></dependency></xt>
</p>
<h5 class='figure'>Java Library</h5>
<p class='bpcode w500'>
- juneau-dto-7.2.1.jar
+ juneau-dto-{@property juneauVersion}.jar
</p>
<h5 class='figure'>OSGi Module</h5>
<p class='bpcode w500'>
- org.apache.juneau.dto_7.2.1.jar
+ org.apache.juneau.dto_{@property juneauVersion}.jar
</p>
<p>
The <code>juneau-dto</code> library contains several predefined POJOs for generating commonly-used document types.
diff --git a/juneau-doc/src/main/resources/Topics/05.juneau-svl.html b/juneau-doc/src/main/resources/Topics/05.juneau-svl.html
index a92adf4..a454b57 100644
--- a/juneau-doc/src/main/resources/Topics/05.juneau-svl.html
+++ b/juneau-doc/src/main/resources/Topics/05.juneau-svl.html
@@ -20,16 +20,16 @@ juneau-svl
<xt><dependency></xt>
<xt><groupId></xt>org.apache.juneau<xt></groupId></xt>
<xt><artifactId></xt>juneau-svl<xt></artifactId></xt>
- <xt><version></xt>7.2.1<xt></version></xt>
+ <xt><version></xt>{@property juneauVersion}<xt></version></xt>
<xt></dependency></xt>
</p>
<h5 class='figure'>Java Library</h5>
<p class='bpcode w500'>
- juneau-svl-7.2.1.jar
+ juneau-svl-{@property juneauVersion}.jar
</p>
<h5 class='figure'>OSGi Module</h5>
<p class='bpcode w500'>
- org.apache.juneau.svl_7.2.1.jar
+ org.apache.juneau.svl_{@property juneauVersion}.jar
</p>
diff --git a/juneau-doc/src/main/resources/Topics/06.juneau-config.html b/juneau-doc/src/main/resources/Topics/06.juneau-config.html
index 561c7fb..3ac5e2a 100644
--- a/juneau-doc/src/main/resources/Topics/06.juneau-config.html
+++ b/juneau-doc/src/main/resources/Topics/06.juneau-config.html
@@ -20,16 +20,16 @@ juneau-config
<xt><dependency></xt>
<xt><groupId></xt>org.apache.juneau<xt></groupId></xt>
<xt><artifactId></xt>juneau-config<xt></artifactId></xt>
- <xt><version></xt>7.2.1<xt></version></xt>
+ <xt><version></xt>{@property juneauVersion}<xt></version></xt>
<xt></dependency></xt>
</p>
<h5 class='figure'>Java Library</h5>
<p class='bpcode w500'>
- juneau-config-7.2.1.jar
+ juneau-config-{@property juneauVersion}.jar
</p>
<h5 class='figure'>OSGi Module</h5>
<p class='bpcode w500'>
- org.apache.juneau.config_7.2.1.jar
+ org.apache.juneau.config_{@property juneauVersion}.jar
</p>
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server.html b/juneau-doc/src/main/resources/Topics/07.juneau-rest-server.html
index 8fb79d8..dcf51f3 100644
--- a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server.html
+++ b/juneau-doc/src/main/resources/Topics/07.juneau-rest-server.html
@@ -20,18 +20,18 @@ juneau-rest-server
<xt><dependency></xt>
<xt><groupId></xt>org.apache.juneau<xt></groupId></xt>
<xt><artifactId></xt>juneau-rest-server<xt></artifactId></xt>
- <xt><version></xt>7.2.1<xt></version></xt>
+ <xt><version></xt>{@property juneauVersion}<xt></version></xt>
<xt></dependency></xt>
</p>
<h5 class='figure'>Java Library</h5>
<p class='bpcode w500'>
- juneau-rest-server-7.2.1.jar
+ juneau-rest-server-{@property juneauVersion}.jar
</p>
<h5 class='figure'>OSGi Module</h5>
<p class='bpcode w500'>
- org.apache.juneau.rest.server_7.2.1.jar
+ org.apache.juneau.rest.server_{@property juneauVersion}.jar
</p>
<p>
diff --git a/juneau-doc/src/main/resources/Topics/08.juneau-rest-server-jaxrs.html b/juneau-doc/src/main/resources/Topics/08.juneau-rest-server-jaxrs.html
index 7421085..7d3d911 100644
--- a/juneau-doc/src/main/resources/Topics/08.juneau-rest-server-jaxrs.html
+++ b/juneau-doc/src/main/resources/Topics/08.juneau-rest-server-jaxrs.html
@@ -20,18 +20,18 @@ juneau-rest-server-jaxrs
<xt><dependency></xt>
<xt><groupId></xt>org.apache.juneau<xt></groupId></xt>
<xt><artifactId></xt>juneau-rest-server-jaxrs<xt></artifactId></xt>
- <xt><version></xt>7.2.1<xt></version></xt>
+ <xt><version></xt>{@property juneauVersion}<xt></version></xt>
<xt></dependency></xt>
</p>
<h5 class='figure'>Java Library</h5>
<p class='bpcode w500'>
- juneau-rest-server-jaxrs-7.2.1.jar
+ juneau-rest-server-jaxrs-{@property juneauVersion}.jar
</p>
<h5 class='figure'>OSGi Module</h5>
<p class='bpcode w500'>
- org.apache.juneau.rest.server_7.2.1.jar
+ org.apache.juneau.rest.server_{@property juneauVersion}.jar
</p>
<p>
diff --git a/juneau-doc/src/main/resources/Topics/09.juneau-rest-client.html b/juneau-doc/src/main/resources/Topics/09.juneau-rest-client.html
index 4cccec6..045ad58 100644
--- a/juneau-doc/src/main/resources/Topics/09.juneau-rest-client.html
+++ b/juneau-doc/src/main/resources/Topics/09.juneau-rest-client.html
@@ -20,18 +20,18 @@ juneau-rest-client
<xt><dependency></xt>
<xt><groupId></xt>org.apache.juneau<xt></groupId></xt>
<xt><artifactId></xt>juneau-rest-client<xt></artifactId></xt>
- <xt><version></xt>7.2.1<xt></version></xt>
+ <xt><version></xt>{@property juneauVersion}<xt></version></xt>
<xt></dependency></xt>
</p>
<h5 class='figure'>Java Library</h5>
<p class='bpcode w500'>
- juneau-rest-client-7.2.1.jar
+ juneau-rest-client-{@property juneauVersion}.jar
</p>
<h5 class='figure'>OSGi Module</h5>
<p class='bpcode w500'>
- org.apache.juneau.rest.client_7.2.1.jar
+ org.apache.juneau.rest.client_{@property juneauVersion}.jar
</p>
<p>
diff --git a/juneau-doc/src/main/resources/Topics/10.juneau-microservice-server.html b/juneau-doc/src/main/resources/Topics/10.juneau-microservice-server.html
index 73f4620..b9ea92c 100644
--- a/juneau-doc/src/main/resources/Topics/10.juneau-microservice-server.html
+++ b/juneau-doc/src/main/resources/Topics/10.juneau-microservice-server.html
@@ -20,18 +20,18 @@ juneau-microservice-server
<xt><dependency></xt>
<xt><groupId></xt>org.apache.juneau<xt></groupId></xt>
<xt><artifactId></xt>juneau-microservice-server<xt></artifactId></xt>
- <xt><version></xt>7.2.1<xt></version></xt>
+ <xt><version></xt>{@property juneauVersion}<xt></version></xt>
<xt></dependency></xt>
</p>
<h5 class='figure'>Java Library</h5>
<p class='bpcode w500'>
- juneau-microservice-server-7.2.1.jar
+ juneau-microservice-server-{@property juneauVersion}.jar
</p>
<h5 class='figure'>OSGi Module</h5>
<p class='bpcode w500'>
- org.apache.juneau.microservice.server_7.2.1.jar
+ org.apache.juneau.microservice.server_{@property juneauVersion}.jar
</p>
<h5 class='figure'>Microservice Starter Project</h5>
diff --git a/juneau-doc/src/main/resources/Topics/11.juneau-examples-core.html b/juneau-doc/src/main/resources/Topics/11.juneau-examples-core.html
index 69f3ca9..a1c9e28 100644
--- a/juneau-doc/src/main/resources/Topics/11.juneau-examples-core.html
+++ b/juneau-doc/src/main/resources/Topics/11.juneau-examples-core.html
@@ -17,7 +17,7 @@ juneau-examples-core
<h5 class='figure'>Archive File</h5>
<p class='bpcode w500'>
- juneau-examples-core-7.2.1.zip
+ juneau-examples-core-{@property juneauVersion}.zip
</p>
<p>
@@ -25,12 +25,12 @@ juneau-examples-core
</p>
<p>
The project project can be loaded into your workspace by importing the
- <code>juneau-examples-core-7.2.1.zip</code> file.
+ <code>juneau-examples-core-{@property juneauVersion}.zip</code> file.
</p>
<h5 class='topic'>juneau-examples-core install instructions</h5>
<p>
- Download the <code>juneau-examples-core-7.2.1.zip</code> file from the downloads page
+ Download the <code>juneau-examples-core-{@property juneauVersion}.zip</code> file from the downloads page
(located in the binaries) and import it into your workspace as an existing project:
</p>
<img class='bordered' src='doc-files/juneau-examples-core.1.png' style='width:512px'>
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest.html b/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest.html
index 3ec32b6..8bdabc6 100644
--- a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest.html
+++ b/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest.html
@@ -17,7 +17,7 @@ juneau-examples-rest
<h5 class='figure'>Archive File</h5>
<p class='bpcode w500'>
- juneau-examples-rest-7.2.1.zip
+ juneau-examples-rest-{@property juneauVersion}.zip
</p>
<p>
@@ -31,7 +31,7 @@ juneau-examples-rest
<h5 class='topic'>juneau-examples-rest install instructions</h5>
<p>
- Download the <code>juneau-examples-rest-7.2.1.zip</code> file from the downloads page
+ Download the <code>juneau-examples-rest-{@property juneauVersion}.zip</code> file from the downloads page
(located in the binaries) and import it into your workspace as an existing project:
</p>
<img class='bordered' src='doc-files/juneau-examples-rest.1.png' style='width:524px'>
diff --git a/juneau-build.sh b/juneau-env.sh
similarity index 84%
copy from juneau-build.sh
copy to juneau-env.sh
index 11b418b..aa362f5 100755
--- a/juneau-build.sh
+++ b/juneau-env.sh
@@ -13,8 +13,4 @@
. ~/.profile
set -e
-mvn clean install
-
-echo '*******************************************************************************'
-echo '***** SUCCESS *****************************************************************'
-echo '*******************************************************************************'
+export JUNEAU_VERSION=7.2.1
diff --git a/pom.xml b/pom.xml
index 9350393..e24e725 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,6 +39,9 @@
<httpclient.version>4.5.6</httpclient.version>
<jetty.version>9.4.12.v20180830</jetty.version>
<juneau.compare.version>7.2.0</juneau.compare.version>
+ <javadoc.juneau.version>7.2.1</javadoc.juneau.version>
+ <juneauVersion>7.2.1</juneauVersion>
+ <juneauVersionNext>7.2.1</juneauVersionNext>
</properties>
<dependencyManagement>
@@ -174,6 +177,8 @@
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.4</version>
<configuration>
+ <additionalJOption>-J-DjuneauVersion=${juneauVersion}</additionalJOption>
+ <additionalJOption>-J-DjuneauVersionNext=${juneauVersionNext}</additionalJOption>
<show>protected</show>
<windowtitle>${project.name} ${project.version}</windowtitle>
<author>true</author>
@@ -193,7 +198,19 @@
</links>
<docfilessubdirs>true</docfilessubdirs>
<javadocDirectory>${basedir}/juneau-doc/src/main/javadoc</javadocDirectory>
- <taglet>org.apache.juneau.doc.internal.DocTag</taglet>
+ <taglets>
+ <taglet>
+ <tagletClass>org.apache.juneau.doc.internal.DocTag</tagletClass>
+ <tagletpath>${basedir}/juneau-doc/juneau-doc.jar</tagletpath>
+ </taglet>
+ <taglet>
+ <tagletClass>org.apache.juneau.doc.internal.PropertyTag</tagletClass>
+ <tagletpath>${basedir}/juneau-doc/juneau-doc.jar</tagletpath>
+ </taglet>
+
+ <!--org.apache.juneau.doc.internal.DocTag</taglet-->
+ <!-- taglet>org.apache.juneau.doc.internal.PropertyTag</taglet-->
+ </taglets>
<tagletpath>${basedir}/juneau-doc/juneau-doc.jar</tagletpath>
</configuration>
<executions>