Skip to content

Commit

Permalink
added version for external jar name in distribution
Browse files Browse the repository at this point in the history
  • Loading branch information
@santhosh-tekuri
santhosh-tekuri committed Oct 2, 2015
1 parent 008b1dc commit 9897b6a
Show file tree
Hide file tree
Showing 4 changed files with 47 additions and 55 deletions.
60 changes: 26 additions & 34 deletions dependencies.xml
View file
Original file line number Diff line number Diff line change
@@ -1,51 +1,43 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="jlibs-dependencies" default="download">
<property name="central.repository" value="http://central.maven.org/maven2"/>
<property name="apache.repository" value="http://svn.apache.org/repos/asf/tuscany/maven"/>

<macrodef name="dependency">
<attribute name="repository"/>
<attribute name="repository" default="${central.repository}"/>
<attribute name="groupId"/>
<attribute name="artifactId"/>
<attribute name="version"/>
<attribute name="packaging" default="jar"/>
<sequential>
<get src="@{repository}/@{groupId}/@{artifactId}/@{version}/@{artifactId}-@{version}.@{packaging}"
dest="@{artifactId}.@{packaging}" usetimestamp="true"/>
dest="@{artifactId}-@{version}.@{packaging}" usetimestamp="true"/>
</sequential>
</macrodef>

<target name="download" depends="jlibs-examples" description="download all dependencies"/>

<target name="jlibs-core" description="download dependencies reqd by jibs-core"/>
<target name="jlibs-jdbc" description="download dependencies reqd by jibs-jdbc"/>
<target name="jlibs-nbp" description="download dependencies reqd by jibs-nbp"/>

<target name="jlibs-xml" depends="jlibs-core, jlibs-nbp" description="download dependencies reqd by jibs-xml">
<dependency repository="${central.repository}" groupid="xerces" artifactid="xercesImpl" version="2.11.0"/>
<dependency repository="${central.repository}" groupid="xml-apis" artifactid="xml-apis" version="1.4.01"/>
</target>

<target name="jlibs-swing" depends="jlibs-xml" description="download dependencies reqd by jibs-swing"/>

<target name="jlibs-xmldog" depends="jlibs-xml" description="download dependencies reqd by jibs-xmldog">
<dependency repository="${central.repository}" groupid="jaxen" artifactid="jaxen" version="1.1.1"/>
</target>

<target name="jlibs-nblr" depends="jlibs-xml, jlibs-swing" description="download dependencies reqd by jibs-nblr"/>

<target name="jlibs-wadl" description="download dependencies reqd by jibs-wadl">
<dependency repository="${central.repository}" groupid="jline" artifactid="jline" version="1.0"/>
<dependency repository="${central.repository}" groupid="com/fifesoft" artifactid="rsyntaxtextarea" version="2.5.0"/>
</target>

<target name="jlibs-examples" depends="jlibs-jdbc, jlibs-swing, jlibs-xmldog, jlibs-nblr, jlibs-wadl" description="download dependencies reqd by jibs-xmldog">
<dependency repository="${apache.repository}" groupid="net/sf/saxon" artifactid="saxon" version="9.0.0.2"/>
<dependency repository="${apache.repository}" groupid="net/sf/saxon" artifactid="saxon-dom" version="9.0.0.2"/>
<dependency repository="${apache.repository}" groupid="net/sf/saxon" artifactid="saxon-xpath" version="9.0.0.2"/>
<dependency repository="${central.repository}" groupid="org/hsqldb" artifactid="hsqldb" version="2.0.0"/>
<dependency repository="${central.repository}" groupid="commons-dbcp" artifactid="commons-dbcp" version="1.4"/>
<dependency repository="${central.repository}" groupid="commons-pool" artifactid="commons-pool" version="1.5.4"/>
<target name="download" description="downloads external dependencies">
<dependency groupid="net/sf/saxon" artifactid="Saxon-HE" version="9.6.0-6"/>
<dependency groupid="commons-dbcp" artifactid="commons-dbcp" version="1.4"/>
<dependency groupid="commons-pool" artifactid="commons-pool" version="1.5.4"/>
<dependency groupid="org/hsqldb" artifactid="hsqldb" version="2.3.3"/>
<dependency groupid="com/fasterxml/jackson/core" artifactid="jackson-annotations" version="2.6.0"/>
<dependency groupid="com/fasterxml/jackson/core" artifactid="jackson-core" version="2.6.2"/>
<dependency groupid="com/fasterxml/jackson/core" artifactid="jackson-databind" version="2.6.2"/>
<dependency groupid="org/msgpack" artifactid="jackson-dataformat-msgpack" version="0.7.0-M6"/>
<dependency groupid="jaxen" artifactid="jaxen" version="1.1.1"/>
<dependency groupid="jline" artifactid="jline" version="1.0"/>
<dependency groupid="org/msgpack" artifactid="msgpack-core" version="0.7.0-M6"/>
<dependency groupid="io/netty" artifactid="netty-buffer" version="4.0.32.Final"/>
<dependency groupid="io/netty" artifactid="netty-codec" version="4.0.32.Final"/>
<dependency groupid="io/netty" artifactid="netty-codec-http" version="4.0.32.Final"/>
<dependency groupid="io/netty" artifactid="netty-common" version="4.0.32.Final"/>
<dependency groupid="io/netty" artifactid="netty-handler" version="4.0.32.Final"/>
<dependency groupid="io/netty" artifactid="netty-transport" version="4.0.32.Final"/>
<dependency groupid="in/jlibs" artifactid="org-netbeans-api-visual" version="RELEASE65"/>
<dependency groupid="in/jlibs" artifactid="rg-netbeans-swing-outline" version="RELEASE65"/>
<dependency groupid="in/jlibs" artifactid="org-openide-util" version="RELEASE65"/>
<dependency groupid="com/fifesoft" artifactid="rsyntaxtextarea" version="2.5.0"/>
<dependency groupid="xerces" artifactid="xercesImpl" version="2.11.0"/>
<dependency groupid="xml-apis" artifactid="xml-apis" version="1.4.01"/>
</target>
</project>

