Skip to content

Commit 7b315eb

Browse files
author
James Leigh
committed
Issue #874: Move buildnumber-maven-plugin to parent pom.xml
Signed-off-by: James Leigh <james.leigh@ontotext.com>
1 parent 6efaa83 commit 7b315eb

61 files changed

Lines changed: 176 additions & 512 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎client/pom.xml‎

Lines changed: 55 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<parent>
55
<groupId>org.eclipse.rdf4j</groupId>
6-
<artifactId>rdf4j-core</artifactId>
6+
<artifactId>rdf4j</artifactId>
77
<version>2.3-SNAPSHOT</version>
88
</parent>
99
<artifactId>rdf4j-client</artifactId>
@@ -183,40 +183,6 @@
183183
</dependencies>
184184
<build>
185185
<plugins>
186-
<plugin>
187-
<groupId>org.apache.maven.plugins</groupId>
188-
<artifactId>maven-shade-plugin</artifactId>
189-
<version>3.0.0</version>
190-
<executions>
191-
<execution>
192-
<phase>package</phase>
193-
<goals>
194-
<goal>shade</goal>
195-
</goals>
196-
<configuration>
197-
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
198-
<artifactSet>
199-
<includes>
200-
<include>org.eclipse.rdf4j:*</include>
201-
</includes>
202-
</artifactSet>
203-
<transformers>
204-
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
205-
</transformers>
206-
</configuration>
207-
</execution>
208-
</executions>
209-
</plugin>
210-
<plugin>
211-
<groupId>org.apache.maven.plugins</groupId>
212-
<artifactId>maven-jar-plugin</artifactId>
213-
<inherited>false</inherited>
214-
<configuration>
215-
<archive>
216-
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
217-
</archive>
218-
</configuration>
219-
</plugin>
220186
<plugin>
221187
<groupId>org.apache.felix</groupId>
222188
<artifactId>maven-bundle-plugin</artifactId>
@@ -230,14 +196,8 @@
230196
</execution>
231197
</executions>
232198
<configuration>
199+
<manifestLocation>${project.build.directory}/manifest/</manifestLocation>
233200
<instructions>
234-
<Implementation-Title>${project.name}</Implementation-Title>
235-
<Implementation-Vendor-Id>${project.groupId}</Implementation-Vendor-Id>
236-
<Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
237-
<Implementation-Version>${project.version}+${buildNumber}</Implementation-Version>
238-
<Implementation-Build>${buildNumber}</Implementation-Build>
239-
<Implementation-URL>${project.url}</Implementation-URL>
240-
<Bundle-Version>${project.version}+${buildNumber}</Bundle-Version>
241201
<Export-Package>!*text-base,!*prop-base,org.eclipse.rdf4j.*</Export-Package>
242202
<Embed-Dependency>
243203
*;
@@ -251,8 +211,59 @@
251211
</configuration>
252212
</plugin>
253213
<plugin>
254-
<groupId>org.codehaus.mojo</groupId>
255-
<artifactId>buildnumber-maven-plugin</artifactId>
214+
<artifactId>maven-resources-plugin</artifactId>
215+
<version>3.0.2</version>
216+
<executions>
217+
<execution>
218+
<id>create-manifest</id>
219+
<phase>process-classes</phase>
220+
<goals>
221+
<goal>copy-resources</goal>
222+
</goals>
223+
<configuration>
224+
<resources>
225+
<resource>
226+
<directory>${project.build.directory}/manifest/</directory>
227+
<filtering>true</filtering>
228+
</resource>
229+
</resources>
230+
<outputDirectory>${project.build.outputDirectory}/META-INF/</outputDirectory>
231+
</configuration>
232+
</execution>
233+
</executions>
234+
</plugin>
235+
<plugin>
236+
<groupId>org.apache.maven.plugins</groupId>
237+
<artifactId>maven-jar-plugin</artifactId>
238+
<configuration>
239+
<archive>
240+
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
241+
</archive>
242+
</configuration>
243+
</plugin>
244+
<plugin>
245+
<groupId>org.apache.maven.plugins</groupId>
246+
<artifactId>maven-shade-plugin</artifactId>
247+
<version>3.0.0</version>
248+
<executions>
249+
<execution>
250+
<phase>package</phase>
251+
<goals>
252+
<goal>shade</goal>
253+
</goals>
254+
<configuration>
255+
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
256+
<artifactSet>
257+
<includes>
258+
<include>org.eclipse.rdf4j:*</include>
259+
</includes>
260+
</artifactSet>
261+
<transformers>
262+
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
263+
</transformers>
264+
</configuration>
265+
</execution>
266+
</executions>
256267
</plugin>
257268
</plugins>
258269
</build>

