Skip to content
This repository was archived by the owner on Jul 6, 2023. It is now read-only.

Commit f436400

Browse files
committed
cleaned up some comments
1 parent e719764 commit f436400

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

Makefile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,15 @@ out/cypher-shell.zip: tmp/cypher-shell.zip
131131
cp $< $@
132132

133133
# ======================= RPM JAVA-ADAPTER =======================
134+
## Build the java adapter package for java 11 compatibility
135+
## oracle and openjdk java 11 don't provide the same java package names any more,
136+
## and rpm might not be advanced enough to support boolean dependencies.
137+
## To fix that, we have a few empty java packages that provide various standard java package names.
138+
## This page is helpful for understanding this make code:
139+
## https://www.gnu.org/software/make/manual/html_node/Automatic-Variables.html
134140

135141
.PHONY: java-adapter
136-
java-adapter: $(java_adapter_artifacts) ## Build the java adapter package for java 11 compatibility
142+
java-adapter: $(java_adapter_artifacts)
137143

138144
out/neo4j-java-adapter-%.rpm: out/rpm/RPMS/noarch/neo4j-java-adapter-%.rpm
139145
mkdir -p $(dir $@)

packaging/test/java-adapter/Dockerfile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,11 @@ FROM centos:7
22

33
VOLUME /repo
44

5-
#COPY ${CYPHER_SHELL_FILE} /repo/
6-
#COPY ${JAVA_ADAPTER_FILE} /repo/
75
COPY *.rpm /repo/
86
COPY tempneo4j.repo /tmp/
97
COPY entrypoint.sh /tmp/
108

119
RUN yum --assumeyes install ${TEST_JAVA} createrepo bc && \
1210
mv /tmp/tempneo4j.repo /etc/yum.repos.d/
1311

14-
#ENTRYPOINT [ "ls", "-l", "/repo"]
1512
ENTRYPOINT [ "/tmp/entrypoint.sh", "${TEST_JAVA}" ]
16-
#ENTRYPOINT [ "test $(yum --assumeno install cypher-shell | grep -c ${TEST_JAVA} | bc) == '0'" ]

0 commit comments

Comments
 (0)