You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by pa...@apache.org on 2018/10/04 15:22:08 UTC
svn commit: r1842825 - in /turbine/fulcrum/trunk: crypto/ dvsl/ hsqldb/
hsqldb/src/test/ intake/ jetty/ mimetype/ naming/ osworkflow/ pbe/ quartz/
resourcemanager/ script/ security/ security/api/ security/hibernate/
security/ldap/ security/memory/ secu...
Author: painter
Date: Thu Oct 4 15:22:07 2018
New Revision: 1842825
URL: http://svn.apache.org/viewvc?rev=1842825&view=rev
Log:
Update all fulcrum components using current yaafi and servlet 3.1.0 - clean build
Modified:
turbine/fulcrum/trunk/crypto/pom.xml
turbine/fulcrum/trunk/dvsl/project.xml
turbine/fulcrum/trunk/hsqldb/pom.xml
turbine/fulcrum/trunk/hsqldb/src/test/test.properties
turbine/fulcrum/trunk/intake/pom.xml
turbine/fulcrum/trunk/jetty/pom.xml
turbine/fulcrum/trunk/mimetype/pom.xml
turbine/fulcrum/trunk/naming/project.xml
turbine/fulcrum/trunk/osworkflow/project.xml
turbine/fulcrum/trunk/pbe/pom.xml
turbine/fulcrum/trunk/quartz/pom.xml
turbine/fulcrum/trunk/resourcemanager/pom.xml
turbine/fulcrum/trunk/script/pom.xml
turbine/fulcrum/trunk/security/api/pom.xml
turbine/fulcrum/trunk/security/hibernate/pom.xml
turbine/fulcrum/trunk/security/ldap/pom.xml
turbine/fulcrum/trunk/security/memory/pom.xml
turbine/fulcrum/trunk/security/nt/pom.xml
turbine/fulcrum/trunk/security/pom.xml
turbine/fulcrum/trunk/security/torque/pom.xml
turbine/fulcrum/trunk/servicemanager/pom.xml
turbine/fulcrum/trunk/spring/pom.xml
turbine/fulcrum/trunk/template/pom.xml
turbine/fulcrum/trunk/testcontainer/pom.xml
turbine/fulcrum/trunk/upload/pom.xml
turbine/fulcrum/trunk/upload/src/test/org/apache/fulcrum/upload/UploadServiceTest.java
turbine/fulcrum/trunk/xslt/pom.xml
Modified: turbine/fulcrum/trunk/crypto/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/crypto/pom.xml?rev=1842825&r1=1842824&r2=1842825&view=diff
==============================================================================
--- turbine/fulcrum/trunk/crypto/pom.xml (original)
+++ turbine/fulcrum/trunk/crypto/pom.xml Thu Oct 4 15:22:07 2018
@@ -74,13 +74,13 @@
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
- <version>1.0.6</version>
+ <version>1.0.8-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-yaafi</artifactId>
- <version>1.0.6</version>
+ <version>1.0.8-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: turbine/fulcrum/trunk/dvsl/project.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/dvsl/project.xml?rev=1842825&r1=1842824&r2=1842825&view=diff
==============================================================================
--- turbine/fulcrum/trunk/dvsl/project.xml (original)
+++ turbine/fulcrum/trunk/dvsl/project.xml Thu Oct 4 15:22:07 2018
@@ -47,11 +47,11 @@
<artifactId>dom4j</artifactId>
<version>1.6.1</version>
</dependency>
- <dependency>
- <groupId>jaxen</groupId>
- <artifactId>jaxen</artifactId>
- <version>1.1-beta-6</version>
- </dependency>
+ <dependency>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ <version>1.1.6</version>
+ </dependency>
<dependency>
<groupId>velocity</groupId>
<artifactId>velocity</artifactId>
@@ -75,13 +75,13 @@
<dependency>
<groupId>fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
- <version>1.0.5</version>
+ <version>1.0.8-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>fulcrum</groupId>
<artifactId>fulcrum-yaafi</artifactId>
- <version>1.0.5</version>
+ <version>1.0.8-SNAPSHOT</version>
</dependency>
<!-- Needed for Gump -->
Modified: turbine/fulcrum/trunk/hsqldb/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/hsqldb/pom.xml?rev=1842825&r1=1842824&r2=1842825&view=diff
==============================================================================
--- turbine/fulcrum/trunk/hsqldb/pom.xml (original)
+++ turbine/fulcrum/trunk/hsqldb/pom.xml Thu Oct 4 15:22:07 2018
@@ -64,13 +64,13 @@
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
- <version>1.0.6</version>
+ <version>1.0.8-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-yaafi</artifactId>
- <version>1.0.6</version>
+ <version>1.0.8-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<!-- project depdendencies -->
Modified: turbine/fulcrum/trunk/hsqldb/src/test/test.properties
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/hsqldb/src/test/test.properties?rev=1842825&r1=1842824&r2=1842825&view=diff
==============================================================================
--- turbine/fulcrum/trunk/hsqldb/src/test/test.properties (original)
+++ turbine/fulcrum/trunk/hsqldb/src/test/test.properties Thu Oct 4 15:22:07 2018
@@ -1,5 +1,5 @@
#HSQL Database Engine 1.8.0.10
-#Wed Oct 03 09:44:31 EDT 2018
+#Thu Oct 04 11:15:54 EDT 2018
hsqldb.script_format=0
runtime.gc_interval=0
sql.enforce_strict_size=false
Modified: turbine/fulcrum/trunk/intake/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/pom.xml?rev=1842825&r1=1842824&r2=1842825&view=diff
==============================================================================
--- turbine/fulcrum/trunk/intake/pom.xml (original)
+++ turbine/fulcrum/trunk/intake/pom.xml Thu Oct 4 15:22:07 2018
@@ -130,14 +130,14 @@
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
- <version>1.0.7</version>
+ <version>1.0.8-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<!-- be aware to adapt group-id to org.apache.fulcrum again after version 1.0.7 -->
<dependency>
- <groupId>org.apache.turbine</groupId>
+ <groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-yaafi</artifactId>
- <version>1.0.7</version>
+ <version>1.0.8-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: turbine/fulcrum/trunk/jetty/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/jetty/pom.xml?rev=1842825&r1=1842824&r2=1842825&view=diff
==============================================================================
--- turbine/fulcrum/trunk/jetty/pom.xml (original)
+++ turbine/fulcrum/trunk/jetty/pom.xml Thu Oct 4 15:22:07 2018
@@ -75,13 +75,13 @@
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
- <version>1.0.6</version>
+ <version>1.0.8-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-yaafi</artifactId>
- <version>1.0.6</version>
+ <version>1.0.8-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: turbine/fulcrum/trunk/mimetype/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/mimetype/pom.xml?rev=1842825&r1=1842824&r2=1842825&view=diff
==============================================================================
--- turbine/fulcrum/trunk/mimetype/pom.xml (original)
+++ turbine/fulcrum/trunk/mimetype/pom.xml Thu Oct 4 15:22:07 2018
@@ -67,13 +67,13 @@
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
- <version>1.0.6</version>
+ <version>1.0.8-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-yaafi</artifactId>
- <version>1.0.6</version>
+ <version>1.0.8-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: turbine/fulcrum/trunk/naming/project.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/naming/project.xml?rev=1842825&r1=1842824&r2=1842825&view=diff
==============================================================================
--- turbine/fulcrum/trunk/naming/project.xml (original)
+++ turbine/fulcrum/trunk/naming/project.xml Thu Oct 4 15:22:07 2018
@@ -36,13 +36,13 @@
<dependency>
<groupId>fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
- <version>1.0.5</version>
+ <version>1.0.8-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>fulcrum</groupId>
<artifactId>fulcrum-yaafi</artifactId>
- <version>1.0.5</version>
+ <version>1.0.8-SNAPSHOT</version>
</dependency>
</dependencies>
Modified: turbine/fulcrum/trunk/osworkflow/project.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/osworkflow/project.xml?rev=1842825&r1=1842824&r2=1842825&view=diff
==============================================================================
--- turbine/fulcrum/trunk/osworkflow/project.xml (original)
+++ turbine/fulcrum/trunk/osworkflow/project.xml Thu Oct 4 15:22:07 2018
@@ -63,13 +63,11 @@
<artifactId>osuser</artifactId>
<version>1.0-dev</version>
</dependency-->
-
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <version>1.0.2</version>
- <url>http://java.sun.com/products/javabeans/glasgow/jaf.html</url>
- </dependency>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ <version>1.1.1</version>
+ </dependency>
<dependency>
<groupId>bsh</groupId>
<artifactId>bsh</artifactId>
@@ -86,13 +84,13 @@
<dependency>
<groupId>fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
- <version>1.0.5</version>
+ <version>1.0.8-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>fulcrum</groupId>
<artifactId>fulcrum-yaafi</artifactId>
- <version>1.0.5</version>
+ <version>1.0.8-SNAPSHOT</version>
</dependency>
Modified: turbine/fulcrum/trunk/pbe/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/pbe/pom.xml?rev=1842825&r1=1842824&r2=1842825&view=diff
==============================================================================
--- turbine/fulcrum/trunk/pbe/pom.xml (original)
+++ turbine/fulcrum/trunk/pbe/pom.xml Thu Oct 4 15:22:07 2018
@@ -6,6 +6,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-pbe</artifactId>
<version>1.0.2-SNAPSHOT</version>
<name>Fulcrum PBE</name>
@@ -49,19 +50,19 @@
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-yaafi-crypto</artifactId>
- <version>1.0.6</version>
+ <version>1.0.7-SNAPSHOT</version>
</dependency>
<!-- testing dependencies -->
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
- <version>1.0.6</version>
+ <version>1.0.8-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-yaafi</artifactId>
- <version>1.0.6</version>
+ <version>1.0.8-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: turbine/fulcrum/trunk/quartz/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/quartz/pom.xml?rev=1842825&r1=1842824&r2=1842825&view=diff
==============================================================================
--- turbine/fulcrum/trunk/quartz/pom.xml (original)
+++ turbine/fulcrum/trunk/quartz/pom.xml Thu Oct 4 15:22:07 2018
@@ -101,13 +101,13 @@
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
- <version>1.0.6</version>
+ <version>1.0.8-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-yaafi</artifactId>
- <version>1.0.6</version>
+ <version>1.0.8-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<!-- Service Dependencies -->
Modified: turbine/fulcrum/trunk/resourcemanager/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/resourcemanager/pom.xml?rev=1842825&r1=1842824&r2=1842825&view=diff
==============================================================================
--- turbine/fulcrum/trunk/resourcemanager/pom.xml (original)
+++ turbine/fulcrum/trunk/resourcemanager/pom.xml Thu Oct 4 15:22:07 2018
@@ -53,19 +53,19 @@
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-pbe</artifactId>
- <version>1.0.1</version>
+ <version>1.0.2-SNAPSHOT</version>
</dependency>
<!-- testing dependencies -->
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
- <version>1.0.6</version>
+ <version>1.0.8-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-yaafi</artifactId>
- <version>1.0.6</version>
+ <version>1.0.8-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -88,8 +88,8 @@
<properties>
<!-- Default configuration for compiler source and target JVM -->
- <maven.compile.source>1.4</maven.compile.source>
- <maven.compile.target>1.4</maven.compile.target>
+ <maven.compile.source>1.8</maven.compile.source>
+ <maven.compile.target>1.8</maven.compile.target>
<fulcrum.release.version>1.0.1</fulcrum.release.version>
<fulcrum.rc.version>RC2</fulcrum.rc.version>
</properties>
Modified: turbine/fulcrum/trunk/script/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/script/pom.xml?rev=1842825&r1=1842824&r2=1842825&view=diff
==============================================================================
--- turbine/fulcrum/trunk/script/pom.xml (original)
+++ turbine/fulcrum/trunk/script/pom.xml Thu Oct 4 15:22:07 2018
@@ -79,13 +79,13 @@
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
- <version>1.0.6</version>
+ <version>1.0.8-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-yaafi</artifactId>
- <version>1.0.6</version>
+ <version>1.0.8-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: turbine/fulcrum/trunk/security/api/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/api/pom.xml?rev=1842825&r1=1842824&r2=1842825&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/api/pom.xml (original)
+++ turbine/fulcrum/trunk/security/api/pom.xml Thu Oct 4 15:22:07 2018
@@ -37,6 +37,7 @@
</scm>
<dependencies>
+
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
@@ -50,16 +51,25 @@
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-crypto</artifactId>
- <version>1.0.7</version>
+ <version>1.0.8-SNAPSHOT</version>
</dependency>
+ <!-- testing dependencies -->
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>3.1.0</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
+ <version>1.0.8-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.turbine</groupId>
+ <groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-yaafi</artifactId>
+ <version>1.0.8-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: turbine/fulcrum/trunk/security/hibernate/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/hibernate/pom.xml?rev=1842825&r1=1842824&r2=1842825&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/hibernate/pom.xml (original)
+++ turbine/fulcrum/trunk/security/hibernate/pom.xml Thu Oct 4 15:22:07 2018
@@ -68,6 +68,7 @@
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-security-api</artifactId>
+ <version>1.1.3-SNAPSHOT</version>
</dependency>
<!-- Needed for the Hibernate SPI -->
@@ -99,15 +100,23 @@
<version>1.8.0.7</version>
<scope>test</scope>
</dependency>
+ <!-- testing dependencies -->
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>3.1.0</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
- <version>1.0.7</version>
+ <version>1.0.8-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.turbine</groupId>
+ <groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-yaafi</artifactId>
+ <version>1.0.8-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: turbine/fulcrum/trunk/security/ldap/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/ldap/pom.xml?rev=1842825&r1=1842824&r2=1842825&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/ldap/pom.xml (original)
+++ turbine/fulcrum/trunk/security/ldap/pom.xml Thu Oct 4 15:22:07 2018
@@ -74,31 +74,31 @@
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-security-api</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.1.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-security-api</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.1.3-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-security-memory</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.1.3-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
- <version>1.0.7</version>
+ <version>1.0.8-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.turbine</groupId>
<artifactId>fulcrum-yaafi</artifactId>
- <version>1.0.7</version>
+ <version>1.0.8-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: turbine/fulcrum/trunk/security/memory/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/memory/pom.xml?rev=1842825&r1=1842824&r2=1842825&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/memory/pom.xml (original)
+++ turbine/fulcrum/trunk/security/memory/pom.xml Thu Oct 4 15:22:07 2018
@@ -79,14 +79,23 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
+ <!-- testing dependencies -->
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>3.1.0</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
+ <version>1.0.8-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.turbine</groupId>
+ <groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-yaafi</artifactId>
+ <version>1.0.8-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: turbine/fulcrum/trunk/security/nt/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/nt/pom.xml?rev=1842825&r1=1842824&r2=1842825&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/nt/pom.xml (original)
+++ turbine/fulcrum/trunk/security/nt/pom.xml Thu Oct 4 15:22:07 2018
@@ -52,7 +52,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.turbine</groupId>
+ <groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-yaafi</artifactId>
<scope>test</scope>
</dependency>
Modified: turbine/fulcrum/trunk/security/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/pom.xml?rev=1842825&r1=1842824&r2=1842825&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/pom.xml (original)
+++ turbine/fulcrum/trunk/security/pom.xml Thu Oct 4 15:22:07 2018
@@ -109,13 +109,13 @@
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
- <version>1.0.7</version>
+ <version>1.0.8-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.turbine</groupId>
+ <groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-yaafi</artifactId>
- <version>1.0.7</version>
+ <version>1.0.8-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: turbine/fulcrum/trunk/security/torque/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/pom.xml?rev=1842825&r1=1842824&r2=1842825&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/pom.xml (original)
+++ turbine/fulcrum/trunk/security/torque/pom.xml Thu Oct 4 15:22:07 2018
@@ -72,17 +72,26 @@
<version>1.8.0.10</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.fulcrum</groupId>
- <artifactId>fulcrum-testcontainer</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.fulcrum</groupId>
- <artifactId>fulcrum-yaafi</artifactId>
- <version>1.0.8-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
+
+ <!-- testing dependencies -->
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>3.1.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.fulcrum</groupId>
+ <artifactId>fulcrum-testcontainer</artifactId>
+ <version>1.0.8-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.fulcrum</groupId>
+ <artifactId>fulcrum-yaafi</artifactId>
+ <version>1.0.8-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<profiles>
Modified: turbine/fulcrum/trunk/servicemanager/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/servicemanager/pom.xml?rev=1842825&r1=1842824&r2=1842825&view=diff
==============================================================================
--- turbine/fulcrum/trunk/servicemanager/pom.xml (original)
+++ turbine/fulcrum/trunk/servicemanager/pom.xml Thu Oct 4 15:22:07 2018
@@ -70,13 +70,13 @@
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
- <version>1.0.6</version>
+ <version>1.0.8-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-yaafi</artifactId>
- <version>1.0.6</version>
+ <version>1.0.8-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: turbine/fulcrum/trunk/spring/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/spring/pom.xml?rev=1842825&r1=1842824&r2=1842825&view=diff
==============================================================================
--- turbine/fulcrum/trunk/spring/pom.xml (original)
+++ turbine/fulcrum/trunk/spring/pom.xml Thu Oct 4 15:22:07 2018
@@ -51,7 +51,7 @@
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-yaafi</artifactId>
- <version>1.0.6</version>
+ <version>1.0.8-SNAPSHOT</version>
<optional>true</optional>
</dependency>
<!-- Spring depedencies - these are optional so you have to declare your Spring dependency manually -->
@@ -91,8 +91,8 @@
<properties>
<!-- Default configuration for compiler source and target JVM -->
- <maven.compile.source>1.4</maven.compile.source>
- <maven.compile.target>1.4</maven.compile.target>
+ <maven.compile.source>1.8</maven.compile.source>
+ <maven.compile.target>1.8</maven.compile.target>
<!-- This bits are used for the staging directory -->
<fulcrum.release.version>1.0.0</fulcrum.release.version>
<fulcrum.rc.version>RC1</fulcrum.rc.version>
Modified: turbine/fulcrum/trunk/template/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/template/pom.xml?rev=1842825&r1=1842824&r2=1842825&view=diff
==============================================================================
--- turbine/fulcrum/trunk/template/pom.xml (original)
+++ turbine/fulcrum/trunk/template/pom.xml Thu Oct 4 15:22:07 2018
@@ -53,7 +53,7 @@
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
- <version>3.2.1</version>
+ <version>3.2.2</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -68,7 +68,7 @@
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-yaafi</artifactId>
- <version>1.0.6</version>
+ <version>1.0.8-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
@@ -78,7 +78,7 @@
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
- <version>1.0.6</version>
+ <version>1.0.8-SNAPSHOT</version>
<type>jar</type>
<scope>test</scope>
</dependency>
Modified: turbine/fulcrum/trunk/testcontainer/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/testcontainer/pom.xml?rev=1842825&r1=1842824&r2=1842825&view=diff
==============================================================================
--- turbine/fulcrum/trunk/testcontainer/pom.xml (original)
+++ turbine/fulcrum/trunk/testcontainer/pom.xml Thu Oct 4 15:22:07 2018
@@ -67,15 +67,14 @@
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-yaafi</artifactId>
- <version>1.0.6</version>
+ <version>1.0.8-SNAPSHOT</version>
<optional>true</optional>
</dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>provided</scope>
- </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>3.1.0</version>
+ </dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
Modified: turbine/fulcrum/trunk/upload/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/upload/pom.xml?rev=1842825&r1=1842824&r2=1842825&view=diff
==============================================================================
--- turbine/fulcrum/trunk/upload/pom.xml (original)
+++ turbine/fulcrum/trunk/upload/pom.xml Thu Oct 4 15:22:07 2018
@@ -78,19 +78,18 @@
<artifactId>avalon-framework-api</artifactId>
<version>4.3.1</version>
</dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <optional>true</optional>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.portlet</groupId>
- <artifactId>portlet-api</artifactId>
- <version>2.0</version>
- <optional>true</optional>
- </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>3.1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.portlet</groupId>
+ <artifactId>portlet-api</artifactId>
+ <version>3.0.1</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
@@ -101,20 +100,20 @@
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
- <version>1.0.7</version>
+ <version>1.0.8-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.turbine</groupId>
+ <groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-yaafi</artifactId>
- <version>1.0.7</version>
+ <version>1.0.8-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<!-- remove mockito, if testcontainer upgrading to v1.0.8 -->
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>2.18.3</version>
+ <version>2.22.0</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: turbine/fulcrum/trunk/upload/src/test/org/apache/fulcrum/upload/UploadServiceTest.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/upload/src/test/org/apache/fulcrum/upload/UploadServiceTest.java?rev=1842825&r1=1842824&r2=1842825&view=diff
==============================================================================
--- turbine/fulcrum/trunk/upload/src/test/org/apache/fulcrum/upload/UploadServiceTest.java (original)
+++ turbine/fulcrum/trunk/upload/src/test/org/apache/fulcrum/upload/UploadServiceTest.java Thu Oct 4 15:22:07 2018
@@ -41,6 +41,7 @@ import java.util.Locale;
import java.util.Map;
import java.util.Vector;
+import javax.servlet.ReadListener;
import javax.servlet.ServletInputStream;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
@@ -132,6 +133,24 @@ public class UploadServiceTest extends B
public int read() throws IOException {
return is.read();
}
+
+ @Override
+ public boolean isFinished() {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ @Override
+ public boolean isReady() {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ @Override
+ public void setReadListener(ReadListener readListener) {
+ // TODO Auto-generated method stub
+
+ }
});
}
Modified: turbine/fulcrum/trunk/xslt/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/xslt/pom.xml?rev=1842825&r1=1842824&r2=1842825&view=diff
==============================================================================
--- turbine/fulcrum/trunk/xslt/pom.xml (original)
+++ turbine/fulcrum/trunk/xslt/pom.xml Thu Oct 4 15:22:07 2018
@@ -90,13 +90,13 @@
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
- <version>1.0.6</version>
+ <version>1.0.8-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-yaafi</artifactId>
- <version>1.0.6</version>
+ <version>1.0.8-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>