Skip to content

Commit 572f7ea

Browse files
committed
Support a java 11 version
1 parent a4ae136 commit 572f7ea

14 files changed

Lines changed: 109 additions & 5 deletions

File tree

core/java11/CHANGELOG.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<!--
2+
#
3+
# Licensed to the Apache Software Foundation (ASF) under one or more
4+
# contributor license agreements. See the NOTICE file distributed with
5+
# this work for additional information regarding copyright ownership.
6+
# The ASF licenses this file to You under the Apache License, Version 2.0
7+
# (the "License"); you may not use this file except in compliance with
8+
# the License. You may obtain a copy of the License at
9+
#
10+
# http://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing, software
13+
# distributed under the License is distributed on an "AS IS" BASIS,
14+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
# See the License for the specific language governing permissions and
16+
# limitations under the License.
17+
#
18+
-->
19+
20+
# Java 11 OpenWhisk Runtime Container
21+
22+
23+
## 1.1.2
24+
Changes:
25+
- Initial release

core/java11/Dockerfile

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
#
2+
# Licensed to the Apache Software Foundation (ASF) under one or more
3+
# contributor license agreements. See the NOTICE file distributed with
4+
# this work for additional information regarding copyright ownership.
5+
# The ASF licenses this file to You under the Apache License, Version 2.0
6+
# (the "License"); you may not use this file except in compliance with
7+
# the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
#
17+
18+
FROM adoptopenjdk/openjdk11-openj9:x86_64-ubuntu-jdk-11.28
19+
20+
RUN rm -rf /var/lib/apt/lists/* && apt-get clean && apt-get update \
21+
&& apt-get install -y --no-install-recommends locales \
22+
&& rm -rf /var/lib/apt/lists/* \
23+
&& locale-gen en_US.UTF-8
24+
25+
ENV LANG="en_US.UTF-8" \
26+
LANGUAGE="en_US:en" \
27+
LC_ALL="en_US.UTF-8" \
28+
VERSION=11
29+
30+
ADD proxy /javaAction
31+
32+
RUN cd /javaAction \
33+
&& rm -rf .classpath .gitignore .gradle .project .settings Dockerfile build \
34+
&& ./gradlew oneJar \
35+
&& rm -rf /javaAction/src \
36+
&& ./compileClassCache.sh
37+
38+
CMD ["java", "-Dfile.encoding=UTF-8", "-Xshareclasses:cacheDir=/javaSharedCache,readonly", "-Xquickstart", "-jar", "/javaAction/build/libs/javaAction-all.jar"]

core/java11/build.gradle

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one or more
3+
* contributor license agreements. See the NOTICE file distributed with
4+
* this work for additional information regarding copyright ownership.
5+
* The ASF licenses this file to You under the Apache License, Version 2.0
6+
* (the "License"); you may not use this file except in compliance with
7+
* the License. You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
17+
18+
ext.dockerImageName = 'java11action'
19+
apply from: '../../gradle/docker.gradle'
20+
21+
distDocker.dependsOn 'copyProxy'
22+
distDocker.finalizedBy('cleanup')
23+
24+
task copyProxy(type: Copy) {
25+
from '../javaActionBase/proxy'
26+
into 'proxy'
27+
}
28+
29+
task cleanup(type: Delete) {
30+
delete 'proxy'
31+
}

core/java8/build.gradle

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,15 @@
1717

1818
ext.dockerImageName = 'java8action'
1919
apply from: '../../gradle/docker.gradle'
20+
21+
distDocker.dependsOn 'copyProxy'
22+
distDocker.finalizedBy('cleanup')
23+
24+
task copyProxy(type: Copy) {
25+
from '../javaActionBase/proxy'
26+
into 'proxy'
27+
}
28+
29+
task cleanup(type: Delete) {
30+
delete 'proxy'
31+
}
File renamed without changes.

core/java8/proxy/gradle/wrapper/gradle-wrapper.jar renamed to core/javaActionBase/proxy/gradle/wrapper/gradle-wrapper.jar

File renamed without changes.

core/java8/proxy/gradle/wrapper/gradle-wrapper.properties renamed to core/javaActionBase/proxy/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
# Licensed to the Apache Software Foundation (ASF) under one or more contributor
2-
# license agreements; and to You under the Apache License, Version 2.0.
3-
41
distributionBase=GRADLE_USER_HOME
52
distributionPath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.3.1-bin.zip
74
zipStoreBase=GRADLE_USER_HOME
85
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)