Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions .github/workflows/icu4j.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,10 @@ jobs:
restore-keys: |
${{ runner.os }}-maven-
lookup-only: true
- uses: actions/setup-java@v5
with:
distribution: 'temurin'
java-version: '21'
- name: Check Java style
run: |
cd icu4j;
Expand Down
10 changes: 10 additions & 0 deletions .mvn/maven.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# Copyright (C) 2025 and later: Unicode, Inc. and others.
# License & terms of use: http://www.unicode.org/copyright.html

# See https://maven.apache.org/configure.html

# Here you can define Maven options instead of passing them in command line.
# Each single argument must be put on a new line.

# Do not display transfer progress when downloading or uploading
--no-transfer-progress
4 changes: 0 additions & 4 deletions icu4j/demos/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,6 @@

<artifactId>demos</artifactId>

<properties>
<icu4j.api.doc.root.dir>${project.basedir}/..</icu4j.api.doc.root.dir>
</properties>

<dependencies>
<dependency>
<groupId>com.ibm.icu</groupId>
Expand Down
9 changes: 2 additions & 7 deletions icu4j/main/charset/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j-root</artifactId>
<artifactId>icu4j-main</artifactId>
<version>79.0.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

<artifactId>icu4j-charset</artifactId>
Expand All @@ -23,7 +22,6 @@
</scm>

<properties>
<icu4j.api.doc.root.dir>${project.basedir}/../..</icu4j.api.doc.root.dir>
<module-name>charset</module-name>
<proj.displayname>charset</proj.displayname>
</properties>
Expand All @@ -35,6 +33,7 @@
<version>${project.version}</version>
</dependency>

<!-- Test only -->
<dependency>
<groupId>com.ibm.icu</groupId>
<artifactId>core</artifactId>
Expand All @@ -53,14 +52,10 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>pl.pragmatists</groupId>
<artifactId>JUnitParams</artifactId>
<version>${junitparams.version}</version>
<scope>test</scope>
</dependency>

</dependencies>
Expand Down
11 changes: 2 additions & 9 deletions icu4j/main/collate/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,20 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j-root</artifactId>
<artifactId>icu4j-main</artifactId>
<version>79.0.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

<artifactId>collate</artifactId>

<properties>
<icu4j.api.doc.root.dir>${project.basedir}/../..</icu4j.api.doc.root.dir>
</properties>

<dependencies>
<dependency>
<groupId>com.ibm.icu</groupId>
<artifactId>core</artifactId>
<version>${project.version}</version>
</dependency>

<!-- Test -->
<!-- Test only -->
<dependency>
<groupId>com.ibm.icu</groupId>
<artifactId>core</artifactId>
Expand Down Expand Up @@ -62,8 +57,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
</dependencies>

Expand Down
15 changes: 2 additions & 13 deletions icu4j/main/common_tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,20 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j-root</artifactId>
<artifactId>icu4j-main</artifactId>
<version>79.0.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

<artifactId>common_tests</artifactId>

<properties>
<icu4j.api.doc.root.dir>${project.basedir}/../..</icu4j.api.doc.root.dir>
</properties>

<dependencies>
<dependency>
<groupId>com.ibm.icu</groupId>
<artifactId>core</artifactId>
<version>${project.version}</version>
</dependency>

