You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2018/01/05 15:12:31 UTC
[myfaces-tobago] branch master updated (7ac8125 -> 33d7690)
This is an automated email from the ASF dual-hosted git repository.
lofwyr pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git.
from 7ac8125 TOBAGO-1654: TLD doc as JAR isn't distributed
new 98691e7 TOBAGO-1654: TLD doc as JAR isn't distributed * update docs: manual step no longer needed
new 33d7690 update version info and copyright year
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/site/apt/release-checklist.apt | 26 +++++-----------------
tobago-assembly/src/main/resources/NOTICE.txt | 2 +-
.../internal/taglib/component/package-info.java | 6 ++---
.../src/main/resources/NOTICE.txt | 2 +-
.../main/tobago-vm/docker/apache-proxy/index.html | 4 ++--
.../tobago-example-demo/src/main/webapp/main.xhtml | 2 +-
6 files changed, 14 insertions(+), 28 deletions(-)
--
To stop receiving notification emails like this one, please contact
['"commits@myfaces.apache.org" <co...@myfaces.apache.org>'].
[myfaces-tobago] 01/02: TOBAGO-1654: TLD doc as JAR isn't
distributed * update docs: manual step no longer needed
Posted by lo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lofwyr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit 98691e7820c31390b5f5c9e1ac291c4d675d7801
Author: Udo Schnurpfeil <lo...@apache.org>
AuthorDate: Fri Jan 5 15:57:56 2018 +0100
TOBAGO-1654: TLD doc as JAR isn't distributed
* update docs: manual step no longer needed
---
src/site/apt/release-checklist.apt | 20 --------------------
1 file changed, 20 deletions(-)
diff --git a/src/site/apt/release-checklist.apt b/src/site/apt/release-checklist.apt
index 9d09bc4..147ac1a 100644
--- a/src/site/apt/release-checklist.apt
+++ b/src/site/apt/release-checklist.apt
@@ -150,26 +150,6 @@ mvn site:stage -DstagingDirectory=/Volumes/tobago-site/tobago-publish
* Update the site after the distribution is on the Apache mirrors available.
- * Workaround for Tobago 3 and higher TLD documentation.
- There is a bug (TOBAGO-1654) so the TLDDOC will not be distributed.
- To upload it into the Maven repo follow these steps:
-
-+------------------------+
-VERSION=4.0.0
-git clone -b tobago-${VERSION} https://github.com/apache/myfaces-tobago tobago-${VERSION}
-cd tobago-${VERSION}/tobago-core
-mvn clean install -Papache-release
-mvn deploy:deploy-file \
- -DgroupId=org.apache.myfaces.tobago \
- -DartifactId=tobago-core \
- -Dversion=${VERSION} \
- -Dclassifier=tlddoc \
- -DgeneratePom=false \
- -DrepositoryId=apache.releases.https \
- -Durl=https://repository.apache.org/content/repositories/releases/ \
- -Dfile=target/tobago-core-${VERSION}-tlddoc.jar
-+------------------------+
-
* Unpack and commit the API Docs of the release with the update.sh (or update-1.5.sh) script in
/Volumes/tobago-site/tobago-publish.
--
To stop receiving notification emails like this one, please contact
"commits@myfaces.apache.org" <co...@myfaces.apache.org>.
[myfaces-tobago] 02/02: update version info and copyright year
Posted by lo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lofwyr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit 33d769009575cca641dff8a304f8413eff8c1db6
Author: Udo Schnurpfeil <lo...@apache.org>
AuthorDate: Fri Jan 5 16:12:19 2018 +0100
update version info and copyright year
---
src/site/apt/release-checklist.apt | 6 ++++++
tobago-assembly/src/main/resources/NOTICE.txt | 2 +-
.../myfaces/tobago/internal/taglib/component/package-info.java | 6 +++---
.../tobago-example-assembly/src/main/resources/NOTICE.txt | 2 +-
.../src/main/tobago-vm/docker/apache-proxy/index.html | 4 ++--
tobago-example/tobago-example-demo/src/main/webapp/main.xhtml | 2 +-
6 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/src/site/apt/release-checklist.apt b/src/site/apt/release-checklist.apt
index 147ac1a..3099823 100644
--- a/src/site/apt/release-checklist.apt
+++ b/src/site/apt/release-checklist.apt
@@ -60,6 +60,12 @@ mvn clean install && mvn checkstyle:check apache-rat:check animal-sniffer:check
mvn clean install -Pall-modules && mvn checkstyle:check apache-rat:check animal-sniffer:check dependency-check:check -Pall-modules
+------------------------+
+ * Check version info in this file manually:
+
++------------------------+
+tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/package-info.java
++------------------------+
+
* Building the Release (Tobago 1.0.x to 2.0.8) [TODO: migrate this docs to git]
* Prepare the release with:
diff --git a/tobago-assembly/src/main/resources/NOTICE.txt b/tobago-assembly/src/main/resources/NOTICE.txt
index 0f93d52..89f576a 100644
--- a/tobago-assembly/src/main/resources/NOTICE.txt
+++ b/tobago-assembly/src/main/resources/NOTICE.txt
@@ -1,5 +1,5 @@
Apache Tobago
-Copyright 2005-2017 The Apache Software Foundation
+Copyright 2005-2018 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/package-info.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/package-info.java
index a8d1c7d..299a4c0 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/package-info.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/package-info.java
@@ -18,8 +18,8 @@
*/
/**
- * <b>Tobago Framework Component Tag Library 3.0.x -
- * (C) Copyright 2005-2017 The Apache Software Foundation</b>
+ * <b>Tobago Framework Component Tag Library 4.0.x -
+ * (C) Copyright 2005-2018 The Apache Software Foundation</b>
*/
@org.apache.myfaces.tobago.apt.annotation.Taglib(
shortName = "tc",
@@ -28,6 +28,6 @@
"org.apache.myfaces.tobago.webapp.TobagoServletContextListener",
"org.apache.myfaces.tobago.webapp.SecretSessionListener"},
name = "tobago",
- displayName = "Tobago Components 3.0.x")
+ displayName = "Tobago Components 4.0.x")
package org.apache.myfaces.tobago.internal.taglib.component;
diff --git a/tobago-example/tobago-example-assembly/src/main/resources/NOTICE.txt b/tobago-example/tobago-example-assembly/src/main/resources/NOTICE.txt
index 0f93d52..89f576a 100644
--- a/tobago-example/tobago-example-assembly/src/main/resources/NOTICE.txt
+++ b/tobago-example/tobago-example-assembly/src/main/resources/NOTICE.txt
@@ -1,5 +1,5 @@
Apache Tobago
-Copyright 2005-2017 The Apache Software Foundation
+Copyright 2005-2018 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
diff --git a/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/apache-proxy/index.html b/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/apache-proxy/index.html
index 35c39de..5170b99 100644
--- a/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/apache-proxy/index.html
+++ b/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/apache-proxy/index.html
@@ -164,8 +164,8 @@
<footer class="bd-footer text-muted">
<div class="container-fluid p-3 p-md-5">
- <p>© 2017 Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
- License, Version 2.0</a>.</p>
+ <p>© 2005-2018 Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">
+ Apache License, Version 2.0</a>.</p>
</div>
</footer>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/main.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/main.xhtml
index fcf08c0..d350050 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/main.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/main.xhtml
@@ -81,7 +81,7 @@
</tc:popup>
<tc:footer fixed="true">
- © 2017 Apache Software Foundation, Licensed under the <a
+ © 2005-2018 Apache Software Foundation, Licensed under the <a
href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
</tc:footer>
--
To stop receiving notification emails like this one, please contact
"commits@myfaces.apache.org" <co...@myfaces.apache.org>.