This is an automated email from the ASF dual-hosted git repository.
OpenPj pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/manifoldcf.git
The following commit(s) were added to refs/heads/trunk by this push:
new a77ff5fed Upgrade commons-io and flapdoodle mongo, fix IDE and build
compatibility
a77ff5fed is described below
commit a77ff5fed1bc6b5847b605001df270ea44b0affa
Author: Piergiorgio Lucidi <[email protected]>
AuthorDate: Mon Oct 5 18:50:39 2026 +0200
Upgrade commons-io and flapdoodle mongo, fix IDE and build compatibility
- Upgraded commons-io to 2.22.0 and flapdoodle mongo to 4.33.0 with
test suite updates.
- Fixed Eclipse/Java 25 split-package, preview features, and m2e
copy-war build issues.
- Configured SharePoint WSDL stub generation and fixed release workflow
schema.
- Added JUnit/Ant temporary test properties files to .gitignore.
---
.github/workflows/create-release-candidate.yml | 1 +
.gitignore | 18 ++--
build.xml | 2 +-
connectors/mongodb/build.xml | 8 +-
.../mongodboutput/tests/APISanityHSQLDBIT.java | 20 ++--
.../output/mongodboutput/tests/BaseITHSQLDB.java | 43 +++++----
connectors/mongodb/pom.xml | 5 +-
connectors/newgeneric/pom.xml | 2 +-
connectors/sharepoint/pom.xml | 20 ++--
framework/scripts-zookeeper/zk-options.env.unix | 2 +-
framework/scripts-zookeeper/zk-options.env.win | 2 +-
framework/scripts/options.env.unix | 2 +-
framework/scripts/options.env.win | 2 +-
pom.xml | 102 +++++++++++++++++++--
14 files changed, 165 insertions(+), 64 deletions(-)
diff --git a/.github/workflows/create-release-candidate.yml
b/.github/workflows/create-release-candidate.yml
index 364b3e5ca..410b72bce 100644
--- a/.github/workflows/create-release-candidate.yml
+++ b/.github/workflows/create-release-candidate.yml
@@ -27,6 +27,7 @@ on:
description: 'Release Candidate Tag'
default: 'RC0'
required: true
+ type: string
jobs:
createReleaseCandidate:
diff --git a/.gitignore b/.gitignore
index f66428bc2..07928fa09 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,11 +5,13 @@
*.iml
/build/
/lib/
-/dist/
-lib-proprietary/*.jar
-site/fonts/
-/.DS_Store
-*.class
-/connectors/*/target/classes
-/connectors/*/target/generated-sources
-/connectors/*/target/test-classes
+/dist/
+lib-proprietary/*.jar
+site/fonts/
+/.DS_Store
+*.class
+/connectors/*/target/classes
+/connectors/*/target/generated-sources
+/connectors/*/target/test-classes
+junit*.properties
+junitvmwatcher*.properties
diff --git a/build.xml b/build.xml
index 44937ca09..e46b33c7a 100644
--- a/build.xml
+++ b/build.xml
@@ -48,7 +48,7 @@
<property name="commons-discovery.version" value="0.5"/>
<property name="commons-el.version" value="1.0"/>
<property name="commons-fileupload.version" value="2.0.0-M2"/>
- <property name="commons-io.version" value="2.16.1"/>
+ <property name="commons-io.version" value="2.22.0"/>
<property name="commons-lang.version" value="2.6"/>
<property name="commons-lang3.version" value="3.12.0"/>
<property name="commons-logging.version" value="1.2"/>
diff --git a/connectors/mongodb/build.xml b/connectors/mongodb/build.xml
index cbfcf4faa..5fe8fa1dd 100644
--- a/connectors/mongodb/build.xml
+++ b/connectors/mongodb/build.xml
@@ -60,22 +60,22 @@
</antcall>
</target>
- <property name="embedded-mongodb.version.label" value="3.4.5"/>
+ <property name="embedded-mongodb.version.label" value="4.33.0"/>
<property name="embedded-mongodb.artifactId"
value="de.flapdoodle.embed.mongo"/>
<property name="embedded-mongodb-package" value="de/flapdoodle/embed"/>
<property name="embedded-mongodb.snapshot-jar"
value="${embedded-mongodb.artifactId}-${embedded-mongodb.version.label}.jar"/>
- <property name="embedded-mongodb.process.version.label" value="3.1.10"/>
+ <property name="embedded-mongodb.process.version.label" value="4.18.0"/>
<property name="embedded-mongodb.process.artifactId"
value="de.flapdoodle.embed.process"/>
<property name="embedded-mongodb.process-package"
value="de/flapdoodle/embed"/>
<property name="embedded-mongodb.process.jar"
value="${embedded-mongodb.process.artifactId}-${embedded-mongodb.process.version.label}.jar"/>
- <property name="embedded-mongodb.packageresolver.version.label"
value="1.0.3"/>
+ <property name="embedded-mongodb.packageresolver.version.label"
value="4.33.0"/>
<property name="embedded-mongodb.packageresolver.artifactId"
value="de.flapdoodle.embed.mongo.packageresolver"/>
<property name="embedded-mongodb-packageresolver-package"
value="de/flapdoodle/embed"/>
<property name="embedded-mongodb.packageresolver.jar"
value="${embedded-mongodb.packageresolver.artifactId}-${embedded-mongodb.packageresolver.version.label}.jar"/>
- <property name="embedded-mongodb.os.version.label" value="1.1.8"/>
+ <property name="embedded-mongodb.os.version.label" value="1.11.0"/>
<property name="embedded-mongodb.os.artifactId" value="de.flapdoodle.os"/>
<property name="embedded-mongodb-os-package" value="de/flapdoodle"/>
<property name="embedded-mongodb.os.jar"
value="${embedded-mongodb.os.artifactId}-${embedded-mongodb.os.version.label}.jar"/>
diff --git
a/connectors/mongodb/connector/src/test/java/org/apache/manifoldcf/agents/output/mongodboutput/tests/APISanityHSQLDBIT.java
b/connectors/mongodb/connector/src/test/java/org/apache/manifoldcf/agents/output/mongodboutput/tests/APISanityHSQLDBIT.java
index e74241523..e759ea39f 100644
---
a/connectors/mongodb/connector/src/test/java/org/apache/manifoldcf/agents/output/mongodboutput/tests/APISanityHSQLDBIT.java
+++
b/connectors/mongodb/connector/src/test/java/org/apache/manifoldcf/agents/output/mongodboutput/tests/APISanityHSQLDBIT.java
@@ -104,15 +104,19 @@ public class APISanityHSQLDBIT extends BaseITHSQLDB {
public void removeTestArea()
throws Exception {
- // deleting the dummyuser
- final BasicDBObject deleteUserCommand = new BasicDBObject("dropUser",
BaseITSanityTestUtils.TARGET_USERNAME_VALUE);
- CommandResult result = mongoDatabase.command(deleteUserCommand);
-
- // dropping the test Collection
- testCollection.drop();
+ if (mongoDatabase != null) {
+ // deleting the dummyuser
+ final BasicDBObject deleteUserCommand = new
BasicDBObject("dropUser", BaseITSanityTestUtils.TARGET_USERNAME_VALUE);
+ CommandResult result = mongoDatabase.command(deleteUserCommand);
+
+ // dropping the test Collection
+ if (testCollection != null) {
+ testCollection.drop();
+ }
- // dropping the test Database
- mongoDatabase.dropDatabase();
+ // dropping the test Database
+ mongoDatabase.dropDatabase();
+ }
}
@Test
diff --git
a/connectors/mongodb/connector/src/test/java/org/apache/manifoldcf/agents/output/mongodboutput/tests/BaseITHSQLDB.java
b/connectors/mongodb/connector/src/test/java/org/apache/manifoldcf/agents/output/mongodboutput/tests/BaseITHSQLDB.java
index 6d282e3ce..28e6c0f49 100644
---
a/connectors/mongodb/connector/src/test/java/org/apache/manifoldcf/agents/output/mongodboutput/tests/BaseITHSQLDB.java
+++
b/connectors/mongodb/connector/src/test/java/org/apache/manifoldcf/agents/output/mongodboutput/tests/BaseITHSQLDB.java
@@ -21,12 +21,17 @@ package
org.apache.manifoldcf.agents.output.mongodboutput.tests;
import org.junit.After;
import org.junit.Before;
-import de.flapdoodle.embed.mongo.MongodExecutable;
-import de.flapdoodle.embed.mongo.MongodStarter;
-import de.flapdoodle.embed.mongo.config.MongodConfig;
import de.flapdoodle.embed.mongo.config.Net;
import de.flapdoodle.embed.mongo.distribution.Version;
-import de.flapdoodle.embed.process.runtime.Network;
+import de.flapdoodle.embed.mongo.transitions.ImmutableMongod;
+import de.flapdoodle.embed.mongo.transitions.Mongod;
+import de.flapdoodle.embed.mongo.transitions.RunningMongodProcess;
+import de.flapdoodle.os.CommonArchitecture;
+import de.flapdoodle.os.CommonOS;
+import de.flapdoodle.os.ImmutablePlatform;
+import de.flapdoodle.os.Platform;
+import de.flapdoodle.reverse.TransitionWalker;
+import de.flapdoodle.reverse.transitions.Start;
/**
* Base integration tests class for MongoDB tested against a CMIS repository
@@ -35,7 +40,7 @@ import de.flapdoodle.embed.process.runtime.Network;
*/
public class BaseITHSQLDB extends
org.apache.manifoldcf.crawler.tests.BaseITHSQLDB {
- private MongodExecutable mongodExecutable;
+ private TransitionWalker.ReachedState<RunningMongodProcess>
mongodProcess;
protected String[] getConnectorNames() {
return new String[] { "CMIS" };
@@ -58,26 +63,26 @@ public class BaseITHSQLDB extends
org.apache.manifoldcf.crawler.tests.BaseITHSQL
@Before
public void setUpMongoDB() throws Exception {
- // start mongod here
- MongodStarter starter = MongodStarter.getDefaultInstance();
String bindIp = "localhost";
int port = 27017;
- MongodConfig mongodConfig =
MongodConfig.builder().version(Version.Main.PRODUCTION)
- .net(new Net(bindIp, port,
Network.localhostIsIPv6())).build();
-
-// IMongodConfig mongodConfig = new
MongodConfigBuilder().version(Version.Main.PRODUCTION)
-// .net(new Net(bindIp, port,
Network.localhostIsIPv6())).build();
-
- mongodExecutable = starter.prepare(mongodConfig);
- mongodExecutable.start();
-
+ ImmutableMongod.Builder mongodBuilder = Mongod.builder()
+
.net(Start.to(Net.class).initializedWith(Net.of(bindIp, port, false)));
+
+ Platform detected = Platform.detect(CommonOS.list());
+ if (detected.operatingSystem() == CommonOS.OS_X &&
detected.architecture() == CommonArchitecture.ARM_64) {
+ Platform x86Platform =
ImmutablePlatform.builder().from(detected)
+ .architecture(CommonArchitecture.X86_64)
+ .build();
+
mongodBuilder.platform(Start.to(Platform.class).initializedWith(x86Platform));
+ }
+
+ mongodProcess = mongodBuilder.build().start(Version.Main.V4_0);
}
@After
public void cleanUpMongoDB() throws Exception {
- // stop mongod here
- if (mongodExecutable != null) {
- mongodExecutable.stop();
+ if (mongodProcess != null) {
+ mongodProcess.close();
}
}
diff --git a/connectors/mongodb/pom.xml b/connectors/mongodb/pom.xml
index d7033f78f..3a0591680 100644
--- a/connectors/mongodb/pom.xml
+++ b/connectors/mongodb/pom.xml
@@ -38,8 +38,7 @@
</developer>
<developer>
<name>Piergiorgio Lucidi</name>
- <organization>Zia Consulting</organization>
- <organizationUrl>https://www.ziaconsulting.com</organizationUrl>
+ <email>[email protected]</email>
<url>https://www.open4dev.com</url>
</developer>
</developers>
@@ -90,7 +89,7 @@
<dependency>
<groupId>de.flapdoodle.embed</groupId>
<artifactId>de.flapdoodle.embed.mongo</artifactId>
- <version>3.4.5</version>
+ <version>4.33.0</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/connectors/newgeneric/pom.xml b/connectors/newgeneric/pom.xml
index 1608df786..8ca217529 100644
--- a/connectors/newgeneric/pom.xml
+++ b/connectors/newgeneric/pom.xml
@@ -92,7 +92,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.4</version>
+ <version>${commons-io.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/connectors/sharepoint/pom.xml b/connectors/sharepoint/pom.xml
index 77e6dc88d..b014a9cd9 100644
--- a/connectors/sharepoint/pom.xml
+++ b/connectors/sharepoint/pom.xml
@@ -172,23 +172,24 @@
</executions>
</plugin>
- <!--
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
- <phase>generate-sources</phase>
- <goals><goal>add-source</goal></goals>
- <configuration>
- <sources>
- <source>build/wsdljava</source>
- </sources>
- </configuration>
+ <id>add-wsdl-sources</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>target/generated-sources/axistools/wsdl2java</source>
+ </sources>
+ </configuration>
</execution>
</executions>
</plugin>
- -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -231,6 +232,7 @@
<executions>
<execution>
+ <phase>generate-sources</phase>
<goals>
<goal>wsdl2java</goal>
</goals>
diff --git a/framework/scripts-zookeeper/zk-options.env.unix
b/framework/scripts-zookeeper/zk-options.env.unix
index d9075219c..c706defec 100644
--- a/framework/scripts-zookeeper/zk-options.env.unix
+++ b/framework/scripts-zookeeper/zk-options.env.unix
@@ -2,4 +2,4 @@
-Xmx256m
--enable-preview
-cp
-.:../lib/angus-activation-2.0.2.jar:../lib/asm-9.10.jar:../lib/asm-commons-9.10.jar:../lib/asm-tree-9.10.jar:../lib/commons-codec-1.19.0.jar:../lib/commons-collections-3.2.2.jar:../lib/commons-collections4-4.4.jar:../lib/commons-discovery-0.5.jar:../lib/commons-el-1.0.jar:../lib/commons-exec-1.3.jar:../lib/commons-fileupload2-core-2.0.0-M2.jar:../lib/commons-fileupload2-jakarta-servlet6-2.0.0-M2.jar:../lib/commons-io-2.16.1.jar:../lib/commons-lang-2.6.jar:../lib/commons-lang3-3.19.0.jar:
[...]
+.:../lib/angus-activation-2.0.2.jar:../lib/asm-9.10.jar:../lib/asm-commons-9.10.jar:../lib/asm-tree-9.10.jar:../lib/commons-codec-1.19.0.jar:../lib/commons-collections-3.2.2.jar:../lib/commons-collections4-4.4.jar:../lib/commons-discovery-0.5.jar:../lib/commons-el-1.0.jar:../lib/commons-exec-1.3.jar:../lib/commons-fileupload2-core-2.0.0-M2.jar:../lib/commons-fileupload2-jakarta-servlet6-2.0.0-M2.jar:../lib/commons-io-2.22.0.jar:../lib/commons-lang-2.6.jar:../lib/commons-lang3-3.19.0.jar:
[...]
diff --git a/framework/scripts-zookeeper/zk-options.env.win
b/framework/scripts-zookeeper/zk-options.env.win
index efb71eef8..692050b88 100644
--- a/framework/scripts-zookeeper/zk-options.env.win
+++ b/framework/scripts-zookeeper/zk-options.env.win
@@ -2,4 +2,4 @@
-Xmx256m
--enable-preview
-cp
-.;..\lib\angus-activation-2.0.2.jar;..\lib\asm-9.10.jar;..\lib\asm-commons-9.10.jar;..\lib\asm-tree-9.10.jar;..\lib\commons-codec-1.19.0.jar;..\lib\commons-collections-3.2.2.jar;..\lib\commons-collections4-4.4.jar;..\lib\commons-discovery-0.5.jar;..\lib\commons-el-1.0.jar;..\lib\commons-exec-1.3.jar;..\lib\commons-fileupload2-core-2.0.0-M2.jar;..\lib\commons-fileupload2-jakarta-servlet6-2.0.0-M2.jar;..\lib\commons-io-2.16.1.jar;..\lib\commons-lang-2.6.jar;..\lib\commons-lang3-3.19.0.jar;
[...]
+.;..\lib\angus-activation-2.0.2.jar;..\lib\asm-9.10.jar;..\lib\asm-commons-9.10.jar;..\lib\asm-tree-9.10.jar;..\lib\commons-codec-1.19.0.jar;..\lib\commons-collections-3.2.2.jar;..\lib\commons-collections4-4.4.jar;..\lib\commons-discovery-0.5.jar;..\lib\commons-el-1.0.jar;..\lib\commons-exec-1.3.jar;..\lib\commons-fileupload2-core-2.0.0-M2.jar;..\lib\commons-fileupload2-jakarta-servlet6-2.0.0-M2.jar;..\lib\commons-io-2.22.0.jar;..\lib\commons-lang-2.6.jar;..\lib\commons-lang3-3.19.0.jar;
[...]
diff --git a/framework/scripts/options.env.unix
b/framework/scripts/options.env.unix
index 796f488a5..dc82a55cc 100644
--- a/framework/scripts/options.env.unix
+++ b/framework/scripts/options.env.unix
@@ -4,4 +4,4 @@
-Djava.security.auth.login.config=
--enable-preview
-cp
-.:../lib/angus-activation-2.0.2.jar:../lib/apache-el-10.1.16.jar:../lib/apache-jsp-10.1.16.jar:../lib/asm-9.7.jar:../lib/asm-commons-9.7.jar:../lib/asm-tree-9.7.jar:../lib/commons-codec-1.16.1.jar:../lib/commons-collections-3.2.2.jar:../lib/commons-collections4-4.4.jar:../lib/commons-discovery-0.5.jar:../lib/commons-el-1.0.jar:../lib/commons-exec-1.3.jar:../lib/commons-fileupload2-core-2.0.0-M2.jar:../lib/commons-fileupload2-jakarta-servlet6-2.0.0-M2.jar:../lib/commons-io-2.16.1.jar:../l
[...]
+.:../lib/angus-activation-2.0.2.jar:../lib/apache-el-10.1.16.jar:../lib/apache-jsp-10.1.16.jar:../lib/asm-9.7.jar:../lib/asm-commons-9.7.jar:../lib/asm-tree-9.7.jar:../lib/commons-codec-1.16.1.jar:../lib/commons-collections-3.2.2.jar:../lib/commons-collections4-4.4.jar:../lib/commons-discovery-0.5.jar:../lib/commons-el-1.0.jar:../lib/commons-exec-1.3.jar:../lib/commons-fileupload2-core-2.0.0-M2.jar:../lib/commons-fileupload2-jakarta-servlet6-2.0.0-M2.jar:../lib/commons-io-2.22.0.jar:../l
[...]
diff --git a/framework/scripts/options.env.win
b/framework/scripts/options.env.win
index b246e0b72..f2f625a18 100644
--- a/framework/scripts/options.env.win
+++ b/framework/scripts/options.env.win
@@ -4,4 +4,4 @@
-Djava.security.auth.login.config=
--enable-preview
-cp
-.;..\lib\angus-activation-2.0.2.jar;..\lib\apache-el-10.1.16.jar;..\lib\apache-jsp-10.1.16.jar;..\lib\asm-9.7.jar;..\lib\asm-commons-9.7.jar;..\lib\asm-tree-9.7.jar;..\lib\commons-codec-1.16.1.jar;..\lib\commons-collections-3.2.2.jar;..\lib\commons-collections4-4.4.jar;..\lib\commons-discovery-0.5.jar;..\lib\commons-el-1.0.jar;..\lib\commons-exec-1.3.jar;..\lib\commons-fileupload2-core-2.0.0-M2.jar;..\lib\commons-fileupload2-jakarta-servlet6-2.0.0-M2.jar;..\lib\commons-io-2.16.1.jar;..\l
[...]
+.;..\lib\angus-activation-2.0.2.jar;..\lib\apache-el-10.1.16.jar;..\lib\apache-jsp-10.1.16.jar;..\lib\asm-9.7.jar;..\lib\asm-commons-9.7.jar;..\lib\asm-tree-9.7.jar;..\lib\commons-codec-1.16.1.jar;..\lib\commons-collections-3.2.2.jar;..\lib\commons-collections4-4.4.jar;..\lib\commons-discovery-0.5.jar;..\lib\commons-el-1.0.jar;..\lib\commons-exec-1.3.jar;..\lib\commons-fileupload2-core-2.0.0-M2.jar;..\lib\commons-fileupload2-jakarta-servlet6-2.0.0-M2.jar;..\lib\commons-io-2.22.0.jar;..\l
[...]
diff --git a/pom.xml b/pom.xml
index 4b8bbcba7..a27e6685e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,7 @@
<wsdl4j.version>1.6.2</wsdl4j.version>
<castor.version>1.0.5</castor.version>
<commons-codec.version>1.10</commons-codec.version>
- <commons-io.version>2.16.1</commons-io.version>
+ <commons-io.version>2.22.0</commons-io.version>
<commons-logging.version>1.2</commons-logging.version>
<commons-collections.version>3.2.2</commons-collections.version>
<commons-fileupload.version>2.0.0-M2</commons-fileupload.version>
@@ -103,21 +103,22 @@
<cxf.version>3.5.9</cxf.version>
<jaxws-ri.version>2.3.2</jaxws-ri.version>
<maven-source-plugin.version>3.4.0</maven-source-plugin.version>
- <maven-jar-plugin.version>3.5.0</maven-jar-plugin.version>
- <maven-rat-plugin.version>0.17</maven-rat-plugin.version>
+ <maven-jar-plugin.version>3.5.1</maven-jar-plugin.version>
+ <maven-rat-plugin.version>0.18</maven-rat-plugin.version>
<maven-war-plugin.version>3.5.1</maven-war-plugin.version>
<maven-assembly-plugin.version>3.8.0</maven-assembly-plugin.version>
<maven-apache-source-release-assembly-descriptor.version>1.5</maven-apache-source-release-assembly-descriptor.version>
- <maven-compiler-plugin.version>3.15.0</maven-compiler-plugin.version>
+ <maven-compiler-plugin.version>3.16.0</maven-compiler-plugin.version>
<maven.compiler.source>25</maven.compiler.source>
<maven.compiler.target>25</maven.compiler.target>
<maven-antrun-plugin.version>3.2.0</maven-antrun-plugin.version>
<javaVersion>25</javaVersion>
<spring-boot.version>4.0.6</spring-boot.version>
- <maven-surefire-plugin.version>3.5.2</maven-surefire-plugin.version>
- <maven-failsafe-plugin.version>3.5.2</maven-failsafe-plugin.version>
+ <maven-surefire-plugin.version>3.6.0</maven-surefire-plugin.version>
+ <maven-failsafe-plugin.version>3.6.0</maven-failsafe-plugin.version>
<skipTests>false</skipTests>
<skipITs>false</skipITs>
+
<build-helper-maven-plugin.version>3.6.2</build-helper-maven-plugin.version>
</properties>
<modules>
@@ -422,6 +423,28 @@
<version>3.3.1</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>${xerces.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>xalan</groupId>
+ <artifactId>serializer</artifactId>
+ <version>${xalan.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -453,6 +476,11 @@
<artifactId>apache-rat-plugin</artifactId>
<version>${maven-rat-plugin.version}</version>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>${build-helper-maven-plugin.version}</version>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
@@ -472,6 +500,44 @@
<argLine>--enable-preview</argLine>
</configuration>
</plugin>
+ <!--This plugin's configuration is used to store Eclipse m2e settings
only. It has no influence on the Maven build itself.-->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <versionRange>[2.0,)</versionRange>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore />
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>native2ascii-maven-plugin</artifactId>
+ <versionRange>[1.0-beta-1,)</versionRange>
+ <goals>
+ <goal>native2ascii</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore />
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
@@ -535,7 +601,7 @@
<maxmem>512m</maxmem>
<compilerArgs>
<arg>-Xpkginfo:always</arg>
- <arg>-Xlint:options</arg><arg>--enable-preview</arg>
+ <arg>-Xlint:options</arg>
<arg>--enable-preview</arg>
</compilerArgs>
</configuration>
@@ -697,6 +763,28 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>eclipse-m2e</id>
+ <activation>
+ <property>
+ <name>m2e.version</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <compilerArgs>
+ <arg>-Xpkginfo:always</arg>
+ <arg>-Xlint:options</arg>
+ </compilerArgs>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
