Skip to content

Commit

Permalink
Merge branch 'release/3.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
@jesse-gallagher
jesse-gallagher committed Sep 9, 2024
2 parents 19d1ff1 + b24564c commit d25271c
Show file tree
Hide file tree
Showing 5 changed files with 67 additions and 44 deletions.
4 changes: 2 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
<profiles>
<profile>
<id>notes</id>
<properties>
<notes-platform>file:///Users/jesse/Java/Domino12.0.2</notes-platform>
<notes-platform14>file:///Users/jdoe/Java/Domino14.0.0</notes-platform14>
</properties>
</profile>
</profile>
Expand Down
101 changes: 62 additions & 39 deletions xpages-webapp-support/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.openntf.xpages</groupId>
<artifactId>xpages-webapp-support</artifactId>
<version>2.2.3</version>
<version>3.0.0</version>
<packaging>pom</packaging>

<inceptionYear>2019</inceptionYear>
Expand Down Expand Up @@ -38,7 +38,7 @@
</modules>

<prerequisites>
<maven>3.0.1</maven>
<maven>3.6.0</maven>
</prerequisites>

<distributionManagement>
Expand Down Expand Up @@ -86,204 +86,204 @@
<dependency>
<groupId>${xpages-groupId}</groupId>
<artifactId>org.eclipse.osgi</artifactId>
<version>3.11.3.20221010-1810</version>
<version>3.17.101.20231027-1214</version>
</dependency>
<dependency>
<groupId>${xpages-groupId}</groupId>
<artifactId>org.eclipse.core.runtime</artifactId>
<version>3.12.0.v20160606-1342</version>
<version>3.24.0.v20210910-0750</version>
</dependency>
<dependency>
<groupId>${xpages-groupId}</groupId>
<artifactId>org.eclipse.equinox.common</artifactId>
<version>3.8.0.20221010-1810</version>
<version>3.15.100.20231027-1214</version>
</dependency>
<dependency>
<groupId>${xpages-groupId}</groupId>
<artifactId>org.eclipse.equinox.registry</artifactId>
<version>3.6.100.v20160223-2218</version>
<version>3.11.100.v20211021-1418</version>
</dependency>

<dependency>
<groupId>${xpages-groupId}</groupId>
<artifactId>com.ibm.icu</artifactId>
<version>56.1.0.v201601250100</version>
<version>67.1.0.v20200706-1749</version>
</dependency>

<dependency>
<groupId>${xpages-groupId}</groupId>
<artifactId>com.ibm.designer.lib.jsf</artifactId>
<version>12.0.2.20221101-2131</version>
<version>12.0.2.20231104-0931</version>
</dependency>

<dependency>
<groupId>${xpages-groupId}</groupId>
<artifactId>com.ibm.xsp.core</artifactId>
<version>12.0.2.20221101-2131</version>
<version>12.0.2.20231104-0931</version>
<classifier>lwpd.xsp.core</classifier>
</dependency>
<dependency>
<groupId>${xpages-groupId}</groupId>
<artifactId>com.ibm.xsp.extsn</artifactId>
<version>12.0.2.20221101-2131</version>
<version>12.0.2.20231104-0931</version>
<classifier>lwpd.xsp.extsn</classifier>
</dependency>
<dependency>
<groupId>${xpages-groupId}</groupId>
<artifactId>com.ibm.commons</artifactId>
<version>12.0.2.20221101-2131</version>
<version>12.0.2.20231104-0931</version>
<classifier>lwpd.commons</classifier>
</dependency>
<dependency>
<groupId>${xpages-groupId}</groupId>
<artifactId>com.ibm.commons.vfs</artifactId>
<version>12.0.2.20221101-2131</version>
<version>12.0.2.20231104-0931</version>
<classifier>lwpd.commons.vfs</classifier>
</dependency>
<dependency>
<groupId>${xpages-groupId}</groupId>
<artifactId>com.ibm.jscript</artifactId>
<version>12.0.2.20221101-2131</version>
<version>12.0.2.20231104-0931</version>
</dependency>
<dependency>
<groupId>${xpages-groupId}</groupId>
<artifactId>com.ibm.xsp.designer</artifactId>
<version>12.0.2.20221101-2131</version>
<version>12.0.2.20231104-0931</version>
<classifier>lwpd.xsp.designer</classifier>
</dependency>
<dependency>
<groupId>${xpages-groupId}</groupId>
<artifactId>com.ibm.designer.runtime</artifactId>
<version>12.0.2.20221101-2131</version>
<version>12.0.2.20231104-0931</version>
<classifier>lwpd.runtime.designer</classifier>
</dependency>
<dependency>
<groupId>${xpages-groupId}</groupId>
<artifactId>com.ibm.designer.runtime.directory</artifactId>
<version>12.0.2.20221101-2131</version>
<version>12.0.2.20231104-0931</version>
<classifier>lwpd.runtime.directory</classifier>
</dependency>
<dependency>
<groupId>${xpages-groupId}</groupId>
<artifactId>com.ibm.commons.xml</artifactId>
<version>12.0.2.20221101-2131</version>
<version>12.0.2.20231104-0931</version>
<classifier>lwpd.commons.xml</classifier>
</dependency>

