Skip to content

Commit 4a031fb

Browse files
cboehmecboehme
committed
Tidy up pom and set new snapshot version
1 parent 4ce8a2d commit 4a031fb

File tree

1 file changed

+90
-85
lines changed

1 file changed

+90
-85
lines changed

‎pom.xml

Lines changed: 90 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,27 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
12
<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">
23
<modelVersion>4.0.0</modelVersion>
4+
5+
<parent>
6+
<groupId>org.sonatype.oss</groupId>
7+
<artifactId>oss-parent</artifactId>
8+
<version>7</version>
9+
</parent>
10+
311
<groupId>org.culturegraph</groupId>
412
<artifactId>metafacture-runner</artifactId>
5-
<version>3.1.3-SNAPSHOT</version>
13+
<version>4.0.0-SNAPSHOT</version>
14+
615
<name>metafacture.runner</name>
716
<description>Standalone applications for working with Flux and Metamorph scripts</description>
17+
<url>http://github.com/culturegraph/metafacture-runner</url>
818
<licenses>
919
<license>
1020
<name>Apache License, Version 2.0</name>
1121
<url>https://www.apache.org/licenses/LICENSE-2.0</url>
1222
</license>
1323
</licenses>
14-
<url>http://github.com/culturegraph/metafacture-runner</url>
15-
<distributionManagement>
16-
<repository>
17-
<id>sonatype-nexus-staging</id>
18-
<name>Sonatype OSS Maven Repository : Releases</name>
19-
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
20-
</repository>
21-
<snapshotRepository>
22-
<id>sonatype-nexus-snapshots</id>
23-
<name>Sonatype OSS Maven Repository : Snapshots</name>
24-
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
25-
<!-- <uniqueVersion>true</uniqueVersion> -->
26-
</snapshotRepository>
27-
</distributionManagement>
24+
2825
<developers>
2926
<developer>
3027
<id>mgeipel</id>
@@ -53,22 +50,91 @@
5350
<timezone>+1</timezone>
5451
</developer>
5552
</developers>
56-
<parent>
57-
<groupId>org.sonatype.oss</groupId>
58-
<artifactId>oss-parent</artifactId>
59-
<version>7</version>
60-
</parent>
61-
<properties>
62-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
63-
<targetJdk>1.6</targetJdk>
64-
</properties>
6553

6654
<scm>
6755
<connection>scm:git:git://github.com/culturegraph/metafacture-runner.git</connection>
6856
<developerConnection>scm:git:[email protected]:culturegraph/metafacture-runner.git</developerConnection>
6957
<url>http://github.com/culturegraph/metafacture-runner</url>
7058
<tag>HEAD</tag>
7159
</scm>
60+
<distributionManagement>
61+
<repository>
62+
<id>sonatype-nexus-staging</id>
63+
<name>Sonatype OSS Maven Repository : Releases</name>
64+
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
65+
</repository>
66+
<snapshotRepository>
67+
<id>sonatype-nexus-snapshots</id>
68+
<name>Sonatype OSS Maven Repository : Snapshots</name>
69+
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
70+
<!-- <uniqueVersion>true</uniqueVersion> -->
71+
</snapshotRepository>
72+
</distributionManagement>
73+
74+
<properties>
75+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
76+
<targetJdk>1.6</targetJdk>
77+
</properties>
78+
79+
<dependencies>
80+
81+
<dependency>
82+
<groupId>org.culturegraph</groupId>
83+
<artifactId>metafacture-core</artifactId>
84+
<version>4.0.0</version>
85+
</dependency>
86+
87+
<!-- In a perfect world the slf4j binding would be a
88+
provided dependency so that the user can replace
89+
it easily with a different binding. However, slf4j
90+
does not use the context class loader for loading
91+
its binding but the same class loader which was
92+
used to load the classes of the slf4j-api. Until
93+
a solution is found for this problem, the binding
94+
need to be placed on the class path. -->
95+
<dependency>
96+
<groupId>org.slf4j</groupId>
97+
<artifactId>slf4j-log4j12</artifactId>
98+
<version>1.7.21</version>
99+
</dependency>
100+
101+
<!-- The following dependencies are placed in the "provided"
102+
scope to prevent them from being included in the class
103+
path but still have them available for building the
104+
distribution assembly.
105+
The reason for this is that an appropriate implementation
106+
for jndi depends on the runtime environment and
107+
should be chosen by the user of the package and not the
108+
package implementer. However, we also attempt to build
109+
a distribution package which should include everything
110+
that is required for metafacture-runner/Flux to work out
111+
of the box. By including the dependencies in the assembly
112+
without putting them on the class path, the user can
113+
replace them easily with other implementations if
114+
necessary. -->
115+
<dependency>
116+
<groupId>simple-jndi</groupId>
117+
<artifactId>simple-jndi</artifactId>
118+
<version>0.11.4.1</version>
119+
<scope>provided</scope>
120+
</dependency>
121+
122+
<dependency>
123+
<!-- Required for connection pooling with simple-jndi -->
124+
<groupId>commons-dbcp</groupId>
125+
<artifactId>commons-dbcp</artifactId>
126+
<version>1.4</version>
127+
<scope>provided</scope>
128+
</dependency>
129+
130+
<dependency>
131+
<groupId>junit</groupId>
132+
<artifactId>junit</artifactId>
133+
<version>4.12</version>
134+
<scope>test</scope>
135+
</dependency>
136+
137+
</dependencies>
72138