<!-- Test only -->
<dependency>
<groupId>com.ibm.icu</groupId>
<artifactId>core</artifactId>
Expand Down Expand Up @@ -73,27 +69,20 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>pl.pragmatists</groupId>
<artifactId>JUnitParams</artifactId>
<version>${junitparams.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>${gson.version}</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
Expand Down
15 changes: 2 additions & 13 deletions icu4j/main/core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,20 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j-root</artifactId>
<artifactId>icu4j-main</artifactId>
<version>79.0.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

<artifactId>core</artifactId>

<properties>
<icu4j.api.doc.root.dir>${project.basedir}/../..</icu4j.api.doc.root.dir>
</properties>

<dependencies>
<dependency>
<groupId>com.ibm.icu</groupId>
<artifactId>tools_taglets</artifactId>
<version>${project.version}</version>
</dependency>

<!-- Test only -->
<dependency>
<groupId>com.ibm.icu</groupId>
<artifactId>framework</artifactId>
Expand All @@ -36,27 +32,20 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>pl.pragmatists</groupId>
<artifactId>JUnitParams</artifactId>
<version>${junitparams.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>${gson.version}</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
Expand Down
4 changes: 1 addition & 3 deletions icu4j/main/currdata/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,14 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j-root</artifactId>
<artifactId>icu4j-main</artifactId>
<version>79.0.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

<artifactId>currdata</artifactId>

<properties>
<proj.displayname>currency data</proj.displayname>
<icu4j.api.doc.root.dir>${project.basedir}/../..</icu4j.api.doc.root.dir>
</properties>

<dependencies>
Expand Down
11 changes: 2 additions & 9 deletions icu4j/main/framework/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,30 +7,23 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j-root</artifactId>
<artifactId>icu4j-main</artifactId>
<version>79.0.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

<artifactId>framework</artifactId>

<properties>
<icu4j.api.doc.root.dir>${project.basedir}/../..</icu4j.api.doc.root.dir>
</properties>

<dependencies>
<!-- Test only -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
Expand Down
19 changes: 13 additions & 6 deletions icu4j/main/icu4j/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,8 @@

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

<artifactId>icu4j</artifactId>
Expand All @@ -25,12 +24,10 @@
</scm>

<properties>
<icu4j.api.doc.root.dir>${project.basedir}/../..</icu4j.api.doc.root.dir>

<localTitle>International Components for Unicode for Java</localTitle>
<mf.Automatic-Module-Name>com.ibm.icu</mf.Automatic-Module-Name>
<mf.Bundle-SymbolicName>com.ibm.icu</mf.Bundle-SymbolicName>
<mf.Bundle-Name>ICU4J</mf.Bundle-Name>
<localTitle>International Components for Unicode for Java</localTitle>
<mf.Bundle-Description>${localTitle}</mf.Bundle-Description>
<mf.Implementation-Title>${localTitle}</mf.Implementation-Title>
<mf.Specification-Title>${localTitle}</mf.Specification-Title>
Expand Down Expand Up @@ -73,7 +70,6 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<executions>
<execution>
Expand All @@ -95,6 +91,17 @@
<dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation>
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
<useDependencyReducedPomInJar>true</useDependencyReducedPomInJar>
<filters>
<filter>
<artifact>com.ibm.icu:*</artifact>
<excludes>
<!-- Exclude taglets code -->
<exclude>com/ibm/icu/dev/tool/docs/**</exclude>
</excludes>
<includes>
</includes>
</filter>
</filters>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<manifestEntries>
Expand Down
4 changes: 1 addition & 3 deletions icu4j/main/langdata/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,14 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j-root</artifactId>
<artifactId>icu4j-main</artifactId>
<version>79.0.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

<artifactId>langdata</artifactId>

<properties>
<proj.displayname>language data</proj.displayname>
<icu4j.api.doc.root.dir>${project.basedir}/../..</icu4j.api.doc.root.dir>
</properties>

<dependencies>
Expand Down
32 changes: 32 additions & 0 deletions icu4j/main/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
* © 2025 and later: Unicode, Inc. and others.
* License & terms of use: http://www.unicode.org/copyright.html
-->
<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j-root</artifactId>
<version>79.0.1-SNAPSHOT</version>
</parent>

<artifactId>icu4j-main</artifactId>
<packaging>pom</packaging>

<modules>
<module>framework</module>
<module>core</module>
<!-- For publishing to Maven Central -->
<module>charset</module>
<module>collate</module>
<module>currdata</module>
<module>langdata</module>
<module>regiondata</module>
<module>translit</module>
<module>common_tests</module>
<!-- Shaded jar for publishing to Maven Central -->
<module>icu4j</module>
</modules>

</project>
4 changes: 1 addition & 3 deletions icu4j/main/regiondata/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,14 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j-root</artifactId>
<artifactId>icu4j-main</artifactId>
<version>79.0.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

<artifactId>regiondata</artifactId>

<properties>
<proj.displayname>region data</proj.displayname>
<icu4j.api.doc.root.dir>${project.basedir}/../..</icu4j.api.doc.root.dir>
</properties>

<dependencies>
Expand Down
Loading