Author: solomax Date: Tue Aug 2 01:50:36 2016 New Revision: 1754807 URL: http://svn.apache.org/viewvc?rev=1754807&view=rev Log: [OPENMEETINGS-1409] license-maven-plugin cannot be used, removed from build
Removed:
openmeetings/application/branches/3.1.x/openmeetings-core/src/license/
openmeetings/application/branches/3.1.x/openmeetings-db/src/license/
openmeetings/application/branches/3.1.x/openmeetings-install/src/license/
openmeetings/application/branches/3.1.x/openmeetings-service/src/license/
openmeetings/application/branches/3.1.x/openmeetings-util/src/license/
openmeetings/application/branches/3.1.x/openmeetings-web/src/license/
openmeetings/application/branches/3.1.x/openmeetings-webservice/src/license/
openmeetings/application/branches/3.2.x/openmeetings-core/src/license/
openmeetings/application/branches/3.2.x/openmeetings-db/src/license/
openmeetings/application/branches/3.2.x/openmeetings-install/src/license/
openmeetings/application/branches/3.2.x/openmeetings-service/src/license/
openmeetings/application/branches/3.2.x/openmeetings-util/src/license/
openmeetings/application/branches/3.2.x/openmeetings-web/src/license/
openmeetings/application/branches/3.2.x/openmeetings-webservice/src/license/
openmeetings/application/trunk/openmeetings-core/src/license/
openmeetings/application/trunk/openmeetings-db/src/license/
openmeetings/application/trunk/openmeetings-install/src/license/
openmeetings/application/trunk/openmeetings-service/src/license/
openmeetings/application/trunk/openmeetings-util/src/license/
openmeetings/application/trunk/openmeetings-web/src/license/
openmeetings/application/trunk/openmeetings-webservice/src/license/
Modified:
openmeetings/application/branches/3.1.x/pom.xml
openmeetings/application/branches/3.2.x/pom.xml
openmeetings/application/trunk/pom.xml
Modified: openmeetings/application/branches/3.1.x/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/pom.xml?rev=1754807&r1=1754806&r2=1754807&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/pom.xml (original)
+++ openmeetings/application/branches/3.1.x/pom.xml Tue Aug 2 01:50:36 2016
@@ -741,54 +741,10 @@
</excludes>
</configuration>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>license-maven-plugin</artifactId>
- <executions>
- <execution>
- <goals>
-
<!--goal>add-third-party</goal-->
-
<!--goal>aggregate-add-third-party</goal-->
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
<pluginManagement>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
-
<artifactId>license-maven-plugin</artifactId>
- <version>1.9</version>
- <executions>
- <execution>
- <configuration>
-
<groupByLicense>true</groupByLicense>
-
<failIfWarning>true</failIfWarning>
-
<useMissingFile>true</useMissingFile>
-
<excludedScopes>test</excludedScopes>
- <licenseMerges>
-
<licenseMerge>The Apache Software License, Version 2.0|Apache 2</licenseMerge>
-
<licenseMerge>The Apache Software License, Version 2.0|Apache 2.0
License</licenseMerge>
-
<licenseMerge>The Apache Software License, Version 2.0|Apache License
2.0</licenseMerge>
-
<licenseMerge>The Apache Software License, Version 2.0|Apache License, Version
2.0</licenseMerge>
-
<licenseMerge>The Apache Software License, Version 2.0|Apache Software License
- Version 2.0</licenseMerge>
-
<licenseMerge>The Apache Software License, Version 2.0|Apache Software License
2.0</licenseMerge>
-
<licenseMerge>The Apache Software License, Version 2.0|Apache Software
Licenses</licenseMerge>
-
<licenseMerge>The Apache Software License, Version 2.0|The Apache License,
Version 2.0</licenseMerge>
-
<licenseMerge>The Apache Software License, Version
2.0|http://www.apache.org/licenses/LICENSE-2.0.txt</licenseMerge>
-
<licenseMerge>The Apache Software License, Version 2.0|ASL, version
2</licenseMerge>
-
<licenseMerge>BSD License|BSD</licenseMerge>
-
<licenseMerge>BSD License|The BSD License</licenseMerge>
-
<licenseMerge>New BSD License|BSD 3-clause</licenseMerge>
-
<licenseMerge>Eclipse Public License 1.0|Eclipse Public License - v
1.0</licenseMerge>
-
<licenseMerge>GNU Lesser General Public License|GNU LESSER GENERAL PUBLIC
LICENSE</licenseMerge>
- </licenseMerges>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${maven.javadoc.version}</version>
@@ -1024,21 +980,6 @@
</goals>
</pluginExecutionFilter>
<action>
-
<ignore></ignore>
-
</action>
-
</pluginExecution>
-
<pluginExecution>
-
<pluginExecutionFilter>
-
<groupId>org.codehaus.mojo</groupId>
-
<artifactId>license-maven-plugin</artifactId>
-
<versionRange>[1.9,)</versionRange>
-
<goals>
-
<goal>add-third-party</goal>
-
<goal>download-licenses</goal>
-
<goal>aggregate-add-third-party</goal>
-
</goals>
-
</pluginExecutionFilter>
- <action>
<ignore></ignore>
</action>
</pluginExecution>
Modified: openmeetings/application/branches/3.2.x/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/pom.xml?rev=1754807&r1=1754806&r2=1754807&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/pom.xml (original)
+++ openmeetings/application/branches/3.2.x/pom.xml Tue Aug 2 01:50:36 2016
@@ -741,54 +741,10 @@
</excludes>
</configuration>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>license-maven-plugin</artifactId>
- <executions>
- <execution>
- <goals>
-
<!--goal>add-third-party</goal-->
-
<!--goal>aggregate-add-third-party</goal-->
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
<pluginManagement>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
-
<artifactId>license-maven-plugin</artifactId>
- <version>1.9</version>
- <executions>
- <execution>
- <configuration>
-
<groupByLicense>true</groupByLicense>
-
<failIfWarning>true</failIfWarning>
-
<useMissingFile>true</useMissingFile>
-
<excludedScopes>test</excludedScopes>
- <licenseMerges>
-
<licenseMerge>The Apache Software License, Version 2.0|Apache 2</licenseMerge>
-
<licenseMerge>The Apache Software License, Version 2.0|Apache 2.0
License</licenseMerge>
-
<licenseMerge>The Apache Software License, Version 2.0|Apache License
2.0</licenseMerge>
-
<licenseMerge>The Apache Software License, Version 2.0|Apache License, Version
2.0</licenseMerge>
-
<licenseMerge>The Apache Software License, Version 2.0|Apache Software License
- Version 2.0</licenseMerge>
-
<licenseMerge>The Apache Software License, Version 2.0|Apache Software License
2.0</licenseMerge>
-
<licenseMerge>The Apache Software License, Version 2.0|Apache Software
Licenses</licenseMerge>
-
<licenseMerge>The Apache Software License, Version 2.0|The Apache License,
Version 2.0</licenseMerge>
-
<licenseMerge>The Apache Software License, Version
2.0|http://www.apache.org/licenses/LICENSE-2.0.txt</licenseMerge>
-
<licenseMerge>The Apache Software License, Version 2.0|ASL, version
2</licenseMerge>
-
<licenseMerge>BSD License|BSD</licenseMerge>
-
<licenseMerge>BSD License|The BSD License</licenseMerge>
-
<licenseMerge>New BSD License|BSD 3-clause</licenseMerge>
-
<licenseMerge>Eclipse Public License 1.0|Eclipse Public License - v
1.0</licenseMerge>
-
<licenseMerge>GNU Lesser General Public License|GNU LESSER GENERAL PUBLIC
LICENSE</licenseMerge>
- </licenseMerges>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${maven.javadoc.version}</version>
@@ -1024,21 +980,6 @@
</goals>
</pluginExecutionFilter>
<action>
-
<ignore></ignore>
-
</action>
-
</pluginExecution>
-
<pluginExecution>
-
<pluginExecutionFilter>
-
<groupId>org.codehaus.mojo</groupId>
-
<artifactId>license-maven-plugin</artifactId>
-
<versionRange>[1.9,)</versionRange>
-
<goals>
-
<goal>add-third-party</goal>
-
<goal>download-licenses</goal>
-
<goal>aggregate-add-third-party</goal>
-
</goals>
-
</pluginExecutionFilter>
- <action>
<ignore></ignore>
</action>
</pluginExecution>
Modified: openmeetings/application/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/pom.xml?rev=1754807&r1=1754806&r2=1754807&view=diff
==============================================================================
--- openmeetings/application/trunk/pom.xml (original)
+++ openmeetings/application/trunk/pom.xml Tue Aug 2 01:50:36 2016
@@ -741,54 +741,10 @@
</excludes>
</configuration>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>license-maven-plugin</artifactId>
- <executions>
- <execution>
- <goals>
-
<!--goal>add-third-party</goal-->
-
<!--goal>aggregate-add-third-party</goal-->
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
<pluginManagement>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
-
<artifactId>license-maven-plugin</artifactId>
- <version>1.9</version>
- <executions>
- <execution>
- <configuration>
-
<groupByLicense>true</groupByLicense>
-
<failIfWarning>true</failIfWarning>
-
<useMissingFile>true</useMissingFile>
-
<excludedScopes>test</excludedScopes>
- <licenseMerges>
-
<licenseMerge>The Apache Software License, Version 2.0|Apache 2</licenseMerge>
-
<licenseMerge>The Apache Software License, Version 2.0|Apache 2.0
License</licenseMerge>
-
<licenseMerge>The Apache Software License, Version 2.0|Apache License
2.0</licenseMerge>
-
<licenseMerge>The Apache Software License, Version 2.0|Apache License, Version
2.0</licenseMerge>
-
<licenseMerge>The Apache Software License, Version 2.0|Apache Software License
- Version 2.0</licenseMerge>
-
<licenseMerge>The Apache Software License, Version 2.0|Apache Software License
2.0</licenseMerge>
-
<licenseMerge>The Apache Software License, Version 2.0|Apache Software
Licenses</licenseMerge>
-
<licenseMerge>The Apache Software License, Version 2.0|The Apache License,
Version 2.0</licenseMerge>
-
<licenseMerge>The Apache Software License, Version
2.0|http://www.apache.org/licenses/LICENSE-2.0.txt</licenseMerge>
-
<licenseMerge>The Apache Software License, Version 2.0|ASL, version
2</licenseMerge>
-
<licenseMerge>BSD License|BSD</licenseMerge>
-
<licenseMerge>BSD License|The BSD License</licenseMerge>
-
<licenseMerge>New BSD License|BSD 3-clause</licenseMerge>
-
<licenseMerge>Eclipse Public License 1.0|Eclipse Public License - v
1.0</licenseMerge>
-
<licenseMerge>GNU Lesser General Public License|GNU LESSER GENERAL PUBLIC
LICENSE</licenseMerge>
- </licenseMerges>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${maven.javadoc.version}</version>
@@ -1024,21 +980,6 @@
</goals>
</pluginExecutionFilter>
<action>
-
<ignore></ignore>
-
</action>
-
</pluginExecution>
-
<pluginExecution>
-
<pluginExecutionFilter>
-
<groupId>org.codehaus.mojo</groupId>
-
<artifactId>license-maven-plugin</artifactId>
-
<versionRange>[1.9,)</versionRange>
-
<goals>
-
<goal>add-third-party</goal>
-
<goal>download-licenses</goal>
-
<goal>aggregate-add-third-party</goal>
-
</goals>
-
</pluginExecutionFilter>
- <action>
<ignore></ignore>
</action>
</pluginExecution>
