Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ICU-22324 Update Maven migration scripts #2661

Merged
merged 1 commit into from
Oct 5, 2023
Merged

ICU-22324 Update Maven migration scripts #2661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file modified icu4j/extract-data-files.sh
100755 → 100644
View file
Open in desktop
Empty file.
14 changes: 13 additions & 1 deletion icu4j/maven-migration/demos/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j-root</artifactId>
<version>74.0.1-SNAPSHOT</version>
<version>74.1-SNAPSHOT</version>
</parent>

<artifactId>demos</artifactId>
Expand All @@ -35,4 +35,16 @@
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<!-- We don't want to deploy this to Maven -->
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>

</project>
8 changes: 5 additions & 3 deletions icu4j/maven-migration/main/charset/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.ibm.icu</groupId>
<artifactId>main</artifactId>
<version>74.0.1-SNAPSHOT</version>
<artifactId>icu4j-root</artifactId>
<version>74.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

<artifactId>icu4j-charset</artifactId>
<description>icu4j-charset is a supplemental library for icu4j, implementing Java Charset SPI.</description>

<properties>
<icu4j.api.doc.root.dir>${project.basedir}/../..</icu4j.api.doc.root.dir>
Expand All @@ -22,7 +24,7 @@
<dependencies>
<dependency>
<groupId>com.ibm.icu</groupId>
<artifactId>core</artifactId>
<artifactId>icu4j</artifactId>
<version>${project.version}</version>
</dependency>

Expand Down
17 changes: 15 additions & 2 deletions icu4j/maven-migration/main/collate/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.ibm.icu</groupId>
<artifactId>main</artifactId>
<version>74.0.1-SNAPSHOT</version>
<artifactId>icu4j-root</artifactId>
<version>74.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

<artifactId>collate</artifactId>
Expand Down Expand Up @@ -66,4 +67,16 @@
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<!-- We don't want to deploy this to Maven -->
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>

</project>
12 changes: 10 additions & 2 deletions icu4j/maven-migration/main/common_tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.ibm.icu</groupId>
<artifactId>main</artifactId>
<version>74.0.1-SNAPSHOT</version>
<artifactId>icu4j-root</artifactId>
<version>74.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

<artifactId>common_tests</artifactId>
Expand Down Expand Up @@ -96,6 +97,13 @@
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<!-- We don't want to deploy this to Maven -->
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>

Expand Down
15 changes: 10 additions & 5 deletions icu4j/maven-migration/main/core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.ibm.icu</groupId>
<artifactId>main</artifactId>
<version>74.0.1-SNAPSHOT</version>
<artifactId>icu4j-root</artifactId>
<version>74.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

<artifactId>core</artifactId>
Expand Down Expand Up @@ -52,9 +53,6 @@
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifestEntries>
Expand All @@ -63,6 +61,13 @@
</archive>
</configuration>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<!-- We don't want to deploy this to Maven -->
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>

Expand Down
17 changes: 15 additions & 2 deletions icu4j/maven-migration/main/currdata/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.ibm.icu</groupId>
<artifactId>main</artifactId>
<version>74.0.1-SNAPSHOT</version>
<artifactId>icu4j-root</artifactId>
<version>74.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

<artifactId>currdata</artifactId>
Expand All @@ -26,4 +27,16 @@
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<!-- We don't want to deploy this to Maven -->
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>

</project>
16 changes: 10 additions & 6 deletions icu4j/maven-migration/main/framework/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.ibm.icu</groupId>
<artifactId>main</artifactId>
<version>74.0.1-SNAPSHOT</version>
<artifactId>icu4j-root</artifactId>
<version>74.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

<artifactId>framework</artifactId>
Expand Down Expand Up @@ -38,9 +39,6 @@
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifestEntries>
Expand All @@ -49,8 +47,14 @@
</archive>
</configuration>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<!-- We don't want to deploy this to Maven -->
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>


</project>
68 changes: 59 additions & 9 deletions icu4j/maven-migration/main/icu4j/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,14 @@

<parent>
<groupId>com.ibm.icu</groupId>
<artifactId>main</artifactId>
<version>74.0.1-SNAPSHOT</version>
<artifactId>icu4j-root</artifactId>
<version>74.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

<artifactId>icu4j</artifactId>
<description>International Components for Unicode for Java (ICU4J) is a mature, widely used Java library
providing Unicode and Globalization support</description>

<properties>
<icu4j.api.doc.root.dir>${project.basedir}/../..</icu4j.api.doc.root.dir>
Expand Down Expand Up @@ -66,6 +69,15 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<executions>
<execution>
<id>source-jar</id>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<createSourcesJar>true</createSourcesJar>
</configuration>
</execution>
<execution>
<goals>
<goal>shade</goal>
Expand All @@ -75,22 +87,60 @@
<createDependencyReducedPom>true</createDependencyReducedPom>
<dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation>
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
<useDependencyReducedPomInJar>true</useDependencyReducedPomInJar>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<manifestEntries>
<Main-Class>com.ibm.icu.util.VersionInfo</Main-Class>
<Export-Package>com.ibm.icu.lang,com.ibm.icu.math,com.ibm.icu.number,com.ibm.icu.text,com.ibm.icu.util</Export-Package>
</manifestEntries>
</transformer>
</transformers>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<artifactId>maven-clean-plugin</artifactId>
<configuration>
<archive>
<manifestEntries>
<Main-Class>com.ibm.icu.util.VersionInfo</Main-Class>
<Export-Package>com.ibm.icu.lang,com.ibm.icu.math,com.ibm.icu.number,com.ibm.icu.text,com.ibm.icu.util</Export-Package>
</manifestEntries>
</archive>
<filesets>
<fileset>
<directory>.</directory>
<includes>
<include>**/dependency-reduced-pom.xml</include>
</includes>
<followSymlinks>false</followSymlinks>
</fileset>
</filesets>
</configuration>
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>with_javadoc</id>
<build>
<plugins>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<!-- This is important. Since this is a shaded jar with no sources,
there is no javadoc generated without this line.
-->
<includeDependencySources>true</includeDependencySources>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>

</project>
17 changes: 15 additions & 2 deletions icu4j/maven-migration/main/langdata/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.ibm.icu</groupId>
<artifactId>main</artifactId>
<version>74.0.1-SNAPSHOT</version>
<artifactId>icu4j-root</artifactId>
<version>74.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

<artifactId>langdata</artifactId>
Expand All @@ -26,4 +27,16 @@
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<!-- We don't want to deploy this to Maven -->
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>

</project>
Loading
Loading