diff --git a/com.github.sdedwards.m2e-nar.repo/pom.xml b/com.github.sdedwards.m2e-nar.repo/pom.xml index dad4cab..e8fbed6 100644 --- a/com.github.sdedwards.m2e-nar.repo/pom.xml +++ b/com.github.sdedwards.m2e-nar.repo/pom.xml @@ -15,7 +15,7 @@ NAR Maven Plugin Integration for Eclipse (update site) - m2e-nar-updatesite-${project.version} + m2e-nar-updatesite-${qualifiedVersion} de.jutzig diff --git a/com.github.sdedwards.m2e-nar.tests/it/it-parent/pom.xml b/com.github.sdedwards.m2e-nar.tests/it/it-parent/pom.xml index be5a0ab..838ac63 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it-parent/pom.xml +++ b/com.github.sdedwards.m2e-nar.tests/it/it-parent/pom.xml @@ -1,23 +1,23 @@ - + #%L + Native ARchive plugin for Maven + %% + Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + %% + Licensed 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. + #L% + --> 4.0.0 @@ -37,7 +37,7 @@ under the License. com.github.maven-nar nar-maven-plugin - 3.1.0 + 3.2.3 diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0001-executable/pom.xml b/com.github.sdedwards.m2e-nar.tests/it/it0001-executable/pom.xml index 432857d..b0ceccf 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0001-executable/pom.xml +++ b/com.github.sdedwards.m2e-nar.tests/it/it0001-executable/pom.xml @@ -1,23 +1,23 @@ - + #%L + Native ARchive plugin for Maven + %% + Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + %% + Licensed 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. + #L% + --> 4.0.0 @@ -33,6 +33,7 @@ under the License. nar NAR Executable Test + 1.0-SNAPSHOT Simple test executable diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0001-executable/src/main/c/Executable.c b/com.github.sdedwards.m2e-nar.tests/it/it0001-executable/src/main/c/Executable.c index 19afb26..609da26 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0001-executable/src/main/c/Executable.c +++ b/com.github.sdedwards.m2e-nar.tests/it/it0001-executable/src/main/c/Executable.c @@ -1,20 +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. + * #%L + * Native ARchive plugin for Maven + * %% + * Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + * %% + * Licensed 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. + * #L% */ #include diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0002-executable-static/pom.xml b/com.github.sdedwards.m2e-nar.tests/it/it0002-executable-static/pom.xml index 327ad0d..3ec2c57 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0002-executable-static/pom.xml +++ b/com.github.sdedwards.m2e-nar.tests/it/it0002-executable-static/pom.xml @@ -1,23 +1,23 @@ - + #%L + Native ARchive plugin for Maven + %% + Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + %% + Licensed 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. + #L% + --> 4.0.0 @@ -33,6 +33,7 @@ under the License. nar NAR Static Executable Test + 1.0-SNAPSHOT Simple executable statically linked with the c runtime diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0002-executable-static/src/main/c/HelloWorldExe.c b/com.github.sdedwards.m2e-nar.tests/it/it0002-executable-static/src/main/c/HelloWorldExe.c index d640602..c342381 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0002-executable-static/src/main/c/HelloWorldExe.c +++ b/com.github.sdedwards.m2e-nar.tests/it/it0002-executable-static/src/main/c/HelloWorldExe.c @@ -1,3 +1,22 @@ +/* + * #%L + * Native ARchive plugin for Maven + * %% + * Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + * %% + * Licensed 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. + * #L% + */ #include int main(int argc, char *argv[]) { diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0003-jni/pom.xml b/com.github.sdedwards.m2e-nar.tests/it/it0003-jni/pom.xml index 946879f..d39b209 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0003-jni/pom.xml +++ b/com.github.sdedwards.m2e-nar.tests/it/it0003-jni/pom.xml @@ -1,23 +1,23 @@ - + #%L + Native ARchive plugin for Maven + %% + Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + %% + Licensed 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. + #L% + --> 4.0.0 @@ -33,6 +33,7 @@ under the License. nar NAR JNI Test + 1.0-SNAPSHOT Simple JNI Library diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0003-jni/src/main/c/HelloWorldJNI.c b/com.github.sdedwards.m2e-nar.tests/it/it0003-jni/src/main/c/HelloWorldJNI.c index 81e0d00..5132721 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0003-jni/src/main/c/HelloWorldJNI.c +++ b/com.github.sdedwards.m2e-nar.tests/it/it0003-jni/src/main/c/HelloWorldJNI.c @@ -1,20 +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. + * #%L + * Native ARchive plugin for Maven + * %% + * Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + * %% + * Licensed 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. + * #L% */ #include diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0003-jni/src/main/java/it0003/HelloWorldJNI.java b/com.github.sdedwards.m2e-nar.tests/it/it0003-jni/src/main/java/it0003/HelloWorldJNI.java index 94a027b..1b799bc 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0003-jni/src/main/java/it0003/HelloWorldJNI.java +++ b/com.github.sdedwards.m2e-nar.tests/it/it0003-jni/src/main/java/it0003/HelloWorldJNI.java @@ -1,23 +1,23 @@ -package it0003; - /* - * 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. + * #%L + * Native ARchive plugin for Maven + * %% + * Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + * %% + * Licensed 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. + * #L% */ +package it0003; public class HelloWorldJNI { diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0003-jni/src/test/c/HelloWorldTest.c b/com.github.sdedwards.m2e-nar.tests/it/it0003-jni/src/test/c/HelloWorldTest.c new file mode 100644 index 0000000..18475db --- /dev/null +++ b/com.github.sdedwards.m2e-nar.tests/it/it0003-jni/src/test/c/HelloWorldTest.c @@ -0,0 +1,39 @@ +/* + * #%L + * Native ARchive plugin for Maven + * %% + * Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + * %% + * Licensed 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. + * #L% + */ +#include +#include + +#ifdef TESTOPT +char *testFlag = TESTOPT; +#else +char *testFlag = "testOption not set"; +#endif + +int main( int argc, const char* argv[] ) +{ + printf( "\nHello World C test:" ); + if (strcmp(testFlag, "testOption not set") == 0) { + printf( "\nTest compiler option not set\n\n" ); + return 1; + } else { + printf( "\nTest compiler option set: %s\n\n", testFlag ); + return 0; + } +} diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0003-jni/src/test/java/c/HelloWorldTest.c b/com.github.sdedwards.m2e-nar.tests/it/it0003-jni/src/test/java/c/HelloWorldTest.c deleted file mode 100644 index 8626e2a..0000000 --- a/com.github.sdedwards.m2e-nar.tests/it/it0003-jni/src/test/java/c/HelloWorldTest.c +++ /dev/null @@ -1,20 +0,0 @@ -#include -#include - -#ifdef TESTOPT -char *testFlag = TESTOPT; -#else -char *testFlag = "testOption not set"; -#endif - -int main( int argc, const char* argv[] ) -{ - printf( "\nHello World C test:" ); - if (strcmp(testFlag, "testOption not set") == 0) { - printf( "\nTest compiler option not set\n\n" ); - return 1; - } else { - printf( "\nTest compiler option set: %s\n\n", testFlag ); - return 0; - } -} diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0003-jni/src/test/java/it0003/test/HelloWorldJNITest.java b/com.github.sdedwards.m2e-nar.tests/it/it0003-jni/src/test/java/it0003/test/HelloWorldJNITest.java index b3cbc50..9ef3040 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0003-jni/src/test/java/it0003/test/HelloWorldJNITest.java +++ b/com.github.sdedwards.m2e-nar.tests/it/it0003-jni/src/test/java/it0003/test/HelloWorldJNITest.java @@ -1,23 +1,23 @@ -package it0003.test; - /* - * 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. + * #%L + * Native ARchive plugin for Maven + * %% + * Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + * %% + * Licensed 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. + * #L% */ +package it0003.test; import it0003.HelloWorldJNI; import org.junit.Assert; diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0004-java-dep-jni/pom.xml b/com.github.sdedwards.m2e-nar.tests/it/it0004-java-dep-jni/pom.xml index 3c3c296..3962baa 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0004-java-dep-jni/pom.xml +++ b/com.github.sdedwards.m2e-nar.tests/it/it0004-java-dep-jni/pom.xml @@ -1,23 +1,23 @@ - + #%L + Native ARchive plugin for Maven + %% + Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + %% + Licensed 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. + #L% + --> 4.0.0 diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0004-java-dep-jni/setup.bsh b/com.github.sdedwards.m2e-nar.tests/it/it0004-java-dep-jni/setup.bsh new file mode 100644 index 0000000..d1f3f88 --- /dev/null +++ b/com.github.sdedwards.m2e-nar.tests/it/it0004-java-dep-jni/setup.bsh @@ -0,0 +1,51 @@ +/* + * #%L + * Native ARchive plugin for Maven + * %% + * Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + * %% + * Licensed 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. + * #L% + */ +/* +* setup.bsh is to simulate when there are multiple nar artifacts in the same repository +* Nar-plugin should be able to choose the correct artifacts by AOL rather than just pick +* the latest one by SNAPSHOT timestamp +*/ + +import java.io.*; +import java.util.*; +import java.text.*; + +String targetPath = localRepositoryPath + "/com/github/maven-nar/its/nar/it0003-jni/1.0-SNAPSHOT"; +File repoDir = new File(targetPath); +File[] artifacts = repoDir.listFiles( new FilenameFilter() { + public boolean accept(File dir, String name) { + return name.startsWith("it0003-jni-") + && name.contains("SNAPSHOT") + && name.endsWith("jni.nar"); + } +}); + +// expect only 1 it0003-jni SNAPSHOT nar +if (artifacts.length == 1) { + Calendar now = Calendar.getInstance(); + Calendar tenMinsago = (Calendar)now.clone(); + tenMinsago.add(Calendar.MINUTE, -10); + DateFormat formatter = new SimpleDateFormat("yyyyMMdd.HHmmss"); + + // Create the fake artifact + File fakeArtifact = new File( targetPath, + artifacts[0].getName().replace("SNAPSHOT", formatter.format(now.getTime()) + "-1")); + fakeArtifact.createNewFile(); +} diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0004-java-dep-jni/src/main/c/hello.c b/com.github.sdedwards.m2e-nar.tests/it/it0004-java-dep-jni/src/main/c/hello.c index 6f1bd48..1bf45c5 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0004-java-dep-jni/src/main/c/hello.c +++ b/com.github.sdedwards.m2e-nar.tests/it/it0004-java-dep-jni/src/main/c/hello.c @@ -1,3 +1,22 @@ +/* + * #%L + * Native ARchive plugin for Maven + * %% + * Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + * %% + * Licensed 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. + * #L% + */ #include "it0004_test_Hello.h" JNIEXPORT jbyte JNICALL Java_it0004_test_Hello_say diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0004-java-dep-jni/src/main/java/it0004/test/Hello.java b/com.github.sdedwards.m2e-nar.tests/it/it0004-java-dep-jni/src/main/java/it0004/test/Hello.java index 2d6003f..b0f5ed4 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0004-java-dep-jni/src/main/java/it0004/test/Hello.java +++ b/com.github.sdedwards.m2e-nar.tests/it/it0004-java-dep-jni/src/main/java/it0004/test/Hello.java @@ -1,23 +1,23 @@ -package it0004.test; - /* - * 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. + * #%L + * Native ARchive plugin for Maven + * %% + * Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + * %% + * Licensed 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. + * #L% */ +package it0004.test; import it0003.HelloWorldJNI; diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0004-java-dep-jni/src/test/java/it0004/test/HelloWorldJavaDepJNITest.java b/com.github.sdedwards.m2e-nar.tests/it/it0004-java-dep-jni/src/test/java/it0004/test/HelloWorldJavaDepJNITest.java index c521031..eeea6d5 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0004-java-dep-jni/src/test/java/it0004/test/HelloWorldJavaDepJNITest.java +++ b/com.github.sdedwards.m2e-nar.tests/it/it0004-java-dep-jni/src/test/java/it0004/test/HelloWorldJavaDepJNITest.java @@ -1,23 +1,23 @@ -package it0004.test; - /* - * 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. + * #%L + * Native ARchive plugin for Maven + * %% + * Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + * %% + * Licensed 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. + * #L% */ +package it0004.test; import it0003.HelloWorldJNI; import org.junit.Assert; diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0005-jni-static/pom.xml b/com.github.sdedwards.m2e-nar.tests/it/it0005-jni-static/pom.xml index 18a7e9d..c13e9b0 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0005-jni-static/pom.xml +++ b/com.github.sdedwards.m2e-nar.tests/it/it0005-jni-static/pom.xml @@ -1,19 +1,22 @@ - - nar NAR Static JNI Test + 1.0-SNAPSHOT Simple Static JNI Library diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0005-jni-static/src/main/c/HelloWorldStaticJNI.c b/com.github.sdedwards.m2e-nar.tests/it/it0005-jni-static/src/main/c/HelloWorldStaticJNI.c index 660e708..053f3ad 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0005-jni-static/src/main/c/HelloWorldStaticJNI.c +++ b/com.github.sdedwards.m2e-nar.tests/it/it0005-jni-static/src/main/c/HelloWorldStaticJNI.c @@ -1,22 +1,22 @@ /* - * 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. + * #%L + * Native ARchive plugin for Maven + * %% + * Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + * %% + * Licensed 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. + * #L% */ - #include #include "it0005_HelloWorldStaticJNI.h" diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0005-jni-static/src/main/java/it0005/HelloWorldStaticJNI.java b/com.github.sdedwards.m2e-nar.tests/it/it0005-jni-static/src/main/java/it0005/HelloWorldStaticJNI.java index e2b1d23..080f9f0 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0005-jni-static/src/main/java/it0005/HelloWorldStaticJNI.java +++ b/com.github.sdedwards.m2e-nar.tests/it/it0005-jni-static/src/main/java/it0005/HelloWorldStaticJNI.java @@ -1,23 +1,23 @@ -package it0005; - /* - * 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. + * #%L + * Native ARchive plugin for Maven + * %% + * Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + * %% + * Licensed 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. + * #L% */ +package it0005; public class HelloWorldStaticJNI { diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0005-jni-static/src/test/java/it0005/test/HelloWorldStaticJNITest.java b/com.github.sdedwards.m2e-nar.tests/it/it0005-jni-static/src/test/java/it0005/test/HelloWorldStaticJNITest.java index 7e47d7f..7843811 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0005-jni-static/src/test/java/it0005/test/HelloWorldStaticJNITest.java +++ b/com.github.sdedwards.m2e-nar.tests/it/it0005-jni-static/src/test/java/it0005/test/HelloWorldStaticJNITest.java @@ -1,23 +1,23 @@ -package it0005.test; - /* - * 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. + * #%L + * Native ARchive plugin for Maven + * %% + * Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + * %% + * Licensed 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. + * #L% */ +package it0005.test; import it0005.HelloWorldStaticJNI; import org.junit.Assert; diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0006-jni-3rdparty/pom.xml b/com.github.sdedwards.m2e-nar.tests/it/it0006-jni-3rdparty/pom.xml index 8096e81..6b5e594 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0006-jni-3rdparty/pom.xml +++ b/com.github.sdedwards.m2e-nar.tests/it/it0006-jni-3rdparty/pom.xml @@ -1,23 +1,23 @@ - + #%L + Native ARchive plugin for Maven + %% + Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + %% + Licensed 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. + #L% + --> 4.0.0 @@ -33,6 +33,7 @@ under the License. nar NAR Third Party JNI + 1.0-SNAPSHOT Java class that uses a 3rd party JNI and its library diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0006-jni-3rdparty/src/test/java/it0006/test/HelloThirdPartyJNITest.java b/com.github.sdedwards.m2e-nar.tests/it/it0006-jni-3rdparty/src/test/java/it0006/test/HelloThirdPartyJNITest.java index 2b559ab..a46877a 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0006-jni-3rdparty/src/test/java/it0006/test/HelloThirdPartyJNITest.java +++ b/com.github.sdedwards.m2e-nar.tests/it/it0006-jni-3rdparty/src/test/java/it0006/test/HelloThirdPartyJNITest.java @@ -1,23 +1,23 @@ -package it0006.test; - /* - * 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. + * #%L + * Native ARchive plugin for Maven + * %% + * Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + * %% + * Licensed 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. + * #L% */ +package it0006.test; import it0003.HelloWorldJNI; import org.junit.Assert; diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0007-lib-shared/pom.xml b/com.github.sdedwards.m2e-nar.tests/it/it0007-lib-shared/pom.xml index 1b08a06..080cf74 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0007-lib-shared/pom.xml +++ b/com.github.sdedwards.m2e-nar.tests/it/it0007-lib-shared/pom.xml @@ -1,23 +1,23 @@ - + #%L + Native ARchive plugin for Maven + %% + Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + %% + Licensed 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. + #L% + --> 4.0.0 @@ -33,6 +33,7 @@ under the License. nar NAR Shared Library + 1.0-SNAPSHOT Simple shared library and test file diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0007-lib-shared/src/main/c/HelloWorldLib.c b/com.github.sdedwards.m2e-nar.tests/it/it0007-lib-shared/src/main/c/HelloWorldLib.c index 9f65143..2611690 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0007-lib-shared/src/main/c/HelloWorldLib.c +++ b/com.github.sdedwards.m2e-nar.tests/it/it0007-lib-shared/src/main/c/HelloWorldLib.c @@ -1,3 +1,22 @@ +/* + * #%L + * Native ARchive plugin for Maven + * %% + * Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + * %% + * Licensed 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. + * #L% + */ #include #include "HelloWorldLib.h" diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0007-lib-shared/src/main/include/HelloWorldLib.h b/com.github.sdedwards.m2e-nar.tests/it/it0007-lib-shared/src/main/include/HelloWorldLib.h index e801bec..f6ed9c0 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0007-lib-shared/src/main/include/HelloWorldLib.h +++ b/com.github.sdedwards.m2e-nar.tests/it/it0007-lib-shared/src/main/include/HelloWorldLib.h @@ -1,3 +1,22 @@ +/* + * #%L + * Native ARchive plugin for Maven + * %% + * Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + * %% + * Licensed 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. + * #L% + */ #ifndef HelloWorldLib_H #define HelloWorldLib_H diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0007-lib-shared/src/test/c/HelloWorldTest.c b/com.github.sdedwards.m2e-nar.tests/it/it0007-lib-shared/src/test/c/HelloWorldTest.c index 4aa35d8..15f98cc 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0007-lib-shared/src/test/c/HelloWorldTest.c +++ b/com.github.sdedwards.m2e-nar.tests/it/it0007-lib-shared/src/test/c/HelloWorldTest.c @@ -1,3 +1,22 @@ +/* + * #%L + * Native ARchive plugin for Maven + * %% + * Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + * %% + * Licensed 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. + * #L% + */ #include #include "HelloWorldLib.h" diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0008-executable-dep-lib-shared/pom.xml b/com.github.sdedwards.m2e-nar.tests/it/it0008-executable-dep-lib-shared/pom.xml index d485d8e..2f87a4b 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0008-executable-dep-lib-shared/pom.xml +++ b/com.github.sdedwards.m2e-nar.tests/it/it0008-executable-dep-lib-shared/pom.xml @@ -1,23 +1,23 @@ - + #%L + Native ARchive plugin for Maven + %% + Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + %% + Licensed 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. + #L% + --> 4.0.0 @@ -33,6 +33,7 @@ under the License. nar NAR Executable and Shared Library + 1.0-SNAPSHOT Executable depending on a shared library. diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0008-executable-dep-lib-shared/src/main/c/HelloWorldExe.c b/com.github.sdedwards.m2e-nar.tests/it/it0008-executable-dep-lib-shared/src/main/c/HelloWorldExe.c index 4aa35d8..15f98cc 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0008-executable-dep-lib-shared/src/main/c/HelloWorldExe.c +++ b/com.github.sdedwards.m2e-nar.tests/it/it0008-executable-dep-lib-shared/src/main/c/HelloWorldExe.c @@ -1,3 +1,22 @@ +/* + * #%L + * Native ARchive plugin for Maven + * %% + * Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + * %% + * Licensed 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. + * #L% + */ #include #include "HelloWorldLib.h" diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0009-jni-dep-lib-shared/pom.xml b/com.github.sdedwards.m2e-nar.tests/it/it0009-jni-dep-lib-shared/pom.xml index ef5afd9..7b7dc72 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0009-jni-dep-lib-shared/pom.xml +++ b/com.github.sdedwards.m2e-nar.tests/it/it0009-jni-dep-lib-shared/pom.xml @@ -1,23 +1,23 @@ - + #%L + Native ARchive plugin for Maven + %% + Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + %% + Licensed 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. + #L% + --> 4.0.0 @@ -33,6 +33,7 @@ under the License. nar NAR JNI and Shared Library + 1.0-SNAPSHOT JNI depending on a shared library. diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0009-jni-dep-lib-shared/src/main/c/HelloWorldSharedLibJNI.c b/com.github.sdedwards.m2e-nar.tests/it/it0009-jni-dep-lib-shared/src/main/c/HelloWorldSharedLibJNI.c index fd23d83..1fcb797 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0009-jni-dep-lib-shared/src/main/c/HelloWorldSharedLibJNI.c +++ b/com.github.sdedwards.m2e-nar.tests/it/it0009-jni-dep-lib-shared/src/main/c/HelloWorldSharedLibJNI.c @@ -1,22 +1,22 @@ /* - * 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. + * #%L + * Native ARchive plugin for Maven + * %% + * Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + * %% + * Licensed 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. + * #L% */ - #include #include "HelloWorldLib.h" diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0009-jni-dep-lib-shared/src/main/java/it0009/HelloWorldSharedLibJNI.java b/com.github.sdedwards.m2e-nar.tests/it/it0009-jni-dep-lib-shared/src/main/java/it0009/HelloWorldSharedLibJNI.java index 04eb225..83351a7 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0009-jni-dep-lib-shared/src/main/java/it0009/HelloWorldSharedLibJNI.java +++ b/com.github.sdedwards.m2e-nar.tests/it/it0009-jni-dep-lib-shared/src/main/java/it0009/HelloWorldSharedLibJNI.java @@ -1,23 +1,23 @@ -package it0009; - /* - * 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. + * #%L + * Native ARchive plugin for Maven + * %% + * Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + * %% + * Licensed 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. + * #L% */ +package it0009; public class HelloWorldSharedLibJNI { diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0009-jni-dep-lib-shared/src/test/java/it0009/test/HelloWorldSharedLibJNITest.java b/com.github.sdedwards.m2e-nar.tests/it/it0009-jni-dep-lib-shared/src/test/java/it0009/test/HelloWorldSharedLibJNITest.java index e052096..6840e6b 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0009-jni-dep-lib-shared/src/test/java/it0009/test/HelloWorldSharedLibJNITest.java +++ b/com.github.sdedwards.m2e-nar.tests/it/it0009-jni-dep-lib-shared/src/test/java/it0009/test/HelloWorldSharedLibJNITest.java @@ -1,23 +1,23 @@ -package it0009.test; - /* - * 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. + * #%L + * Native ARchive plugin for Maven + * %% + * Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + * %% + * Licensed 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. + * #L% */ +package it0009.test; import it0009.HelloWorldSharedLibJNI; import org.junit.Assert; diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0010-lib-static/echo.bat b/com.github.sdedwards.m2e-nar.tests/it/it0010-lib-static/echo.bat new file mode 100644 index 0000000..0619b2b --- /dev/null +++ b/com.github.sdedwards.m2e-nar.tests/it/it0010-lib-static/echo.bat @@ -0,0 +1,4 @@ +@echo off +rem dummy batch file to test user defined commands from +rem nar-process-libraries. Just display the arguments passed +echo %* diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0010-lib-static/pom.xml b/com.github.sdedwards.m2e-nar.tests/it/it0010-lib-static/pom.xml index 9312e2b..2b845b2 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0010-lib-static/pom.xml +++ b/com.github.sdedwards.m2e-nar.tests/it/it0010-lib-static/pom.xml @@ -1,23 +1,23 @@ - + #%L + Native ARchive plugin for Maven + %% + Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + %% + Licensed 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. + #L% + --> 4.0.0 @@ -33,13 +33,15 @@ under the License. nar NAR Static Library + 1.0-SNAPSHOT - Simple static library and test file + Simple static library and test file; test nar-process-libraries commands http://maven.apache.org/ true + echo @@ -62,7 +64,48 @@ under the License. + + + run-commands + + nar-process-libraries + + + + + + ${command.executable} + + Hello from ${nar.aol}! + + static + + + + ${command.executable} + static + + + + + + + + + + windows + + + windows + + + + echo.bat + + + + diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0010-lib-static/src/main/c/HelloWorldLib.c b/com.github.sdedwards.m2e-nar.tests/it/it0010-lib-static/src/main/c/HelloWorldLib.c index 9f65143..2611690 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0010-lib-static/src/main/c/HelloWorldLib.c +++ b/com.github.sdedwards.m2e-nar.tests/it/it0010-lib-static/src/main/c/HelloWorldLib.c @@ -1,3 +1,22 @@ +/* + * #%L + * Native ARchive plugin for Maven + * %% + * Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + * %% + * Licensed 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. + * #L% + */ #include #include "HelloWorldLib.h" diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0010-lib-static/src/main/include/HelloWorldLib.h b/com.github.sdedwards.m2e-nar.tests/it/it0010-lib-static/src/main/include/HelloWorldLib.h index 8c50dfb..c164729 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0010-lib-static/src/main/include/HelloWorldLib.h +++ b/com.github.sdedwards.m2e-nar.tests/it/it0010-lib-static/src/main/include/HelloWorldLib.h @@ -1,3 +1,22 @@ +/* + * #%L + * Native ARchive plugin for Maven + * %% + * Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + * %% + * Licensed 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. + * #L% + */ #ifndef HelloWorldLib_H #define HelloWorldLib_H diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0010-lib-static/src/test/c/HelloWorldTest.c b/com.github.sdedwards.m2e-nar.tests/it/it0010-lib-static/src/test/c/HelloWorldTest.c index 4aa35d8..15f98cc 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0010-lib-static/src/test/c/HelloWorldTest.c +++ b/com.github.sdedwards.m2e-nar.tests/it/it0010-lib-static/src/test/c/HelloWorldTest.c @@ -1,3 +1,22 @@ +/* + * #%L + * Native ARchive plugin for Maven + * %% + * Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + * %% + * Licensed 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. + * #L% + */ #include #include "HelloWorldLib.h" diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0011-executable-dep-lib-static/pom.xml b/com.github.sdedwards.m2e-nar.tests/it/it0011-executable-dep-lib-static/pom.xml index 5f16cac..7a3a856 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0011-executable-dep-lib-static/pom.xml +++ b/com.github.sdedwards.m2e-nar.tests/it/it0011-executable-dep-lib-static/pom.xml @@ -1,23 +1,23 @@ - + #%L + Native ARchive plugin for Maven + %% + Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + %% + Licensed 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. + #L% + --> 4.0.0 @@ -33,6 +33,7 @@ under the License. nar NAR Executable and Static Library + 1.0-SNAPSHOT Executable depending on a static library. diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0011-executable-dep-lib-static/src/main/c/HelloWorldExe.c b/com.github.sdedwards.m2e-nar.tests/it/it0011-executable-dep-lib-static/src/main/c/HelloWorldExe.c index 4aa35d8..15f98cc 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0011-executable-dep-lib-static/src/main/c/HelloWorldExe.c +++ b/com.github.sdedwards.m2e-nar.tests/it/it0011-executable-dep-lib-static/src/main/c/HelloWorldExe.c @@ -1,3 +1,22 @@ +/* + * #%L + * Native ARchive plugin for Maven + * %% + * Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + * %% + * Licensed 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. + * #L% + */ #include #include "HelloWorldLib.h" diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0012-jni-dep-lib-static/pom.xml b/com.github.sdedwards.m2e-nar.tests/it/it0012-jni-dep-lib-static/pom.xml index 9515b62..9f39bbd 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0012-jni-dep-lib-static/pom.xml +++ b/com.github.sdedwards.m2e-nar.tests/it/it0012-jni-dep-lib-static/pom.xml @@ -1,23 +1,23 @@ - + #%L + Native ARchive plugin for Maven + %% + Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + %% + Licensed 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. + #L% + --> 4.0.0 @@ -33,6 +33,7 @@ under the License. nar NAR JNI + 1.0-SNAPSHOT JNI diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0012-jni-dep-lib-static/src/main/c/HelloWorldSharedLibJNI.c b/com.github.sdedwards.m2e-nar.tests/it/it0012-jni-dep-lib-static/src/main/c/HelloWorldSharedLibJNI.c index e044f28..9e70283 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0012-jni-dep-lib-static/src/main/c/HelloWorldSharedLibJNI.c +++ b/com.github.sdedwards.m2e-nar.tests/it/it0012-jni-dep-lib-static/src/main/c/HelloWorldSharedLibJNI.c @@ -1,22 +1,22 @@ /* - * 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. + * #%L + * Native ARchive plugin for Maven + * %% + * Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + * %% + * Licensed 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. + * #L% */ - #include #include "HelloWorldLib.h" diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0012-jni-dep-lib-static/src/main/java/it0012/HelloWorldSharedLibJNI.java b/com.github.sdedwards.m2e-nar.tests/it/it0012-jni-dep-lib-static/src/main/java/it0012/HelloWorldSharedLibJNI.java index effc91b..3e5f0a3 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0012-jni-dep-lib-static/src/main/java/it0012/HelloWorldSharedLibJNI.java +++ b/com.github.sdedwards.m2e-nar.tests/it/it0012-jni-dep-lib-static/src/main/java/it0012/HelloWorldSharedLibJNI.java @@ -1,23 +1,23 @@ -package it0012; - /* - * 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. + * #%L + * Native ARchive plugin for Maven + * %% + * Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + * %% + * Licensed 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. + * #L% */ +package it0012; public class HelloWorldSharedLibJNI { diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0012-jni-dep-lib-static/src/test/java/it0012/test/HelloWorldSharedLibJNITest.java b/com.github.sdedwards.m2e-nar.tests/it/it0012-jni-dep-lib-static/src/test/java/it0012/test/HelloWorldSharedLibJNITest.java index 1a7e4b2..77ccee3 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0012-jni-dep-lib-static/src/test/java/it0012/test/HelloWorldSharedLibJNITest.java +++ b/com.github.sdedwards.m2e-nar.tests/it/it0012-jni-dep-lib-static/src/test/java/it0012/test/HelloWorldSharedLibJNITest.java @@ -1,23 +1,23 @@ -package it0012.test; - /* - * 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. + * #%L + * Native ARchive plugin for Maven + * %% + * Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + * %% + * Licensed 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. + * #L% */ +package it0012.test; import it0012.HelloWorldSharedLibJNI; import org.junit.Assert; diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0013-gnu-executable/pom.xml b/com.github.sdedwards.m2e-nar.tests/it/it0013-gnu-executable/pom.xml index 54969b4..c6e3228 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0013-gnu-executable/pom.xml +++ b/com.github.sdedwards.m2e-nar.tests/it/it0013-gnu-executable/pom.xml @@ -1,23 +1,23 @@ - + #%L + Native ARchive plugin for Maven + %% + Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + %% + Licensed 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. + #L% + --> 4.0.0 @@ -33,6 +33,7 @@ under the License. nar NAR GNU Test + 1.0-SNAPSHOT Simple test for GNU package diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0013-gnu-executable/src/gnu/COPYING b/com.github.sdedwards.m2e-nar.tests/it/it0013-gnu-executable/src/gnu/COPYING index 84e4ea1..c026b6b 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0013-gnu-executable/src/gnu/COPYING +++ b/com.github.sdedwards.m2e-nar.tests/it/it0013-gnu-executable/src/gnu/COPYING @@ -1,17 +1,11 @@ -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 +Licensed 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. + 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. diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0013-gnu-executable/src/gnu/autogen.sh b/com.github.sdedwards.m2e-nar.tests/it/it0013-gnu-executable/src/gnu/autogen.sh old mode 100755 new mode 100644 index c7df22c..334698d --- a/com.github.sdedwards.m2e-nar.tests/it/it0013-gnu-executable/src/gnu/autogen.sh +++ b/com.github.sdedwards.m2e-nar.tests/it/it0013-gnu-executable/src/gnu/autogen.sh @@ -1,3 +1,23 @@ #!/bin/sh + +### +# #%L +# Native ARchive plugin for Maven +# %% +# Copyright (C) 2002 - 2014 NAR Maven Plugin developers. +# %% +# Licensed 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. +# #L% +### autoreconf --force --install -I config -I m4 diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0013-gnu-executable/src/gnu/src/Executable.c b/com.github.sdedwards.m2e-nar.tests/it/it0013-gnu-executable/src/gnu/src/Executable.c index 19afb26..c342381 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0013-gnu-executable/src/gnu/src/Executable.c +++ b/com.github.sdedwards.m2e-nar.tests/it/it0013-gnu-executable/src/gnu/src/Executable.c @@ -1,22 +1,22 @@ /* - * 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. + * #%L + * Native ARchive plugin for Maven + * %% + * Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + * %% + * Licensed 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. + * #L% */ - #include int main(int argc, char *argv[]) { diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0014-multi-module/it0014-jni-dep-lib-shared/pom.xml b/com.github.sdedwards.m2e-nar.tests/it/it0014-multi-module/it0014-jni-dep-lib-shared/pom.xml index 7a5493c..7b58d72 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0014-multi-module/it0014-jni-dep-lib-shared/pom.xml +++ b/com.github.sdedwards.m2e-nar.tests/it/it0014-multi-module/it0014-jni-dep-lib-shared/pom.xml @@ -1,23 +1,23 @@ - + #%L + Native ARchive plugin for Maven + %% + Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + %% + Licensed 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. + #L% + --> 4.0.0 @@ -32,6 +32,7 @@ under the License. nar NAR JNI and Shared Library + 1.0-SNAPSHOT JNI depending on a shared library. diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0014-multi-module/it0014-jni-dep-lib-shared/src/main/c/HelloWorldSharedLibJNI.c b/com.github.sdedwards.m2e-nar.tests/it/it0014-multi-module/it0014-jni-dep-lib-shared/src/main/c/HelloWorldSharedLibJNI.c index 852f84e..c789edc 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0014-multi-module/it0014-jni-dep-lib-shared/src/main/c/HelloWorldSharedLibJNI.c +++ b/com.github.sdedwards.m2e-nar.tests/it/it0014-multi-module/it0014-jni-dep-lib-shared/src/main/c/HelloWorldSharedLibJNI.c @@ -1,22 +1,22 @@ /* - * 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. + * #%L + * Native ARchive plugin for Maven + * %% + * Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + * %% + * Licensed 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. + * #L% */ - #include #include "HelloWorldLib.h" diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0014-multi-module/it0014-jni-dep-lib-shared/src/main/java/it0014/HelloWorldSharedLibJNI.java b/com.github.sdedwards.m2e-nar.tests/it/it0014-multi-module/it0014-jni-dep-lib-shared/src/main/java/it0014/HelloWorldSharedLibJNI.java index 54abdb3..eb0b138 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0014-multi-module/it0014-jni-dep-lib-shared/src/main/java/it0014/HelloWorldSharedLibJNI.java +++ b/com.github.sdedwards.m2e-nar.tests/it/it0014-multi-module/it0014-jni-dep-lib-shared/src/main/java/it0014/HelloWorldSharedLibJNI.java @@ -1,23 +1,23 @@ -package it0014; - /* - * 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. + * #%L + * Native ARchive plugin for Maven + * %% + * Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + * %% + * Licensed 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. + * #L% */ +package it0014; public class HelloWorldSharedLibJNI { diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0014-multi-module/it0014-jni-dep-lib-shared/src/test/java/it0014/test/HelloWorldSharedLibJNITest.java b/com.github.sdedwards.m2e-nar.tests/it/it0014-multi-module/it0014-jni-dep-lib-shared/src/test/java/it0014/test/HelloWorldSharedLibJNITest.java index 4d55410..1562548 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0014-multi-module/it0014-jni-dep-lib-shared/src/test/java/it0014/test/HelloWorldSharedLibJNITest.java +++ b/com.github.sdedwards.m2e-nar.tests/it/it0014-multi-module/it0014-jni-dep-lib-shared/src/test/java/it0014/test/HelloWorldSharedLibJNITest.java @@ -1,23 +1,23 @@ -package it0014.test; - /* - * 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. + * #%L + * Native ARchive plugin for Maven + * %% + * Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + * %% + * Licensed 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. + * #L% */ +package it0014.test; import it0014.HelloWorldSharedLibJNI; import org.junit.Assert; diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0014-multi-module/it0014-lib-shared/pom.xml b/com.github.sdedwards.m2e-nar.tests/it/it0014-multi-module/it0014-lib-shared/pom.xml index 411651c..dfdca4f 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0014-multi-module/it0014-lib-shared/pom.xml +++ b/com.github.sdedwards.m2e-nar.tests/it/it0014-multi-module/it0014-lib-shared/pom.xml @@ -1,23 +1,23 @@ - + #%L + Native ARchive plugin for Maven + %% + Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + %% + Licensed 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. + #L% + --> 4.0.0 @@ -32,6 +32,7 @@ under the License. nar NAR Shared Library + 1.0-SNAPSHOT Simple shared library and test file diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0014-multi-module/it0014-lib-shared/src/main/c/HelloWorldLib.c b/com.github.sdedwards.m2e-nar.tests/it/it0014-multi-module/it0014-lib-shared/src/main/c/HelloWorldLib.c index 9f65143..2611690 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0014-multi-module/it0014-lib-shared/src/main/c/HelloWorldLib.c +++ b/com.github.sdedwards.m2e-nar.tests/it/it0014-multi-module/it0014-lib-shared/src/main/c/HelloWorldLib.c @@ -1,3 +1,22 @@ +/* + * #%L + * Native ARchive plugin for Maven + * %% + * Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + * %% + * Licensed 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. + * #L% + */ #include #include "HelloWorldLib.h" diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0014-multi-module/it0014-lib-shared/src/main/include/HelloWorldLib.h b/com.github.sdedwards.m2e-nar.tests/it/it0014-multi-module/it0014-lib-shared/src/main/include/HelloWorldLib.h index e801bec..f6ed9c0 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0014-multi-module/it0014-lib-shared/src/main/include/HelloWorldLib.h +++ b/com.github.sdedwards.m2e-nar.tests/it/it0014-multi-module/it0014-lib-shared/src/main/include/HelloWorldLib.h @@ -1,3 +1,22 @@ +/* + * #%L + * Native ARchive plugin for Maven + * %% + * Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + * %% + * Licensed 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. + * #L% + */ #ifndef HelloWorldLib_H #define HelloWorldLib_H diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0014-multi-module/it0014-lib-shared/src/test/c/HelloWorldTest.c b/com.github.sdedwards.m2e-nar.tests/it/it0014-multi-module/it0014-lib-shared/src/test/c/HelloWorldTest.c index 4aa35d8..15f98cc 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0014-multi-module/it0014-lib-shared/src/test/c/HelloWorldTest.c +++ b/com.github.sdedwards.m2e-nar.tests/it/it0014-multi-module/it0014-lib-shared/src/test/c/HelloWorldTest.c @@ -1,3 +1,22 @@ +/* + * #%L + * Native ARchive plugin for Maven + * %% + * Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + * %% + * Licensed 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. + * #L% + */ #include #include "HelloWorldLib.h" diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0014-multi-module/pom.xml b/com.github.sdedwards.m2e-nar.tests/it/it0014-multi-module/pom.xml index 4894e45..6c8a82f 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0014-multi-module/pom.xml +++ b/com.github.sdedwards.m2e-nar.tests/it/it0014-multi-module/pom.xml @@ -1,23 +1,23 @@ - + #%L + Native ARchive plugin for Maven + %% + Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + %% + Licensed 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. + #L% + --> 4.0.0 @@ -33,6 +33,7 @@ under the License. pom NAR Multi Module + 1.0-SNAPSHOT Simple Multi Module project diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0015-cpp-executable/pom.xml b/com.github.sdedwards.m2e-nar.tests/it/it0015-cpp-executable/pom.xml index 437add7..ae76a8b 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0015-cpp-executable/pom.xml +++ b/com.github.sdedwards.m2e-nar.tests/it/it0015-cpp-executable/pom.xml @@ -1,23 +1,23 @@ - + #%L + Native ARchive plugin for Maven + %% + Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + %% + Licensed 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. + #L% + --> 4.0.0 @@ -33,6 +33,7 @@ under the License. nar NAR C++ Executable Test + 1.0-SNAPSHOT Simple c++ test executable diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0015-cpp-executable/src/main/c++/Executable.cpp b/com.github.sdedwards.m2e-nar.tests/it/it0015-cpp-executable/src/main/c++/Executable.cpp index 976ffb8..d2b8b9c 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0015-cpp-executable/src/main/c++/Executable.cpp +++ b/com.github.sdedwards.m2e-nar.tests/it/it0015-cpp-executable/src/main/c++/Executable.cpp @@ -1,22 +1,22 @@ /* - * 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. + * #%L + * Native ARchive plugin for Maven + * %% + * Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + * %% + * Licensed 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. + * #L% */ - #include #include diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0015-cpp-executable/src/main/include/example.h b/com.github.sdedwards.m2e-nar.tests/it/it0015-cpp-executable/src/main/include/example.h index 46d9013..c4872e7 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0015-cpp-executable/src/main/include/example.h +++ b/com.github.sdedwards.m2e-nar.tests/it/it0015-cpp-executable/src/main/include/example.h @@ -1,3 +1,22 @@ +/* + * #%L + * Native ARchive plugin for Maven + * %% + * Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + * %% + * Licensed 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. + * #L% + */ /* File : example.h */ class Shape { diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0016-layout/include/HelloWorldLib.h b/com.github.sdedwards.m2e-nar.tests/it/it0016-layout/include/HelloWorldLib.h index e801bec..f6ed9c0 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0016-layout/include/HelloWorldLib.h +++ b/com.github.sdedwards.m2e-nar.tests/it/it0016-layout/include/HelloWorldLib.h @@ -1,3 +1,22 @@ +/* + * #%L + * Native ARchive plugin for Maven + * %% + * Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + * %% + * Licensed 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. + * #L% + */ #ifndef HelloWorldLib_H #define HelloWorldLib_H diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0016-layout/it0016-exe-dep-lib-layout20/pom.xml b/com.github.sdedwards.m2e-nar.tests/it/it0016-layout/it0016-exe-dep-lib-layout20/pom.xml index bb98db5..7c03d3c 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0016-layout/it0016-exe-dep-lib-layout20/pom.xml +++ b/com.github.sdedwards.m2e-nar.tests/it/it0016-layout/it0016-exe-dep-lib-layout20/pom.xml @@ -1,23 +1,23 @@ - + #%L + Native ARchive plugin for Maven + %% + Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + %% + Licensed 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. + #L% + --> 4.0.0 @@ -32,6 +32,7 @@ under the License. nar NAR Executable and Shared Library (Layout20) + 1.0-SNAPSHOT Executable depending on a shared library. diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0016-layout/it0016-exe-dep-lib-layout20/src/main/c/HelloWorldExe.c b/com.github.sdedwards.m2e-nar.tests/it/it0016-layout/it0016-exe-dep-lib-layout20/src/main/c/HelloWorldExe.c index 4aa35d8..15f98cc 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0016-layout/it0016-exe-dep-lib-layout20/src/main/c/HelloWorldExe.c +++ b/com.github.sdedwards.m2e-nar.tests/it/it0016-layout/it0016-exe-dep-lib-layout20/src/main/c/HelloWorldExe.c @@ -1,3 +1,22 @@ +/* + * #%L + * Native ARchive plugin for Maven + * %% + * Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + * %% + * Licensed 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. + * #L% + */ #include #include "HelloWorldLib.h" diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0016-layout/it0016-exe-dep-lib-layout21/pom.xml b/com.github.sdedwards.m2e-nar.tests/it/it0016-layout/it0016-exe-dep-lib-layout21/pom.xml index d7b0a8c..ffba985 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0016-layout/it0016-exe-dep-lib-layout21/pom.xml +++ b/com.github.sdedwards.m2e-nar.tests/it/it0016-layout/it0016-exe-dep-lib-layout21/pom.xml @@ -1,23 +1,23 @@ - + #%L + Native ARchive plugin for Maven + %% + Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + %% + Licensed 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. + #L% + --> 4.0.0 @@ -32,6 +32,7 @@ under the License. nar NAR Executable and Shared Library (Layout21) + 1.0-SNAPSHOT Executable depending on a shared library. diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0016-layout/it0016-exe-dep-lib-layout21/src/main/c/HelloWorldExe.c b/com.github.sdedwards.m2e-nar.tests/it/it0016-layout/it0016-exe-dep-lib-layout21/src/main/c/HelloWorldExe.c index 4aa35d8..15f98cc 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0016-layout/it0016-exe-dep-lib-layout21/src/main/c/HelloWorldExe.c +++ b/com.github.sdedwards.m2e-nar.tests/it/it0016-layout/it0016-exe-dep-lib-layout21/src/main/c/HelloWorldExe.c @@ -1,3 +1,22 @@ +/* + * #%L + * Native ARchive plugin for Maven + * %% + * Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + * %% + * Licensed 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. + * #L% + */ #include #include "HelloWorldLib.h" diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0016-layout/it0016-lib-layout20/pom.xml b/com.github.sdedwards.m2e-nar.tests/it/it0016-layout/it0016-lib-layout20/pom.xml index aef9a52..2284c60 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0016-layout/it0016-lib-layout20/pom.xml +++ b/com.github.sdedwards.m2e-nar.tests/it/it0016-layout/it0016-lib-layout20/pom.xml @@ -1,23 +1,23 @@ - + #%L + Native ARchive plugin for Maven + %% + Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + %% + Licensed 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. + #L% + --> 4.0.0 @@ -32,6 +32,7 @@ under the License. nar NAR Shared Library (Layout20) + 1.0-SNAPSHOT Simple shared library and test file diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0016-layout/it0016-lib-layout20/src/main/c/HelloWorldLib.c b/com.github.sdedwards.m2e-nar.tests/it/it0016-layout/it0016-lib-layout20/src/main/c/HelloWorldLib.c index 9f65143..2611690 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0016-layout/it0016-lib-layout20/src/main/c/HelloWorldLib.c +++ b/com.github.sdedwards.m2e-nar.tests/it/it0016-layout/it0016-lib-layout20/src/main/c/HelloWorldLib.c @@ -1,3 +1,22 @@ +/* + * #%L + * Native ARchive plugin for Maven + * %% + * Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + * %% + * Licensed 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. + * #L% + */ #include #include "HelloWorldLib.h" diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0016-layout/it0016-lib-layout20/src/main/include/HelloWorldLib.h b/com.github.sdedwards.m2e-nar.tests/it/it0016-layout/it0016-lib-layout20/src/main/include/HelloWorldLib.h index e801bec..f6ed9c0 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0016-layout/it0016-lib-layout20/src/main/include/HelloWorldLib.h +++ b/com.github.sdedwards.m2e-nar.tests/it/it0016-layout/it0016-lib-layout20/src/main/include/HelloWorldLib.h @@ -1,3 +1,22 @@ +/* + * #%L + * Native ARchive plugin for Maven + * %% + * Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + * %% + * Licensed 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. + * #L% + */ #ifndef HelloWorldLib_H #define HelloWorldLib_H diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0016-layout/it0016-lib-layout20/src/test/c/HelloWorldTest.c b/com.github.sdedwards.m2e-nar.tests/it/it0016-layout/it0016-lib-layout20/src/test/c/HelloWorldTest.c index 4aa35d8..15f98cc 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0016-layout/it0016-lib-layout20/src/test/c/HelloWorldTest.c +++ b/com.github.sdedwards.m2e-nar.tests/it/it0016-layout/it0016-lib-layout20/src/test/c/HelloWorldTest.c @@ -1,3 +1,22 @@ +/* + * #%L + * Native ARchive plugin for Maven + * %% + * Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + * %% + * Licensed 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. + * #L% + */ #include #include "HelloWorldLib.h" diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0016-layout/it0016-lib-layout21/pom.xml b/com.github.sdedwards.m2e-nar.tests/it/it0016-layout/it0016-lib-layout21/pom.xml index 0480ed8..71084c6 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0016-layout/it0016-lib-layout21/pom.xml +++ b/com.github.sdedwards.m2e-nar.tests/it/it0016-layout/it0016-lib-layout21/pom.xml @@ -1,23 +1,23 @@ - + #%L + Native ARchive plugin for Maven + %% + Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + %% + Licensed 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. + #L% + --> 4.0.0 @@ -32,6 +32,7 @@ under the License. nar NAR Shared Library (Layout21) + 1.0-SNAPSHOT Simple shared library and test file diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0016-layout/it0016-lib-layout21/src/main/c/HelloWorldLib.c b/com.github.sdedwards.m2e-nar.tests/it/it0016-layout/it0016-lib-layout21/src/main/c/HelloWorldLib.c index 9f65143..2611690 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0016-layout/it0016-lib-layout21/src/main/c/HelloWorldLib.c +++ b/com.github.sdedwards.m2e-nar.tests/it/it0016-layout/it0016-lib-layout21/src/main/c/HelloWorldLib.c @@ -1,3 +1,22 @@ +/* + * #%L + * Native ARchive plugin for Maven + * %% + * Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + * %% + * Licensed 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. + * #L% + */ #include #include "HelloWorldLib.h" diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0016-layout/it0016-lib-layout21/src/main/include/HelloWorldLib.h b/com.github.sdedwards.m2e-nar.tests/it/it0016-layout/it0016-lib-layout21/src/main/include/HelloWorldLib.h index e801bec..f6ed9c0 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0016-layout/it0016-lib-layout21/src/main/include/HelloWorldLib.h +++ b/com.github.sdedwards.m2e-nar.tests/it/it0016-layout/it0016-lib-layout21/src/main/include/HelloWorldLib.h @@ -1,3 +1,22 @@ +/* + * #%L + * Native ARchive plugin for Maven + * %% + * Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + * %% + * Licensed 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. + * #L% + */ #ifndef HelloWorldLib_H #define HelloWorldLib_H diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0016-layout/it0016-lib-layout21/src/test/c/HelloWorldTest.c b/com.github.sdedwards.m2e-nar.tests/it/it0016-layout/it0016-lib-layout21/src/test/c/HelloWorldTest.c index 4aa35d8..15f98cc 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0016-layout/it0016-lib-layout21/src/test/c/HelloWorldTest.c +++ b/com.github.sdedwards.m2e-nar.tests/it/it0016-layout/it0016-lib-layout21/src/test/c/HelloWorldTest.c @@ -1,3 +1,22 @@ +/* + * #%L + * Native ARchive plugin for Maven + * %% + * Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + * %% + * Licensed 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. + * #L% + */ #include #include "HelloWorldLib.h" diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0016-layout/lib/x86_64-MacOSX-g++/shared/history.xml b/com.github.sdedwards.m2e-nar.tests/it/it0016-layout/lib/x86_64-MacOSX-g++/shared/history.xml index 2004850..7c45d55 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0016-layout/lib/x86_64-MacOSX-g++/shared/history.xml +++ b/com.github.sdedwards.m2e-nar.tests/it/it0016-layout/lib/x86_64-MacOSX-g++/shared/history.xml @@ -1,4 +1,24 @@ - + + + diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0016-layout/pom.xml b/com.github.sdedwards.m2e-nar.tests/it/it0016-layout/pom.xml index 9a44b3b..eb2159b 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0016-layout/pom.xml +++ b/com.github.sdedwards.m2e-nar.tests/it/it0016-layout/pom.xml @@ -1,23 +1,23 @@ - + #%L + Native ARchive plugin for Maven + %% + Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + %% + Licensed 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. + #L% + --> 4.0.0 @@ -33,6 +33,7 @@ under the License. pom NAR Layout + 1.0-SNAPSHOT Project to check layout compatibility diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0017-toolchain/pom.xml b/com.github.sdedwards.m2e-nar.tests/it/it0017-toolchain/pom.xml index 9bfbb5e..aedc378 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0017-toolchain/pom.xml +++ b/com.github.sdedwards.m2e-nar.tests/it/it0017-toolchain/pom.xml @@ -1,23 +1,23 @@ - + #%L + Native ARchive plugin for Maven + %% + Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + %% + Licensed 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. + #L% + --> 4.0.0 @@ -33,6 +33,7 @@ under the License. nar NAR JNI Test with ToolChain + 1.0-SNAPSHOT Simple JNI Library using ToolChain diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0017-toolchain/src/main/c/HelloWorldJNI.c b/com.github.sdedwards.m2e-nar.tests/it/it0017-toolchain/src/main/c/HelloWorldJNI.c index 21aa05a..184659e 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0017-toolchain/src/main/c/HelloWorldJNI.c +++ b/com.github.sdedwards.m2e-nar.tests/it/it0017-toolchain/src/main/c/HelloWorldJNI.c @@ -1,22 +1,22 @@ /* - * 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. + * #%L + * Native ARchive plugin for Maven + * %% + * Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + * %% + * Licensed 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. + * #L% */ - #include #include "it0017_HelloWorldJNI.h" diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0017-toolchain/src/main/java/it0017/HelloWorldJNI.java b/com.github.sdedwards.m2e-nar.tests/it/it0017-toolchain/src/main/java/it0017/HelloWorldJNI.java index b41439a..50e5e77 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0017-toolchain/src/main/java/it0017/HelloWorldJNI.java +++ b/com.github.sdedwards.m2e-nar.tests/it/it0017-toolchain/src/main/java/it0017/HelloWorldJNI.java @@ -1,23 +1,23 @@ -package it0017; - /* - * 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. + * #%L + * Native ARchive plugin for Maven + * %% + * Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + * %% + * Licensed 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. + * #L% */ +package it0017; public class HelloWorldJNI { diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0017-toolchain/src/test/java/it0017/test/HelloWorldJNITest.java b/com.github.sdedwards.m2e-nar.tests/it/it0017-toolchain/src/test/java/it0017/test/HelloWorldJNITest.java index 7ac0a79..222e15e 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0017-toolchain/src/test/java/it0017/test/HelloWorldJNITest.java +++ b/com.github.sdedwards.m2e-nar.tests/it/it0017-toolchain/src/test/java/it0017/test/HelloWorldJNITest.java @@ -1,23 +1,23 @@ -package it0017.test; - /* - * 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. + * #%L + * Native ARchive plugin for Maven + * %% + * Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + * %% + * Licensed 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. + * #L% */ +package it0017.test; import it0017.HelloWorldJNI; import org.junit.Assert; diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0018-fortran/pom.xml b/com.github.sdedwards.m2e-nar.tests/it/it0018-fortran/pom.xml index 0bab3b6..46f1f65 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0018-fortran/pom.xml +++ b/com.github.sdedwards.m2e-nar.tests/it/it0018-fortran/pom.xml @@ -1,23 +1,23 @@ - + #%L + Native ARchive plugin for Maven + %% + Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + %% + Licensed 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. + #L% + --> 4.0.0 @@ -33,6 +33,7 @@ under the License. nar NAR Fortran + 1.0-SNAPSHOT Fortran Example diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0019-compiler/pom.xml b/com.github.sdedwards.m2e-nar.tests/it/it0019-compiler/pom.xml index a3480bb..65979dd 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0019-compiler/pom.xml +++ b/com.github.sdedwards.m2e-nar.tests/it/it0019-compiler/pom.xml @@ -1,23 +1,23 @@ - + #%L + Native ARchive plugin for Maven + %% + Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + %% + Licensed 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. + #L% + --> 4.0.0 @@ -33,6 +33,7 @@ under the License. nar NAR Compiler Test + 1.0-SNAPSHOT Compiler Configuration Test diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0019-compiler/src/main/c/Executable.c b/com.github.sdedwards.m2e-nar.tests/it/it0019-compiler/src/main/c/Executable.c index 19afb26..c342381 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0019-compiler/src/main/c/Executable.c +++ b/com.github.sdedwards.m2e-nar.tests/it/it0019-compiler/src/main/c/Executable.c @@ -1,22 +1,22 @@ /* - * 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. + * #%L + * Native ARchive plugin for Maven + * %% + * Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + * %% + * Licensed 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. + * #L% */ - #include int main(int argc, char *argv[]) { diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0020-lib-3rdparty/pom.xml b/com.github.sdedwards.m2e-nar.tests/it/it0020-lib-3rdparty/pom.xml index 631d71a..2c59216 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0020-lib-3rdparty/pom.xml +++ b/com.github.sdedwards.m2e-nar.tests/it/it0020-lib-3rdparty/pom.xml @@ -1,23 +1,23 @@ - + #%L + Native ARchive plugin for Maven + %% + Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + %% + Licensed 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. + #L% + --> 4.0.0 @@ -33,6 +33,7 @@ under the License. nar NAR Executable depending on 3rd party lib + 1.0-SNAPSHOT Executable depending on a 3rd party lib. diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0020-lib-3rdparty/src/nar/resources/noarch/include/HelloWorldLib.h b/com.github.sdedwards.m2e-nar.tests/it/it0020-lib-3rdparty/src/nar/resources/noarch/include/HelloWorldLib.h index e801bec..f6ed9c0 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0020-lib-3rdparty/src/nar/resources/noarch/include/HelloWorldLib.h +++ b/com.github.sdedwards.m2e-nar.tests/it/it0020-lib-3rdparty/src/nar/resources/noarch/include/HelloWorldLib.h @@ -1,3 +1,22 @@ +/* + * #%L + * Native ARchive plugin for Maven + * %% + * Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + * %% + * Licensed 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. + * #L% + */ #ifndef HelloWorldLib_H #define HelloWorldLib_H diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0020-lib-3rdparty/src/test/c/HelloWorldExe.c b/com.github.sdedwards.m2e-nar.tests/it/it0020-lib-3rdparty/src/test/c/HelloWorldExe.c index 4aa35d8..15f98cc 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0020-lib-3rdparty/src/test/c/HelloWorldExe.c +++ b/com.github.sdedwards.m2e-nar.tests/it/it0020-lib-3rdparty/src/test/c/HelloWorldExe.c @@ -1,3 +1,22 @@ +/* + * #%L + * Native ARchive plugin for Maven + * %% + * Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + * %% + * Licensed 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. + * #L% + */ #include #include "HelloWorldLib.h" diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0021-executable-dep-lib-3rdparty/pom.xml b/com.github.sdedwards.m2e-nar.tests/it/it0021-executable-dep-lib-3rdparty/pom.xml index a81cc2b..8dc1dfc 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0021-executable-dep-lib-3rdparty/pom.xml +++ b/com.github.sdedwards.m2e-nar.tests/it/it0021-executable-dep-lib-3rdparty/pom.xml @@ -1,23 +1,23 @@ - + #%L + Native ARchive plugin for Maven + %% + Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + %% + Licensed 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. + #L% + --> 4.0.0 @@ -33,6 +33,7 @@ under the License. nar NAR Executable dependent on 3rdParty Library + 1.0-SNAPSHOT Executable depending on a shared 3rd party library. diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0021-executable-dep-lib-3rdparty/src/main/c/HelloWorldExe.c b/com.github.sdedwards.m2e-nar.tests/it/it0021-executable-dep-lib-3rdparty/src/main/c/HelloWorldExe.c index 4aa35d8..15f98cc 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0021-executable-dep-lib-3rdparty/src/main/c/HelloWorldExe.c +++ b/com.github.sdedwards.m2e-nar.tests/it/it0021-executable-dep-lib-3rdparty/src/main/c/HelloWorldExe.c @@ -1,3 +1,22 @@ +/* + * #%L + * Native ARchive plugin for Maven + * %% + * Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + * %% + * Licensed 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. + * #L% + */ #include #include "HelloWorldLib.h" diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0022-objective-c-executable/pom.xml b/com.github.sdedwards.m2e-nar.tests/it/it0022-objective-c-executable/pom.xml index 802fcf6..7cdaa41 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0022-objective-c-executable/pom.xml +++ b/com.github.sdedwards.m2e-nar.tests/it/it0022-objective-c-executable/pom.xml @@ -1,23 +1,23 @@ - + #%L + Native ARchive plugin for Maven + %% + Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + %% + Licensed 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. + #L% + --> 4.0.0 @@ -33,6 +33,7 @@ under the License. nar NAR Objective C Executable Test + 1.0-SNAPSHOT Simple objective c test executable diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0022-objective-c-executable/src/main/include/Talker.h b/com.github.sdedwards.m2e-nar.tests/it/it0022-objective-c-executable/src/main/include/Talker.h index ead932f..1fb348f 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0022-objective-c-executable/src/main/include/Talker.h +++ b/com.github.sdedwards.m2e-nar.tests/it/it0022-objective-c-executable/src/main/include/Talker.h @@ -1,3 +1,22 @@ +/* + * #%L + * Native ARchive plugin for Maven + * %% + * Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + * %% + * Licensed 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. + * #L% + */ #import @interface Talker : NSObject diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0023-local-aol-properties/aol.properties b/com.github.sdedwards.m2e-nar.tests/it/it0023-local-aol-properties/aol.properties index 75f014e..767fefc 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0023-local-aol-properties/aol.properties +++ b/com.github.sdedwards.m2e-nar.tests/it/it0023-local-aol-properties/aol.properties @@ -1,3 +1,22 @@ +### +# #%L +# Native ARchive plugin for Maven +# %% +# Copyright (C) 2002 - 2014 NAR Maven Plugin developers. +# %% +# Licensed 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. +# #L% +### # # Override to switch on compiled fragment # @@ -25,3 +44,5 @@ x86_64.MacOSX.icpc.c.defines=LOCAL_AOL sparc.SunOS.CC.c.defines=LOCAL_AOL +i386.FreeBSD.gpp.c.defines=LOCAL_AOL +amd64.FreeBSD.gpp.c.defines=LOCAL_AOL diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0023-local-aol-properties/pom.xml b/com.github.sdedwards.m2e-nar.tests/it/it0023-local-aol-properties/pom.xml index 3d80795..c2869f5 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0023-local-aol-properties/pom.xml +++ b/com.github.sdedwards.m2e-nar.tests/it/it0023-local-aol-properties/pom.xml @@ -1,23 +1,23 @@ - + #%L + Native ARchive plugin for Maven + %% + Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + %% + Licensed 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. + #L% + --> 4.0.0 @@ -33,6 +33,7 @@ under the License. nar NAR Shared Library with local AOL properties + 1.0-SNAPSHOT Simple shared library and test fileusing local AOL properties diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0023-local-aol-properties/src/main/c/HelloWorldLib.c b/com.github.sdedwards.m2e-nar.tests/it/it0023-local-aol-properties/src/main/c/HelloWorldLib.c index 8453004..470b47f 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0023-local-aol-properties/src/main/c/HelloWorldLib.c +++ b/com.github.sdedwards.m2e-nar.tests/it/it0023-local-aol-properties/src/main/c/HelloWorldLib.c @@ -1,3 +1,22 @@ +/* + * #%L + * Native ARchive plugin for Maven + * %% + * Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + * %% + * Licensed 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. + * #L% + */ #include #include "HelloWorldLib.h" diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0023-local-aol-properties/src/main/include/HelloWorldLib.h b/com.github.sdedwards.m2e-nar.tests/it/it0023-local-aol-properties/src/main/include/HelloWorldLib.h index 4dd167c..338f4ea 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0023-local-aol-properties/src/main/include/HelloWorldLib.h +++ b/com.github.sdedwards.m2e-nar.tests/it/it0023-local-aol-properties/src/main/include/HelloWorldLib.h @@ -1,3 +1,22 @@ +/* + * #%L + * Native ARchive plugin for Maven + * %% + * Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + * %% + * Licensed 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. + * #L% + */ #ifndef HelloWorldLib_H #define HelloWorldLib_H diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0023-local-aol-properties/src/test/c/HelloWorldTest.c b/com.github.sdedwards.m2e-nar.tests/it/it0023-local-aol-properties/src/test/c/HelloWorldTest.c index 4aa35d8..15f98cc 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/it0023-local-aol-properties/src/test/c/HelloWorldTest.c +++ b/com.github.sdedwards.m2e-nar.tests/it/it0023-local-aol-properties/src/test/c/HelloWorldTest.c @@ -1,3 +1,22 @@ +/* + * #%L + * Native ARchive plugin for Maven + * %% + * Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + * %% + * Licensed 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. + * #L% + */ #include #include "HelloWorldLib.h" diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0024-namedout/dep/pom.xml b/com.github.sdedwards.m2e-nar.tests/it/it0024-namedout/dep/pom.xml new file mode 100644 index 0000000..7bd018e --- /dev/null +++ b/com.github.sdedwards.m2e-nar.tests/it/it0024-namedout/dep/pom.xml @@ -0,0 +1,71 @@ + + + + + 4.0.0 + + + com.github.sdedwards.m2e-nar.tests + it0024-namedout + 1.0-SNAPSHOT + + + it0024-namedout-dep + nar + + Executable depending on a Library with named output + 1.0-SNAPSHOT + + Executable depending on a shared library. + + + + true + + + + integration-test + + + com.github.maven-nar + nar-maven-plugin + true + + + + executable + true + + + + + + + + + + com.github.sdedwards.m2e-nar.tests + it0024-namedout-lib + 1.0-SNAPSHOT + nar + + + diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0024-namedout/dep/src/main/c/HelloWorldExe.c b/com.github.sdedwards.m2e-nar.tests/it/it0024-namedout/dep/src/main/c/HelloWorldExe.c new file mode 100644 index 0000000..308bdbd --- /dev/null +++ b/com.github.sdedwards.m2e-nar.tests/it/it0024-namedout/dep/src/main/c/HelloWorldExe.c @@ -0,0 +1,26 @@ +/* + * #%L + * Native ARchive plugin for Maven + * %% + * Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + * %% + * Licensed 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. + * #L% + */ +#include +#include "HelloWorldLib.h" + +int main(int argc, char *argv[]) { + printf("%s\n", HelloWorldLib_sayHello()); + return 0; +} diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0024-namedout/lib/pom.xml b/com.github.sdedwards.m2e-nar.tests/it/it0024-namedout/lib/pom.xml new file mode 100644 index 0000000..c5e7b5c --- /dev/null +++ b/com.github.sdedwards.m2e-nar.tests/it/it0024-namedout/lib/pom.xml @@ -0,0 +1,70 @@ + + + + + 4.0.0 + + + com.github.sdedwards.m2e-nar.tests + it0024-namedout + 1.0-SNAPSHOT + + + it0024-namedout-lib + nar + + A library with overridden output name + 1.0-SNAPSHOT + + Simple shared library and test file + + http://maven.apache.org/ + + + true + + + + integration-test + + + com.github.maven-nar + nar-maven-plugin + true + + lib-shared + + + shared + it0024 + + + + + HelloWorldTest + shared + + + + + + + diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0024-namedout/lib/src/main/c/HelloWorldLib.c b/com.github.sdedwards.m2e-nar.tests/it/it0024-namedout/lib/src/main/c/HelloWorldLib.c new file mode 100644 index 0000000..2611690 --- /dev/null +++ b/com.github.sdedwards.m2e-nar.tests/it/it0024-namedout/lib/src/main/c/HelloWorldLib.c @@ -0,0 +1,26 @@ +/* + * #%L + * Native ARchive plugin for Maven + * %% + * Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + * %% + * Licensed 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. + * #L% + */ +#include +#include "HelloWorldLib.h" + +char* HelloWorldLib_sayHello() { + return "Hello NAR LIB World!"; +} + diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0024-namedout/lib/src/main/include/HelloWorldLib.h b/com.github.sdedwards.m2e-nar.tests/it/it0024-namedout/lib/src/main/include/HelloWorldLib.h new file mode 100644 index 0000000..06f6554 --- /dev/null +++ b/com.github.sdedwards.m2e-nar.tests/it/it0024-namedout/lib/src/main/include/HelloWorldLib.h @@ -0,0 +1,28 @@ +/* + * #%L + * Native ARchive plugin for Maven + * %% + * Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + * %% + * Licensed 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. + * #L% + */ +#ifndef HelloWorldLib_H +#define HelloWorldLib_H + +#ifdef WIN32 +__declspec(dllexport) +#endif +extern char* HelloWorldLib_sayHello(); + +#endif diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0024-namedout/lib/src/test/c/HelloWorldTest.c b/com.github.sdedwards.m2e-nar.tests/it/it0024-namedout/lib/src/test/c/HelloWorldTest.c new file mode 100644 index 0000000..308bdbd --- /dev/null +++ b/com.github.sdedwards.m2e-nar.tests/it/it0024-namedout/lib/src/test/c/HelloWorldTest.c @@ -0,0 +1,26 @@ +/* + * #%L + * Native ARchive plugin for Maven + * %% + * Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + * %% + * Licensed 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. + * #L% + */ +#include +#include "HelloWorldLib.h" + +int main(int argc, char *argv[]) { + printf("%s\n", HelloWorldLib_sayHello()); + return 0; +} diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0024-namedout/lib/src/test/java/NarSystemTest.java b/com.github.sdedwards.m2e-nar.tests/it/it0024-namedout/lib/src/test/java/NarSystemTest.java new file mode 100644 index 0000000..3d13a95 --- /dev/null +++ b/com.github.sdedwards.m2e-nar.tests/it/it0024-namedout/lib/src/test/java/NarSystemTest.java @@ -0,0 +1,29 @@ +/* + * #%L + * Native ARchive plugin for Maven + * %% + * Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + * %% + * Licensed 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. + * #L% + */ +import it0024.NarSystem; + +import org.junit.Test; + +public class NarSystemTest { + @Test + public void loadLibrary() { + NarSystem.loadLibrary(); + } +} diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0024-namedout/pom.xml b/com.github.sdedwards.m2e-nar.tests/it/it0024-namedout/pom.xml new file mode 100644 index 0000000..975875a --- /dev/null +++ b/com.github.sdedwards.m2e-nar.tests/it/it0024-namedout/pom.xml @@ -0,0 +1,46 @@ + + + + + 4.0.0 + + + com.github.sdedwards.m2e-nar.tests + it-parent + 1.0-SNAPSHOT + ../it-parent/pom.xml + + + it0024-namedout + pom + + Aggregator of tests for overridden <output> + 1.0-SNAPSHOT + + Simple shared library and test file + + + + lib + dep + + + diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0025-jar-dep-jni/pom.xml b/com.github.sdedwards.m2e-nar.tests/it/it0025-jar-dep-jni/pom.xml new file mode 100644 index 0000000..53d5743 --- /dev/null +++ b/com.github.sdedwards.m2e-nar.tests/it/it0025-jar-dep-jni/pom.xml @@ -0,0 +1,77 @@ + + + + + 4.0.0 + + + com.github.sdedwards.m2e-nar.tests + it-parent + 1.0-SNAPSHOT + ../it-parent/pom.xml + + + it0025-jar-dep-jni + jar + + JAR Java Class Depends on JNI NAR + + Java class which depends on a separate JNI library + + + + true + + + + integration-test + + + com.github.maven-nar + nar-maven-plugin + true + + + nar-download + + nar-download + + + + nar-integration-test + + nar-integration-test + + + + + + + + + + com.github.sdedwards.m2e-nar.tests + it0003-jni + 1.0-SNAPSHOT + nar + + + diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0025-jar-dep-jni/src/main/java/it0025/Hello.java b/com.github.sdedwards.m2e-nar.tests/it/it0025-jar-dep-jni/src/main/java/it0025/Hello.java new file mode 100644 index 0000000..86f18f6 --- /dev/null +++ b/com.github.sdedwards.m2e-nar.tests/it/it0025-jar-dep-jni/src/main/java/it0025/Hello.java @@ -0,0 +1,30 @@ +/* + * #%L + * Native ARchive plugin for Maven + * %% + * Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + * %% + * Licensed 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. + * #L% + */ +package it0025; + +import it0003.HelloWorldJNI; + +public class Hello +{ + public static int times(int x, int y) + { + return new HelloWorldJNI().timesHello(x, y); + } +} diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0025-jar-dep-jni/src/test/java/it0025/HelloTest.java b/com.github.sdedwards.m2e-nar.tests/it/it0025-jar-dep-jni/src/test/java/it0025/HelloTest.java new file mode 100644 index 0000000..aa352e4 --- /dev/null +++ b/com.github.sdedwards.m2e-nar.tests/it/it0025-jar-dep-jni/src/test/java/it0025/HelloTest.java @@ -0,0 +1,31 @@ +/* + * #%L + * Native ARchive plugin for Maven + * %% + * Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + * %% + * Licensed 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. + * #L% + */ +package it0025; + +import org.junit.Assert; +import org.junit.Test; + +public class HelloTest +{ + @Test public final void testTimes() + { + Assert.assertEquals(42, Hello.times(3, 14)); + } +} diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0026-native-lib-loader/pom.xml b/com.github.sdedwards.m2e-nar.tests/it/it0026-native-lib-loader/pom.xml new file mode 100644 index 0000000..50c4f46 --- /dev/null +++ b/com.github.sdedwards.m2e-nar.tests/it/it0026-native-lib-loader/pom.xml @@ -0,0 +1,71 @@ + + + + + 4.0.0 + + + com.github.sdedwards.m2e-nar.tests + it-parent + 1.0-SNAPSHOT + ../it-parent/pom.xml + + + it0026-native-lib-loader + 1.0-SNAPSHOT + nar + + NAR with native-lib-loader + + NAR with native-lib-loader + + + + integration-test + + + com.github.maven-nar + nar-maven-plugin + true + + + true + + + + jni + it0026.test + false + + + + + + + + + + org.scijava + native-lib-loader + 2.0.2 + + + diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0026-native-lib-loader/src/main/c/hello.c b/com.github.sdedwards.m2e-nar.tests/it/it0026-native-lib-loader/src/main/c/hello.c new file mode 100644 index 0000000..958b656 --- /dev/null +++ b/com.github.sdedwards.m2e-nar.tests/it/it0026-native-lib-loader/src/main/c/hello.c @@ -0,0 +1,27 @@ +/* + * #%L + * Native ARchive plugin for Maven + * %% + * Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + * %% + * Licensed 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. + * #L% + */ +#include +#include "it0026_test_NarSystem.h" + +JNIEXPORT jbyte JNICALL Java_it0026_test_Hello_test + (JNIEnv *env, jclass clazz) +{ + return (jbyte)108; +} diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0026-native-lib-loader/src/main/java/it0026/test/Hello.java b/com.github.sdedwards.m2e-nar.tests/it/it0026-native-lib-loader/src/main/java/it0026/test/Hello.java new file mode 100644 index 0000000..de4210c --- /dev/null +++ b/com.github.sdedwards.m2e-nar.tests/it/it0026-native-lib-loader/src/main/java/it0026/test/Hello.java @@ -0,0 +1,33 @@ +/* + * #%L + * Native ARchive plugin for Maven + * %% + * Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + * %% + * Licensed 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. + * #L% + */ +package it0026.test; + +public class Hello { + static + { + NarSystem.loadLibrary(); + } + + public native static byte test(); + + public static void main(final String... args) { + System.exit((int) test()); + } +} diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0026-native-lib-loader/src/test/java/it0026/test/HelloTest.java b/com.github.sdedwards.m2e-nar.tests/it/it0026-native-lib-loader/src/test/java/it0026/test/HelloTest.java new file mode 100644 index 0000000..ee2c2fd --- /dev/null +++ b/com.github.sdedwards.m2e-nar.tests/it/it0026-native-lib-loader/src/test/java/it0026/test/HelloTest.java @@ -0,0 +1,32 @@ +/* + * #%L + * Native ARchive plugin for Maven + * %% + * Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + * %% + * Licensed 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. + * #L% + */ +package it0026.test; + +import it0026.test.Hello; +import org.junit.Assert; +import org.junit.Test; + +public class HelloTest +{ + @Test public final void testNativeMethod() + { + Assert.assertEquals(108, Hello.test()); + } +} diff --git a/com.github.sdedwards.m2e-nar.tests/it/it0026-native-lib-loader/verify.bsh b/com.github.sdedwards.m2e-nar.tests/it/it0026-native-lib-loader/verify.bsh new file mode 100644 index 0000000..0b1b578 --- /dev/null +++ b/com.github.sdedwards.m2e-nar.tests/it/it0026-native-lib-loader/verify.bsh @@ -0,0 +1,69 @@ +/* + * #%L + * Native ARchive plugin for Maven + * %% + * Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + * %% + * Licensed 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. + * #L% + */ + +/* + * This script verifies that the native-lib-loader method to unpack and + * load native libraries works even with fully packaged .jar files. + */ + +import java.io.BufferedReader; +import java.io.File; +import java.io.InputStreamReader; + +nativeLibLoaderVersion = "2.0.2"; +classPath = localRepositoryPath + "/org/scijava/native-lib-loader/" + + nativeLibLoaderVersion + "/native-lib-loader-" + + nativeLibLoaderVersion + ".jar"; +new File(basedir + "/target/").list(new FilenameFilter() { + public boolean accept(File dir, String name) { + if (name.startsWith("it0026-native-lib-loader-1.0-SNAPSHOT")) { + classPath += File.pathSeparator + + new File(dir, name).getPath(); + } + return false; + } +}); + +printInputStream(in) { + buffered = new BufferedReader(new InputStreamReader(in)); + new Thread() { + public void run() { + for (;;) { + line = buffered.readLine(); + if (line == null) break; + print(line); + } + buffered.close(); + } + }.start(); +} + +print("Starting java -classpath '" + classPath + "' it0026.test.Hello"); +process = new ProcessBuilder(new String[] { + "java", "-classpath", classPath, "it0026.test.Hello" + }).start(); +printInputStream(process.getErrorStream()); +printInputStream(process.getInputStream()); +exitCode = process.waitFor(); + +if (exitCode != 108) { + print("Unexpected exit code: " + exitCode); + return false; +} diff --git a/com.github.sdedwards.m2e-nar.tests/it/pom.xml b/com.github.sdedwards.m2e-nar.tests/it/pom.xml index cc60f68..3670272 100644 --- a/com.github.sdedwards.m2e-nar.tests/it/pom.xml +++ b/com.github.sdedwards.m2e-nar.tests/it/pom.xml @@ -62,5 +62,8 @@ under the License. it0021-executable-dep-lib-3rdparty it0022-objective-c-executable it0023-local-aol-properties + it0024-namedout + it0025-jar-dep-jni + it0026-native-lib-loader diff --git a/com.github.sdedwards.m2e-nar/src/com/github/maven_nar/AbstractDependencyMojo.java b/com.github.sdedwards.m2e-nar/src/com/github/maven_nar/AbstractDependencyMojo.java index c399936..2675cb4 100644 --- a/com.github.sdedwards.m2e-nar/src/com/github/maven_nar/AbstractDependencyMojo.java +++ b/com.github.sdedwards.m2e-nar/src/com/github/maven_nar/AbstractDependencyMojo.java @@ -313,7 +313,7 @@ private EclipseNarLayout resolveEclipseProject(final Artifact artifact, final Co return null; } IMavenProjectFacade dependency = projectManager.getMavenProject(artifact.getGroupId(), artifact.getArtifactId(), artifact.getBaseVersion()); - if (dependency == null) { + if (dependency == null || dependency.getFullPath(artifact.getFile()) == null) { return null; } if (dependency.getProject().equals(facade.getProject())) { diff --git a/com.github.sdedwards.m2e-nar/src/com/github/maven_nar/Compiler.java b/com.github.sdedwards.m2e-nar/src/com/github/maven_nar/Compiler.java index db40243..96e1dac 100644 --- a/com.github.sdedwards.m2e-nar/src/com/github/maven_nar/Compiler.java +++ b/com.github.sdedwards.m2e-nar/src/com/github/maven_nar/Compiler.java @@ -343,8 +343,8 @@ public List getSourceDirectories(String type) { * * @see com.github.maven_nar.ICompiler#getIncludePaths(java.lang.String) */ - public final List getIncludePaths(String type) { - List includePathList = createIncludePaths(type, type.equals(TEST) ? testIncludePaths : includePaths); + public final List getIncludePaths(String type) { + List includePathList = createIncludePaths(type, type.equals(TEST) ? testIncludePaths : includePaths); if (type.equals(TEST)) { // Add main includes paths too includePathList.addAll(createIncludePaths(MAIN, includePaths)); @@ -352,16 +352,18 @@ public final List getIncludePaths(String type) { return includePathList; } - private List createIncludePaths(String type, List paths) { + private List createIncludePaths(String type, List paths) { List includeList = paths; if (includeList == null || (paths.size() == 0)) { includeList = new ArrayList(); for (Iterator i = getSourceDirectories(type).iterator(); i.hasNext();) { // VR 20100318 only add include directories that exist - we now // fail the build fast if an include directory does not exist - File includePath = new File((File) i.next(), "include"); - if (includePath.isDirectory()) { - includeList.add(includePath.getPath()); + File file = new File((File) i.next(), "include"); + if (file.isDirectory()) { + IncludePath includePath = new IncludePath(); + includePath.setPath( file.getPath() ); + includeList.add(includePath); } } } diff --git a/com.github.sdedwards.m2e-nar/src/com/github/maven_nar/ICompiler.java b/com.github.sdedwards.m2e-nar/src/com/github/maven_nar/ICompiler.java index 778f0a8..32b62b3 100644 --- a/com.github.sdedwards.m2e-nar/src/com/github/maven_nar/ICompiler.java +++ b/com.github.sdedwards.m2e-nar/src/com/github/maven_nar/ICompiler.java @@ -31,7 +31,7 @@ public interface ICompiler { public abstract List/* */getSourceDirectories(String type); - public abstract List/* */getIncludePaths(String type); + public abstract List/* */getIncludePaths(String type); public abstract List/* */getSystemIncludePaths(); diff --git a/com.github.sdedwards.m2e-nar/src/com/github/maven_nar/IncludePath.java b/com.github.sdedwards.m2e-nar/src/com/github/maven_nar/IncludePath.java new file mode 100644 index 0000000..c3f61e7 --- /dev/null +++ b/com.github.sdedwards.m2e-nar/src/com/github/maven_nar/IncludePath.java @@ -0,0 +1,82 @@ +/* + * #%L + * Native ARchive plugin for Maven + * %% + * Copyright (C) 2002 - 2014 NAR Maven Plugin developers. + * %% + * Licensed 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. + * #L% + */ +package com.github.maven_nar; + +import java.io.File; +import java.util.List; + +/** + * An include path. + * + * Binds together include path itself (e.g. folder path) and allowed + * include file masks (e.g. *.h). + * + * @author Ivan Drobyshevskyi + */ +public class IncludePath { + /** + * Include path itself. + * + * @parameter + * @required + */ + private String path; + + /** + * List of include files masks. + * + * @parameter + */ + private List/* */includes; + + /** + * File corresponding to the path above. + */ + private File file; + + public String getPath() { + return path; + } + public void setPath(String path) { + this.path = path; + file = new File(path); + } + public void set(String path) { + setPath(path); + } + public File getFile() { + return file; + } + public final String getIncludes() + { + StringBuilder includesString = new StringBuilder(); + + if (includes == null) + return null; + + for (String s : (List) includes) + includesString.append(s + ","); + + return includesString.toString(); + } + boolean exists() { + return file.exists() && file.isDirectory(); + } +} diff --git a/com.github.sdedwards.m2e-nar/src/com/github/sdedwards/m2e_nar/internal/NarExecutionBuilder.java b/com.github.sdedwards.m2e-nar/src/com/github/sdedwards/m2e_nar/internal/NarExecutionBuilder.java index 94d1892..f707d94 100644 --- a/com.github.sdedwards.m2e-nar/src/com/github/sdedwards/m2e_nar/internal/NarExecutionBuilder.java +++ b/com.github.sdedwards.m2e-nar/src/com/github/sdedwards/m2e_nar/internal/NarExecutionBuilder.java @@ -42,6 +42,7 @@ import com.github.maven_nar.INarCompileMojo; import com.github.maven_nar.ISysLib; import com.github.maven_nar.ITest; +import com.github.maven_nar.IncludePath; import com.github.sdedwards.m2e_nar.MavenNarPlugin; import com.github.sdedwards.m2e_nar.internal.cdt.CdtUtils; import com.github.sdedwards.m2e_nar.internal.model.NarBuildArtifact; @@ -172,7 +173,10 @@ private NarCompiler buildCompilerSettings(final ICompiler compiler, final String NarCompiler settings = new NarCompiler(); settings.setName(compiler.getName()); List includePaths = settings.getIncludePaths(); - includePaths.addAll(compiler.getIncludePaths(buildType)); + for (Object obj : compiler.getIncludePaths(buildType)) { + IncludePath includePath = (IncludePath)obj; + includePaths.add(includePath.getPath()); + } List systemIncludes = compiler.getSystemIncludePaths(); if (systemIncludes != null) { diff --git a/pom.xml b/pom.xml index 1b6576c..05cae49 100644 --- a/pom.xml +++ b/pom.xml @@ -68,8 +68,8 @@ under the License. UTF-8 - 0.22.0 - http://download.eclipse.org/releases/kepler + 0.23.0 + http://download.eclipse.org/releases/luna sdedwards/m2e-nar @@ -224,23 +224,14 @@ under the License. ${project.basedir}/LICENSE - - org.apache.maven.plugins - maven-release-plugin - 2.5.2 - - true - v@{project.version} - - de.jutzig github-release-plugin 1.1.1 First try at release - v${project.version} - v${project.version} + v${unqualifiedVersion} + v${unqualifiedVersion} ${github.repo.id}