Skip to content

Commit 281cd4e

Browse files
committed
ant 1 : maven 0
1 parent 72e0269 commit 281cd4e

File tree

2 files changed

+46
-30
lines changed

2 files changed

+46
-30
lines changed

api/pom.xml

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
<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">
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
23
<parent>
34
<groupId>org.asynchttpclient</groupId>
45
<artifactId>async-http-client-project</artifactId>
@@ -15,11 +16,6 @@
1516
<plugins>
1617
<plugin>
1718
<artifactId>maven-jar-plugin</artifactId>
18-
<configuration>
19-
<excludes>
20-
<exclude>**/NettyAsyncHttpProvider.class</exclude>
21-
</excludes>
22-
</configuration>
2319
<executions>
2420
<execution>
2521
<goals>
@@ -28,6 +24,26 @@
2824
</execution>
2925
</executions>
3026
</plugin>
27+
<plugin>
28+
<artifactId>maven-antrun-plugin</artifactId>
29+
<executions>
30+
<execution>
31+
<phase>process-classes</phase>
32+
<goals>
33+
<goal>run</goal>
34+
</goals>
35+
</execution>
36+
</executions>
37+
<configuration>
38+
<tasks>
39+
<delete>
40+
<fileset
41+
dir="${project.build.outputDirectory}/org/asynchttpclient/netty"
42+
includes="NettyAsyncHttpProvider.*" />
43+
</delete>
44+
</tasks>
45+
</configuration>
46+
</plugin>
3147
</plugins>
3248
</build>
3349
</project>

pom.xml

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -161,30 +161,30 @@
161161
</execution>
162162
</executions>
163163
</plugin>
164-
<!-- <plugin> -->
165-
<!-- <groupId>org.apache.felix</groupId> -->
166-
<!-- <artifactId>maven-bundle-plugin</artifactId> -->
167-
<!-- <version>2.5.4</version> -->
168-
<!-- <extensions>true</extensions> -->
169-
<!-- <configuration> -->
170-
<!-- <manifestLocation>META-INF</manifestLocation> -->
171-
<!-- <instructions> -->
172-
<!-- <Bundle-Version> -->
173-
<!-- $(replace;$(project.version);-SNAPSHOT;.$(tstamp;yyyyMMdd-HHmm)) -->
174-
<!-- </Bundle-Version> -->
175-
<!-- <Bundle-Vendor>Sonatype</Bundle-Vendor> -->
176-
<!-- </instructions> -->
177-
<!-- </configuration> -->
178-
<!-- <executions> -->
179-
<!-- <execution> -->
180-
<!-- <id>osgi-bundle</id> -->
181-
<!-- <phase>package</phase> -->
182-
<!-- <goals> -->
183-
<!-- <goal>bundle</goal> -->
184-
<!-- </goals> -->
185-
<!-- </execution> -->
186-
<!-- </executions> -->
187-
<!-- </plugin> -->
164+
<plugin>
165+
<groupId>org.apache.felix</groupId>
166+
<artifactId>maven-bundle-plugin</artifactId>
167+
<version>2.5.4</version>
168+
<extensions>true</extensions>
169+
<configuration>
170+
<manifestLocation>META-INF</manifestLocation>
171+
<instructions>
172+
<Bundle-Version>
173+
$(replace;$(project.version);-SNAPSHOT;.$(tstamp;yyyyMMdd-HHmm))
174+
</Bundle-Version>
175+
<Bundle-Vendor>Sonatype</Bundle-Vendor>
176+
</instructions>
177+
</configuration>
178+
<executions>
179+
<execution>
180+
<id>osgi-bundle</id>
181+
<phase>package</phase>
182+
<goals>
183+
<goal>bundle</goal>
184+
</goals>
185+
</execution>
186+
</executions>
187+
</plugin>
188188
<plugin>
189189
<artifactId>maven-enforcer-plugin</artifactId>
190190
<version>1.4</version>

0 commit comments

Comments
 (0)