You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2017/07/04 09:39:28 UTC
openmeetings git commit: no jira: more work on LICENSE generation
automation
Repository: openmeetings
Updated Branches:
refs/heads/master dd043e069 -> bccd24a4a
no jira: more work on LICENSE generation automation
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/bccd24a4
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/bccd24a4
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/bccd24a4
Branch: refs/heads/master
Commit: bccd24a4af42cf8fc58dfc1e635a7027a74e2dca
Parents: dd043e0
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Tue Jul 4 16:39:19 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Tue Jul 4 16:39:19 2017 +0700
----------------------------------------------------------------------
pom.xml | 32 ++++++++++++++++++++++++++++++--
1 file changed, 30 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/bccd24a4/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ff086ec..14d5d6c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -251,10 +251,38 @@
Apache Software Licenses|
Apache License, Version 2.0 and|
ASL, version 2|
- ASF 2.0
+ ASF 2.0|
+ Apache License, Version 2.0 and
+ Common Development And Distribution License (CDDL) Version 1.0|
+ The SAX License
+ </licenseMerge>
+ <licenseMerge>
+ Eclipse Public License 1.0|
+ Eclipse Public License - v 1.0|
+ Eclipse Public License - Version 1.0
+ </licenseMerge>
+ <licenseMerge>
+ BSD license|
+ BSD|
+ The BSD License
+ </licenseMerge>
+ <licenseMerge>
+ FreeBSD License|
+ The BSD 2-Clause License|
+ BSD-2-Clause|
+ BSD style
+ </licenseMerge>
+ <licenseMerge>
+ BSD License 2.0|
+ BSD 3-clause New License|
+ New BSD License
+ </licenseMerge>
+ <licenseMerge>
+ The W3C License|
+ The W3C Software License
</licenseMerge>
</licenseMerges>
- <!-- license.fileTemplate>/org/codehaus/mojo/license/third-party-file-groupByLicense.ftl</license.fileTemplate-->
+ <fileTemplate>/org/codehaus/mojo/license/third-party-file-groupByLicense.ftl</fileTemplate>
</configuration>
</execution>
</executions>