summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Donszelmann <Mark.Donszelmann@gmail.com>2009-10-03 14:53:01 +0200
committerMark Donszelmann <Mark.Donszelmann@gmail.com>2009-10-03 14:53:01 +0200
commit1b3f5eb617863b4d4c2e1c29b48a1efba2bdf5ff (patch)
treee8831dc2e66d61d394773582f1068ef0c10963d3
parentf16721c64008697a5b37c002f3b201d15e556c7a (diff)
downloadmaven-nar-plugin-1b3f5eb617863b4d4c2e1c29b48a1efba2bdf5ff.tar.gz
maven-nar-plugin-1b3f5eb617863b4d4c2e1c29b48a1efba2bdf5ff.tar.bz2
maven-nar-plugin-1b3f5eb617863b4d4c2e1c29b48a1efba2bdf5ff.tar.xz
maven-nar-plugin-1b3f5eb617863b4d4c2e1c29b48a1efba2bdf5ff.zip
Added test 3
-rw-r--r--ReleaseNotes.txt2
-rw-r--r--src/it/it-parent/pom.xml10
-rw-r--r--src/it/it0001-executable/pom.xml (renamed from src/it/executable/pom.xml)2
-rw-r--r--src/it/it0001-executable/src/main/c/Executable.c (renamed from src/it/executable/src/main/c/Executable.c)0
-rw-r--r--src/it/it0002-executable-static/pom.xml71
-rw-r--r--src/it/it0002-executable-static/src/main/c/HelloWorldExe.c8
-rw-r--r--src/it/it0003-jni/pom.xml (renamed from src/it/jni/pom.xml)10
-rw-r--r--src/it/it0003-jni/src/main/c/HelloWorldJNI.c (renamed from src/it/jni/src/main/c/HelloWorldJNI.c)0
-rw-r--r--src/it/it0003-jni/src/main/java/com/mycompany/mypackage/HelloWorldJNI.java (renamed from src/it/jni/src/main/java/com/mycompany/mypackage/HelloWorldJNI.java)0
-rw-r--r--src/it/it0003-jni/src/test/java/HelloWorldJNITest.java (renamed from src/it/jni/src/test/java/HelloWorldJNITest.java)0
-rw-r--r--src/site/apt/HelloWorld.apt4
11 files changed, 95 insertions, 12 deletions
diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
index 83838d3..369f297 100644
--- a/ReleaseNotes.txt
+++ b/ReleaseNotes.txt
@@ -15,6 +15,8 @@ Bugs
- Excecutable needs a test to run and verify the output of Executable.
+- Resource directory seems in GIT while it should not, it should be generated in target
+
- When it test fails it seems not reported in main pom, refer to executable
- nar-integration (our plugin copy) tests are not run when maven.tests.skip=true is set...
diff --git a/src/it/it-parent/pom.xml b/src/it/it-parent/pom.xml
index 003cca1..44a0010 100644
--- a/src/it/it-parent/pom.xml
+++ b/src/it/it-parent/pom.xml
@@ -43,6 +43,7 @@ under the License.
</snapshots>
</repository>
</repositories>
+
<pluginRepositories>
<pluginRepository>
<id>local.central</id>
@@ -55,4 +56,13 @@ under the License.
</snapshots>
</pluginRepository>
</pluginRepositories>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</project>
diff --git a/src/it/executable/pom.xml b/src/it/it0001-executable/pom.xml
index 98b664e..63391cf 100644
--- a/src/it/executable/pom.xml
+++ b/src/it/it0001-executable/pom.xml
@@ -29,7 +29,7 @@ under the License.
<relativePath>../it-parent/pom.xml</relativePath>
</parent>
- <artifactId>executable</artifactId>
+ <artifactId>it0001-executable</artifactId>
<packaging>nar</packaging>
<name>Maven NAR Executable Test</name>
diff --git a/src/it/executable/src/main/c/Executable.c b/src/it/it0001-executable/src/main/c/Executable.c
index d640602..d640602 100644
--- a/src/it/executable/src/main/c/Executable.c
+++ b/src/it/it0001-executable/src/main/c/Executable.c
diff --git a/src/it/it0002-executable-static/pom.xml b/src/it/it0002-executable-static/pom.xml
new file mode 100644
index 0000000..42d4e8b
--- /dev/null
+++ b/src/it/it0002-executable-static/pom.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.its.nar</groupId>
+ <artifactId>it-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <relativePath>../it-parent/pom.xml</relativePath>
+ </parent>
+
+ <artifactId>it0002-executable-static</artifactId>
+ <packaging>nar</packaging>
+
+ <name>Maven NAR Static Executable Test</name>
+ <version>1.0-SNAPSHOT</version>
+ <description>
+ Simple executable statically linked with the c runtime
+ </description>
+
+<!--
+ <properties>
+ <maven.test.skip>true</maven.test.skip>
+ </properties>
+-->
+
+ <build>
+ <defaultGoal>integration-test</defaultGoal>
+ <plugins>
+ <plugin>
+ <artifactId>maven-nar-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <runtime>static</runtime>
+ <libraries>
+ <library>
+ <type>executable</type>
+ <run>true</run>
+ </library>
+ </libraries>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/src/it/it0002-executable-static/src/main/c/HelloWorldExe.c b/src/it/it0002-executable-static/src/main/c/HelloWorldExe.c
new file mode 100644
index 0000000..d640602
--- /dev/null
+++ b/src/it/it0002-executable-static/src/main/c/HelloWorldExe.c
@@ -0,0 +1,8 @@
+#include <stdio.h>
+
+int main(int argc, char *argv[]) {
+ printf("Helloworld\n");
+ return 0;
+}
+
+
diff --git a/src/it/jni/pom.xml b/src/it/it0003-jni/pom.xml
index 486ac48..8c1881b 100644
--- a/src/it/jni/pom.xml
+++ b/src/it/it0003-jni/pom.xml
@@ -29,7 +29,7 @@ under the License.
<relativePath>../it-parent/pom.xml</relativePath>
</parent>
- <artifactId>jni</artifactId>
+ <artifactId>it0003-jni</artifactId>
<packaging>nar</packaging>
<name>Maven NAR JNI Test</name>
@@ -70,12 +70,4 @@ under the License.
</plugin>
</plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
</project>
diff --git a/src/it/jni/src/main/c/HelloWorldJNI.c b/src/it/it0003-jni/src/main/c/HelloWorldJNI.c
index 716722e..716722e 100644
--- a/src/it/jni/src/main/c/HelloWorldJNI.c
+++ b/src/it/it0003-jni/src/main/c/HelloWorldJNI.c
diff --git a/src/it/jni/src/main/java/com/mycompany/mypackage/HelloWorldJNI.java b/src/it/it0003-jni/src/main/java/com/mycompany/mypackage/HelloWorldJNI.java
index 2af3f3c..2af3f3c 100644
--- a/src/it/jni/src/main/java/com/mycompany/mypackage/HelloWorldJNI.java
+++ b/src/it/it0003-jni/src/main/java/com/mycompany/mypackage/HelloWorldJNI.java
diff --git a/src/it/jni/src/test/java/HelloWorldJNITest.java b/src/it/it0003-jni/src/test/java/HelloWorldJNITest.java
index 683c321..683c321 100644
--- a/src/it/jni/src/test/java/HelloWorldJNITest.java
+++ b/src/it/it0003-jni/src/test/java/HelloWorldJNITest.java
diff --git a/src/site/apt/HelloWorld.apt b/src/site/apt/HelloWorld.apt
index 3a11ce5..08138d3 100644
--- a/src/site/apt/HelloWorld.apt
+++ b/src/site/apt/HelloWorld.apt
@@ -15,13 +15,13 @@ There are also some unit test which are run and call the same method.
[executable] A C routine.
- [helloworldstaticexe] A C routine statically linked with the C-runtime library.
+ [executable-static] A C routine statically linked with the C-runtime library.
[]
[jni] A C routine called from Java and a Java unit test.
- [helloworldjnilibjava] A java project which depends on "jni".
+ [java-dep-jni] A java project which depends on "jni".
[helloworldstaticjni] A C routine called from Java statically linked with the C-runtime library and a Java unit test.