Skip to content

Commit 7a05700

Browse files
mihnitaecheran
authored andcommitted
ICU-23247 Fewer warnings when generating icu4j
1 parent a9fdce6 commit 7a05700

2 files changed

Lines changed: 4 additions & 10 deletions

File tree

icu4j/main/icu4j/pom.xml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -72,21 +72,13 @@
7272
<plugin>
7373
<artifactId>maven-shade-plugin</artifactId>
7474
<executions>
75-
<execution>
76-
<id>source-jar</id>
77-
<goals>
78-
<goal>shade</goal>
79-
</goals>
80-
<configuration>
81-
<createSourcesJar>true</createSourcesJar>
82-
</configuration>
83-
</execution>
8475
<execution>
8576
<goals>
8677
<goal>shade</goal>
8778
</goals>
8879
<phase>package</phase>
8980
<configuration>
81+
<createSourcesJar>true</createSourcesJar>
9082
<createDependencyReducedPom>true</createDependencyReducedPom>
9183
<dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation>
9284
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
@@ -97,6 +89,8 @@
9789
<excludes>
9890
<!-- Exclude taglets code -->
9991
<exclude>com/ibm/icu/dev/tool/docs/**</exclude>
92+
<!-- We exclude the manifests in dependencies -->
93+
<exclude>META-INF/MANIFEST.MF</exclude>
10094
<!-- Exclude maven info for unpublished artifacts -->
10195
<exclude>META-INF/maven/com.ibm.icu/core/**</exclude>
10296
<exclude>META-INF/maven/com.ibm.icu/tools_taglets/**</exclude>

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@
133133
<mf.Specification-Version>${icu.major.version}</mf.Specification-Version>
134134
<mf.Implementation-Version>${project.version}</mf.Implementation-Version>
135135
<mf.Bundle-Version>${project.version}</mf.Bundle-Version>
136-
<mf.Bundle-RequiredExecutionEnvironment>JavaSE-1.8</mf.Bundle-RequiredExecutionEnvironment>
136+
<mf.Bundle-RequiredExecutionEnvironment>JavaSE-${maven.compiler.release}</mf.Bundle-RequiredExecutionEnvironment>
137137

138138
<!-- For most modules artifactId does not have an "icu4j" prefix, so this is a good default -->
139139
<module-name>${project.artifactId}</module-name>

0 commit comments

Comments
 (0)