This is an automated email from the ASF dual-hosted git repository.
jtulach pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans-html4j.git
The following commit(s) were added to refs/heads/master by this push:
new 67c2002 NETBEANS-111: Use enforcer plugin to prevent accidental
exposure of testng and asm artifacts from HTML/Java API modules
67c2002 is described below
commit 67c200239202de14cbaf2296eb9d54661c0f0323
Author: Jaroslav Tulach <[email protected]>
AuthorDate: Thu Nov 2 08:44:48 2017 +0100
NETBEANS-111: Use enforcer plugin to prevent accidental exposure of testng
and asm artifacts from HTML/Java API modules
---
boot-agent-test/pom.xml | 7 ++++++
html4j-maven-plugin/pom.xml | 7 ++++++
json-tck/pom.xml | 2 +-
.../org/netbeans/html/json/tck/KnockoutTCK.java | 4 +--
ko-felix-test/pom.xml | 7 ++++++
ko-osgi-test/pom.xml | 7 ++++++
ko-ws-tyrus/pom.xml | 5 ++++
pom.xml | 29 +++++++++++++++++++++-
xhr4j/pom.xml | 5 ++++
9 files changed, 69 insertions(+), 4 deletions(-)
diff --git a/boot-agent-test/pom.xml b/boot-agent-test/pom.xml
index 6add3c1..40d5a65 100644
--- a/boot-agent-test/pom.xml
+++ b/boot-agent-test/pom.xml
@@ -38,6 +38,13 @@
<skip>true</skip>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
<dependencies>
diff --git a/html4j-maven-plugin/pom.xml b/html4j-maven-plugin/pom.xml
index 22f5397..e172b3c 100644
--- a/html4j-maven-plugin/pom.xml
+++ b/html4j-maven-plugin/pom.xml
@@ -58,6 +58,13 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
diff --git a/json-tck/pom.xml b/json-tck/pom.xml
index 3d68dc1..b882cab 100644
--- a/json-tck/pom.xml
+++ b/json-tck/pom.xml
@@ -67,7 +67,7 @@
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
- <scope>compile</scope>
+ <scope>test</scope>
<type>jar</type>
<exclusions>
<exclusion>
diff --git a/json-tck/src/main/java/org/netbeans/html/json/tck/KnockoutTCK.java
b/json-tck/src/main/java/org/netbeans/html/json/tck/KnockoutTCK.java
index c3c02e0..14d5d7b 100644
--- a/json-tck/src/main/java/org/netbeans/html/json/tck/KnockoutTCK.java
+++ b/json-tck/src/main/java/org/netbeans/html/json/tck/KnockoutTCK.java
@@ -32,7 +32,6 @@ import net.java.html.json.tests.Utils;
import net.java.html.json.tests.WebSocketTest;
import org.netbeans.html.context.spi.Contexts.Builder;
import org.openide.util.lookup.ServiceProvider;
-import org.testng.annotations.Factory;
/** Entry point for providers of different HTML binding technologies (like
* Knockout.js in JavaFX's WebView). Sample usage:
@@ -45,7 +44,8 @@ public final class MyKnockoutBindingTest extends KnockoutTCK {
// use {@link Builder}.{@link Builder#build() build}();
}
- {@code @}{@link Factory} public static Object[] create() {
+ {@code @org.testng.annotations.Factory}
+ public static Object[] create() {
return VMTest.newTests().withClasses({@link
KnockoutTCK#testClasses}()).build();
}
}
diff --git a/ko-felix-test/pom.xml b/ko-felix-test/pom.xml
index 1f8f74b..06f75f8 100644
--- a/ko-felix-test/pom.xml
+++ b/ko-felix-test/pom.xml
@@ -51,6 +51,13 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<additionalClasspathElements>
diff --git a/ko-osgi-test/pom.xml b/ko-osgi-test/pom.xml
index c934edd..ae170fb 100644
--- a/ko-osgi-test/pom.xml
+++ b/ko-osgi-test/pom.xml
@@ -51,6 +51,13 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<additionalClasspathElements>
diff --git a/ko-ws-tyrus/pom.xml b/ko-ws-tyrus/pom.xml
index b0bf25c..9794e2f 100644
--- a/ko-ws-tyrus/pom.xml
+++ b/ko-ws-tyrus/pom.xml
@@ -164,6 +164,11 @@
<scope>test</scope>
<version>3.1.0</version>
</dependency>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<description>An implementation module that provides support for WebSocket
protocol on JDK7.
No need to use it when running on JDK8 with FX WebView supporting WebSocket
directly.</description>
diff --git a/pom.xml b/pom.xml
index 11a5054..6ec614b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -172,12 +172,39 @@
org.netbeans.html.boot.impl:org.netbeans.html.boot.fx:org.netbeans.html.context.
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.3.1</version>
+ <executions>
+ <execution>
+ <id>ban-certain-libraries</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <bannedDependencies>
+ <excludes>
+ <exclude>org.testng</exclude>
+ <exclude>org.ow2.asm</exclude>
+ </excludes>
+ <includes>
+
<include>org.testng:*:*:jar:test</include>
+
<include>org.ow2.asm:*:*:jar:provided</include>
+ </includes>
+ </bannedDependencies>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<version>0.12</version>
<executions>
<execution>
- <phase>validate</phase>
+ <phase>prepare-package</phase>
<goals>
<goal>check</goal>
<goal>rat</goal>
diff --git a/xhr4j/pom.xml b/xhr4j/pom.xml
index 86b2ca6..917f427 100644
--- a/xhr4j/pom.xml
+++ b/xhr4j/pom.xml
@@ -136,6 +136,11 @@
<artifactId>javax.servlet-api</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<description>Implementation module with support for XHR via Java.
Use it to workaround CORS limitations.</description>
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
