Fixes issue JanusGraph#506 [skip ci]

Signed-off-by: Robert Dale <robdale@gmail.com>
souo · Sep 9, 2017 · dc2fecd · dc2fecd
1 parent d5ada26
commit dc2fecd
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 91 deletions.
diff --git a/janusgraph-dist/src/pkg/static/debian/control b/janusgraph-dist/src/pkg/static/debian/control
@@ -2,15 +2,15 @@ Source: janusgraph
 Section: misc
 Priority: extra
 Maintainer: Dan LaRocque <dalaro@hopcount.org>
-Build-Depends: debhelper (>= 7), openjdk-7-jdk | java7-sdk, maven
+Build-Depends: debhelper (>= 7), openjdk-8-jdk | java8-sdk, maven
 Homepage: http://janusgraph.org
 Vcs-Git: https://github.com/JanusGraph/janusgraph.git
 Vcs-Browser: https://github.com/JanusGraph/janusgraph
 Standards-Version: 3.9.4
 
 Package: janusgraph
 Architecture: all
-Depends: openjdk-7-jre-headless | openjdk-7-jre | java7-runtime, adduser, ${misc:Depends}
+Depends: openjdk-8-jre-headless | openjdk-8-jre | java8-runtime, adduser, ${misc:Depends}
 Recommends: ntp
 Description: JanusGraph is a scalable, distributed, concurrent graph database 
  JanusGraph is a scalable graph database optimized for storing

diff --git a/janusgraph-dist/src/pkg/static/pkgcommon/payload/etc/janusgraph/janusgraph-env.sh b/janusgraph-dist/src/pkg/static/pkgcommon/payload/etc/janusgraph/janusgraph-env.sh
@@ -158,8 +158,8 @@ JMX_PORT="8189" # N.B. 7199 is Cassandra's default JMX port
 JVM_OPTS="$JVM_OPTS -ea"
 
 # add the jamm javaagent if it is available
-if [ "$JVM_VENDOR" != "OpenJDK" -o "$JVM_VERSION" \> "1.6.0" ] \
-      || [ "$JVM_VERSION" = "1.6.0" -a "$JVM_PATCH_VERSION" -ge 23 ] \
+if [ "$JVM_VENDOR" != "OpenJDK" -o "$JVM_VERSION" \> "1.8.0" ] \
+      || [ "$JVM_VERSION" = "1.8.0" -a "$JVM_PATCH_VERSION" -ge 40 ] \
       && [ -e "$JANUSGRAPH_HOME/lib/jamm-0.2.5.jar" ]
 then
     JVM_OPTS="$JVM_OPTS -javaagent:$JANUSGRAPH_HOME/lib/jamm-0.2.5.jar"
@@ -207,8 +207,7 @@ JVM_OPTS="$JVM_OPTS -XX:MaxTenuringThreshold=1"
 JVM_OPTS="$JVM_OPTS -XX:CMSInitiatingOccupancyFraction=75"
 JVM_OPTS="$JVM_OPTS -XX:+UseCMSInitiatingOccupancyOnly"
 JVM_OPTS="$JVM_OPTS -XX:+UseTLAB"
-# note: bash evals '1.7.x' as > '1.7' so this is really a >= 1.7 jvm check
-if [ "$JVM_VERSION" \> "1.7" ] && [ "$JVM_ARCH" = "64-Bit" ] ; then
+if [ "$JVM_ARCH" = "64-Bit" ] ; then
     JVM_OPTS="$JVM_OPTS -XX:+UseCondCardMark"
 fi
 
@@ -221,8 +220,8 @@ fi
 # JVM_OPTS="$JVM_OPTS -XX:+PrintPromotionFailure"
 # JVM_OPTS="$JVM_OPTS -XX:PrintFLSStatistics=1"
 # JVM_OPTS="$JVM_OPTS -Xloggc:/var/log/janusgraph/gc-`date +%s`.log"
-# If you are using JDK 6u34 7u2 or later you can enable GC log rotation
-# don't stick the date in the log name if rotation is on.
+# Enable GC log rotation
+# Don't stick the date in the log name if rotation is on.
 # JVM_OPTS="$JVM_OPTS -Xloggc:/var/log/janusgraph/gc.log"
 # JVM_OPTS="$JVM_OPTS -XX:+UseGCLogFileRotation"
 # JVM_OPTS="$JVM_OPTS -XX:NumberOfGCLogFiles=10"

diff --git a/janusgraph-dist/src/pkg/static/pkgcommon/payload/usr/share/janusgraph/janusgraph.in.sh b/janusgraph-dist/src/pkg/static/pkgcommon/payload/usr/share/janusgraph/janusgraph.in.sh
@@ -24,7 +24,7 @@ JANUSGRAPH_CONF="/etc/janusgraph"
 JANUSGRAPH_CFG="$JANUSGRAPH_CONF/config.properties"
 
 # JAVA_HOME can optionally be set here
-#JAVA_HOME=/usr/local/jdk6
+#JAVA_HOME=/usr/local/jdk8
 
 # The java classpath (required)
 CLASSPATH="$JANUSGRAPH_CONF"

diff --git a/jre6.xslt b/jre6.xslt
diff --git a/pom.xml b/pom.xml
@@ -1501,54 +1501,6 @@
             </build>
         </profile>
 
-        <profile>
-            <id>target-jre6</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>xml-maven-plugin</artifactId>
-                        <configuration>
-                            <forceCreation>true</forceCreation>
-                            <transformationSets>
-                                <transformationSet>
-                                    <dir>${basedir}</dir>
-                                    <includes>
-                                        <include>pom.xml</include>
-                                    </includes>
-                                    <stylesheet>${top.level.basedir}/jre6.xslt</stylesheet>
-                                </transformationSet>
-                            </transformationSets>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>net.sourceforge.saxon</groupId>
-                                <artifactId>saxon</artifactId>
-                                <version>9.1.0.8</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <artifactId>maven-resources-plugin</artifactId>
-                        <configuration>
-                            <outputDirectory>${basedir}</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>${basedir}/target/generated-resources/xml/xslt/</directory>
-                                    <includes>
-                                        <include>pom.xml</include>
-                                    </includes>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
         <profile>
             <id>asciidoc</id>
             <activation>