summaryrefslogtreecommitdiff
path: root/usr/src/lib/libslp
diff options
context:
space:
mode:
authorDan McDonald <danmcd@joyent.com>2020-09-22 10:39:49 -0400
committerDan McDonald <danmcd@joyent.com>2020-09-22 10:39:49 -0400
commit267e12a7d9bf6e5fcefb9cc00f46bfff0dc5226e (patch)
tree19a3941920d0039c35d53a5cbee189b5ca51995a /usr/src/lib/libslp
parent517abc5c668925e6092495bf332233c3599980d2 (diff)
parente9faba760cdf80d7dfa110fe0830917ab94668c2 (diff)
downloadillumos-joyent-vpc.tar.gz
Merge branch 'master' into vpcvpc
Diffstat (limited to 'usr/src/lib/libslp')
-rw-r--r--usr/src/lib/libslp/javalib/Makefile.conf6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr/src/lib/libslp/javalib/Makefile.conf b/usr/src/lib/libslp/javalib/Makefile.conf
index 1c6443a071..a34afab69c 100644
--- a/usr/src/lib/libslp/javalib/Makefile.conf
+++ b/usr/src/lib/libslp/javalib/Makefile.conf
@@ -56,7 +56,7 @@ SLPCLASSPATH=$(CLASSES):$(SLPJAVASRC)
# javac flags
JFLAGS= -O -d $(CLASSES) -sourcepath $(SLPCLASSPATH)
-JFLAGS += -source 1.6 -target 1.6 -Xlint:deprecation,-options
+JFLAGS += -source 7 -target 7 -Xlint:-options
# The default make rule for Java files
COMPILE.java=$(JAVAC) $(JFLAGS)
@@ -86,7 +86,7 @@ SLP_CLASSES=\
UARequester.class SARequester.class slpd.class \
SunServerDATable.class AttributeVerifier.class \
SunDATable.class SLPHeaderV2.class SLPServerHeaderV2.class \
-SLPHeaderV1.class SLPV1Manager.class Syslog.class \
+SLPHeaderV1.class SLPV1Manager.class Syslog.class \
StderrLog.class SLPDgui.class \
ServiceLocationException.class ServiceLocationEnumeration.class \
ServiceLocationEnumerator.class Assert.class \
@@ -141,7 +141,7 @@ ServerAttribute.class ServiceLocationAttribute.class \
ServiceLocationEnumeration.class ServiceLocationEnumerator.class \
ServiceLocationException.class ServiceType.class \
UARequester.class ServiceLocationManager.class \
-SunDATable.class TemplateRegistry.class SLPTemplateRegistry.class \
+SunDATable.class TemplateRegistry.class SLPTemplateRegistry.class \
ServiceLocationAttributeVerifier.class AttributeVerifier.class \
ServiceLocationAttributeDescriptor.class AttributeDescriptor.class \
URLAttributeVerifier.class StderrLog.class \