You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by tv...@apache.org on 2018/08/01 20:27:42 UTC
svn commit: r1837260 - in /turbine/core/trunk:
conf/test/fulcrumComponentConfiguration.xml
conf/test/fulcrumRoleConfiguration.xml pom.xml
Author: tv
Date: Wed Aug 1 20:27:42 2018
New Revision: 1837260
URL: http://svn.apache.org/viewvc?rev=1837260&view=rev
Log:
Remove dependency on fulcrum-upload
Modified:
turbine/core/trunk/conf/test/fulcrumComponentConfiguration.xml
turbine/core/trunk/conf/test/fulcrumRoleConfiguration.xml
turbine/core/trunk/pom.xml
Modified: turbine/core/trunk/conf/test/fulcrumComponentConfiguration.xml
URL: http://svn.apache.org/viewvc/turbine/core/trunk/conf/test/fulcrumComponentConfiguration.xml?rev=1837260&r1=1837259&r2=1837260&view=diff
==============================================================================
--- turbine/core/trunk/conf/test/fulcrumComponentConfiguration.xml (original)
+++ turbine/core/trunk/conf/test/fulcrumComponentConfiguration.xml Wed Aug 1 20:27:42 2018
@@ -42,7 +42,6 @@
<bundle>org.apache.turbine.services.localization.BarBundle</bundle>
</bundles>
</localization>
- <upload repository="target" sizeMax="1048576" sizeThreshold="10240"/>
<intake>
<serialDataPath>target/appData.ser</serialDataPath>
<xmlPaths>
Modified: turbine/core/trunk/conf/test/fulcrumRoleConfiguration.xml
URL: http://svn.apache.org/viewvc/turbine/core/trunk/conf/test/fulcrumRoleConfiguration.xml?rev=1837260&r1=1837259&r2=1837260&view=diff
==============================================================================
--- turbine/core/trunk/conf/test/fulcrumRoleConfiguration.xml (original)
+++ turbine/core/trunk/conf/test/fulcrumRoleConfiguration.xml Wed Aug 1 20:27:42 2018
@@ -49,11 +49,6 @@
default-class="org.apache.fulcrum.localization.DefaultLocalizationService"/>
<role
- name="org.apache.fulcrum.upload.UploadService"
- shorthand="upload"
- default-class="org.apache.fulcrum.upload.DefaultUploadService"/>
-
- <role
name="org.apache.fulcrum.intake.IntakeService"
shorthand="intake"
default-class="org.apache.fulcrum.intake.IntakeServiceImpl"/>
Modified: turbine/core/trunk/pom.xml
URL: http://svn.apache.org/viewvc/turbine/core/trunk/pom.xml?rev=1837260&r1=1837259&r2=1837260&view=diff
==============================================================================
--- turbine/core/trunk/pom.xml (original)
+++ turbine/core/trunk/pom.xml Wed Aug 1 20:27:42 2018
@@ -835,40 +835,20 @@
<artifactId>commons-codec</artifactId>
<version>1.11</version>
</dependency>
- <!--
- TODO after 4.0.x releae:
-
- update to <groupId>org.apache.commons</groupId>
- <artifactId>commons-collections4</artifactId>
- <version>4.1</version>
- and
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-configuration2</artifactId>
- <version>2.2</version may otherwise switch to other framework ? -->
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2.2</version>
- </dependency>
- <dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
- <version>1.10</version>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-configuration2</artifactId>
+ <version>2.2</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-email</artifactId>
<version>1.5</version>
</dependency>
- <!-- TODO requires Java 1.7 :
+ <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.7</version>
- -->
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.6</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
@@ -914,9 +894,8 @@
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-parser</artifactId>
- <version>1.0.3</version>
+ <version>2.0.0-SNAPSHOT</version>
</dependency>
- <!-- using snapshot until released -->
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-intake</artifactId>
@@ -1058,12 +1037,6 @@
<version>2.2.9</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.fulcrum</groupId>
- <artifactId>fulcrum-upload</artifactId>
- <version>1.0.5</version>
- <scope>test</scope>
- </dependency>
<!-- moved mockito to testcontainer with v1.0.8 -->
<dependency>
<groupId>org.mockito</groupId>
@@ -1144,7 +1117,7 @@
<!-- TODO: Change for release -->
<!--turbine.site.path>turbine/development/turbine-4.1</turbine.site.path-->
<turbine.site.path>turbine/turbine-4.0</turbine.site.path>
- <fulcrum.intake>1.2.3</fulcrum.intake>
+ <fulcrum.intake>2.0.0-SNAPSHOT</fulcrum.intake>
<fulcrum.security>1.1.2</fulcrum.security>
<slf4j.version>1.7.25</slf4j.version>
<dependency.check.skip>true</dependency.check.skip>