Skip to content

Commit de94380

Browse files
jtulachjtulach
committed
Up-to-date with most recent master
2 parents 9bc1429 + 3ce4a3c commit de94380

File tree

109 files changed

+3997
-1809
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

109 files changed

+3997
-1809
lines changed

‎.github/workflows/javadoc.yml‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
#
2+
# Licensed to the Apache Software Foundation (ASF) under one
3+
# or more contributor license agreements. See the NOTICE file
4+
# distributed with this work for additional information
5+
# regarding copyright ownership. The ASF licenses this file
6+
# to you under the Apache License, Version 2.0 (the
7+
# "License"); you may not use this file except in compliance
8+
# with 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,
13+
# software distributed under the License is distributed on an
14+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
# KIND, either express or implied. See the License for the
16+
# specific language governing permissions and limitations
17+
# under the License.
18+
#
19+
20+
name: Javadoc
21+
22+
on:
23+
push:
24+
branches: [ master ]
25+
pull_request:
26+
branches: [ master ]
27+
28+
jobs:
29+
build:
30+
31+
runs-on: ${{ matrix.os }}
32+
strategy:
33+
matrix:
34+
java: [ '17' ]
35+
os: [ ubuntu-22.04 ]
36+
37+
steps:
38+
- uses: actions/checkout@v2
39+
- name: Set up Java
40+
uses: actions/setup-java@v2
41+
with:
42+
distribution: 'zulu'
43+
java-version: ${{ matrix.java }}
44+
45+
- name: Build
46+
run: mvn -q install -DskipTests
47+
48+
- name: Javadoc
49+
run: mvn -q "javadoc:aggregate"

‎.github/workflows/linux.yml‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
#
2+
# Licensed to the Apache Software Foundation (ASF) under one
3+
# or more contributor license agreements. See the NOTICE file
4+
# distributed with this work for additional information
5+
# regarding copyright ownership. The ASF licenses this file
6+
# to you under the Apache License, Version 2.0 (the
7+
# "License"); you may not use this file except in compliance
8+
# with 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,
13+
# software distributed under the License is distributed on an
14+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
# KIND, either express or implied. See the License for the
16+
# specific language governing permissions and limitations
17+
# under the License.
18+
#
19+
20+
name: Linux
21+
22+
on:
23+
push:
24+
branches: [ master ]
25+
pull_request:
26+
branches: [ master ]
27+
28+
jobs:
29+
build:
30+
31+
runs-on: ${{ matrix.os }}
32+
strategy:
33+
matrix:
34+
java: [ '8', '11', '17', '21' ]
35+
os: [ ubuntu-22.04 ]
36+
37+
steps:
38+
- uses: actions/checkout@v2
39+
- name: Set up Java
40+
uses: actions/setup-java@v2
41+
with:
42+
distribution: 'zulu'
43+
java-version: ${{ matrix.java }}
44+
45+
- name: Build with Maven
46+
run: mvn -q install -DskipTests
47+
48+
- name: Run tests
49+
run: xvfb-run -a mvn -q verify "-Dorg.netbeans.html.Generic.wait4js=true" "-DskipBrowserTests=true"

‎.github/workflows/mac.yml‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
#
2+
# Licensed to the Apache Software Foundation (ASF) under one
3+
# or more contributor license agreements. See the NOTICE file
4+
# distributed with this work for additional information
5+
# regarding copyright ownership. The ASF licenses this file
6+
# to you under the Apache License, Version 2.0 (the
7+
# "License"); you may not use this file except in compliance
8+
# with 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,
13+
# software distributed under the License is distributed on an
14+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
# KIND, either express or implied. See the License for the
16+
# specific language governing permissions and limitations
17+
# under the License.
18+
#
19+
20+
name: Mac OS X
21+
22+
on:
23+
push:
24+
branches: [ master ]
25+
pull_request:
26+
branches: [ master ]
27+
28+
jobs:
29+
build:
30+
31+
runs-on: ${{ matrix.os }}
32+
strategy:
33+
matrix:
34+
java: [ '11', '17' ]
35+
os: [ macos-14 ]
36+
37+
steps:
38+
- uses: actions/checkout@v2
39+
- name: Set up Java
40+
uses: actions/setup-java@v2
41+
with:
42+
distribution: 'zulu'
43+
java-version: ${{ matrix.java }}
44+
45+
- name: Build with Maven
46+
run: mvn -q install -DskipTests
47+
48+
- name: Run tests
49+
run: mvn -q verify "-Dorg.netbeans.html.Generic.wait4js=true"

