svn commit: r1691474 - in /portals/jetspeed-2/portal/trunk/jetspeed-archetype/src/main/resources/archetype-resources: jetspeed-mvn-settings.xml pom.xml

Author: taylor
Date: Fri Jul 17 01:24:19 2015
New Revision: 1691474

URL: http://svn.apache.org/r1691474
Log:
JS2-1332: release preparation, archetype cleanup

Modified:
    portals/jetspeed-2/portal/trunk/jetspeed-archetype/src/main/resources/archetype-resources/jetspeed-mvn-settings.xml
    portals/jetspeed-2/portal/trunk/jetspeed-archetype/src/main/resources/archetype-resources/pom.xml

Modified: portals/jetspeed-2/portal/trunk/jetspeed-archetype/src/main/resources/archetype-resources/jetspeed-mvn-settings.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-archetype/src/main/resources/archetype-resources/jetspeed-mvn-settings.xml?rev=1691474&r1=1691473&r2=1691474&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-archetype/src/main/resources/archetype-resources/jetspeed-mvn-settings.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-archetype/src/main/resources/archetype-resources/jetspeed-mvn-settings.xml Fri Jul 17 01:24:19 2015
@@ -55,7 +55,7 @@
       </activation>
       <properties>
         
-        <org.apache.jetspeed.server.home>/change/this/apache-tomcat-7.0.62/</org.apache.jetspeed.server.home>
+        <org.apache.jetspeed.server.home>/change/this/apache-tomcat-7.0.63/</org.apache.jetspeed.server.home>
         <org.apache.jetspeed.catalina.version.major>7</org.apache.jetspeed.catalina.version.major>
         
         <!--

Modified: portals/jetspeed-2/portal/trunk/jetspeed-archetype/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-archetype/src/main/resources/archetype-resources/pom.xml?rev=1691474&r1=1691473&r2=1691474&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-archetype/src/main/resources/archetype-resources/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-archetype/src/main/resources/archetype-resources/pom.xml Fri Jul 17 01:24:19 2015
@@ -33,15 +33,15 @@
   <properties>
     <org.apache.portals.jetspeed.version>2.3.0-SNAPSHOT</org.apache.portals.jetspeed.version>
     <org.apache.pluto.version>2.0.3</org.apache.pluto.version>
-    <org.apache.portals.applications.apa-logging.version>1.0</org.apache.portals.applications.apa-logging.version>
+    <org.apache.portals.applications.apa-logging.version>1.1</org.apache.portals.applications.apa-logging.version>
     <ccpp.version>1.0</ccpp.version>
-    <org.apache.portals.bridges.common.version>2.0</org.apache.portals.bridges.common.version>
+    <org.apache.portals.bridges.common.version>2.1</org.apache.portals.bridges.common.version>
     <portals.portlet2-api-spec.version>1.0</portals.portlet2-api-spec.version>
     <javax.servlet.version>3.0.1</javax.servlet.version>
     <javax.servlet.jsp.version>2.2.1</javax.servlet.jsp.version>
-    <javax.servlet.jstl.version>1.2</javax.servlet.jstl.version>
+    <javax.servlet.jstl.version>1.1.2</javax.servlet.jstl.version>
     <portal.context.name>${artifactId}</portal.context.name>
-    <org.apache.jetspeed.server.home>/opt/apache-tomcat-6.0.33/</org.apache.jetspeed.server.home>
+    <org.apache.jetspeed.server.home>/opt/apache-tomcat-7.0.63/</org.apache.jetspeed.server.home>
   </properties>
 
   <dependencyManagement>