Merge branch 'master' of https://github.com/jmxtrans/jmxtrans

jmxtrans · Aug 12, 2015 · c89bd56 · c89bd56
2 parents 283d421 + b636958
commit c89bd56
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 2 deletions.
diff --git a/jmxtrans/pom.xml b/jmxtrans/pom.xml
@@ -321,8 +321,9 @@
 								<script>if [ $1 = 1 ]; then
                   USER_ID=`id -u %{package.user} 2&gt;/dev/null`
                     if [ -z "$USER_ID" ]; then
+									    groupadd -f ${package.user}
 									    /usr/sbin/useradd -c "${project.name}" -s /bin/sh -r -d \
-									    ${package.install.dir} -U ${package.user}
+									    ${package.install.dir} -G ${package.user} ${package.user}
                     fi
 									fi</script>
 							</preinstallScriptlet>

diff --git a/jmxtrans/src/deb/control/preinst b/jmxtrans/src/deb/control/preinst
@@ -5,7 +5,7 @@ set -e
 case "$1" in
     install)
         if ! id jmxtrans > /dev/null 2>&1 ; then
-            adduser --system --shell /bin/bash --home /home/jmxtrans --disabled-login --disabled-password --group jmxtrans
+            adduser --system --shell /bin/bash --home /usr/share/jmxtrans --disabled-login --disabled-password --group jmxtrans
         fi
     ;;
     upgrade|abort-upgrade)

diff --git a/pom.xml b/pom.xml
@@ -1078,6 +1078,26 @@
 				</pluginManagement>
 			</build>
 		</profile>
+		<profile>
+			<id>jdk_higher_or_equal_than_8</id>
+			<activation>
+				<activeByDefault>false</activeByDefault>
+				<jdk>[1.8,)</jdk>
+			</activation>
+			<build>
+				<pluginManagement>
+					<plugins>
+						<plugin>
+							<groupId>org.apache.maven.plugins</groupId>
+							<artifactId>maven-javadoc-plugin</artifactId>
+							<configuration>
+								<additionalparam>-Xdoclint:none</additionalparam>
+							</configuration>
+						</plugin>
+					</plugins>
+				</pluginManagement>
+			</build>
+		</profile>
 	</profiles>
 
 </project>