‎.github/workflows/windows.yml‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
#
2+
# Licensed to the Apache Software Foundation (ASF) under one
3+
# or more contributor license agreements. See the NOTICE file
4+
# distributed with this work for additional information
5+
# regarding copyright ownership. The ASF licenses this file
6+
# to you under the Apache License, Version 2.0 (the
7+
# "License"); you may not use this file except in compliance
8+
# with 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,
13+
# software distributed under the License is distributed on an
14+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
# KIND, either express or implied. See the License for the
16+
# specific language governing permissions and limitations
17+
# under the License.
18+
#
19+
20+
name: Windows
21+
22+
on:
23+
push:
24+
branches: [ master ]
25+
pull_request:
26+
branches: [ master ]
27+
28+
jobs:
29+
build:
30+
31+
runs-on: ${{ matrix.os }}
32+
strategy:
33+
matrix:
34+
java: [ '8', '11', '17', '21' ]
35+
os: [ windows-2022 ]
36+
37+
steps:
38+
- uses: actions/checkout@v2
39+
- name: Set up Java
40+
uses: actions/setup-java@v2
41+
with:
42+
distribution: 'zulu'
43+
java-version: ${{ matrix.java }}
44+
45+
- name: Build with Maven
46+
run: mvn -q install -DskipTests
47+
48+
- name: Run tests
49+
run: mvn -q verify "-Dorg.netbeans.html.Generic.wait4js=true" "-DskipBrowserTests=true"

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
/target/
33
*.orig
44
*/nb-configuration.xml
5+
*/dependency-reduced-pom.xml
56
*/nbactions.xml
67
/html4j-maven-plugin/src/test/resources/org/netbeans/html/mojo/gradle*/build/*
78
/html4j-maven-plugin/src/test/resources/org/netbeans/html/mojo/gradle*/.gradle/*

‎.travis.yml‎

Lines changed: 0 additions & 71 deletions
This file was deleted.

‎README.md‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@
22

33
In need of cross platform, client side interaction between Java and JavaScript?
44

5-
[![Travis](https://travis-ci.org/apache/netbeans-html4j.svg?branch=master)](https://travis-ci.org/apache/netbeans-html4j)
5+
[![Linux](https://github.com/apache/netbeans-html4j/actions/workflows/linux.yml/badge.svg)](https://github.com/apache/netbeans-html4j/actions/workflows/linux.yml)
6+
[![Mac OS X](https://github.com/apache/netbeans-html4j/actions/workflows/mac.yml/badge.svg)](https://github.com/apache/netbeans-html4j/actions/workflows/mac.yml)
7+
[![Windows](https://github.com/apache/netbeans-html4j/actions/workflows/windows.yml/badge.svg)](https://github.com/apache/netbeans-html4j/actions/workflows/windows.yml)
8+
[![Javadoc](https://github.com/apache/netbeans-html4j/actions/workflows/javadoc.yml/badge.svg)](https://github.com/apache/netbeans-html4j/actions/workflows/javadoc.yml)
69
[![Linux](https://ci-builds.apache.org/job/Netbeans/job/netbeans-html4j-linux/badge/icon)](https://ci-builds.apache.org/job/Netbeans/job/netbeans-html4j-linux/)
710
[![Windows](https://ci-builds.apache.org/job/Netbeans/job/netbeans-html4j-windows/badge/icon)](https://ci-builds.apache.org/job/Netbeans/job/netbeans-html4j-windows/)
811

‎boot-agent-test/pom.xml‎

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
</parent>
2929
<artifactId>boot-agent-test</artifactId>
3030
<packaging>jar</packaging>
31-
<name>Dynamic Boot Test</name>
31+
<name>Agent Boot Test</name>
3232
<properties>
3333
<skipTests>${skipJavaFXTests}</skipTests>
3434
</properties>
@@ -48,6 +48,23 @@
4848
<skip>true</skip>
4949
</configuration>
5050
</plugin>
51+
<plugin>
52+
<artifactId>maven-dependency-plugin</artifactId>
53+
<executions>
54+
<execution>
55+
<goals>
56+
<goal>properties</goal>
57+
</goals>
58+
</execution>
59+
</executions>
60+
</plugin>
61+
<plugin>
62+
<artifactId>maven-surefire-plugin</artifactId>
63+
<version>3.2.5</version>
64+
<configuration>
65+
<argLine>-javaagent:${org.netbeans.html:net.java.html.boot:jar}</argLine>
66+
</configuration>
67+
</plugin>
5168
</plugins>
5269
</build>
5370
<dependencies>
@@ -70,27 +87,19 @@
7087
<scope>test</scope>
7188
<type>jar</type>
7289
</dependency>
73-
<dependency>
74-
<groupId>org.netbeans.api</groupId>
75-
<artifactId>org-openide-util-lookup</artifactId>
76-
<scope>test</scope>
77-
<type>jar</type>
78-
</dependency>
7990
<dependency>
8091
<groupId>${project.groupId}</groupId>
81-
<artifactId>net.java.html.boot.fx</artifactId>
92+
<artifactId>net.java.html.boot.script</artifactId>
8293
<version>${project.version}</version>
8394
<scope>test</scope>
8495
</dependency>
8596
<dependency>
86-
<groupId>org.openjfx</groupId>
87-
<artifactId>javafx-web</artifactId>
88-
<scope>test</scope>
97+
<groupId>org.graalvm.js</groupId>
98+
<artifactId>js</artifactId>
8999
</dependency>
90100
<dependency>
91-
<groupId>org.ow2.asm</groupId>
92-
<artifactId>asm</artifactId>
93-
<scope>test</scope>
101+
<groupId>org.graalvm.js</groupId>
102+
<artifactId>js-scriptengine</artifactId>
94103
</dependency>
95104
</dependencies>
96105
</project>

0 commit comments

Comments
 (0)