Added: maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/no-header-files/src/main/configs/config.test URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/no-header-files/src/main/configs/config.test?rev=1814611&view=auto ============================================================================== --- maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/no-header-files/src/main/configs/config.test (added) +++ maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/no-header-files/src/main/configs/config.test Wed Nov 8 18:21:35 2017 @@ -0,0 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +Test configuration file which should be located in config/config.test in +resulting jmod file. \ No newline at end of file
Added: maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/no-header-files/verify.groovy URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/no-header-files/verify.groovy?rev=1814611&view=auto ============================================================================== --- maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/no-header-files/verify.groovy (added) +++ maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/no-header-files/verify.groovy Wed Nov 8 18:21:35 2017 @@ -0,0 +1,50 @@ + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import java.io.*; +import java.util.*; +import java.util.jar.*; +import org.codehaus.plexus.util.*; + +boolean result = true; + +try +{ + File target = new File( basedir, "target" ); + if ( !target.exists() || !target.isDirectory() ) + { + System.err.println( "target file is missing or not a directory." ); + return false; + } + File artifact = new File( target, "maven-jlink-plugin-cli-options-no-header-files-99.0.zip" ); + if ( !artifact.exists() || artifact.isDirectory() ) + { + System.err.println( "maven-jlink-plugin-cli-options-no-header-files-99.0.zip file is missing or is a directory." ); + return false; + } + +} +catch( Throwable e ) +{ + e.printStackTrace(); + result = false; +} + +return result; Added: maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/no-man-pages/invoker.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/no-man-pages/invoker.properties?rev=1814611&view=auto ============================================================================== --- maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/no-man-pages/invoker.properties (added) +++ maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/no-man-pages/invoker.properties Wed Nov 8 18:21:35 2017 @@ -0,0 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +invoker.java.version = 1.9+ +invoker.goals = clean package Added: maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/no-man-pages/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/no-man-pages/pom.xml?rev=1814611&view=auto ============================================================================== --- maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/no-man-pages/pom.xml (added) +++ maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/no-man-pages/pom.xml Wed Nov 8 18:21:35 2017 @@ -0,0 +1,66 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> + +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"; +> + <modelVersion>4.0.0</modelVersion> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jlink-plugin-cli-options-no-man-pages</artifactId> + <version>99.0</version> + <packaging>jlink</packaging> + <name>Maven</name> + <url>http://maven.apache.org</url> + <description>Test JLink CLI Options --no-man-pages.</description> + <properties> + <maven.compiler.source>1.9</maven.compiler.source> + <maven.compiler.target>1.9</maven.compiler.target> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> + <dependencies> + <dependency> + <groupId>localhost</groupId> + <artifactId>first-jar-module-info</artifactId> + <version>99.0</version> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.7.0</version> + <configuration> + <source>1.9</source> + <target>1.9</target> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jlink-plugin</artifactId> + <version>@project.version@</version> + <extensions>true</extensions> + <configuration> + <noManPages>true</noManPages> + </configuration> + </plugin> + </plugins> + </build> +</project> Added: maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/no-man-pages/src/main/configs/config.test URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/no-man-pages/src/main/configs/config.test?rev=1814611&view=auto ============================================================================== --- maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/no-man-pages/src/main/configs/config.test (added) +++ maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/no-man-pages/src/main/configs/config.test Wed Nov 8 18:21:35 2017 @@ -0,0 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +Test configuration file which should be located in config/config.test in +resulting jmod file. \ No newline at end of file Added: maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/no-man-pages/verify.groovy URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/no-man-pages/verify.groovy?rev=1814611&view=auto ============================================================================== --- maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/no-man-pages/verify.groovy (added) +++ maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/no-man-pages/verify.groovy Wed Nov 8 18:21:35 2017 @@ -0,0 +1,50 @@ + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import java.io.*; +import java.util.*; +import java.util.jar.*; +import org.codehaus.plexus.util.*; + +boolean result = true; + +try +{ + File target = new File( basedir, "target" ); + if ( !target.exists() || !target.isDirectory() ) + { + System.err.println( "target file is missing or not a directory." ); + return false; + } + File artifact = new File( target, "maven-jlink-plugin-cli-options-no-man-pages-99.0.zip" ); + if ( !artifact.exists() || artifact.isDirectory() ) + { + System.err.println( "maven-jlink-plugin-cli-options-no-man-pages-99.0.zip file is missing or is a directory." ); + return false; + } + +} +catch( Throwable e ) +{ + e.printStackTrace(); + result = false; +} + +return result; Added: maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/strip-debug/invoker.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/strip-debug/invoker.properties?rev=1814611&view=auto ============================================================================== --- maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/strip-debug/invoker.properties (added) +++ maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/strip-debug/invoker.properties Wed Nov 8 18:21:35 2017 @@ -0,0 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +invoker.java.version = 1.9+ +invoker.goals = clean package Added: maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/strip-debug/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/strip-debug/pom.xml?rev=1814611&view=auto ============================================================================== --- maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/strip-debug/pom.xml (added) +++ maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/strip-debug/pom.xml Wed Nov 8 18:21:35 2017 @@ -0,0 +1,66 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> + +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"; +> + <modelVersion>4.0.0</modelVersion> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jlink-plugin-cli-options-strip-debug</artifactId> + <version>99.0</version> + <packaging>jlink</packaging> + <name>Maven</name> + <url>http://maven.apache.org</url> + <description>Test JLink CLI Options --strip-debug.</description> + <properties> + <maven.compiler.source>1.9</maven.compiler.source> + <maven.compiler.target>1.9</maven.compiler.target> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> + <dependencies> + <dependency> + <groupId>localhost</groupId> + <artifactId>first-jar-module-info</artifactId> + <version>99.0</version> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.7.0</version> + <configuration> + <source>1.9</source> + <target>1.9</target> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jlink-plugin</artifactId> + <version>@project.version@</version> + <extensions>true</extensions> + <configuration> + <stripDebug>true</stripDebug> + </configuration> + </plugin> + </plugins> + </build> +</project> Added: maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/strip-debug/src/main/configs/config.test URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/strip-debug/src/main/configs/config.test?rev=1814611&view=auto ============================================================================== --- maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/strip-debug/src/main/configs/config.test (added) +++ maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/strip-debug/src/main/configs/config.test Wed Nov 8 18:21:35 2017 @@ -0,0 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +Test configuration file which should be located in config/config.test in +resulting jmod file. \ No newline at end of file Added: maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/strip-debug/verify.groovy URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/strip-debug/verify.groovy?rev=1814611&view=auto ============================================================================== --- maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/strip-debug/verify.groovy (added) +++ maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/strip-debug/verify.groovy Wed Nov 8 18:21:35 2017 @@ -0,0 +1,50 @@ + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import java.io.*; +import java.util.*; +import java.util.jar.*; +import org.codehaus.plexus.util.*; + +boolean result = true; + +try +{ + File target = new File( basedir, "target" ); + if ( !target.exists() || !target.isDirectory() ) + { + System.err.println( "target file is missing or not a directory." ); + return false; + } + File artifact = new File( target, "maven-jlink-plugin-cli-options-strip-debug-99.0.zip" ); + if ( !artifact.exists() || artifact.isDirectory() ) + { + System.err.println( "maven-jlink-plugin-cli-options-strip-debug-99.0.zip file is missing or is a directory." ); + return false; + } + +} +catch( Throwable e ) +{ + e.printStackTrace(); + result = false; +} + +return result; Added: maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/suggest-providers/invoker.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/suggest-providers/invoker.properties?rev=1814611&view=auto ============================================================================== --- maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/suggest-providers/invoker.properties (added) +++ maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/suggest-providers/invoker.properties Wed Nov 8 18:21:35 2017 @@ -0,0 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +invoker.java.version = 1.9+ +invoker.goals = clean package Added: maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/suggest-providers/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/suggest-providers/pom.xml?rev=1814611&view=auto ============================================================================== --- maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/suggest-providers/pom.xml (added) +++ maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/suggest-providers/pom.xml Wed Nov 8 18:21:35 2017 @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> + +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"; +> + <modelVersion>4.0.0</modelVersion> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jlink-plugin-cli-options-suggest-providers</artifactId> + <version>99.0</version> + <packaging>jlink</packaging> + <name>Maven</name> + <url>http://maven.apache.org</url> + <description>Test JLink CLI Options --suggest-providers xyz.</description> + <properties> + <maven.compiler.source>1.9</maven.compiler.source> + <maven.compiler.target>1.9</maven.compiler.target> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> + <dependencies> + <dependency> + <groupId>localhost</groupId> + <artifactId>first-jar-module-info</artifactId> + <version>99.0</version> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.7.0</version> + <configuration> + <source>1.9</source> + <target>1.9</target> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jlink-plugin</artifactId> + <version>@project.version@</version> + <extensions>true</extensions> + <configuration> + <suggestProviders> + <suggestProvider>java.security.Provider</suggestProvider> + </suggestProviders> + </configuration> + </plugin> + </plugins> + </build> +</project> Added: maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/suggest-providers/src/main/configs/config.test URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/suggest-providers/src/main/configs/config.test?rev=1814611&view=auto ============================================================================== --- maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/suggest-providers/src/main/configs/config.test (added) +++ maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/suggest-providers/src/main/configs/config.test Wed Nov 8 18:21:35 2017 @@ -0,0 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +Test configuration file which should be located in config/config.test in +resulting jmod file. \ No newline at end of file Added: maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/suggest-providers/verify.groovy URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/suggest-providers/verify.groovy?rev=1814611&view=auto ============================================================================== --- maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/suggest-providers/verify.groovy (added) +++ maven/plugins/trunk/maven-jlink-plugin/src/it/projects/cli-options/suggest-providers/verify.groovy Wed Nov 8 18:21:35 2017 @@ -0,0 +1,50 @@ + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import java.io.*; +import java.util.*; +import java.util.jar.*; +import org.codehaus.plexus.util.*; + +boolean result = true; + +try +{ + File target = new File( basedir, "target" ); + if ( !target.exists() || !target.isDirectory() ) + { + System.err.println( "target file is missing or not a directory." ); + return false; + } + File artifact = new File( target, "maven-jlink-plugin-cli-options-suggest-providers-99.0.zip" ); + if ( !artifact.exists() || artifact.isDirectory() ) + { + System.err.println( "maven-jlink-plugin-cli-options-suggest-providers-99.0.zip file is missing or is a directory." ); + return false; + } + +} +catch( Throwable e ) +{ + e.printStackTrace(); + result = false; +} + +return result; Added: maven/plugins/trunk/maven-jlink-plugin/src/it/projects/setup-jar-module-info/invoker.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jlink-plugin/src/it/projects/setup-jar-module-info/invoker.properties?rev=1814611&view=auto ============================================================================== --- maven/plugins/trunk/maven-jlink-plugin/src/it/projects/setup-jar-module-info/invoker.properties (added) +++ maven/plugins/trunk/maven-jlink-plugin/src/it/projects/setup-jar-module-info/invoker.properties Wed Nov 8 18:21:35 2017 @@ -0,0 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +invoker.java.version = 1.9+ +invoker.goals = clean install Added: maven/plugins/trunk/maven-jlink-plugin/src/it/projects/setup-jar-module-info/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jlink-plugin/src/it/projects/setup-jar-module-info/pom.xml?rev=1814611&view=auto ============================================================================== --- maven/plugins/trunk/maven-jlink-plugin/src/it/projects/setup-jar-module-info/pom.xml (added) +++ maven/plugins/trunk/maven-jlink-plugin/src/it/projects/setup-jar-module-info/pom.xml Wed Nov 8 18:21:35 2017 @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> + +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"; +> + <modelVersion>4.0.0</modelVersion> + <groupId>localhost</groupId> + <artifactId>first-jar-module-info</artifactId> + <version>99.0</version> + <name>Maven</name> + <description> + Test Project to prepare a jar file which contains + module-info.class file. + </description> + <properties> + <maven.compiler.source>1.9</maven.compiler.source> + <maven.compiler.target>1.9</maven.compiler.target> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.7.0</version> + <configuration> + <source>1.9</source> + <target>1.9</target> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> +</project> Added: maven/plugins/trunk/maven-jlink-plugin/src/it/projects/setup-jar-module-info/src/main/java/module-info.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jlink-plugin/src/it/projects/setup-jar-module-info/src/main/java/module-info.java?rev=1814611&view=auto ============================================================================== --- maven/plugins/trunk/maven-jlink-plugin/src/it/projects/setup-jar-module-info/src/main/java/module-info.java (added) +++ maven/plugins/trunk/maven-jlink-plugin/src/it/projects/setup-jar-module-info/src/main/java/module-info.java Wed Nov 8 18:21:35 2017 @@ -0,0 +1,23 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +module first.jar.module.info { + requires java.base; + exports myproject; +} Added: maven/plugins/trunk/maven-jlink-plugin/src/it/projects/setup-jar-module-info/src/main/java/myproject/HelloWorld.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jlink-plugin/src/it/projects/setup-jar-module-info/src/main/java/myproject/HelloWorld.java?rev=1814611&view=auto ============================================================================== --- maven/plugins/trunk/maven-jlink-plugin/src/it/projects/setup-jar-module-info/src/main/java/myproject/HelloWorld.java (added) +++ maven/plugins/trunk/maven-jlink-plugin/src/it/projects/setup-jar-module-info/src/main/java/myproject/HelloWorld.java Wed Nov 8 18:21:35 2017 @@ -0,0 +1,36 @@ +package myproject; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +/** + * The classic Hello World App. + */ +public class HelloWorld { + + /** + * Main method. + * + * @param args Not used + */ + public static void main( String[] args ) + { + System.out.println( "Hello World from base jar file." ); + } +} \ No newline at end of file Added: maven/plugins/trunk/maven-jlink-plugin/src/it/projects/setup-jar/invoker.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jlink-plugin/src/it/projects/setup-jar/invoker.properties?rev=1814611&view=auto ============================================================================== --- maven/plugins/trunk/maven-jlink-plugin/src/it/projects/setup-jar/invoker.properties (added) +++ maven/plugins/trunk/maven-jlink-plugin/src/it/projects/setup-jar/invoker.properties Wed Nov 8 18:21:35 2017 @@ -0,0 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +invoker.java.version = 1.9+ +invoker.goals = clean install Added: maven/plugins/trunk/maven-jlink-plugin/src/it/projects/setup-jar/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jlink-plugin/src/it/projects/setup-jar/pom.xml?rev=1814611&view=auto ============================================================================== --- maven/plugins/trunk/maven-jlink-plugin/src/it/projects/setup-jar/pom.xml (added) +++ maven/plugins/trunk/maven-jlink-plugin/src/it/projects/setup-jar/pom.xml Wed Nov 8 18:21:35 2017 @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> + +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"; +> + <modelVersion>4.0.0</modelVersion> + <groupId>localhost</groupId> + <artifactId>first-jar</artifactId> + <version>99.0</version> + <name>Maven</name> + <description> + Test Project to prepare a jar file which does not contain + module-info.class file. + </description> + <properties> + <maven.compiler.source>1.9</maven.compiler.source> + <maven.compiler.target>1.9</maven.compiler.target> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.7.0</version> + <configuration> + <source>1.9</source> + <target>1.9</target> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> +</project> Added: maven/plugins/trunk/maven-jlink-plugin/src/it/projects/setup-jar/src/main/java/myproject/HelloWorld.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jlink-plugin/src/it/projects/setup-jar/src/main/java/myproject/HelloWorld.java?rev=1814611&view=auto ============================================================================== --- maven/plugins/trunk/maven-jlink-plugin/src/it/projects/setup-jar/src/main/java/myproject/HelloWorld.java (added) +++ maven/plugins/trunk/maven-jlink-plugin/src/it/projects/setup-jar/src/main/java/myproject/HelloWorld.java Wed Nov 8 18:21:35 2017 @@ -0,0 +1,36 @@ +package myproject; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +/** + * The classic Hello World App. + */ +public class HelloWorld { + + /** + * Main method. + * + * @param args Not used + */ + public static void main( String[] args ) + { + System.out.println( "Hello World from base jar file." ); + } +} \ No newline at end of file Modified: maven/plugins/trunk/maven-jlink-plugin/src/main/filtered-resources/META-INF/plexus/components.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jlink-plugin/src/main/filtered-resources/META-INF/plexus/components.xml?rev=1814611&r1=1814610&r2=1814611&view=diff ============================================================================== --- maven/plugins/trunk/maven-jlink-plugin/src/main/filtered-resources/META-INF/plexus/components.xml (original) +++ maven/plugins/trunk/maven-jlink-plugin/src/main/filtered-resources/META-INF/plexus/components.xml Wed Nov 8 18:21:35 2017 @@ -55,6 +55,21 @@ <id>default</id> <!-- START SNIPPET: jlink-lifecycle --> <phases> + <process-resources> + org.apache.maven.plugins:maven-resources-plugin:3.0.2:resources + </process-resources> + <compile> + org.apache.maven.plugins:maven-compiler-plugin:3.5.1:compile + </compile> + <process-test-resources> + org.apache.maven.plugins:maven-resources-plugin:3.0.2:testResources + </process-test-resources> + <test-compile> + org.apache.maven.plugins:maven-compiler-plugin:3.5.1:testCompile + </test-compile> + <test> + org.apache.maven.plugins:maven-surefire-plugin:2.19.1:test + </test> <package> org.apache.maven.plugins:maven-jlink-plugin:${project.version}:jlink </package> Modified: maven/plugins/trunk/maven-jlink-plugin/src/main/java/org/apache/maven/plugins/jlink/JLinkMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jlink-plugin/src/main/java/org/apache/maven/plugins/jlink/JLinkMojo.java?rev=1814611&r1=1814610&r2=1814611&view=diff ============================================================================== --- maven/plugins/trunk/maven-jlink-plugin/src/main/java/org/apache/maven/plugins/jlink/JLinkMojo.java (original) +++ maven/plugins/trunk/maven-jlink-plugin/src/main/java/org/apache/maven/plugins/jlink/JLinkMojo.java Wed Nov 8 18:21:35 2017 @@ -429,7 +429,7 @@ public class JLinkMojo throw new MojoFailureException( message ); } - if ( endian != null && ( !"big".equals( endian ) || !"little".equals( endian ) ) ) + if ( endian != null && ( !"big".equals( endian ) && !"little".equals( endian ) ) ) { String message = "The given endian parameter " + endian + " does not contain one of the following values: 'little' or 'big'."; @@ -484,7 +484,7 @@ public class JLinkMojo if ( endian != null ) { - argsFile.println( "--endians" ); + argsFile.println( "--endian" ); argsFile.println( endian ); } if ( ignoreSigningInformation )
