Author: piergiorgio
Date: Fri Dec 17 11:59:42 2021
New Revision: 1896098
URL: http://svn.apache.org/viewvc?rev=1896098&view=rev
Log:
- fix for updating icu4j in the Alfresco WARs for executing integration tests
(CONNECTORS-1685)
Modified:
manifoldcf/trunk/CHANGES.txt
manifoldcf/trunk/connectors/alfresco-webscript/build.xml
manifoldcf/trunk/connectors/alfresco-webscript/pom.xml
manifoldcf/trunk/test-materials/alfresco-4-war/pom.xml
Modified: manifoldcf/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1896098&r1=1896097&r2=1896098&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Fri Dec 17 11:59:42 2021
@@ -3,6 +3,9 @@ $Id$
======================= 2.21-dev =====================
+CONNECTORS-1685: Fix to update the Icu4j dependencies in the Alfresco WARs
+(Piergiorgio Lucidi)
+
CONNECTORS-1684: Fix javadoc syntax and javadoc build in travis ci.
(Markus Schuch)
Modified: manifoldcf/trunk/connectors/alfresco-webscript/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/alfresco-webscript/build.xml?rev=1896098&r1=1896097&r2=1896098&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/alfresco-webscript/build.xml (original)
+++ manifoldcf/trunk/connectors/alfresco-webscript/build.xml Fri Dec 17
11:59:42 2021
@@ -76,6 +76,26 @@
<param name="artifact-name"
value="alfresco-indexer-webscripts-war"/>
<param name="artifact-type" value="war"/>
</antcall>
+
+ <mkdir
dir="test-materials-proprietary/alfresco-indexer-webscripts-war-${alfresco-indexer.version}"
/>
+ <unzip
src="test-materials-proprietary/alfresco-indexer-webscripts-war-${alfresco-indexer.version}.war"
+
dest="test-materials-proprietary/alfresco-indexer-webscripts-war-${alfresco-indexer.version}"/>
+
+ <delete
file="test-materials-proprietary/alfresco-indexer-webscripts-war-${alfresco-indexer.version}.war"
/>
+ <delete
file="test-materials-proprietary/alfresco-indexer-webscripts-war-${alfresco-indexer.version}/WEB-INF/lib/icu4j-3.6.1.jar"
/>
+
+ <antcall target="download-via-maven">
+ <param name="project-path" value="com/ibm/icu"/>
+ <param name="artifact-version" value="68.2"/>
+ <param name="target"
value="test-materials-proprietary/alfresco-indexer-webscripts-war-${alfresco-indexer.version}/WEB-INF/lib"/>
+ <param name="artifact-name" value="icu4j"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+
+ <zip
destfile="test-materials-proprietary/alfresco-indexer-webscripts-war-${alfresco-indexer.version}.war"
+
basedir="test-materials-proprietary/alfresco-indexer-webscripts-war-${alfresco-indexer.version}"
/>
+
+ <delete
dir="test-materials-proprietary/alfresco-indexer-webscripts-war-${alfresco-indexer.version}"
/>
</target>
<target name="integration">
Modified: manifoldcf/trunk/connectors/alfresco-webscript/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/alfresco-webscript/pom.xml?rev=1896098&r1=1896097&r2=1896098&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/alfresco-webscript/pom.xml (original)
+++ manifoldcf/trunk/connectors/alfresco-webscript/pom.xml Fri Dec 17 11:59:42
2021
@@ -47,6 +47,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<alfresco.indexer.version>0.8.1</alfresco.indexer.version>
+ <icu4j.version>68.2</icu4j.version>
</properties>
<repositories>
@@ -122,7 +123,6 @@
<workingDirectory>target/test-output</workingDirectory>
</configuration>
</plugin>
-
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
@@ -167,12 +167,82 @@
<overWrite>false</overWrite>
<destFileName>alfresco.war</destFileName>
</artifactItem>
+ <artifactItem>
+ <artifactId>icu4j</artifactId>
+ <groupId>com.ibm.icu</groupId>
+ <version>${icu4j.version}</version>
+ <type>jar</type>
+ <overWrite>false</overWrite>
+
<destFileName>icu4j-${icu4j.version}.jar</destFileName>
+ </artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack-filtered-alfresco-indexer-war</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+
<outputDirectory>target/alfresco-indexer-webscripts-war-${alfresco.indexer.version}</outputDirectory>
+ <artifactItems>
+ <artifactItem>
+
<artifactId>alfresco-indexer-webscripts-war</artifactId>
+ <groupId>com.github.maoo.indexer</groupId>
+
<version>${alfresco.indexer.version}</version>
+ <type>war</type>
+ <overWrite>false</overWrite>
+ <destFileName>alfresco.war</destFileName>
+
<excludes>WEB-INF/lib/icu4j-3.6.1.jar</excludes>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-icu-in-alfresco-indexer-war</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+
<outputDirectory>target/alfresco-indexer-webscripts-war-${alfresco.indexer.version}/WEB-INF/lib</outputDirectory>
+ <artifactItems>
+ <artifactItem>
+ <artifactId>icu4j</artifactId>
+ <groupId>com.ibm.icu</groupId>
+ <version>${icu4j.version}</version>
+ <type>jar</type>
+ <overWrite>false</overWrite>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>Zip Alfresco WAR with ICU JAR</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <zip destfile="target/dependency/alfresco.war"
basedir="target/alfresco-indexer-webscripts-war-${alfresco.indexer.version}" />
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.22.2</version>
Modified: manifoldcf/trunk/test-materials/alfresco-4-war/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/test-materials/alfresco-4-war/pom.xml?rev=1896098&r1=1896097&r2=1896098&view=diff
==============================================================================
--- manifoldcf/trunk/test-materials/alfresco-4-war/pom.xml (original)
+++ manifoldcf/trunk/test-materials/alfresco-4-war/pom.xml Fri Dec 17 11:59:42
2021
@@ -80,15 +80,20 @@
<type>war</type>
</dependency>
<dependency>
- <groupId>tk.skuro.alfresco</groupId>
- <artifactId>h2-support</artifactId>
- <version>1.5</version>
- </dependency>
- <dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- <version>1.3.172</version>
- </dependency>
+ <groupId>tk.skuro.alfresco</groupId>
+ <artifactId>h2-support</artifactId>
+ <version>1.5</version>
+ </dependency>
+ <dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ <version>1.3.172</version>
+ </dependency>
+ <dependency>
+ <groupId>com.ibm.icu</groupId>
+ <artifactId>icu4j</artifactId>
+ <version>68.2</version>
+ </dependency>
</dependencies>
<build>
@@ -111,10 +116,17 @@
</resource>
</resources>
+ <pluginManagement>
<plugins>
<plugin>
<artifactId>maven-war-plugin</artifactId>
<version>2.3</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
<configuration>
<!-- Here is can control the order of overlay of your
(WAR, AMP, etc.) dependencies
| NOTE: At least one WAR dependency must be
uncompressed first
@@ -134,6 +146,7 @@
<excludes/>
</overlay>
</overlays>
+
<packagingExcludes>WEB-INF/lib/icu4j_3_6_1.jar</packagingExcludes>
</configuration>
</plugin>
</plugins>
