Author: sgoeschl
Date: Sat Jan 7 08:55:40 2006
New Revision: 366829
URL: http://svn.apache.org/viewcvs?rev=366829&view=rev
Log:
Resolving JAR conflicts reported by dependency convergence report
Modified:
jakarta/turbine/fulcrum/trunk/groovy/project.xml
jakarta/turbine/fulcrum/trunk/osworkflow/example/project.xml
jakarta/turbine/fulcrum/trunk/script/project.xml
jakarta/turbine/fulcrum/trunk/script/src/java/org/apache/fulcrum/script/impl/ScriptAvalonContextImpl.java
jakarta/turbine/fulcrum/trunk/script/src/java/org/apache/fulcrum/script/impl/ScriptBaseService.java
jakarta/turbine/fulcrum/trunk/security/adapters/turbine/project.xml
jakarta/turbine/fulcrum/trunk/template/project.xml
Modified: jakarta/turbine/fulcrum/trunk/groovy/project.xml
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/fulcrum/trunk/groovy/project.xml?rev=366829&r1=366828&r2=366829&view=diff
==============================================================================
--- jakarta/turbine/fulcrum/trunk/groovy/project.xml (original)
+++ jakarta/turbine/fulcrum/trunk/groovy/project.xml Sat Jan 7 08:55:40 2006
@@ -22,7 +22,7 @@
<dependency>
<groupId>groovy</groupId>
<artifactId>groovy-all</artifactId>
- <version>1.0-jsr-03</version>
+ <version>1.0-jsr-04</version>
</dependency>
<!-- Needed only for testing -->
Modified: jakarta/turbine/fulcrum/trunk/osworkflow/example/project.xml
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/fulcrum/trunk/osworkflow/example/project.xml?rev=366829&r1=366828&r2=366829&view=diff
==============================================================================
--- jakarta/turbine/fulcrum/trunk/osworkflow/example/project.xml (original)
+++ jakarta/turbine/fulcrum/trunk/osworkflow/example/project.xml Sat Jan 7
08:55:40 2006
@@ -123,15 +123,6 @@
<!-- Boilerplate Turbine Dependency List -->
<dependency>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework</artifactId>
- <version>4.1.5</version>
- <url>http://jakarta.apache.org/avalon/</url>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
- </dependency>
- <dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.6.1</version>
@@ -160,7 +151,7 @@
<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
- <version>1.0</version>
+ <version>1.1</version>
<url>http://jakarta.apache.org/commons/sandbox/configuration/index.html</url>
<properties>
<war.bundle>true</war.bundle>
Modified: jakarta/turbine/fulcrum/trunk/script/project.xml
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/fulcrum/trunk/script/project.xml?rev=366829&r1=366828&r2=366829&view=diff
==============================================================================
--- jakarta/turbine/fulcrum/trunk/script/project.xml (original)
+++ jakarta/turbine/fulcrum/trunk/script/project.xml Sat Jan 7 08:55:40 2006
@@ -19,7 +19,7 @@
<dependency>
<groupId>fulcrum</groupId>
<artifactId>fulcrum-yaafi</artifactId>
- <version>1.0.5-dev</version>
+ <version>1.0.4</version>
<url>http://jakarta.apache.org/turbine/fulcrum/</url>
</dependency>
Modified:
jakarta/turbine/fulcrum/trunk/script/src/java/org/apache/fulcrum/script/impl/ScriptAvalonContextImpl.java
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/fulcrum/trunk/script/src/java/org/apache/fulcrum/script/impl/ScriptAvalonContextImpl.java?rev=366829&r1=366828&r2=366829&view=diff
==============================================================================
---
jakarta/turbine/fulcrum/trunk/script/src/java/org/apache/fulcrum/script/impl/ScriptAvalonContextImpl.java
(original)
+++
jakarta/turbine/fulcrum/trunk/script/src/java/org/apache/fulcrum/script/impl/ScriptAvalonContextImpl.java
Sat Jan 7 08:55:40 2006
@@ -35,10 +35,10 @@
public class ScriptAvalonContextImpl implements ScriptAvalonContext
{
/** context key for persistent directory*/
- private final static String URN_AVALON_HOME = "context-root";
+ private final static String URN_AVALON_HOME = "urn:avalon:home";
/** context key for temporary directory */
- private final static String URN_AVALON_TEMP = "impl.workDir";
+ private final static String URN_AVALON_TEMP = "urn:avalon:temp";
/** the Avalon service manager instance */
private ServiceManager serviceManager;
Modified:
jakarta/turbine/fulcrum/trunk/script/src/java/org/apache/fulcrum/script/impl/ScriptBaseService.java
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/fulcrum/trunk/script/src/java/org/apache/fulcrum/script/impl/ScriptBaseService.java?rev=366829&r1=366828&r2=366829&view=diff
==============================================================================
---
jakarta/turbine/fulcrum/trunk/script/src/java/org/apache/fulcrum/script/impl/ScriptBaseService.java
(original)
+++
jakarta/turbine/fulcrum/trunk/script/src/java/org/apache/fulcrum/script/impl/ScriptBaseService.java
Sat Jan 7 08:55:40 2006
@@ -48,10 +48,10 @@
implements Contextualizable, Serviceable, Configurable, Parameterizable,
Reconfigurable, Disposable
{
/** context key for persistent directory */
- private final static String URN_AVALON_HOME = "context-root";
+ private final static String URN_AVALON_HOME = "urn:avalon:home";
/** context key for temporary directory */
- private final static String URN_AVALON_TEMP = "impl.workDir";
+ private final static String URN_AVALON_TEMP = "urn:avalon:temp";
/** The context supplied by the avalon framework */
private Context context;
Modified: jakarta/turbine/fulcrum/trunk/security/adapters/turbine/project.xml
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/fulcrum/trunk/security/adapters/turbine/project.xml?rev=366829&r1=366828&r2=366829&view=diff
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/adapters/turbine/project.xml
(original)
+++ jakarta/turbine/fulcrum/trunk/security/adapters/turbine/project.xml Sat Jan
7 08:55:40 2006
@@ -33,7 +33,7 @@
<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
- <version>1.0</version>
+ <version>1.1</version>
</dependency>
@@ -48,7 +48,7 @@
<dependency>
<groupId>xstream</groupId>
<artifactId>xstream</artifactId>
- <version>1.0.2</version>
+ <version>1.1.2</version>
<url>http://xstream.codehaus.org/</url>
</dependency>
Modified: jakarta/turbine/fulcrum/trunk/template/project.xml
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/fulcrum/trunk/template/project.xml?rev=366829&r1=366828&r2=366829&view=diff
==============================================================================
--- jakarta/turbine/fulcrum/trunk/template/project.xml (original)
+++ jakarta/turbine/fulcrum/trunk/template/project.xml Sat Jan 7 08:55:40 2006
@@ -8,7 +8,7 @@
<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
- <version>1.0</version>
+ <version>1.1</version>
<url>http://jakarta.apache.org/commons/configuration</url>
</dependency>
<dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