73139
<build>
74140
<resources>
@@ -80,7 +146,6 @@
80146
</excludes>
81147
</resource>
82148
</resources>
83-
84149
<plugins>
85150
<plugin>
86151
<groupId>org.apache.maven.plugins</groupId>
@@ -197,66 +262,6 @@
197262
</plugins>
198263
</build>
199264

200-
<dependencies>
201-
202-
<dependency>
203-
<groupId>org.culturegraph</groupId>
204-
<artifactId>metafacture-core</artifactId>
205-
<version>4.0.0</version>
206-
</dependency>
207-
208-
<!-- In a perfect world the slf4j binding would be a
209-
provided dependency so that the user can replace
210-
it easily with a different binding. However, slf4j
211-
does not use the context class loader for loading
212-
its binding but the same class loader which was
213-
used to load the classes of the slf4j-api. Until
214-
a solution is found for this problem, the binding
215-
need to be placed on the class path. -->
216-
<dependency>
217-
<groupId>org.slf4j</groupId>
218-
<artifactId>slf4j-log4j12</artifactId>
219-
<version>1.7.21</version>
220-
</dependency>
221-
222-
<!-- The following dependencies are placed in the "provided"
223-
scope to prevent them from being included in the class
224-
path but still have them available for building the
225-
distribution assembly.
226-
The reason for this is that an appropriate implementation
227-
for jndi depends on the runtime environment and
228-
should be chosen by the user of the package and not the
229-
package implementer. However, we also attempt to build
230-
a distribution package which should include everything
231-
that is required for metafacture-runner/Flux to work out
232-
of the box. By including the dependencies in the assembly
233-
without putting them on the class path, the user can
234-
replace them easily with other implementations if
235-
necessary. -->
236-
<dependency>
237-
<groupId>simple-jndi</groupId>
238-
<artifactId>simple-jndi</artifactId>
239-
<version>0.11.4.1</version>
240-
<scope>provided</scope>
241-
</dependency>
242-
243-
<dependency>
244-
<!-- Required for connection pooling with simple-jndi -->
245-
<groupId>commons-dbcp</groupId>
246-
<artifactId>commons-dbcp</artifactId>
247-
<version>1.4</version>
248-
<scope>provided</scope>
249-
</dependency>
250-
251-
<dependency>
252-
<groupId>junit</groupId>
253-
<artifactId>junit</artifactId>
254-
<version>4.12</version>
255-
<scope>test</scope>
256-
</dependency>
257-
258-
</dependencies>
259-
260265
<profiles>
261266
<profile>
262267
<id>sonatype-oss-release</id>

0 commit comments

Comments
 (0)