From 7e9c5be170f395fa001a79cc27d5c69c928ba69f Mon Sep 17 00:00:00 2001 From: Jesse Gallagher Date: Mon, 9 Sep 2024 13:29:42 -0400 Subject: [PATCH 1/3] Set version to 3.0.0-SNAPSHOT --- xpages-webapp-support/pom.xml | 2 +- xpages-webapp-support/xpages-runtime-domino/pom.xml | 2 +- xpages-webapp-support/xpages-runtime/pom.xml | 2 +- xpages-webapp-support/xsp-maven-plugin/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xpages-webapp-support/pom.xml b/xpages-webapp-support/pom.xml index e8b0d4e..ef358ef 100644 --- a/xpages-webapp-support/pom.xml +++ b/xpages-webapp-support/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.openntf.xpages xpages-webapp-support - 2.2.3 + 3.0.0-SNAPSHOT pom 2019 diff --git a/xpages-webapp-support/xpages-runtime-domino/pom.xml b/xpages-webapp-support/xpages-runtime-domino/pom.xml index 09e49a6..ee5124e 100644 --- a/xpages-webapp-support/xpages-runtime-domino/pom.xml +++ b/xpages-webapp-support/xpages-runtime-domino/pom.xml @@ -7,7 +7,7 @@ org.openntf.xpages xpages-webapp-support - 2.2.3 + 3.0.0-SNAPSHOT xpages-runtime-domino diff --git a/xpages-webapp-support/xpages-runtime/pom.xml b/xpages-webapp-support/xpages-runtime/pom.xml index bf83b72..127e20f 100644 --- a/xpages-webapp-support/xpages-runtime/pom.xml +++ b/xpages-webapp-support/xpages-runtime/pom.xml @@ -5,7 +5,7 @@ org.openntf.xpages xpages-webapp-support - 2.2.3 + 3.0.0-SNAPSHOT xpages-runtime diff --git a/xpages-webapp-support/xsp-maven-plugin/pom.xml b/xpages-webapp-support/xsp-maven-plugin/pom.xml index af596cf..2057e11 100644 --- a/xpages-webapp-support/xsp-maven-plugin/pom.xml +++ b/xpages-webapp-support/xsp-maven-plugin/pom.xml @@ -7,7 +7,7 @@ org.openntf.xpages xpages-webapp-support - 2.2.3 + 3.0.0-SNAPSHOT xsp-maven-plugin maven-plugin From 744f83a77e1fdeb9f21817bb044c379bfacd3e74 Mon Sep 17 00:00:00 2001 From: Jesse Gallagher Date: Mon, 9 Sep 2024 13:54:29 -0400 Subject: [PATCH 2/3] Pin dependencies to Domino 14.0.0 --- README.md | 4 +- xpages-webapp-support/pom.xml | 99 +++++++++++++++++++++-------------- 2 files changed, 63 insertions(+), 40 deletions(-) diff --git a/README.md b/README.md index cccb6d2..6299957 100644 --- a/README.md +++ b/README.md @@ -8,14 +8,14 @@ This project is generally a developer tool, as XPages outside of Domino is thoro ## Building and Using -To build this project or use it as a dependency, you must have a property in your Maven ~/.m2/settings.xml named `notes-platform` and containing a URL to a Domino Update Site for Domino 12.0.2+. For example: +To build this project or use it as a dependency, you must have a property in your Maven ~/.m2/settings.xml named `notes-platform14` and containing a URL to a Domino Update Site for Domino 14.0.0. For example: ```xml notes - file:///Users/jesse/Java/Domino12.0.2 + file:///Users/jdoe/Java/Domino14.0.0 diff --git a/xpages-webapp-support/pom.xml b/xpages-webapp-support/pom.xml index ef358ef..6eeddc9 100644 --- a/xpages-webapp-support/pom.xml +++ b/xpages-webapp-support/pom.xml @@ -38,7 +38,7 @@ - 3.0.1 + 3.6.0 @@ -86,87 +86,87 @@ ${xpages-groupId} org.eclipse.osgi - 3.11.3.20221010-1810 + 3.17.101.20231027-1214 ${xpages-groupId} org.eclipse.core.runtime - 3.12.0.v20160606-1342 + 3.24.0.v20210910-0750 ${xpages-groupId} org.eclipse.equinox.common - 3.8.0.20221010-1810 + 3.15.100.20231027-1214 ${xpages-groupId} org.eclipse.equinox.registry - 3.6.100.v20160223-2218 + 3.11.100.v20211021-1418 ${xpages-groupId} com.ibm.icu - 56.1.0.v201601250100 + 67.1.0.v20200706-1749 ${xpages-groupId} com.ibm.designer.lib.jsf - 12.0.2.20221101-2131 + 12.0.2.20231104-0931 ${xpages-groupId} com.ibm.xsp.core - 12.0.2.20221101-2131 + 12.0.2.20231104-0931 lwpd.xsp.core ${xpages-groupId} com.ibm.xsp.extsn - 12.0.2.20221101-2131 + 12.0.2.20231104-0931 lwpd.xsp.extsn ${xpages-groupId} com.ibm.commons - 12.0.2.20221101-2131 + 12.0.2.20231104-0931 lwpd.commons ${xpages-groupId} com.ibm.commons.vfs - 12.0.2.20221101-2131 + 12.0.2.20231104-0931 lwpd.commons.vfs ${xpages-groupId} com.ibm.jscript - 12.0.2.20221101-2131 + 12.0.2.20231104-0931 ${xpages-groupId} com.ibm.xsp.designer - 12.0.2.20221101-2131 + 12.0.2.20231104-0931 lwpd.xsp.designer ${xpages-groupId} com.ibm.designer.runtime - 12.0.2.20221101-2131 + 12.0.2.20231104-0931 lwpd.runtime.designer ${xpages-groupId} com.ibm.designer.runtime.directory - 12.0.2.20221101-2131 + 12.0.2.20231104-0931 lwpd.runtime.directory ${xpages-groupId} com.ibm.commons.xml - 12.0.2.20221101-2131 + 12.0.2.20231104-0931 lwpd.commons.xml @@ -174,19 +174,19 @@ ${xpages-groupId} com.ibm.xsp.dojo - 12.0.2.20221101-2131 + 12.0.2.20231104-0931 xsp.dojo ${xpages-groupId} com.ibm.xsp.theme.oneui.idx - 12.0.2.20221101-2131 + 12.0.2.20231104-0931 xsp.theme.oneui.idx ${xpages-groupId} com.ibm.xsp.theme.oneuiv302 - 12.0.2.20221101-2131 + 12.0.2.20231104-0931 xsp.theme.oneuiv302 @@ -194,47 +194,47 @@ ${xpages-groupId} com.ibm.xsp.extlib - 12.0.2.v00_00_20221101-2131 + 14.0.0.v00_00_20231104-0931 ${xpages-groupId} com.ibm.xsp.extlib.core - 12.0.2.v00_00_20221101-2131 + 14.0.0.v00_00_20231104-0931 ${xpages-groupId} com.ibm.xsp.extlib.controls - 12.0.2.v00_00_20221101-2131 + 14.0.0.v00_00_20231104-0931 ${xpages-groupId} com.ibm.xsp.extlib.oneui - 12.0.2.v00_00_20221101-2131 + 14.0.0.v00_00_20231104-0931 ${xpages-groupId} com.ibm.xsp.theme.bootstrap - 12.0.2.v00_00_20221101-2131 + 14.0.0.v00_00_20231104-0931 ${xpages-groupId} com.ibm.xsp.extlib.mobile - 12.0.2.v00_00_20221101-2131 + 14.0.0.v00_00_20231104-0931 ${xpages-groupId} com.ibm.xsp.extlib.domino - 12.0.2.v00_00_20221101-2131 + 14.0.0.v00_00_20231104-0931 ${xpages-groupId} com.ibm.xsp.extlib.relational - 12.0.2.v00_00_20221101-2131 + 14.0.0.v00_00_20231104-0931 ${xpages-groupId} com.ibm.commons.jdbc - 12.0.2.20221101-2131 + 12.0.2.20231104-0931 lwpd.commons.jdbc @@ -242,48 +242,48 @@ ${xpages-groupId} com.ibm.xsp.domino - 12.0.2.20221101-2131 + 12.0.2.20231104-0931 lwpd.xsp.domino ${xpages-groupId} com.ibm.domino.napi.impl - 12.0.2.20221103-1500 + 14.0.0.20231109-1500 lwpd.domino.napi ${xpages-groupId} com.ibm.domino.xsp.adapter - 12.0.2.20221101-2131 + 12.0.2.20231104-0931 lwpd.domino.adapter ${xpages-groupId} com.ibm.domino.xsp.adapter.nsf - 12.0.2.20221101-2131 + 12.0.2.20231104-0931 lwpd.domino.adapter.nsf ${xpages-groupId} com.ibm.notes.java.api.win32.linux - 12.0.2.20221103-1500 + 14.0.0.20231109-1500 Notes ${xpages-groupId} com.ibm.domino.xsp.bootstrap - 12.0.2.20221101-2131 + 12.0.2.20231104-0931 xsp.domino.bridge ${xpages-groupId} com.ibm.xsp.http.bootstrap - 12.0.2.20221103-1500 + 14.0.0.20231109-1500 ${xpages-groupId} com.ibm.domino.services - 12.0.2.v00_00_20221101-2131 + 14.0.0.v00_00_20231104-0931 @@ -326,6 +326,29 @@ + + org.apache.maven.plugins + maven-enforcer-plugin + 3.0.0 + + + enforce-maven-and-java + + enforce + + + + + 3.6.0 + + + 17 + + + + + + @@ -334,14 +357,14 @@ p2-layout-resolver - notes-platform + notes-platform14 com.hcl.xsp.p2 - ${notes-platform} + ${notes-platform14} p2 From b24564c41d9fb5c68ff94c9114c00bf351c1bec9 Mon Sep 17 00:00:00 2001 From: Jesse Gallagher Date: Mon, 9 Sep 2024 13:55:03 -0400 Subject: [PATCH 3/3] Set version to 3.0.0 --- xpages-webapp-support/pom.xml | 2 +- xpages-webapp-support/xpages-runtime-domino/pom.xml | 2 +- xpages-webapp-support/xpages-runtime/pom.xml | 2 +- xpages-webapp-support/xsp-maven-plugin/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xpages-webapp-support/pom.xml b/xpages-webapp-support/pom.xml index 6eeddc9..d87605f 100644 --- a/xpages-webapp-support/pom.xml +++ b/xpages-webapp-support/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.openntf.xpages xpages-webapp-support - 3.0.0-SNAPSHOT + 3.0.0 pom 2019 diff --git a/xpages-webapp-support/xpages-runtime-domino/pom.xml b/xpages-webapp-support/xpages-runtime-domino/pom.xml index ee5124e..2ecffb6 100644 --- a/xpages-webapp-support/xpages-runtime-domino/pom.xml +++ b/xpages-webapp-support/xpages-runtime-domino/pom.xml @@ -7,7 +7,7 @@ org.openntf.xpages xpages-webapp-support - 3.0.0-SNAPSHOT + 3.0.0 xpages-runtime-domino diff --git a/xpages-webapp-support/xpages-runtime/pom.xml b/xpages-webapp-support/xpages-runtime/pom.xml index 127e20f..86b965d 100644 --- a/xpages-webapp-support/xpages-runtime/pom.xml +++ b/xpages-webapp-support/xpages-runtime/pom.xml @@ -5,7 +5,7 @@ org.openntf.xpages xpages-webapp-support - 3.0.0-SNAPSHOT + 3.0.0 xpages-runtime diff --git a/xpages-webapp-support/xsp-maven-plugin/pom.xml b/xpages-webapp-support/xsp-maven-plugin/pom.xml index 2057e11..19d1490 100644 --- a/xpages-webapp-support/xsp-maven-plugin/pom.xml +++ b/xpages-webapp-support/xsp-maven-plugin/pom.xml @@ -7,7 +7,7 @@ org.openntf.xpages xpages-webapp-support - 3.0.0-SNAPSHOT + 3.0.0 xsp-maven-plugin maven-plugin