<!-- Themes and Dojo -->
<dependency>
<groupId>${xpages-groupId}</groupId>
<artifactId>com.ibm.xsp.dojo</artifactId>
<version>12.0.2.20221101-2131</version>
<version>12.0.2.20231104-0931</version>
<classifier>xsp.dojo</classifier>
</dependency>
<dependency>
<groupId>${xpages-groupId}</groupId>
<artifactId>com.ibm.xsp.theme.oneui.idx</artifactId>
<version>12.0.2.20221101-2131</version>
<version>12.0.2.20231104-0931</version>
<classifier>xsp.theme.oneui.idx</classifier>
</dependency>
<dependency>
<groupId>${xpages-groupId}</groupId>
<artifactId>com.ibm.xsp.theme.oneuiv302</artifactId>
<version>12.0.2.20221101-2131</version>
<version>12.0.2.20231104-0931</version>
<classifier>xsp.theme.oneuiv302</classifier>
</dependency>

<!-- ExtLib -->
<dependency>
<groupId>${xpages-groupId}</groupId>
<artifactId>com.ibm.xsp.extlib</artifactId>
<version>12.0.2.v00_00_20221101-2131</version>
<version>14.0.0.v00_00_20231104-0931</version>
</dependency>
<dependency>
<groupId>${xpages-groupId}</groupId>
<artifactId>com.ibm.xsp.extlib.core</artifactId>
<version>12.0.2.v00_00_20221101-2131</version>
<version>14.0.0.v00_00_20231104-0931</version>
</dependency>
<dependency>
<groupId>${xpages-groupId}</groupId>
<artifactId>com.ibm.xsp.extlib.controls</artifactId>
<version>12.0.2.v00_00_20221101-2131</version>
<version>14.0.0.v00_00_20231104-0931</version>
</dependency>
<dependency>
<groupId>${xpages-groupId}</groupId>
<artifactId>com.ibm.xsp.extlib.oneui</artifactId>
<version>12.0.2.v00_00_20221101-2131</version>
<version>14.0.0.v00_00_20231104-0931</version>
</dependency>
<dependency>
<groupId>${xpages-groupId}</groupId>
<artifactId>com.ibm.xsp.theme.bootstrap</artifactId>
<version>12.0.2.v00_00_20221101-2131</version>
<version>14.0.0.v00_00_20231104-0931</version>
</dependency>
<dependency>
<groupId>${xpages-groupId}</groupId>
<artifactId>com.ibm.xsp.extlib.mobile</artifactId>
<version>12.0.2.v00_00_20221101-2131</version>
<version>14.0.0.v00_00_20231104-0931</version>
</dependency>
<dependency>
<groupId>${xpages-groupId}</groupId>
<artifactId>com.ibm.xsp.extlib.domino</artifactId>
<version>12.0.2.v00_00_20221101-2131</version>
<version>14.0.0.v00_00_20231104-0931</version>
</dependency>
<dependency>
<groupId>${xpages-groupId}</groupId>
<artifactId>com.ibm.xsp.extlib.relational</artifactId>
<version>12.0.2.v00_00_20221101-2131</version>
<version>14.0.0.v00_00_20231104-0931</version>
</dependency>
<dependency>
<groupId>${xpages-groupId}</groupId>
<artifactId>com.ibm.commons.jdbc</artifactId>
<version>12.0.2.20221101-2131</version>
<version>12.0.2.20231104-0931</version>
<classifier>lwpd.commons.jdbc</classifier>
</dependency>

