You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rz...@apache.org on 2022/04/17 17:48:30 UTC

[tomee] branch master updated (4728d35605 -> 1d45d144d4)

This is an automated email from the ASF dual-hosted git repository.

rzo1 pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git


    from 4728d35605 TOMEE-3913 - Examples: Upgrade JUnit 4.12 to 4.13.2
     new c2fdbeb5df TOMEE-3913 - Examples: Upgrade JUnit 4.11 to 4.13.2
     new 1d45d144d4 License / Rat fixes

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:
 examples/async-servlet/pom.xml                        |  2 +-
 examples/connector-ear/connector-sample-war/pom.xml   |  2 +-
 examples/connector-ear/pom.xml                        |  2 +-
 examples/mp-config-example/pom.xml                    |  2 +-
 examples/mp-config-source-database/pom.xml            |  2 +-
 examples/mvc-cxf-hibernate/pom.xml                    |  2 +-
 examples/mvc-cxf/pom.xml                              |  2 +-
 examples/mvc-resteasy/pom.xml                         |  2 +-
 .../io/smallrye/metrics/base-metrics.properties       | 19 +++++++++++++++++++
 .../io/smallrye/metrics/vendor-metrics.properties     | 19 +++++++++++++++++++
 10 files changed, 46 insertions(+), 8 deletions(-)


[tomee] 02/02: License / Rat fixes

Posted by rz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rzo1 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git

commit 1d45d144d4024ca9b9851a659147ac7ecdf345e7
Author: Richard Zowalla <rz...@apache.org>
AuthorDate: Sun Apr 17 19:48:19 2022 +0200

    License / Rat fixes
---
 .../io/smallrye/metrics/base-metrics.properties       | 19 +++++++++++++++++++
 .../io/smallrye/metrics/vendor-metrics.properties     | 19 +++++++++++++++++++
 2 files changed, 38 insertions(+)

diff --git a/tomee/tomee-microprofile/mp-common/src/main/resources/io/smallrye/metrics/base-metrics.properties b/tomee/tomee-microprofile/mp-common/src/main/resources/io/smallrye/metrics/base-metrics.properties
index 954fb51c90..0cc48b9b3b 100644
--- a/tomee/tomee-microprofile/mp-common/src/main/resources/io/smallrye/metrics/base-metrics.properties
+++ b/tomee/tomee-microprofile/mp-common/src/main/resources/io/smallrye/metrics/base-metrics.properties
@@ -1,3 +1,22 @@
+#
+#
+#    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.
+#
 classloader.loadedClasses.count.displayName: Current Loaded Class Count
 classloader.loadedClasses.count.type: gauge
 classloader.loadedClasses.count.unit: none
diff --git a/tomee/tomee-microprofile/mp-common/src/main/resources/io/smallrye/metrics/vendor-metrics.properties b/tomee/tomee-microprofile/mp-common/src/main/resources/io/smallrye/metrics/vendor-metrics.properties
index 72e16e1d11..ed922ab350 100644
--- a/tomee/tomee-microprofile/mp-common/src/main/resources/io/smallrye/metrics/vendor-metrics.properties
+++ b/tomee/tomee-microprofile/mp-common/src/main/resources/io/smallrye/metrics/vendor-metrics.properties
@@ -1,3 +1,22 @@
+#
+#
+#    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.
+#
 BufferPool_used_memory_%s.mbean: java.nio:type=BufferPool,name=%s/MemoryUsed
 BufferPool_used_memory_%s.description: The memory used by the NIO pool: %s
 BufferPool_used_memory_%s.multi: true


[tomee] 01/02: TOMEE-3913 - Examples: Upgrade JUnit 4.11 to 4.13.2

Posted by rz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rzo1 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git

commit c2fdbeb5df46b3c1ef31087f2799982051280051
Author: Richard Zowalla <rz...@apache.org>
AuthorDate: Sun Apr 17 19:33:28 2022 +0200

    TOMEE-3913 - Examples: Upgrade JUnit 4.11 to 4.13.2
---
 examples/async-servlet/pom.xml                      | 2 +-
 examples/connector-ear/connector-sample-war/pom.xml | 2 +-
 examples/connector-ear/pom.xml                      | 2 +-
 examples/mp-config-example/pom.xml                  | 2 +-
 examples/mp-config-source-database/pom.xml          | 2 +-
 examples/mvc-cxf-hibernate/pom.xml                  | 2 +-
 examples/mvc-cxf/pom.xml                            | 2 +-
 examples/mvc-resteasy/pom.xml                       | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/examples/async-servlet/pom.xml b/examples/async-servlet/pom.xml
index 24801ad8da..b45db06305 100644
--- a/examples/async-servlet/pom.xml
+++ b/examples/async-servlet/pom.xml
@@ -53,7 +53,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.11</version>
+      <version>4.13.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/examples/connector-ear/connector-sample-war/pom.xml b/examples/connector-ear/connector-sample-war/pom.xml
index 58b2426196..4d784975be 100644
--- a/examples/connector-ear/connector-sample-war/pom.xml
+++ b/examples/connector-ear/connector-sample-war/pom.xml
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.11</version>
+      <version>4.13.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/examples/connector-ear/pom.xml b/examples/connector-ear/pom.xml
index 49ba90fc5b..546ef767fd 100644
--- a/examples/connector-ear/pom.xml
+++ b/examples/connector-ear/pom.xml
@@ -36,7 +36,7 @@
       <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
-        <version>4.11</version>
+        <version>4.13.2</version>
         <scope>test</scope>
       </dependency>
       <dependency>
diff --git a/examples/mp-config-example/pom.xml b/examples/mp-config-example/pom.xml
index 8b092019a3..97364eb081 100644
--- a/examples/mp-config-example/pom.xml
+++ b/examples/mp-config-example/pom.xml
@@ -70,7 +70,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.11</version>
+      <version>4.13.2</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/mp-config-source-database/pom.xml b/examples/mp-config-source-database/pom.xml
index 8ba1a1226b..db924e6d68 100644
--- a/examples/mp-config-source-database/pom.xml
+++ b/examples/mp-config-source-database/pom.xml
@@ -82,7 +82,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.11</version>
+      <version>4.13.2</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/mvc-cxf-hibernate/pom.xml b/examples/mvc-cxf-hibernate/pom.xml
index c0a8235974..ec0268ae4c 100644
--- a/examples/mvc-cxf-hibernate/pom.xml
+++ b/examples/mvc-cxf-hibernate/pom.xml
@@ -164,7 +164,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.11</version>
+      <version>4.13.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/examples/mvc-cxf/pom.xml b/examples/mvc-cxf/pom.xml
index d463d7c244..daf2d4d651 100644
--- a/examples/mvc-cxf/pom.xml
+++ b/examples/mvc-cxf/pom.xml
@@ -139,7 +139,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.11</version>
+      <version>4.13.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/examples/mvc-resteasy/pom.xml b/examples/mvc-resteasy/pom.xml
index e3c804b170..9b1d000c2f 100644
--- a/examples/mvc-resteasy/pom.xml
+++ b/examples/mvc-resteasy/pom.xml
@@ -121,7 +121,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.11</version>
+      <version>4.13.2</version>
       <scope>test</scope>
     </dependency>
   </dependencies>