2 changes: 1 addition & 1 deletion distribution/src/assembly/default.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<dependencySets>
<dependencySet>
<outputDirectory>lib/external</outputDirectory>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
<outputFileNameMapping>${artifact.artifactId}-${artifact.version}.${artifact.extension}</outputFileNameMapping>
<excludes>
<exclude>in.jlibs:jlibs-*</exclude>
</excludes>
Expand Down
34 changes: 17 additions & 17 deletions examples/bin/examples.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,38 +3,38 @@
../lib/jlibs-visitor.jar
../lib/jlibs-core.jar

../lib/external/xercesImpl.jar
../lib/external/xml-apis.jar
../lib/external/xercesImpl-2.11.0.jar
../lib/external/xml-apis-1.4.01.jar
../lib/jlibs-xml.jar
../lib/jlibs-xsd.jar
../lib/jlibs-xml-crawler.jar

../lib/external/jaxen.jar
../lib/external/jaxen-1.1.1.jar
../lib/jlibs-xmldog.jar

../lib/external/org-netbeans-swing-outline.jar
../lib/external/org-netbeans-swing-outline-RELEASE65.jar
../lib/jlibs-swing.jar

../lib/external/Saxon-HE.jar
../lib/external/Saxon-HE-9.6.0-6.jar
../lib/jlibs-examples.jar

../lib/external/jline.jar
../lib/external/rsyntaxtextarea.jar
../lib/external/jline-1.0.jar
../lib/external/rsyntaxtextarea-2.5.0.jar
../lib/jlibs-wadl.jar

../lib/jlibs-wamp4j-core.jar
../lib/external/jackson-annotations.jar
../lib/external/jackson-core.jar
../lib/external/jackson-databind.jar
../lib/external/jackson-dataformat-msgpack.jar
../lib/external/jackson-annotations-2.6.0.jar
../lib/external/jackson-core-2.6.2.jar
../lib/external/jackson-databind-2.6.2.jar
../lib/external/jackson-dataformat-msgpack-0.7.0-M6.jar

../lib/jlibs-wamp4j-netty.jar
../lib/external/netty-buffer.jar
../lib/external/netty-codec-http.jar
../lib/external/netty-codec.jar
../lib/external/netty-common.jar
../lib/external/netty-handler.jar
../lib/external/netty-transport.jar
../lib/external/netty-buffer-4.0.32.Final.jar
../lib/external/netty-codec-4.0.32.Final.jar
../lib/external/netty-codec-http-4.0.32.Final.jar
../lib/external/netty-common-4.0.32.Final.jar
../lib/external/netty-handler-4.0.32.Final.jar
../lib/external/netty-transport-4.0.32.Final.jar

<jvm.args>
-XX:+HeapDumpOnOutOfMemoryError
Expand Down
6 changes: 3 additions & 3 deletions nblr/bin/nblr.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
../lib/jlibs-apt.jar
../lib/jlibs-core.jar

../lib/external/xercesImpl.jar
../lib/external/xercesImpl-2.11.0.jar
../lib/jlibs-xml.jar
../lib/jlibs-xml-nbp.jar
../lib/jlibs-xml-binding.jar
Expand All @@ -11,8 +11,8 @@

../lib/jlibs-nbp.jar

../lib/external/org-openide-util.jar
../lib/external/org-netbeans-api-visual.jar
../lib/external/org-openide-util-RELEASE65.jar
../lib/external/org-netbeans-api-visual-RELEASE65.jar
../lib/jlibs-nblr.jar

<jvm.args>
Expand Down

0 comments on commit 9897b6a

Please sign in to comment.