zookeeper-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ars...@apache.org
Subject zookeeper git commit: ZOOKEEPER-2460 Remove javacc dependency from public Maven pom
Date Thu, 16 Mar 2017 18:08:46 GMT
Repository: zookeeper
Updated Branches:
  refs/heads/branch-3.5 f25c95ada -> f5aacfcdf


ZOOKEEPER-2460 Remove javacc dependency from public Maven pom

Author: eolivelli <eolivelli@gmail.com>

Reviewers: Mohammad Arshad <arshad@apache.org>

Closes #116 from eolivelli/ZOOKEEPER-2460

(cherry picked from commit b4dded46f901fbc2128c7f752107a1391d676968)
Signed-off-by: Mohammad Arshad <arshad@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/zookeeper/repo
Commit: http://git-wip-us.apache.org/repos/asf/zookeeper/commit/f5aacfcd
Tree: http://git-wip-us.apache.org/repos/asf/zookeeper/tree/f5aacfcd
Diff: http://git-wip-us.apache.org/repos/asf/zookeeper/diff/f5aacfcd

Branch: refs/heads/branch-3.5
Commit: f5aacfcdfd09be337f1e60d20fc86e95958d2b0d
Parents: f25c95a
Author: Enrico Olivelli <eolivelli@gmail.com>
Authored: Thu Mar 16 23:37:22 2017 +0530
Committer: Mohammad Arshad <arshad@apache.org>
Committed: Thu Mar 16 23:38:15 2017 +0530

----------------------------------------------------------------------
 build.xml                       | 15 +++++++++++----
 ivy.xml                         |  4 +++-
 src/java/lib/javacc.LICENSE.txt | 26 --------------------------
 3 files changed, 14 insertions(+), 31 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zookeeper/blob/f5aacfcd/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 8ae36fc..df5e4e8 100644
--- a/build.xml
+++ b/build.xml
@@ -120,6 +120,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
     <property name="ivy.package.lib" value="${build.dir}/package/lib"/>
     <property name="ivy.test.lib" value="${build.dir}/test/lib"/>
     <property name="ivy.jdiff.lib" value="${build.dir}/jdiff/lib"/>
+    <property name="ivy.javacc.lib" value="${build.dir}/javacc/lib"/>
     <property name="ivysettings.xml" value="${basedir}/ivysettings.xml"/>
     
     <property name="mvnrepo" value="https://repo1.maven.org/maven2"/>
@@ -254,17 +255,17 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
     </target>
     
 	
-    <target name="generate_jute_parser" depends="init,ivy-retrieve">
+    <target name="generate_jute_parser" depends="init,ivy-retrieve,ivy-retrieve-javacc">
       <property name="jute_javacc.dir" value="${build.dir}/jute_compiler" />
       <property name="jute_javacc.packagedir" value="/org/apache/jute/compiler/generated"
/>
       <mkdir dir="${jute_javacc.dir}${jute_javacc.packagedir}"/>
       <!-- the javacc task expects a "javacc.jar" file... -->
       <ivy:artifactproperty name="[artifact].revision" value="[revision]" />
-      <move file="${ivy.lib}/javacc-${javacc.revision}.jar" tofile="${ivy.lib}/javacc.jar"
failonerror="false"/>
+      <move file="${ivy.javacc.lib}/javacc-${javacc.revision}.jar" tofile="${ivy.javacc.lib}/javacc.jar"
failonerror="false"/>
       <javacc
           target="${java.src.dir}${jute_javacc.packagedir}/rcc.jj"
           outputdirectory="${jute_javacc.dir}${jute_javacc.packagedir}/"
-          javacchome="${ivy.lib}"
+          javacchome="${ivy.javacc.lib}"
           />
     </target>
      
@@ -386,6 +387,12 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
                     pattern="${ivy.jdiff.lib}/[artifact]-[revision].[ext]"/>
     </target>
 
+     <target name="ivy-retrieve-javacc" depends="init,ivy-init">
+      <mkdir dir="${ivy.javacc.lib}"/>
+      <ivy:retrieve settingsRef="${ant.project.name}" conf="javacc"
+                    pattern="${ivy.javacc.lib}/[artifact]-[revision].[ext]"/>
+    </target>
+
     <target name="ivy-retrieve-releaseaudit" depends="init,ivy-init">
       <ivy:retrieve settingsRef="${ant.project.name}" conf="releaseaudit"
                     pattern="${ivy.lib}/[artifact]-[revision].[ext]"/>
@@ -749,7 +756,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
 
       <ivy:makepom settingsRef="${ant.project.name}" ivyfile="${basedir}/ivy.xml"
                    pomfile="${dist.maven.dir}/${final.name}.pom"
-                   templatefile="${basedir}/src/pom.template">
+                   templatefile="${basedir}/src/pom.template" conf="default,test" >
         <mapping conf="default" scope="compile"/>
         <mapping conf="test" scope="test"/>
       </ivy:makepom>

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/f5aacfcd/ivy.xml
----------------------------------------------------------------------
diff --git a/ivy.xml b/ivy.xml
index 4ecb3a6..e56ecd8 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -32,6 +32,7 @@
     <conf name="mvn-ant-task" visibility="private"/>
     <conf name="optional"/> <!-- optional in generated pom -->
     <conf name="jdiff" visibility="private"/>
+    <conf name="javacc" visibility="private"/>
     <conf name="releaseaudit" visibility="private" description="Artifacts required for
releaseaudit target"/>
   </configurations>
 
@@ -75,7 +76,8 @@
     <dependency org="commons-collections" name="commons-collections" 
                 rev="3.2.2" conf="releaseaudit->default"/>
 
-    <dependency org="net.java.dev.javacc" name="javacc" rev="5.0" />
+    <dependency org="net.java.dev.javacc" name="javacc" rev="5.0"
+                conf="javacc->default" />
 
     <dependency org="org.eclipse.jetty" name="jetty-server" rev="9.2.18.v20160721"
                 conf="optional->default"/>

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/f5aacfcd/src/java/lib/javacc.LICENSE.txt
----------------------------------------------------------------------
diff --git a/src/java/lib/javacc.LICENSE.txt b/src/java/lib/javacc.LICENSE.txt
deleted file mode 100644
index 2b7a7d7..0000000
--- a/src/java/lib/javacc.LICENSE.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-Copyright (c) 2006, Sun Microsystems, Inc.
-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 Sun Microsystems, Inc. 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.


Mime
View raw message