Author: taylor
Date: Wed May 4 18:46:27 2016
New Revision: 1742316
URL: http://svn.apache.org/viewvc?rev=1742316&view=rev
Log:
JS2-1355: pre-release version patches
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed-demo/jetspeed-mvn-demo-pom.xml
portals/jetspeed-2/portal/trunk/enterprise/ear-full/pom.xml
portals/jetspeed-2/portal/trunk/enterprise/ear-min/pom.xml
portals/jetspeed-2/portal/trunk/enterprise/pom.xml
portals/jetspeed-2/portal/trunk/jetspeed-archetype/pom.xml
portals/jetspeed-2/portal/trunk/jetspeed-archetype/src/main/resources/archetype-resources/pom.xml
portals/jetspeed-2/portal/trunk/jetspeed-installer/BUILD.txt
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/antinstall-config.xml
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/build.xml
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/database/database.properties.template
portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-ant-installer-pom.xml
portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-database-pom.xml
portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml
portals/jetspeed-2/portal/trunk/jetspeed-installer/pom.xml
portals/jetspeed-2/portal/trunk/jetspeed-mvn-db-init-pom.xml
portals/jetspeed-2/portal/trunk/src/site/site.xml
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed-demo/jetspeed-mvn-demo-pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed-demo/jetspeed-mvn-demo-pom.xml?rev=1742316&r1=1742315&r2=1742316&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed-demo/jetspeed-mvn-demo-pom.xml
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed-demo/jetspeed-mvn-demo-pom.xml
Wed May 4 18:46:27 2016
@@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.portals.jetspeed-2</groupId>
<artifactId>applications</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.1</version>
</parent>
<packaging>pom</packaging>
Modified: portals/jetspeed-2/portal/trunk/enterprise/ear-full/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/enterprise/ear-full/pom.xml?rev=1742316&r1=1742315&r2=1742316&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/enterprise/ear-full/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/enterprise/ear-full/pom.xml Wed May 4
18:46:27 2016
@@ -32,7 +32,7 @@
<parent>
<groupId>org.apache.portals.jetspeed-2</groupId>
<artifactId>jetspeed-enterprise</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<packaging>ear</packaging>
Modified: portals/jetspeed-2/portal/trunk/enterprise/ear-min/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/enterprise/ear-min/pom.xml?rev=1742316&r1=1742315&r2=1742316&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/enterprise/ear-min/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/enterprise/ear-min/pom.xml Wed May 4
18:46:27 2016
@@ -32,7 +32,7 @@
<parent>
<groupId>org.apache.portals.jetspeed-2</groupId>
<artifactId>jetspeed-enterprise</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<packaging>ear</packaging>
Modified: portals/jetspeed-2/portal/trunk/enterprise/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/enterprise/pom.xml?rev=1742316&r1=1742315&r2=1742316&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/enterprise/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/enterprise/pom.xml Wed May 4 18:46:27 2016
@@ -32,7 +32,7 @@
<parent>
<groupId>org.apache.portals.jetspeed-2</groupId>
<artifactId>jetspeed-2</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<packaging>pom</packaging>
Modified: portals/jetspeed-2/portal/trunk/jetspeed-archetype/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-archetype/pom.xml?rev=1742316&r1=1742315&r2=1742316&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-archetype/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-archetype/pom.xml Wed May 4
18:46:27 2016
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.portals.jetspeed-2</groupId>
<artifactId>jetspeed-2</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.1</version>
</parent>
<packaging>maven-archetype</packaging>
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=1742316&r1=1742315&r2=1742316&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
Wed May 4 18:46:27 2016
@@ -31,7 +31,7 @@
<packaging>pom</packaging>
<properties>
-
<org.apache.portals.jetspeed.version>2.3.1-SNAPSHOT</org.apache.portals.jetspeed.version>
+
<org.apache.portals.jetspeed.version>2.3.1</org.apache.portals.jetspeed.version>
<org.apache.pluto.version>2.0.3</org.apache.pluto.version>
<org.apache.portals.applications.apa-logging.version>1.1</org.apache.portals.applications.apa-logging.version>
<ccpp.version>1.0</ccpp.version>
Modified: portals/jetspeed-2/portal/trunk/jetspeed-installer/BUILD.txt
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-installer/BUILD.txt?rev=1742316&r1=1742315&r2=1742316&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-installer/BUILD.txt (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-installer/BUILD.txt Wed May 4
18:46:27 2016
@@ -22,8 +22,8 @@ should be used as follows:
The self executing installer can be found in the maven target directory
after the build:
-jetspeed-installer-2.3.1-SNAPSHOT.jar
+jetspeed-installer-2.3.1.jar
It can be run simply enough:
-> java -jar jetspeed-installer-2.3.1-SNAPSHOT.jar
+> java -jar jetspeed-installer-2.3.1.jar
Modified:
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/antinstall-config.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/antinstall-config.xml?rev=1742316&r1=1742315&r2=1742316&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/antinstall-config.xml
(original)
+++
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/antinstall-config.xml
Wed May 4 18:46:27 2016
@@ -23,11 +23,11 @@
"http://antinstaller.sourceforge.net/dtd/antinstall-config-0.8.dtd";>
-->
-<installer ui="swing,text" lookAndFeel="jgoodies" name="Jetspeed Enterprise
Portal 2.3.1-SNAPSHOT Installer"
+<installer ui="swing,text" lookAndFeel="jgoodies" name="Jetspeed Enterprise
Portal 2.3.1 Installer"
windowIcon="/resources/feather-small.png"
defaultImageResource="/resources/Jetspeed_blue_med.png" minJavaVersion="1.5"
wide="700:250" antialiased="true" finishButtonText="Install or Execute"
debug="true" verbose="true">
- <page type="input" name="intro" displayText="Welcome to the Jetspeed
Enterprise Portal 2.3.1-SNAPSHOT">
+ <page type="input" name="intro" displayText="Welcome to the Jetspeed
Enterprise Portal 2.3.1">
<comment displayText="" />
<comment displayText="This installer will guide you through setting up the
Jetspeed Portal or" />
<comment displayText="performing portal database maintenance tasks." />
@@ -61,8 +61,8 @@
</page>
<page type="input" name="properties" displayText="Installation location"
ifProperty="${operation}=install">
- <directory property="installDir"
defaultValue="${java.user.home}/Jetspeed-2.3.1-SNAPSHOT"
- defaultValueWin="C:\Apache\Jetspeed-2.3.1-SNAPSHOT" displayText="Select
an installation directory" create="true"
+ <directory property="installDir"
defaultValue="${java.user.home}/Jetspeed-2.3.1"
+ defaultValueWin="C:\Apache\Jetspeed-2.3.1" displayText="Select an
installation directory" create="true"
checkExists="true" />
<comment displayText=""/>
<comment displayText="Warning: on Windows, the location must not contain
spaces." bold="true"/>
@@ -71,7 +71,7 @@
<page type="input" name="properties" displayText="Temporary installation
location" ifProperty="${operation}!=install">
<comment displayText="Select temporary directory requried by installer if
necessary." />
<comment displayText="" />
- <directory property="installDir"
defaultValue="${java.java.io.tmpdir}/Jetspeed-2.3.1-SNAPSHOT"
+ <directory property="installDir"
defaultValue="${java.java.io.tmpdir}/Jetspeed-2.3.1"
displayText="Enter temporary directory"/>
</page>
@@ -99,7 +99,7 @@
<page type="input" name="requiredComponents" displayText="Components
selection, (Demo)"
ifProperty="(${operation}=install) AND (${installationType}=demo)">
<hidden property="setupDBAntTarget" value="runSetupNoDB" />
- <comment displayText="Jetspeed Enterprise Portal version 2.3.1-SNAPSHOT,
(Demo)" bold="true" />
+ <comment displayText="Jetspeed Enterprise Portal version 2.3.1, (Demo)"
bold="true" />
<target displayText="Tomcat 7.0.69 Webserver" target="install"
defaultValue="true" force="true" />
<checkbox displayText="Jetspeed Portal" property="dummy"
defaultValue="true" force="true" />
<checkbox displayText="Jetspeed Layout Portlets" property="dummy"
defaultValue="true" force="true" />
@@ -114,7 +114,7 @@
<page type="input" name="requiredComponents" displayText="Components
selection, (Minimal)"
ifProperty="(${operation}=install) AND (${installationType}=minimal)">
<hidden property="setupDBAntTarget" value="runSetupNoDB" />
- <comment displayText="Jetspeed Enterprise Portal version 2.3.1-SNAPSHOT"
bold="true" />
+ <comment displayText="Jetspeed Enterprise Portal version 2.3.1"
bold="true" />
<target displayText="Tomcat 7.0.69 Webserver" target="install"
defaultValue="true" force="true" />
<checkbox displayText="Jetspeed Portal" property="dummy"
defaultValue="true" force="true" />
<checkbox displayText="Jetspeed Layout Portlets" property="dummy"
defaultValue="true" force="true" />
Modified:
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/build.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/build.xml?rev=1742316&r1=1742315&r2=1742316&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/build.xml
(original)
+++
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/build.xml
Wed May 4 18:46:27 2016
@@ -36,7 +36,7 @@
<fileset dir="${installDir}" includes="**/*"/>
</delete>
- <echo>Installing Jetspeed-2.3.1-SNAPSHOT Enterprise Portal</echo>
+ <echo>Installing Jetspeed-2.3.1 Enterprise Portal</echo>
<unzip src="${antinstaller.jar}" dest="${installDir}">
<patternset>
<include name="tomcat-portal.zip" />
Modified:
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/database/database.properties.template
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/database/database.properties.template?rev=1742316&r1=1742315&r2=1742316&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/database/database.properties.template
(original)
+++
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/database/database.properties.template
Wed May 4 18:46:27 2016
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-; Jetspeed Enterprise Portal 2.3.1-SNAPSHOT Database setup configuration
+; Jetspeed Enterprise Portal 2.3.1 Database setup configuration
; db.type supported values: db2, derby, mssql, mysql, oracle, postgresql, sapdb
db.type=@db.type@
Modified:
portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-ant-installer-pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-ant-installer-pom.xml?rev=1742316&r1=1742315&r2=1742316&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-ant-installer-pom.xml
(original)
+++
portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-ant-installer-pom.xml
Wed May 4 18:46:27 2016
@@ -32,7 +32,7 @@
<parent>
<groupId>org.apache.portals.jetspeed-2</groupId>
<artifactId>jetspeed-2</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.1</version>
</parent>
<packaging>jar</packaging>
Modified:
portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-database-pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-database-pom.xml?rev=1742316&r1=1742315&r2=1742316&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-database-pom.xml
(original)
+++
portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-database-pom.xml
Wed May 4 18:46:27 2016
@@ -32,7 +32,7 @@
<parent>
<groupId>org.apache.portals.jetspeed-2</groupId>
<artifactId>jetspeed-2</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.1</version>
</parent>
<packaging>pom</packaging>
Modified:
portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml?rev=1742316&r1=1742315&r2=1742316&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml
(original)
+++
portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml
Wed May 4 18:46:27 2016
@@ -32,7 +32,7 @@
<parent>
<groupId>org.apache.portals.jetspeed-2</groupId>
<artifactId>jetspeed-2</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.1</version>
</parent>
<packaging>pom</packaging>
Modified: portals/jetspeed-2/portal/trunk/jetspeed-installer/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-installer/pom.xml?rev=1742316&r1=1742315&r2=1742316&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-installer/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-installer/pom.xml Wed May 4
18:46:27 2016
@@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.portals.jetspeed-2</groupId>
<artifactId>jetspeed-2</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.1</version>
</parent>
<build>
Modified: portals/jetspeed-2/portal/trunk/jetspeed-mvn-db-init-pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-mvn-db-init-pom.xml?rev=1742316&r1=1742315&r2=1742316&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-mvn-db-init-pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-mvn-db-init-pom.xml Wed May 4
18:46:27 2016
@@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.portals.jetspeed-2</groupId>
<artifactId>jetspeed-2</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.1</version>
</parent>
<packaging>pom</packaging>
Modified: portals/jetspeed-2/portal/trunk/src/site/site.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/src/site/site.xml?rev=1742316&r1=1742315&r2=1742316&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/src/site/site.xml (original)
+++ portals/jetspeed-2/portal/trunk/src/site/site.xml Wed May 4 18:46:27 2016
@@ -25,7 +25,7 @@
<skin>
<groupId>org.apache.portals.jetspeed-2</groupId>
<artifactId>jetspeed-maven-skin</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.1</version>
</skin>
<body>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscr...@portals.apache.org
For additional commands, e-mail: jetspeed-dev-h...@portals.apache.org
