diff --git a/NOTICE.txt b/NOTICE.txt index a371c0869..74c0539ae 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -5,6 +5,7 @@ Copyright 2006,2010 The Apache Software Foundation This product includes software developed by The Apache Software Foundation (http://www.apache.org/). +Apache, the Apache feather logo and OpenJPA are trademarks of The Apache Software Foundation. COPYRIGHT NOTICES diff --git a/openjpa-all/src/main/appended-resources/META-INF/NOTICE.vm b/openjpa-all/src/main/appended-resources/META-INF/NOTICE.vm index 1543cf925..0bb19eb52 100644 --- a/openjpa-all/src/main/appended-resources/META-INF/NOTICE.vm +++ b/openjpa-all/src/main/appended-resources/META-INF/NOTICE.vm @@ -1,4 +1,6 @@ +Apache, the Apache feather logo and OpenJPA are trademarks of Apache Software Foundation. + openjpa-all includes software developed by the: Apache Commons Collections project Apache Commons Lang project diff --git a/openjpa-project/CHANGES.txt b/openjpa-project/CHANGES.txt index a71c8deaf..d36d40281 100644 --- a/openjpa-project/CHANGES.txt +++ b/openjpa-project/CHANGES.txt @@ -71,6 +71,7 @@ License Notices ------- Copyright 2006,2010 The Apache Software Foundation + Apache, the Apache feather logo and OpenJPA are trademarks of The Apache Software Foundation. This product includes software developed at The Apache Software Foundation (http://www.apache.org/). diff --git a/openjpa-project/NOTICE.txt b/openjpa-project/NOTICE.txt index e0d8a4acf..168483f3a 100644 --- a/openjpa-project/NOTICE.txt +++ b/openjpa-project/NOTICE.txt @@ -5,6 +5,8 @@ Copyright 2006,2010 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). +Apache, the Apache feather logo and OpenJPA are trademarks of The Apache Software Foundation. + The OpenJPA binary assembly includes software developed by the: Apache Commons Collections project Apache Commons Lang project diff --git a/openjpa-project/RELEASE-NOTES.html b/openjpa-project/RELEASE-NOTES.html index c2f18eebc..9534b5c36 100644 --- a/openjpa-project/RELEASE-NOTES.html +++ b/openjpa-project/RELEASE-NOTES.html @@ -737,7 +737,7 @@ in each release of OpenJPA.


-

Copyright (C) 2006-2009 Apache Software Foundation. Licensed under Apache License 2.0.
-Apache and the Apache feather logo are trademarks of Apache Software Foundation.
+

Copyright (C) 2006,2010 The Apache Software Foundation. Licensed under Apache License 2.0.
+Apache, the Apache feather logo and OpenJPA are trademarks of The Apache Software Foundation.
diff --git a/openjpa/src/main/appended-resources/META-INF/NOTICE.vm b/openjpa/src/main/appended-resources/META-INF/NOTICE.vm index 4728993fa..5e7cd387b 100644 --- a/openjpa/src/main/appended-resources/META-INF/NOTICE.vm +++ b/openjpa/src/main/appended-resources/META-INF/NOTICE.vm @@ -1,4 +1,6 @@ +Apache, the Apache feather logo and OpenJPA are trademarks of Apache Software Foundation. + OpenJPA includes software developed by the SERP project Copyright (c) 2002-2006, A. Abram White. All rights reserved.