-
-
Notifications
You must be signed in to change notification settings - Fork 552
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
XWIKI-20477: Upgrade to Solr 9.4.1 and Lucene 9.8.0
* fix solr cores migration * add upgrade test (still need to explicitly check if the data can be found in the new cores but it was checked by hand)
- Loading branch information
Showing
6 changed files
with
144 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
75 changes: 75 additions & 0 deletions
75
...n-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-1210-custom/pom.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
|
|
||
| <!-- | ||
| * See the NOTICE file distributed with this work for additional | ||
| * information regarding copyright ownership. | ||
| * | ||
| * This is free software; you can redistribute it and/or modify it | ||
| * under the terms of the GNU Lesser General Public License as | ||
| * published by the Free Software Foundation; either version 2.1 of | ||
| * the License, or (at your option) any later version. | ||
| * | ||
| * This software is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| * Lesser General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Lesser General Public | ||
| * License along with this software; if not, write to the Free | ||
| * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA | ||
| * 02110-1301 USA, or see the FSF site: http://www.fsf.org. | ||
| --> | ||
|
|
||
| <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <parent> | ||
| <groupId>org.xwiki.platform</groupId> | ||
| <artifactId>xwiki-platform-distribution-flavor-test-upgrade</artifactId> | ||
| <version>16.1.0-SNAPSHOT</version> | ||
| </parent> | ||
| <artifactId>xwiki-platform-distribution-flavor-test-upgrade-1210</artifactId> | ||
| <name>XWiki Platform - Distribution - Flavor - Functional Tests - Upgrade - From ${upgradetest.previousflavor.version} with custom data</name> | ||
| <packaging>pom</packaging> | ||
| <description>XWiki Platform - Distribution - Flavor - Functional Tests - Upgrade - From ${upgradetest.previousflavor.version} with custom data</description> | ||
| <properties> | ||
| <upgradetest.previousflavor.version>12.10.11</upgradetest.previousflavor.version> | ||
| <upgradetest.previousdata.classifier>custom-0</upgradetest.previousdata.classifier> | ||
| </properties> | ||
| <dependencies> | ||
| <dependency> | ||
| <groupId>${upgradetest.previousdata.groupId}</groupId> | ||
| <artifactId>${upgradetest.previousdata.artifactId}</artifactId> | ||
| <!-- Using a fixed version instead of ${upgradetest.previousflavor.version} because of | ||
| https://issues.apache.org/jira/browse/MRELEASE-799, causing "The artifact (...) requires a different | ||
| version (...) than what is found (...) for the expression (upgradetest.previousflavor.version) in the | ||
| project (...)" otherwise, when using the release plugin --> | ||
| <version>12.10.11</version> | ||
| <type>zip</type> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| </dependencies> | ||
| <build> | ||
| <plugins> | ||
| <!-- Step 1: Compile the JUnit Selenium Tests --> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-compiler-plugin</artifactId> | ||
| </plugin> | ||
| <!-- Step 2: Process the test resources --> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-resources-plugin</artifactId> | ||
| </plugin> | ||
| <!-- Step 3: Prepare the application --> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-dependency-plugin</artifactId> | ||
| </plugin> | ||
| <!-- Step 4: Execute the tests (they start/stop XWiki) --> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-surefire-plugin</artifactId> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| </project> |
47 changes: 47 additions & 0 deletions
47
...bution-flavor-test-upgrade-1210-custom/src/test/it/org/xwiki/test/ui/Upgrade1210Test.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| /* | ||
| * See the NOTICE file distributed with this work for additional | ||
| * information regarding copyright ownership. | ||
| * | ||
| * This is free software; you can redistribute it and/or modify it | ||
| * under the terms of the GNU Lesser General Public License as | ||
| * published by the Free Software Foundation; either version 2.1 of | ||
| * the License, or (at your option) any later version. | ||
| * | ||
| * This software is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| * Lesser General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Lesser General Public | ||
| * License along with this software; if not, write to the Free | ||
| * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA | ||
| * 02110-1301 USA, or see the FSF site: http://www.fsf.org. | ||
| */ | ||
| package org.xwiki.test.ui; | ||
|
|
||
| /** | ||
| * Execute upgrade tests. | ||
| * | ||
| * @version $Id$ | ||
| */ | ||
| public class Upgrade1210Test extends UpgradeTest | ||
| { | ||
| @Override | ||
| protected void setupLogs() | ||
| { | ||
| validateConsole.getLogCaptureConfiguration().registerExpected( | ||
| // Caused by the fact that we upgrade from an old version of XWiki having these deprecated uses | ||
| "Deprecated usage of getter [com.xpn.xwiki.api.Document.getName]", | ||
|
|
||
| // Those deprecated are related to the Velocity upgrade performed in 12.0 (XCOMMONS-1529) | ||
| "Deprecated usage of method [org.apache.velocity.tools.generic.SortTool.sort]", | ||
| "Deprecated usage of getter [org.xwiki.velocity.tools.CollectionsTool.getSet]", | ||
| "Deprecated usage of method [org.apache.velocity.tools.generic.MathTool.toInteger]", | ||
| "Deprecated usage of method [org.xwiki.velocity.tools.CollectionsTool.sort]", | ||
|
|
||
| // The currently installed flavor is not valid anymore before the upgrade | ||
| "Invalid extension [org.xwiki.platform:xwiki-platform-distribution-flavor-mainwiki/10.11.1] on namespace " | ||
| + "[wiki:xwiki] (InvalidExtensionException: Dependency [org.xwiki.platform:xwiki-platform-oldcore-" | ||
| + "[10.11.1]] is incompatible with the core extension [org.xwiki.platform:xwiki-platform-legacy-oldcore"); | ||
| } | ||
| } |