JAMES-2486 Update dnsjava
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/63dca36d Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/63dca36d Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/63dca36d Branch: refs/heads/master Commit: 63dca36d5baf6d93e5d7a4cd4c0e5a1a918ec34d Parents: 0c641e7 Author: Gautier DI FOLCO <[email protected]> Authored: Tue Jul 17 16:53:54 2018 +0200 Committer: benwa <[email protected]> Committed: Tue Jul 31 09:25:23 2018 +0700 ---------------------------------------------------------------------- pom.xml | 2 +- .../main/licensing/app/license-for-binary.txt | 51 ++++++++++---------- server/app/src/main/licensing/app/licensing.xml | 6 +-- server/app/src/main/licensing/war/LICENSE | 49 +++++++++---------- server/app/src/main/licensing/war/licensing.xml | 4 +- .../features/src/main/resources/features.xml | 8 +-- 6 files changed, 59 insertions(+), 61 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/63dca36d/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 1ba0db8..19bf0fc 100644 --- a/pom.xml +++ b/pom.xml @@ -608,7 +608,7 @@ <servlet-api.version>2.4</servlet-api.version> <commons-logging.version>1.1.1</commons-logging.version> - <dnsjava.version>2.1.1</dnsjava.version> + <dnsjava.version>2.1.8</dnsjava.version> <junit.version>4.12</junit.version> <junit.jupiter.version>5.0.2</junit.jupiter.version> <junit.plateform.version>1.0.2</junit.plateform.version> http://git-wip-us.apache.org/repos/asf/james-project/blob/63dca36d/server/app/src/main/licensing/app/license-for-binary.txt ---------------------------------------------------------------------- diff --git a/server/app/src/main/licensing/app/license-for-binary.txt b/server/app/src/main/licensing/app/license-for-binary.txt index aeb5951..682a01f 100644 --- a/server/app/src/main/licensing/app/license-for-binary.txt +++ b/server/app/src/main/licensing/app/license-for-binary.txt @@ -372,39 +372,38 @@ Within the lib directory from OW2 http://www.ow2.org/ asm-3.1.jar - licensed under the BSD (3-clause) http://www.opensource.org/licenses/BSD-3-Clause (as follows) + licensed under the BSD (2-clause) http://www.opensource.org/licenses/BSD-2-Clause (as follows) dnsjava is placed under the BSD license. Several files are also under additional licenses; see the individual files for details. - Copyright (c) 1999-2005, Brian Wellington - All rights reserved. - + Copyright (c) 1998-2011, Brian Wellington. + 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 the dnsjava project 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. + + * 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. + + 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 HOLDER 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. from Brian Wellington - dnsjava-2.1.1.jar + dnsjava-2.1.8.jar licensed under the BSD (3-clause) http://www.opensource.org/licenses/BSD-3-Clause (as follows) @@ -1137,4 +1136,4 @@ Within the lib directory from JETM http://jetm.void.fm jetm-1.2.3.jar - jetm-optional-1.2.3.jar \ No newline at end of file + jetm-optional-1.2.3.jar http://git-wip-us.apache.org/repos/asf/james-project/blob/63dca36d/server/app/src/main/licensing/app/licensing.xml ---------------------------------------------------------------------- diff --git a/server/app/src/main/licensing/app/licensing.xml b/server/app/src/main/licensing/app/licensing.xml index c21773d..741e4be 100644 --- a/server/app/src/main/licensing/app/licensing.xml +++ b/server/app/src/main/licensing/app/licensing.xml @@ -1419,12 +1419,12 @@ All rights reserved. <resource name='bcprov-jdk15-1.45.jar'/> </by-organisation> </with-license> - <with-license id='BSD3Clause'> + <with-license id='BSD2Clause'> <copyright-notice> dnsjava is placed under the BSD license. Several files are also under additional licenses; see the individual files for details. -Copyright (c) 1999-2005, Brian Wellington +Copyright (c) 1999-2011, Brian Wellington All rights reserved. </copyright-notice> <license-parameters> @@ -1434,7 +1434,7 @@ All rights reserved. </parameter> </license-parameters> <by-organisation id='person:Brian.Wellington'> - <resource name='dnsjava-2.1.1.jar'/> + <resource name='dnsjava-2.1.8.jar'/> </by-organisation> </with-license> <with-license id='BSD3Clause'> http://git-wip-us.apache.org/repos/asf/james-project/blob/63dca36d/server/app/src/main/licensing/war/LICENSE ---------------------------------------------------------------------- diff --git a/server/app/src/main/licensing/war/LICENSE b/server/app/src/main/licensing/war/LICENSE index 094ca05..63641f0 100644 --- a/server/app/src/main/licensing/war/LICENSE +++ b/server/app/src/main/licensing/war/LICENSE @@ -247,39 +247,38 @@ Within the WEB-INF/lib directory from OW2 http://www.ow2.org/ asm-3.1.jar - licensed under the BSD (3-clause) http://www.opensource.org/licenses/BSD-3-Clause (as follows) + licensed under the BSD (2-clause) http://www.opensource.org/licenses/BSD-2-Clause (as follows) dnsjava is placed under the BSD license. Several files are also under additional licenses; see the individual files for details. - Copyright (c) 1999-2005, Brian Wellington - All rights reserved. - + Copyright (c) 1998-2011, Brian Wellington. + 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 the dnsjava project 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. + + * 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. + + 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 HOLDER 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. from Brian Wellington - dnsjava-2.1.1.jar + dnsjava-2.1.8.jar licensed under the BSD (3-clause) http://www.opensource.org/licenses/BSD-3-Clause (as follows) http://git-wip-us.apache.org/repos/asf/james-project/blob/63dca36d/server/app/src/main/licensing/war/licensing.xml ---------------------------------------------------------------------- diff --git a/server/app/src/main/licensing/war/licensing.xml b/server/app/src/main/licensing/war/licensing.xml index 44d7dbc..27ffdbc 100644 --- a/server/app/src/main/licensing/war/licensing.xml +++ b/server/app/src/main/licensing/war/licensing.xml @@ -1369,7 +1369,7 @@ All rights reserved. dnsjava is placed under the BSD license. Several files are also under additional licenses; see the individual files for details. -Copyright (c) 1999-2005, Brian Wellington +Copyright (c) 1999-2011, Brian Wellington All rights reserved. </copyright-notice> <license-parameters> @@ -1379,7 +1379,7 @@ All rights reserved. </parameter> </license-parameters> <by-organisation id='person:Brian.Wellington'> - <resource name='dnsjava-2.1.1.jar'/> + <resource name='dnsjava-2.1.8.jar'/> </by-organisation> </with-license> <with-license id='BSD3Clause'> http://git-wip-us.apache.org/repos/asf/james-project/blob/63dca36d/server/karaf/features/src/main/resources/features.xml ---------------------------------------------------------------------- diff --git a/server/karaf/features/src/main/resources/features.xml b/server/karaf/features/src/main/resources/features.xml index bce8f36..25b8716 100644 --- a/server/karaf/features/src/main/resources/features.xml +++ b/server/karaf/features/src/main/resources/features.xml @@ -74,14 +74,14 @@ <feature version="${spring.version}">spring31</feature> </feature> - <feature name="dnsjava-2.1.1" version="2.1.1"> + <feature name="dnsjava-2.1.8" version="2.1.8"> <bundle dependency="true">mvn:dnsjava/dnsjava/${dnsjava.version}</bundle> <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.junit/4.11_1</bundle> </feature> <feature name="james-server-dnsservice-dnsjava" version="${project.version}"> <feature>commons-configuration</feature> - <feature>dnsjava-2.1.1</feature> + <feature>dnsjava-2.1.8</feature> <feature>james-server-dnsservice-library</feature> <bundle dependency="true">mvn:org.apache.james/james-server-dnsservice-api/${project.version}</bundle> <bundle dependency="true">mvn:org.apache.james/james-server-dnsservice-dnsjava/${project.version}</bundle> @@ -93,7 +93,7 @@ </feature> <feature name="james-server-dnsservice-library" version="${project.version}"> - <feature>dnsjava-2.1.1</feature> + <feature>dnsjava-2.1.8</feature> <bundle dependency="true">mvn:org.apache.james/james-server-dnsservice-library/${project.version}</bundle> <bundle dependency="true">mvn:org.apache.james/james-server-dnsservice-api/${project.version}</bundle> <bundle dependency="true">mvn:org.apache.james/apache-mailet-api/${mailet.version}</bundle> @@ -339,4 +339,4 @@ <bundle>mvn:org.apache.commons/commons-jexl/2.1.1</bundle> </feature> -</features> \ No newline at end of file +</features> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
