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 2019/10/23 10:46:35 UTC
[myfaces-tobago] branch master updated (1b75873 -> bb70cdc)
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 1b75873 Merge pull request #19 from cadimmek/patch-1
new b654aa1 TOBAGO-1967: Upgrade to Bootstrap 4.3.1 * update missing JS * update missing CSS for Docker demo
new bb70cdc fix rat checks
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:
pom.xml | 3 +++
.../docker/apache-proxy/bootstrap-4.1.3.min.css | 7 -------
.../docker/apache-proxy/bootstrap-4.3.1.min.css | 7 +++++++
.../src/main/tobago-vm/docker/apache-proxy/index.html | 2 +-
tobago-theme/tobago-theme-standard/pom.xml | 2 +-
.../tobago-theme-standard/src/main/npm/jest.config.js | 17 +++++++++++++++++
.../src/main/resources/META-INF/tobago-config.xml | 4 ++--
7 files changed, 31 insertions(+), 11 deletions(-)
delete mode 100644 tobago-example/tobago-example-demo/src/main/tobago-vm/docker/apache-proxy/bootstrap-4.1.3.min.css
create mode 100644 tobago-example/tobago-example-demo/src/main/tobago-vm/docker/apache-proxy/bootstrap-4.3.1.min.css
[myfaces-tobago] 01/02: TOBAGO-1967: Upgrade to Bootstrap 4.3.1 *
update missing JS * update missing CSS for Docker demo
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 b654aa1db5efb47f008da3ed07c6e1f3ed092944
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Wed Oct 23 12:45:51 2019 +0200
TOBAGO-1967: Upgrade to Bootstrap 4.3.1
* update missing JS
* update missing CSS for Docker demo
---
.../src/main/tobago-vm/docker/apache-proxy/bootstrap-4.1.3.min.css | 7 -------
.../src/main/tobago-vm/docker/apache-proxy/bootstrap-4.3.1.min.css | 7 +++++++
.../src/main/tobago-vm/docker/apache-proxy/index.html | 2 +-
tobago-theme/tobago-theme-standard/pom.xml | 2 +-
.../src/main/resources/META-INF/tobago-config.xml | 4 ++--
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/apache-proxy/bootstrap-4.1.3.min.css b/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/apache-proxy/bootstrap-4.1.3.min.css
deleted file mode 100644
index 8826912..0000000
--- a/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/apache-proxy/bootstrap-4.1.3.min.css
+++ /dev/null
@@ -1,7 +0,0 @@
-/*!
- * Bootstrap v4.1.3 (https://getbootstrap.com/)
- * Copyright 2011-2018 The Bootstrap Authors
- * Copyright 2011-2018 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- */:root{--blue:#007bff;--indigo:#6610f2;--purple:#6f42c1;--pink:#e83e8c;--red:#dc3545;--orange:#fd7e14;--yellow:#ffc107;--green:#28a745;--teal:#20c997;--cyan:#17a2b8;--white:#fff;--gray:#6c757d;--gray-dark:#343a40;--primary:#007bff;--secondary:#6c757d;--success:#28a745;--info:#17a2b8;--warning:#ffc107;--danger:#dc3545;--light:#f8f9fa;--dark:#343a40;--breakpoint-xs:0;--breakpoint-sm:576px;--breakpoint-md:768px;--breakpoint-lg:992px;--breakpoint-xl:1200px;--font-family-sans-serif:-apple-s [...]
-/*# sourceMappingURL=bootstrap.min.css.map */
\ No newline at end of file
diff --git a/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/apache-proxy/bootstrap-4.3.1.min.css b/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/apache-proxy/bootstrap-4.3.1.min.css
new file mode 100644
index 0000000..92e3fe8
--- /dev/null
+++ b/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/apache-proxy/bootstrap-4.3.1.min.css
@@ -0,0 +1,7 @@
+/*!
+ * Bootstrap v4.3.1 (https://getbootstrap.com/)
+ * Copyright 2011-2019 The Bootstrap Authors
+ * Copyright 2011-2019 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ */:root{--blue:#007bff;--indigo:#6610f2;--purple:#6f42c1;--pink:#e83e8c;--red:#dc3545;--orange:#fd7e14;--yellow:#ffc107;--green:#28a745;--teal:#20c997;--cyan:#17a2b8;--white:#fff;--gray:#6c757d;--gray-dark:#343a40;--primary:#007bff;--secondary:#6c757d;--success:#28a745;--info:#17a2b8;--warning:#ffc107;--danger:#dc3545;--light:#f8f9fa;--dark:#343a40;--breakpoint-xs:0;--breakpoint-sm:576px;--breakpoint-md:768px;--breakpoint-lg:992px;--breakpoint-xl:1200px;--font-family-sans-serif:-apple-s [...]
+/*# sourceMappingURL=bootstrap.min.css.map */
\ No newline at end of file
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 f87f379..2606e26 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
@@ -4,7 +4,7 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<title>Tobago Demo</title>
- <link href="bootstrap-4.1.3.min.css" rel="stylesheet">
+ <link href="bootstrap-4.3.1.min.css" rel="stylesheet">
<script src="jquery-1.11.3.js"></script>
<style>
div.disabled {
diff --git a/tobago-theme/tobago-theme-standard/pom.xml b/tobago-theme/tobago-theme-standard/pom.xml
index 32b1e71..615c348 100644
--- a/tobago-theme/tobago-theme-standard/pom.xml
+++ b/tobago-theme/tobago-theme-standard/pom.xml
@@ -62,7 +62,7 @@
<dependency>
<groupId>org.webjars</groupId>
<artifactId>bootstrap</artifactId>
- <version>4.1.3</version>
+ <version>4.3.1</version>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml b/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml
index 7c4c862..751e3ad 100644
--- a/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml
+++ b/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml
@@ -42,7 +42,7 @@
<script name="/webjars/jquery/3.4.1/jquery.min.js"/>
<script name="/webjars/tether/1.4.0/js/tether.min.js"/>
<script name="/webjars/popper.js/1.14.3/umd/popper.min.js"/>
- <script name="/webjars/bootstrap/4.1.3/js/bootstrap.min.js"/>
+ <script name="/webjars/bootstrap/4.3.1/js/bootstrap.min.js"/>
<script name="/webjars/momentjs/2.22.2/min/moment-with-locales.min.js"/>
<script name="/webjars/Eonasdan-bootstrap-datetimepicker/4.17.47/js/bootstrap-datetimepicker.min.js"/>
<!-- <script name="/tobago/standard/tobago-bootstrap/${project.version}/node_modules/@babel/polyfill/dist/polyfill.js"/>-->
@@ -61,7 +61,7 @@
<script name="/webjars/jquery/3.4.1/jquery.js"/>
<script name="/webjars/tether/1.4.0/js/tether.js"/>
<script name="/webjars/popper.js/1.14.3/umd/popper.js"/>
- <script name="/webjars/bootstrap/4.1.3/js/bootstrap.js"/>
+ <script name="/webjars/bootstrap/4.3.1/js/bootstrap.js"/>
<script name="/webjars/momentjs/2.22.2/min/moment-with-locales.js"/>
<script name="/webjars/Eonasdan-bootstrap-datetimepicker/4.17.47/js/bootstrap-datetimepicker.js"/>
<script name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago-myfaces.js"/>
[myfaces-tobago] 02/02: fix rat checks
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 bb70cdc6acf1b55d736ac86838efec3a409a082d
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Wed Oct 23 12:46:18 2019 +0200
fix rat checks
---
pom.xml | 3 +++
.../tobago-theme-standard/src/main/npm/jest.config.js | 17 +++++++++++++++++
2 files changed, 20 insertions(+)
diff --git a/pom.xml b/pom.xml
index a76720b..f19bffd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -941,6 +941,8 @@
<!-- json -->
<exclude>**/*.json</exclude>
+ <exclude>**/.babelrc</exclude>
+ <exclude>**/.browserslistrc</exclude>
<!-- photo shop -->
<exclude>**/*.psd</exclude>
@@ -950,6 +952,7 @@
<!-- readme -->
<exclude>**/readme.*</exclude>
+ <exclude>**/*.md</exclude>
<!-- tobago-vm index page -->
<exclude>**/tobago-vm/docker/apache-proxy/jquery-*.js</exclude>
diff --git a/tobago-theme/tobago-theme-standard/src/main/npm/jest.config.js b/tobago-theme/tobago-theme-standard/src/main/npm/jest.config.js
index e6e7b4f..2f3de86 100644
--- a/tobago-theme/tobago-theme-standard/src/main/npm/jest.config.js
+++ b/tobago-theme/tobago-theme-standard/src/main/npm/jest.config.js
@@ -1,3 +1,20 @@
+/*
+ * 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.
+ */
+
module.exports = {
"roots": [
"<rootDir>/ts"