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 2015/10/29 18:20:14 UTC
svn commit: r1711306 - in /openmeetings/branches/3.0.x: LICENSE ivy.xml
Author: solomax
Date: Thu Oct 29 17:20:14 2015
New Revision: 1711306
URL: http://svn.apache.org/viewvc?rev=1711306&view=rev
Log:
[OPENMEETINGS-1273] missing library was added
Modified:
openmeetings/branches/3.0.x/LICENSE
openmeetings/branches/3.0.x/ivy.xml
Modified: openmeetings/branches/3.0.x/LICENSE
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/LICENSE?rev=1711306&r1=1711305&r2=1711306&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/LICENSE (original)
+++ openmeetings/branches/3.0.x/LICENSE Thu Oct 29 17:20:14 2015
@@ -1754,3 +1754,61 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE A
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+======================================================================================================================
+
+For ThreeTen library: threetenbp-jar-1.3.1.jar
+
+ * Copyright (c) 2007-present, Stephen Colebourne & Michael Nascimento Santos
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * * Neither the name of JSR-310 nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+======================================================================================================================
+
+For Json library: json-20090211.jar
+
+Copyright (c) 2002 JSON.org
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
+ The Software shall be used for Good, not Evil.
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
Modified: openmeetings/branches/3.0.x/ivy.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/ivy.xml?rev=1711306&r1=1711305&r2=1711306&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/ivy.xml (original)
+++ openmeetings/branches/3.0.x/ivy.xml Thu Oct 29 17:20:14 2015
@@ -260,12 +260,6 @@
<dependency org="org.apache.wicket" name="wicket-native-websocket-javax" rev="7.1.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="br.com.digilabs.jqplot" name="jqplot4java" rev="1.3.0" conf="openmeetings->*" transitive="false">
- <include type="jar" />
- </dependency>
- <dependency org="org.wicketstuff" name="jqplot" rev="7.0.0" conf="openmeetings->*" transitive="false">
- <include type="jar" />
- </dependency>
<dependency org="com.googlecode.wicket-jquery-ui" name="wicket-jquery-ui-core" rev="7.1.0" conf="openmeetings->*" transitive="false"/>
<dependency org="com.googlecode.wicket-jquery-ui" name="wicket-jquery-ui" rev="7.1.0" conf="openmeetings->*" transitive="false"/>
<dependency org="com.googlecode.wicket-jquery-ui" name="wicket-jquery-ui-calendar" rev="7.1.0" conf="openmeetings->*" transitive="false"/>
@@ -289,7 +283,15 @@
<dependency org="org.wicketstuff" name="wicketstuff-select2" rev="7.0.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
-
+ <dependency org="org.wicketstuff" name="jqplot" rev="7.0.0" conf="openmeetings->*" transitive="false">
+ <include type="jar" />
+ </dependency>
+ <dependency org="br.com.digilabs.jqplot" name="jqplot4java" rev="1.3.0" conf="openmeetings->*" transitive="false">
+ <include type="jar" />
+ </dependency>
+ <dependency org="org.json" name="json" rev="20090211" conf="openmeetings->*" transitive="false">
+ <include type="jar" />
+ </dependency>
<dependency org="commons-net" name="commons-net" rev="3.3" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>