‎core/config/pom.xml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,4 @@
3232
<scope>test</scope>
3333
</dependency>
3434
</dependencies>
35-
<build>
36-
<plugins>
37-
<plugin>
38-
<groupId>org.codehaus.mojo</groupId>
39-
<artifactId>buildnumber-maven-plugin</artifactId>
40-
</plugin>
41-
</plugins>
42-
</build>
4335
</project>

‎core/console/pom.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,6 @@
7878
</archive>
7979
</configuration>
8080
</plugin>
81-
<plugin>
82-
<groupId>org.codehaus.mojo</groupId>
83-
<artifactId>buildnumber-maven-plugin</artifactId>
84-
</plugin>
8581
</plugins>
8682
</build>
8783
</project>

‎core/http/client/pom.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,6 @@
8585
<groupId>com.github.siom79.japicmp</groupId>
8686
<artifactId>japicmp-maven-plugin</artifactId>
8787
</plugin>
88-
<plugin>
89-
<groupId>org.codehaus.mojo</groupId>
90-
<artifactId>buildnumber-maven-plugin</artifactId>
91-
</plugin>
9288
</plugins>
9389
</build>
9490
</project>

‎core/http/pom.xml‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -22,28 +22,4 @@
2222
<module>workbench</module>
2323
</modules>
2424

25-
<build>
26-
<pluginManagement>
27-
<plugins>
28-
<plugin>
29-
<groupId>org.apache.maven.plugins</groupId>
30-
<artifactId>maven-war-plugin</artifactId>
31-
<version>2.1.1</version>
32-
<configuration>
33-
<failOnMissingWebXml>false</failOnMissingWebXml>
34-
<archive>
35-
<manifestEntries>
36-
<Implementation-Title>${project.name}</Implementation-Title>
37-
<Implementation-Vendor-Id>${project.groupId}</Implementation-Vendor-Id>
38-
<Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
39-
<Implementation-Version>${project.version}+${buildNumber}</Implementation-Version>
40-
<Implementation-Build>${buildNumber}</Implementation-Build>
41-
</manifestEntries>
42-
</archive>
43-
</configuration>
44-
</plugin>
45-
</plugins>
46-
</pluginManagement>
47-
</build>
48-
4925
</project>

‎core/http/protocol/pom.xml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,4 @@
4040
<artifactId>junit</artifactId>
4141
</dependency>
4242
</dependencies>
43-
<build>
44-
<plugins>
45-
<plugin>
46-
<groupId>org.codehaus.mojo</groupId>
47-
<artifactId>buildnumber-maven-plugin</artifactId>
48-
</plugin>
49-
</plugins>
50-
</build>
5143
</project>

‎core/http/server-spring/pom.xml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,4 @@
7979
<artifactId>spring-test</artifactId>
8080
</dependency>
8181
</dependencies>
82-
<build>
83-
<plugins>
84-
<plugin>
85-
<groupId>org.codehaus.mojo</groupId>
86-
<artifactId>buildnumber-maven-plugin</artifactId>
87-
</plugin>
88-
</plugins>
89-
</build>
9082
</project>

‎core/model/pom.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,6 @@
3030
<groupId>com.github.siom79.japicmp</groupId>
3131
<artifactId>japicmp-maven-plugin</artifactId>
3232
</plugin>
33-
<plugin>
34-
<groupId>org.codehaus.mojo</groupId>
35-
<artifactId>buildnumber-maven-plugin</artifactId>
36-
</plugin>
3733
</plugins>
3834
</build>
3935
</project>

‎core/pom.xml‎

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -36,29 +36,6 @@
3636
<name>RDF4J Core</name>
3737
<description>Core modules for RDF4J</description>
3838

39-
<build>
40-
<pluginManagement>
41-
<plugins>
42-
<plugin>
43-
<groupId>org.apache.maven.plugins</groupId>
44-
<artifactId>maven-jar-plugin</artifactId>
45-
<version>2.3.1</version>
46-
<configuration>
47-
<archive>
48-
<manifestEntries>
49-
<Implementation-Title>${project.name}</Implementation-Title>
50-
<Implementation-Vendor-Id>${project.groupId}</Implementation-Vendor-Id>
51-
<Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
52-
<Implementation-Version>${project.version}+${buildNumber}</Implementation-Version>
53-
<Implementation-Build>${buildNumber}</Implementation-Build>
54-
</manifestEntries>
55-
</archive>
56-
</configuration>
57-
</plugin>
58-
</plugins>
59-
</pluginManagement>
60-
</build>
61-
6239
<profiles>
6340
<profile>
6441
<id>assembly</id>

‎core/query/pom.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,6 @@
3737
<groupId>com.github.siom79.japicmp</groupId>
3838
<artifactId>japicmp-maven-plugin</artifactId>
3939
</plugin>
40-
<plugin>
41-
<groupId>org.codehaus.mojo</groupId>
42-
<artifactId>buildnumber-maven-plugin</artifactId>
43-
</plugin>
4440
</plugins>
4541
</build>
4642
</project>

0 commit comments

Comments
 (0)