Skip to content

Commit ef29ac9

Browse files
committed
Manually merge last part of #48 to master
1 parent 88580c9 commit ef29ac9

File tree

5 files changed

+44
-53
lines changed

5 files changed

+44
-53
lines changed

eclipse-collections/pom.xml

+8-19
Original file line numberDiff line numberDiff line change
@@ -44,25 +44,14 @@
4444

4545
<build>
4646
<plugins>
47-
<plugin>
48-
<groupId>com.google.code.maven-replacer-plugin</groupId>
49-
<artifactId>replacer</artifactId>
50-
<executions>
51-
<execution>
52-
<id>process-packageVersion</id>
53-
<phase>generate-sources</phase>
54-
</execution>
55-
</executions>
56-
</plugin>
57-
<plugin>
58-
<groupId>org.apache.maven.plugins</groupId>
59-
<artifactId>maven-surefire-plugin</artifactId>
60-
<configuration>
61-
<excludes>
62-
<exclude>com/fasterxml/jackson/**/failing/*.java</exclude>
63-
</excludes>
64-
</configuration>
65-
</plugin>
47+
<plugin>
48+
<groupId>com.google.code.maven-replacer-plugin</groupId>
49+
<artifactId>replacer</artifactId>
50+
</plugin>
51+
<plugin>
52+
<groupId>org.moditect</groupId>
53+
<artifactId>moditect-maven-plugin</artifactId>
54+
</plugin>
6655
</plugins>
6756
</build>
6857
</project>

guava/pom.xml

+2-13
Original file line numberDiff line numberDiff line change
@@ -53,21 +53,10 @@ com.google.common.*;version="${version.guava.osgi}",
5353
<plugin>
5454
<groupId>com.google.code.maven-replacer-plugin</groupId>
5555
<artifactId>replacer</artifactId>
56-
<executions>
57-
<execution>
58-
<id>process-packageVersion</id>
59-
<phase>generate-sources</phase>
60-
</execution>
61-
</executions>
6256
</plugin>
6357
<plugin>
64-
<groupId>org.apache.maven.plugins</groupId>
65-
<artifactId>maven-surefire-plugin</artifactId>
66-
<configuration>
67-
<excludes>
68-
<exclude>com/fasterxml/jackson/**/failing/*.java</exclude>
69-
</excludes>
70-
</configuration>
58+
<groupId>org.moditect</groupId>
59+
<artifactId>moditect-maven-plugin</artifactId>
7160
</plugin>
7261
</plugins>
7362
</build>

hppc/pom.xml

+4-7
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,12 @@ High-Performance Primitive Collections (HPPC, see http://labs.carrotsearch.com/h
3333
<build>
3434
<plugins>
3535
<plugin>
36-
<!-- Inherited from oss-base. Generate PackageVersion.java.-->
3736
<groupId>com.google.code.maven-replacer-plugin</groupId>
3837
<artifactId>replacer</artifactId>
39-
<executions>
40-
<execution>
41-
<id>process-packageVersion</id>
42-
<phase>generate-sources</phase>
43-
</execution>
44-
</executions>
38+
</plugin>
39+
<plugin>
40+
<groupId>org.moditect</groupId>
41+
<artifactId>moditect-maven-plugin</artifactId>
4542
</plugin>
4643
</plugins>
4744
</build>

pcollections/pom.xml

+2-13
Original file line numberDiff line numberDiff line change
@@ -41,21 +41,10 @@ PCollections (http://pcollections.org/) types
4141
<plugin>
4242
<groupId>com.google.code.maven-replacer-plugin</groupId>
4343
<artifactId>replacer</artifactId>
44-
<executions>
45-
<execution>
46-
<id>process-packageVersion</id>
47-
<phase>generate-sources</phase>
48-
</execution>
49-
</executions>
5044
</plugin>
5145
<plugin>
52-
<groupId>org.apache.maven.plugins</groupId>
53-
<artifactId>maven-surefire-plugin</artifactId>
54-
<configuration>
55-
<excludes>
56-
<exclude>com/fasterxml/jackson/**/failing/*.java</exclude>
57-
</excludes>
58-
</configuration>
46+
<groupId>org.moditect</groupId>
47+
<artifactId>moditect-maven-plugin</artifactId>
5948
</plugin>
6049
</plugins>
6150
</build>

pom.xml

+28-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
</dependency>
4040
</dependencies>
4141

42-
4342
<!-- Alas, need to include snapshot reference since otherwise can not find
4443
snapshot of parent... -->
4544
<repositories>
@@ -51,4 +50,32 @@
5150
<snapshots><enabled>true</enabled></snapshots>
5251
</repository>
5352
</repositories>
53+
54+
<build>
55+
<pluginManagement>
56+
<plugins>
57+
<plugin>
58+
<!-- Inherited from oss-base. Generate PackageVersion.java.-->
59+
<groupId>com.google.code.maven-replacer-plugin</groupId>
60+
<artifactId>replacer</artifactId>
61+
<executions>
62+
<execution>
63+
<id>process-packageVersion</id>
64+
<phase>generate-sources</phase>
65+
</execution>
66+
</executions>
67+
</plugin>
68+
69+
<plugin>
70+
<groupId>org.apache.maven.plugins</groupId>
71+
<artifactId>maven-surefire-plugin</artifactId>
72+
<configuration>
73+
<excludes>
74+
<exclude>com/fasterxml/jackson/**/failing/*.java</exclude>
75+
</excludes>
76+
</configuration>
77+
</plugin>
78+
</plugins>
79+
</pluginManagement>
80+
</build>
5481
</project>

0 commit comments

Comments
 (0)