Author: taylor
Date: Sat Jul 12 22:26:42 2014
New Revision: 1610077
URL: http://svn.apache.org/r1610077
Log:
JS2-1290: jar upgrade for spring and some apache commons dependencies.
contribution from David Dyer
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/pom.xml
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/views.properties
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/_content/BillOfRights.html
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/_content/en/bor.html
Modified: portals/jetspeed-2/applications/j2-admin/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/pom.xml?rev=1610077&r1=1610076&r2=1610077&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/pom.xml (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/pom.xml Sat Jul 12 22:26:42
2014
@@ -36,22 +36,23 @@
<org.apache.portals.bridges.velocity.version>2.0</org.apache.portals.bridges.velocity.version>
<org.apache.portals.bridges.frameworks.version>1.0.4</org.apache.portals.bridges.frameworks.version>
<org.apache.portals.bridges.portletfilter.version>1.0.4</org.apache.portals.bridges.portletfilter.version>
-
<org.apache.portals.applications.apa-gems.version>1.1</org.apache.portals.applications.apa-gems.version>
+
<org.apache.portals.applications.apa-gems.version>1.2-SNAPSHOT</org.apache.portals.applications.apa-gems.version>
<org.apache.portals.applications.apa-webcontent.version>1.4-SNAPSHOT</org.apache.portals.applications.apa-webcontent.version>
- <commons-digester.version>1.8</commons-digester.version>
- <commons-configuration.version>1.6</commons-configuration.version>
- <commons-lang.version>2.4</commons-lang.version>
- <commons-fileupload.version>1.2</commons-fileupload.version>
- <commons-io.version>1.4</commons-io.version>
- <commons-beanutils.version>1.8.0</commons-beanutils.version>
+ <commons-digester.version>2.1</commons-digester.version>
+ <commons-configuration.version>1.10</commons-configuration.version>
+ <commons-lang.version>2.6</commons-lang.version>
+ <commons-fileupload.version>1.3.1</commons-fileupload.version>
+ <commons-io.version>2.4</commons-io.version>
+ <commons-beanutils.version>1.9.2</commons-beanutils.version>
<slf4j.version>1.5.6</slf4j.version>
<javax.servlet.jstl.version>1.1.2</javax.servlet.jstl.version>
<javax.servlet.version>2.4</javax.servlet.version>
<javax.servlet.jsp.version>2.0</javax.servlet.jsp.version>
- <log4j.version>1.2.14</log4j.version>
+ <log4j.version>1.2.17</log4j.version>
<portals.portlet2-api-spec.version>1.0</portals.portlet2-api-spec.version>
<org.apache.pluto.version>2.0.3</org.apache.pluto.version>
- <spring.version>2.5.6</spring.version>
+ <!-- <spring.version>2.5.6</spring.version> -->
+ <spring.version>3.2.9.RELEASE</spring.version>
<taglibs-request.version>1.0.1</taglibs-request.version>
<taglibs-standard.version>1.1.2</taglibs-standard.version>
<velocity-tools.version>1.3</velocity-tools.version>
@@ -309,6 +310,17 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
+ <artifactId>spring-context-support</artifactId>
+ <version>${spring.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>${spring.version}</version>
<exclusions>
@@ -394,7 +406,14 @@
</exclusion>
</exclusions>
</dependency>
-
+
+ <!-- test dependencies -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.10</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<!-- Build Configuration -->
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/views.properties
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/views.properties?rev=1610077&r1=1610076&r2=1610077&view=diff
==============================================================================
---
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/views.properties
(original)
+++
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/views.properties
Sat Jul 12 22:26:42 2014
@@ -14,9 +14,9 @@
# limitations under the License.
-constraintsView.class =
org.springframework.web.servlet.view.velocity.VelocityView
+constraintsView.(class) =
org.springframework.web.servlet.view.velocity.VelocityView
constraintsView.url = security/constraints/constraints-view.vm
-#constraintsEdit.class = org.springframework.web.servlet.view.JstlView
+#constraintsEdit.(class) = org.springframework.web.servlet.view.JstlView
#constraintsEdit.url = /WEB-INF/jsp/domTreeEdit.jsp
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/_content/BillOfRights.html
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/_content/BillOfRights.html?rev=1610077&r1=1610076&r2=1610077&view=diff
==============================================================================
---
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/_content/BillOfRights.html
(original)
+++
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/_content/BillOfRights.html
Sat Jul 12 22:26:42 2014
@@ -90,7 +90,7 @@ to the rules of the common law.
<P>Excessive bail shall not be required, nor excessive fines
imposed, nor cruel and unusual punishments inflicted.
-<P><a name="9"<strong><H3>Amendment IX</h3></strong></a>
+<P><a name="9"><strong><H3>Amendment IX</h3></strong></a>
<P>The enumeration in the Constitution, of certain rights, shall
not be construed to deny or disparage others retained by the people.
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/_content/en/bor.html
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/_content/en/bor.html?rev=1610077&r1=1610076&r2=1610077&view=diff
==============================================================================
---
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/_content/en/bor.html
(original)
+++
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/_content/en/bor.html
Sat Jul 12 22:26:42 2014
@@ -90,7 +90,7 @@ to the rules of the common law.
<P>Excessive bail shall not be required, nor excessive fines
imposed, nor cruel and unusual punishments inflicted.
-<P><a name="9"<strong><H3>Amendment IX</h3></strong></a>
+<P><a name="9"><strong><H3>Amendment IX</h3></strong></a>
<P>The enumeration in the Constitution, of certain rights, shall
not be construed to deny or disparage others retained by the people.
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscr...@portals.apache.org
For additional commands, e-mail: jetspeed-dev-h...@portals.apache.org
