Skip to content

Commit

Permalink
Merge pull request #1241 from percussion/release-update-missed-snapsh…
Browse files Browse the repository at this point in the history
…ots-to-release

Bump dev branch to 8.1.5-SNAPSHOT
  • Loading branch information
natechadwick committed Mar 14, 2024
2 parents 29f7f52 + ee6f23d commit 8ea4aa7
Show file tree
Hide file tree
Showing 15 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion WebUI/war/jslib/profiles/3x/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "perc-jsprofile-3x",
"version": "8.1.4-SNAPSHOT",
"version": "8.1.4",
"description": "Package to include Percussion 3rd party dependencies for the jquery 3.x profile",
"dependencies": {
"jquery":"3.6.0",
Expand Down
4 changes: 2 additions & 2 deletions deliverytiersuite/delivery-tier-suite/p13n-ds/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.percussion.deliverytier</groupId>
<artifactId>delivery-tier-suite</artifactId>
<version>8.1.4-SNAPSHOT</version>
<version>8.1.4</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>com.percussion.soln.p13n</groupId>
Expand Down Expand Up @@ -105,7 +105,7 @@
<dependency>
<groupId>com.percussion.soln.p13n</groupId>
<artifactId>p13n-api</artifactId>
<version>8.1.4-SNAPSHOT</version>
<version>8.1.4</version>
<scope>compile</scope>
</dependency>

Expand Down
2 changes: 1 addition & 1 deletion deliverytiersuite/delivery-tier-suite/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@
<configuration>
<toolchains>
<!-- <jdk>
<version>8.1.4-SNAPSHOT</version>
<version>8.1.4</version>
<vendor>amazon</vendor>
</jdk>
-->
Expand Down
2 changes: 1 addition & 1 deletion modules/ContentUI/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
<configuration>
<toolchains>
<jdk>
<version>8.1.4-SNAPSHOT</version>
<version>8.1.4</version>
<vendor>oracle</vendor>
</jdk>
</toolchains>
Expand Down
2 changes: 1 addition & 1 deletion modules/DesktopContentExplorer/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<jdkToolchain>
<version>8.1.4-SNAPSHOT</version>
<version>8.1.4</version>
<vendor>oracle</vendor>
</jdkToolchain>
<verbose>true</verbose>
Expand Down
2 changes: 1 addition & 1 deletion modules/Help/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
<configuration>
<toolchains>
<jdk>
<version>8.1.4-SNAPSHOT</version>
<version>8.1.4</version>
<vendor>oracle</vendor>
</jdk>
</toolchains>
Expand Down
2 changes: 1 addition & 1 deletion modules/ServerUIComponents/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
<configuration>
<toolchains>
<jdk>
<version>8.1.4-SNAPSHOT</version>
<version>8.1.4</version>
<vendor>oracle</vendor>
</jdk>
</toolchains>
Expand Down
2 changes: 1 addition & 1 deletion modules/extensions-landingpage/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.percussion</groupId>
<artifactId>core</artifactId>
<version>8.1.4-SNAPSHOT</version>
<version>8.1.4</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>com.percussion.soln.landingpage</groupId>
Expand Down
2 changes: 1 addition & 1 deletion modules/p13n-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.percussion</groupId>
<artifactId>core</artifactId>
<version>8.1.4-SNAPSHOT</version>
<version>8.1.4</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>com.percussion.soln.p13n</groupId>
Expand Down
2 changes: 1 addition & 1 deletion modules/patch-tools/readme.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
This 8.1.2.1 patch release provides a mix of security updates and bug fixes to the 8.1.2 release version of PercussionCMS. This update is only applicable to the 8.1.2 release version. All updates in this "hotfix" will be included in the 8.1.4-SNAPSHOT release version.
This 8.1.2.1 patch release provides a mix of security updates and bug fixes to the 8.1.2 release version of PercussionCMS. This update is only applicable to the 8.1.2 release version. All updates in this "hotfix" will be included in the 8.1.4 release version.

-----------------
Security Updates
Expand Down
2 changes: 1 addition & 1 deletion modules/perc-samples/perc-loader-sample-java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.percussion</groupId>
<artifactId>core</artifactId>
<version>8.1.4-SNAPSHOT</version>
<version>8.1.4</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<artifactId>perc-samples-java</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions modules/redirect-tool/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>core</artifactId>
<groupId>com.percussion</groupId>
<version>8.1.4-SNAPSHOT</version>
<version>8.1.4</version>
<relativePath>../../pom.xml</relativePath>

</parent>
Expand Down Expand Up @@ -120,7 +120,7 @@
<dependency>
<groupId>com.percussion</groupId>
<artifactId>perc-security-utils</artifactId>
<version>8.1.4-SNAPSHOT</version>
<version>8.1.4</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion modules/segmentation-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.percussion</groupId>
<artifactId>core</artifactId>
<version>8.1.4-SNAPSHOT</version>
<version>8.1.4</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>com.percussion.soln.segment</groupId>
Expand Down
2 changes: 1 addition & 1 deletion modules/segmentation-rx/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.percussion</groupId>
<artifactId>core</artifactId>
<version>8.1.4-SNAPSHOT</version>
<version>8.1.4</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>com.percussion.soln.segment</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
<xsl:variable name="ajaxswingUrl">
<xsl:value-of disable-output-escaping="yes" select="concat($ajaxSwingRoot,'?')"/>
<xsl:text disable-output-escaping="yes">CODEBASE=</xsl:text>
<xsl:value-of select="url:encode(concat($rxroot,'/dce/perc-content-explorer-8.1.4-SNAPSHOT.jar'))" />
<xsl:value-of select="url:encode(concat($rxroot,'/dce/perc-content-explorer-8.1.4.jar'))" />
<xsl:text disable-output-escaping="yes">&amp;VIEW=CX&amp;MAYSCRIPT=true&amp;NAME=ContentExplorerApplet&amp;ID=ContentExplorerApplet</xsl:text>
<xsl:text>&amp;DEBUG=</xsl:text>
<xsl:if test="//@debug = 'true'">
Expand Down

0 comments on commit 8ea4aa7

Please sign in to comment.