Author: chris.laprun(a)jboss.com Date: 2007-07-17 19:14:46 -0400 (Tue, 17 Jul 2007) New Revision: 7811 Modified: branches/JBoss_Portal_Branch_2_6/build/distrib.xml branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/server/PortalConstants.java Log: - Updated release version to 2.6.1.GA. Modified: branches/JBoss_Portal_Branch_2_6/build/distrib.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/build/distrib.xml 2007-07-17 22:53:37 UTC (rev 7810) +++ branches/JBoss_Portal_Branch_2_6/build/distrib.xml 2007-07-17 23:14:46 UTC (rev 7811) @@ -2,7 +2,7 @@ <property name="source.dir" value="../../jboss-portal-2.6"/> <property name="docs.dir" value="${source.dir}-docs"/> - <property name="release.version" value="2.6"/> + <property name="release.version" value="2.6.1.GA"/> <!-- --> <property name="portal.release.normal.name" value="jboss-portal-${release.version}"/> @@ -153,10 +153,11 @@ </target> <target name="patch-log4j"> - <patch patchfile="${source.dir}/build/etc/resources/jboss-log4j.xml.diff" originalfile="${todir}/conf/jboss-log4j.xml" strip="1"/> + <patch patchfile="${source.dir}/build/etc/resources/jboss-log4j.xml.diff" + originalfile="${todir}/conf/jboss-log4j.xml" strip="1"/> </target> - <!-- use -Dno-doc=true if you simply want jboss-portal.sar without licenses etc--> + <!-- use -Dno-doc=true if you simply want jboss-portal.sar without licenses etc--> <target name="package-bin" unless="no-doc"> <sequential> <mkdir dir="${todir}"/> Modified: branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/server/PortalConstants.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/server/PortalConstants.java 2007-07-17 22:53:37 UTC (rev 7810) +++ branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/server/PortalConstants.java 2007-07-17 23:14:46 UTC (rev 7811) @@ -36,7 +36,7 @@ { /** Current version. */ - public static final Version VERSION = new Version("JBoss Portal", 2, 6, 1, new Version.Qualifier(Version.Qualifier.Prefix.CR, Version.Qualifier.Suffix.SUFFIX_1), "Ninja"); + public static final Version VERSION = new Version("JBoss Portal", 2, 6, 1, new Version.Qualifier(Version.Qualifier.Prefix.GA), "Ninja"); /** The default portal name. */ public static final String DEFAULT_PORTAL_NAME = "default";