Skip to content

Commit dd6dff6

Browse files
childsbchildsb
committed
Merge remote-tracking branch 'upstream/master' into multi_vol
Conflicts: pom.xml
2 parents aac854d + 938d258 commit dd6dff6

File tree

1 file changed

+171
-157
lines changed

1 file changed

+171
-157
lines changed

‎pom.xml‎

Lines changed: 171 additions & 157 deletions
Original file line numberDiff line numberDiff line change
@@ -1,159 +1,173 @@
11
<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/maven-v4_0_0.xsd">
3-
<modelVersion>4.0.0</modelVersion>
4-
<groupId>org.apache.hadoop.fs.glusterfs</groupId>
5-
<artifactId>glusterfs-hadoop</artifactId>
6-
<packaging>jar</packaging>
7-
<!-- from now, we will update version manually
8-
and ignore maven snapshot features -->
9-
<version>2.1.6</version>
10-
<name>glusterfs-hadoop</name>
11-
<url>http://maven.apache.org</url>
12-
<dependencies>
13-
<dependency>
14-
<groupId>junit</groupId>
15-
<artifactId>junit</artifactId>
16-
<version>4.9</version>
17-
<scope>test</scope>
18-
</dependency>
19-
<dependency>
20-
<groupId>org.apache.hadoop</groupId>
21-
<artifactId>hadoop-common</artifactId>
22-
<version>2.0.5-alpha</version>
23-
</dependency>
24-
<dependency>
25-
<groupId>org.apache.hadoop</groupId>
26-
<artifactId>hadoop-common-test</artifactId>
27-
<version>0.22.0</version>
28-
<scope>test</scope>
29-
</dependency>
30-
<dependency>
31-
<groupId>org.apache.hadoop</groupId>
32-
<artifactId>hadoop-test</artifactId>
33-
<version>1.0.0</version>
34-
<scope>test</scope>
35-
</dependency>
36-
<dependency>
37-
<groupId>org.slf4j</groupId>
38-
<artifactId>slf4j-api</artifactId>
39-
<version>1.5.8</version>
40-
<scope>compile</scope>
41-
</dependency>
42-
<dependency>
43-
<groupId>org.slf4j</groupId>
44-
<artifactId>slf4j-log4j12</artifactId>
45-
<version>1.7.3</version>
46-
</dependency>
47-
</dependencies>
48-
<build>
49-
<testResources>
50-
<testResource>
51-
<directory>conf</directory>
52-
</testResource>
53-
</testResources>
54-
<plugins>
55-
<plugin>
56-
<groupId>org.apache.maven.plugins</groupId>
57-
<artifactId>maven-compiler-plugin</artifactId>
58-
<version>2.3.2</version>
59-
<configuration>
60-
<source>1.5</source>
61-
<target>1.5</target>
62-
</configuration>
63-
</plugin>
64-
65-
<plugin>
66-
<groupId>pl.project13.maven</groupId>
67-
<artifactId>git-commit-id-plugin</artifactId>
68-
<version>2.1.4</version>
69-
<executions>
70-
<execution>
71-
<goals>
72-
<goal>revision</goal>
73-
</goals>
74-
</execution>
75-
</executions>
76-
77-
<configuration>
78-
<!-- that's the default value, you don't have to set it -->
79-
<prefix>git</prefix>
80-
81-
<!-- that's the default value -->
82-
<dateFormat>dd.MM.yyyy '@' HH:mm:ss z</dateFormat>
83-
84-
<!-- true is default here, it prints some more information during the build -->
85-
<verbose>true</verbose>
86-
87-
<!--
88-
If you'd like to tell the plugin where your .git directory is,
89-
use this setting, otherwise we'll perform a search trying to
90-
figure out the right directory. It's better to add it explicite IMHO.
91-
-->
92-
<dotGitDirectory>${project.basedir}/.git</dotGitDirectory>
93-
94-
<!-- ALTERNATE SETUP - GENERATE FILE -->
95-
<!--
96-
If you want to keep git information, even in your WAR file etc,
97-
use this mode, which will generate a properties file (with filled out values)
98-
which you can then normally read using new Properties().load(/**/)
99-
-->
100-
101-
<!--
102-
this is true by default; You may want to set this to false, if the plugin should run inside a
103-
<packaging>pom</packaging> project. Most projects won't need to override this property.
104-
105-
For an use-case for this kind of behaviour see: https://github.com/ktoso/maven-git-commit-id-plugin/issues/21
106-
-->
107-
<skipPoms>true</skipPoms>
108-
109-
<!-- this is false by default, forces the plugin to generate the git.properties file -->
110-
<generateGitPropertiesFile>true</generateGitPropertiesFile>
111-
112-
<!-- The path for the to be generated properties file, it's relative to ${project.basedir} -->
113-
<generateGitPropertiesFilename>src/main/resources/git.properties</generateGitPropertiesFilename>
114-
115-
<!-- true by default, controls whether the plugin will fail when no .git directory is found, when set to false the plugin will just skip execution -->
116-
<!-- @since 2.0.4 -->
117-
<failOnNoGitDirectory>false</failOnNoGitDirectory>
118-
119-
<!-- @since 2.1.0 -->
120-
<!--
121-
read up about git-describe on the in man, or it's homepage - it's a really powerful versioning helper
122-
and the recommended way to use git-commit-id-plugin. The configuration bellow is optional,
123-
by default describe will run "just like git-describe on the command line", even though it's a JGit reimplementation.
124-
-->
125-
<gitDescribe>
126-
<!-- This will show the available tags-->
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<groupId>org.apache.hadoop.fs.glusterfs</groupId>
5+
<artifactId>glusterfs-hadoop</artifactId>
6+
<packaging>jar</packaging>
7+
<!-- from now, we will update version manually and ignore maven snapshot
8+
features -->
9+
<version>2.1.7</version>
10+
<name>glusterfs-hadoop</name>
11+
<url>http://maven.apache.org</url>
12+
13+
<distributionManagement>
14+
<repository>
15+
<id>maven-s3-release-repo</id>
16+
<name>S3 Release Repository</name>
17+
<url>s3://rhbd/maven/repositories/internal</url>
18+
</repository>
19+
</distributionManagement>
20+
21+
<dependencies>
22+
<dependency>
23+
<groupId>junit</groupId>
24+
<artifactId>junit</artifactId>
25+
<version>4.9</version>
26+
<scope>test</scope>
27+
</dependency>
28+
<dependency>
29+
<groupId>org.apache.hadoop</groupId>
30+
<artifactId>hadoop-common</artifactId>
31+
<version>2.0.5-alpha</version>
32+
</dependency>
33+
<dependency>
34+
<groupId>org.apache.hadoop</groupId>
35+
<artifactId>hadoop-common-test</artifactId>
36+
<version>0.22.0</version>
37+
<scope>test</scope>
38+
</dependency>
39+
<dependency>
40+
<groupId>org.apache.hadoop</groupId>
41+
<artifactId>hadoop-test</artifactId>
42+
<version>1.0.0</version>
43+
<scope>test</scope>
44+
</dependency>
45+
<dependency>
46+
<groupId>org.slf4j</groupId>
47+
<artifactId>slf4j-api</artifactId>
48+
<version>1.5.8</version>
49+
<scope>compile</scope>
50+
</dependency>
51+
<dependency>
52+
<groupId>org.slf4j</groupId>
53+
<artifactId>slf4j-log4j12</artifactId>
54+
<version>1.7.3</version>
55+
</dependency>
56+
</dependencies>
57+
<build>
58+
59+
<testResources>
60+
<testResource>
61+
<directory>conf</directory>
62+
</testResource>
63+
</testResources>
64+
65+
<extensions>
66+
<extension>
67+
<groupId>org.springframework.build</groupId>
68+
<artifactId>aws-maven</artifactId>
69+
<version>5.0.0.RELEASE</version>
70+
</extension>
71+
</extensions>
72+
73+
74+
<plugins>
75+
76+
77+
<plugin>
78+
<groupId>org.apache.maven.plugins</groupId>
79+
<artifactId>maven-compiler-plugin</artifactId>
80+
<version>2.3.2</version>
81+
<configuration>
82+
<source>1.5</source>
83+
<target>1.5</target>
84+
</configuration>
85+
</plugin>
86+
87+
<plugin>
88+
<groupId>pl.project13.maven</groupId>
89+
<artifactId>git-commit-id-plugin</artifactId>
90+
<version>2.1.4</version>
91+
<executions>
92+
<execution>
93+
<goals>
94+
<goal>revision</goal>
95+
</goals>
96+
</execution>
97+
</executions>
98+
99+
<configuration>
100+
<!-- that's the default value, you don't have to set it -->
101+
<prefix>git</prefix>
102+
103+
<!-- that's the default value -->
104+
<dateFormat>dd.MM.yyyy '@' HH:mm:ss z</dateFormat>
105+
106+
<!-- true is default here, it prints some more information during the
107+
build -->
108+
<verbose>true</verbose>
109+
110+
<!-- If you'd like to tell the plugin where your .git directory is,
111+
use this setting, otherwise we'll perform a search trying to figure out the
112+
right directory. It's better to add it explicite IMHO. -->
113+
<dotGitDirectory>${project.basedir}/.git</dotGitDirectory>
114+
115+
<!-- ALTERNATE SETUP - GENERATE FILE -->
116+
<!-- If you want to keep git information, even in your WAR file etc,
117+
use this mode, which will generate a properties file (with filled out values)
118+
which you can then normally read using new Properties().load(/**/) -->
119+
120+
<!-- this is true by default; You may want to set this to false, if
121+
the plugin should run inside a <packaging>pom</packaging> project. Most projects
122+
won't need to override this property. For an use-case for this kind of behaviour
123+
see: https://github.com/ktoso/maven-git-commit-id-plugin/issues/21 -->
124+
<skipPoms>true</skipPoms>
125+
126+
<!-- this is false by default, forces the plugin to generate the git.properties
127+
file -->
128+
<generateGitPropertiesFile>true</generateGitPropertiesFile>
129+
130+
<!-- The path for the to be generated properties file, it's relative
131+
to ${project.basedir} -->
132+
<generateGitPropertiesFilename>src/main/resources/git.properties</generateGitPropertiesFilename>
133+
134+
<!-- true by default, controls whether the plugin will fail when no
135+
.git directory is found, when set to false the plugin will just skip execution -->
136+
<!-- @since 2.0.4 -->
137+
<failOnNoGitDirectory>false</failOnNoGitDirectory>
138+
139+
<!-- @since 2.1.0 -->
140+
<!-- read up about git-describe on the in man, or it's homepage - it's
141+
a really powerful versioning helper and the recommended way to use git-commit-id-plugin.
142+
The configuration bellow is optional, by default describe will run "just
143+
like git-describe on the command line", even though it's a JGit reimplementation. -->
144+
<gitDescribe>
145+
<!-- This will show the available tags -->
127146
<tags>true</tags>
128-
129-
<!-- don't generate the describe property -->
130-
<skip>false</skip>
131-
<!--
132-
if no tag was found "near" this commit, just print the commit's id instead,
133-
helpful when you always expect this field to be not-empty
134-
-->
135-
<always>false</always>
136-
<!--
137-
how many chars should be displayed as the commit object id?
138-
7 is git's default,
139-
0 has a special meaning (see end of this README.md),
140-
and 40 is the maximum value here
141-
-->
142-
<abbrev>7</abbrev>
143-
144-
<!-- when the build is triggered while the repo is in "dirty state", append this suffix -->
145-
<dirty>-dirty</dirty>
146-
147-
<!--
148-
always print using the "tag-commits_from_tag-g_commit_id-maybe_dirty" format, even if "on" a tag.
149-
The distance will always be 0 if you're "on" the tag.
150-
-->
151-
<forceLongFormat>false</forceLongFormat>
152-
</gitDescribe>
153-
</configuration>
154-
155-
</plugin>
156-
157-
</plugins>
158-
</build>
159-
</project>
147+
148+
<!-- don't generate the describe property -->
149+
<skip>false</skip>
150+
<!-- if no tag was found "near" this commit, just print the commit's
151+
id instead, helpful when you always expect this field to be not-empty -->
152+
<always>false</always>
153+
<!-- how many chars should be displayed as the commit object id? 7
154+
is git's default, 0 has a special meaning (see end of this README.md), and
155+
40 is the maximum value here -->
156+
<abbrev>7</abbrev>
157+
158+
<!-- when the build is triggered while the repo is in "dirty state",
159+
append this suffix -->
160+
<dirty>-dirty</dirty>
161+
162+
<!-- always print using the "tag-commits_from_tag-g_commit_id-maybe_dirty"
163+
format, even if "on" a tag. The distance will always be 0 if you're "on"
164+
the tag. -->
165+
<forceLongFormat>false</forceLongFormat>
166+
</gitDescribe>
167+
</configuration>
168+
169+
</plugin>
170+
171+
</plugins>
172+
</build>
173+
</project>

0 commit comments

Comments
 (0)