<!-- Domino-specific -->
<dependency>
<groupId>${xpages-groupId}</groupId>
<artifactId>com.ibm.xsp.domino</artifactId>
<version>12.0.2.20221101-2131</version>
<version>12.0.2.20231104-0931</version>
<classifier>lwpd.xsp.domino</classifier>
</dependency>
<dependency>
<groupId>${xpages-groupId}</groupId>
<artifactId>com.ibm.domino.napi.impl</artifactId>
<version>12.0.2.20221103-1500</version>
<version>14.0.0.20231109-1500</version>
<classifier>lwpd.domino.napi</classifier>
</dependency>
<dependency>
<groupId>${xpages-groupId}</groupId>
<artifactId>com.ibm.domino.xsp.adapter</artifactId>
<version>12.0.2.20221101-2131</version>
<version>12.0.2.20231104-0931</version>
<classifier>lwpd.domino.adapter</classifier>
</dependency>
<dependency>
<groupId>${xpages-groupId}</groupId>
<artifactId>com.ibm.domino.xsp.adapter.nsf</artifactId>
<version>12.0.2.20221101-2131</version>
<version>12.0.2.20231104-0931</version>
<classifier>lwpd.domino.adapter.nsf</classifier>
</dependency>
<dependency>
<groupId>${xpages-groupId}</groupId>
<artifactId>com.ibm.notes.java.api.win32.linux</artifactId>
<version>12.0.2.20221103-1500</version>
<version>14.0.0.20231109-1500</version>
<classifier>Notes</classifier>
</dependency>
<dependency>
<groupId>${xpages-groupId}</groupId>
<artifactId>com.ibm.domino.xsp.bootstrap</artifactId>
<version>12.0.2.20221101-2131</version>
<version>12.0.2.20231104-0931</version>
<classifier>xsp.domino.bridge</classifier>
</dependency>
<dependency>
<groupId>${xpages-groupId}</groupId>
<artifactId>com.ibm.xsp.http.bootstrap</artifactId>
<version>12.0.2.20221103-1500</version>
<version>14.0.0.20231109-1500</version>
</dependency>
<dependency>
<groupId>${xpages-groupId}</groupId>
<artifactId>com.ibm.domino.services</artifactId>
<version>12.0.2.v00_00_20221101-2131</version>
<version>14.0.0.v00_00_20231104-0931</version>
</dependency>

<!-- XPages Bazaar -->
Expand Down Expand Up @@ -326,6 +326,29 @@
</mapping>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0</version>
<executions>
<execution>
<id>enforce-maven-and-java</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<requireMavenVersion>
<version>3.6.0</version>
</requireMavenVersion>
<requireJavaVersion>
<version>17</version>
</requireJavaVersion>
</rules>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

Expand All @@ -334,14 +357,14 @@
<id>p2-layout-resolver</id>
<activation>
<property>
<name>notes-platform</name>
<name>notes-platform14</name>
</property>
</activation>

<repositories>
<repository>
<id>com.hcl.xsp.p2</id>
<url>${notes-platform}</url>
<url>${notes-platform14}</url>
<layout>p2</layout>
</repository>
</repositories>
Expand Down
2 changes: 1 addition & 1 deletion xpages-webapp-support/xpages-runtime-domino/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.openntf.xpages</groupId>
<artifactId>xpages-webapp-support</artifactId>
<version>2.2.3</version>
<version>3.0.0</version>
</parent>
<artifactId>xpages-runtime-domino</artifactId>

Expand Down
2 changes: 1 addition & 1 deletion xpages-webapp-support/xpages-runtime/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.openntf.xpages</groupId>
<artifactId>xpages-webapp-support</artifactId>
<version>2.2.3</version>
<version>3.0.0</version>
</parent>
<artifactId>xpages-runtime</artifactId>

Expand Down
2 changes: 1 addition & 1 deletion xpages-webapp-support/xsp-maven-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.openntf.xpages</groupId>
<artifactId>xpages-webapp-support</artifactId>
<version>2.2.3</version>
<version>3.0.0</version>
</parent>
<artifactId>xsp-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>
Expand Down

0 comments on commit d25271c

Please sign in to comment.