From 07fe18c259b12c725c12758e5ca32b88c840ba81 Mon Sep 17 00:00:00 2001
From: Marek Goldmann <marek.goldmann@gmail.com>
Date: Mon, 16 Dec 2013 11:27:28 +0100
Subject: [PATCH] Adjust IVY paths
---
ivy.settings.xml | 10 ++++------
ivy.xml | 13 +++++++------
2 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/ivy.settings.xml b/ivy.settings.xml
index 3ebabf1..a2d5426 100644
--- a/ivy.settings.xml
+++ b/ivy.settings.xml
@@ -26,8 +26,10 @@
artifactPattern="[organisation]/[module]/[type]s/[artifact]-[revision](-[classifier]).[ext]"/>
<resolvers>
<filesystem name="local">
- <ivy pattern="${ivy.cache.dir}/[module]/ivy-[revision].xml"/>
- <artifact pattern="${ivy.cache.dir}/[organisation]/[module]/[artifact]-[revision](-[classifier]).[ext]"/>
+ <ivy pattern="${basedir}/[module]/ivy-[revision].xml"/>
+ <artifact pattern="/usr/share/java/[artifact].[ext]" />
+ <artifact pattern="/usr/share/java/[artifact]/[artifact].[ext]" />
+ <artifact pattern="/usr/share/java/jboss/[artifact].[ext]" />
</filesystem>
<ibiblio name="jboss" m2compatible="true" usepoms="false" root="${jboss.repo}"
pattern="[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]"/>
@@ -39,10 +41,6 @@
pattern="[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]"/>
<chain name="default" returnFirst="true">
<resolver ref="local"/>
- <resolver ref="jboss"/>
- <resolver ref="snapshots"/>
- <resolver ref="central"/>
- <resolver ref="fungal"/>
</chain>
</resolvers>
</ivysettings>
diff --git a/ivy.xml b/ivy.xml
index d4ad55e..0de4366 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -98,9 +98,10 @@
<!-- Maven doesn't handle dependencies well, so logging has to be first -->
<dependency org="org.jboss.jdeparser" name="jdeparser" rev="${version.jboss.jdeparser}" conf="as,common,ironjacamar-depchain"/>
<dependency org="org.jboss.logging" name="jboss-logging" rev="${version.jboss.logging}" conf="as,common,ironjacamar-common-impl,ironjacamar-core-impl,ironjacamar-depchain,ironjacamar-deployers-common,ironjacamar-deployers-fungal"/>
- <dependency org="org.jboss.logging" name="jboss-logging-processor" rev="${version.jboss.logging-processor}" conf="as,common"/>
+ <dependency org="org.jboss.logging" name="jboss-logging-tools/jboss-logging-processor" rev="${version.jboss.logging-processor}" conf="as,common"/>
+ <dependency org="org.jboss.logging" name="jboss-logging-tools/jboss-logging-annotations" rev="${version.jboss.logging-processor}" conf="common,as"/>
<dependency org="org.jboss.logmanager" name="jboss-logmanager" rev="${version.jboss.logmanager}" conf="as,common,ironjacamar-depchain"/>
- <dependency org="org.jboss.logmanager" name="log4j-jboss-logmanager" rev="${version.jboss.logmanager.log4j}" conf="as,common,ironjacamar-depchain"/>
+ <dependency org="org.jboss.logmanager" name="log4j-jboss-logmanager/log4j-jboss-logmanager" rev="${version.jboss.logmanager.log4j}" conf="as,common,ironjacamar-depchain"/>
<!-- Keep these sorted -->
<dependency org="apache-logging" name="commons-logging" rev="${version.apache-logging}" conf="common,ironjacamar-depchain"/>
@@ -117,8 +118,8 @@
<dependency org="javax.el" name="javax.el-api" rev="${version.jetty.el}" conf="jetty"/>
<dependency org="javax.servlet" name="javax.servlet-api" rev="${version.jetty.servlet}" conf="jetty"/>
<dependency org="javax.servlet.jsp" name="javax.servlet.jsp-api" rev="${version.jetty.jsp}" conf="jetty"/>
- <dependency org="javax.validation" name="validation-api" rev="${version.validation-api}" conf="as,common,ironjacamar-core-impl,ironjacamar-depchain,ironjacamar-deployers-fungal"/>
- <dependency org="jdepend" name="jdepend" rev="${version.jdepend}" conf="tools"/>
+ <dependency org="javax.validation" name="bean-validation-api" rev="${version.validation-api}" conf="as,common,ironjacamar-core-impl,ironjacamar-depchain,ironjacamar-deployers-fungal"/>
+ <dependency org="jdepend" name="jdepend" rev="${version.jdepend}" conf="tools,as"/>
<dependency org="junit" name="junit" rev="${version.junit}" conf="test"/>
<dependency org="log4j" name="log4j" rev="${version.apache-log4j}" conf="common,ironjacamar-depchain"/>
<dependency org="net.sf.saxon" name="saxon" rev="${version.saxon}" conf="tools"/>
@@ -188,8 +189,8 @@
<dependency org="org.jboss.shrinkwrap" name="shrinkwrap-spi" rev="${version.jboss.shrinkwrap}" conf="embedded,ironjacamar-depchain"/>
<dependency org="org.jboss.slf4j" name="slf4j-jboss-logmanager" rev="${version.jboss.slf4j.logmanager}" conf="common,ironjacamar-depchain"/>
<dependency org="org.jboss.spec.javax.jms" name="jboss-jms-api_1.1_spec" rev="${version.jboss.jms.api}" conf="hornetq"/>
- <dependency org="org.jboss.spec.javax.security.auth.message" name="jboss-jaspi-api_1.0_spec" rev="${version.jboss.jaspi.api}" conf="as,common,ironjacamar-core-impl,ironjacamar-depchain"/>
- <dependency org="org.jboss.spec.javax.transaction" name="jboss-transaction-api_1.2_spec" rev="${version.transaction.api}" conf="as,common,ironjacamar-core-api,ironjacamar-core-impl,ironjacamar-depchain,ironjacamar-deployers-fungal,ironjacamar-spec-api,ironjacamar-jdbc"/>
+ <dependency org="org.jboss.spec.javax.security.auth.message" name="jboss-jaspi-1.0-api/jboss-jaspi-api_1.0_spec" rev="${version.jboss.jaspi.api}" conf="as,common,ironjacamar-core-impl,ironjacamar-depchain"/>
+ <dependency org="org.jboss.spec.javax.transaction" name="jboss-transaction-1.2-api/jboss-transaction-api_1.2_spec" rev="${version.transaction.api}" conf="as,common,ironjacamar-core-api,ironjacamar-core-impl,ironjacamar-depchain,ironjacamar-deployers-fungal,ironjacamar-spec-api,ironjacamar-jdbc"/>
<dependency org="org.jboss.stdio" name="jboss-stdio" rev="${version.jboss.stdio}" conf="common,ironjacamar-depchain"/>
<dependency org="org.jboss.threads" name="jboss-threads" rev="${version.jboss.threads}" conf="as,common,ironjacamar-core-api,ironjacamar-core-impl,ironjacamar-depchain"/>
<dependency org="org.jgroups" name="jgroups" rev="${version.jgroups}" conf="as,common,ironjacamar-depchain"/>
--
1.8.4.2