summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Donszelmann <Mark.Donszelmann@gmail.com>2009-12-02 15:30:06 +0100
committerMark Donszelmann <Mark.Donszelmann@gmail.com>2009-12-02 15:30:06 +0100
commit66e677ea889d6f2441322670a199f05c9ae582f8 (patch)
tree920ec88b255d1eff779f06de02b6cfdfd3a75f74
parentcd4ddec0a0c14db770877eb0211327c57c0cff08 (diff)
downloadmaven-nar-plugin-66e677ea889d6f2441322670a199f05c9ae582f8.tar.gz
maven-nar-plugin-66e677ea889d6f2441322670a199f05c9ae582f8.tar.bz2
maven-nar-plugin-66e677ea889d6f2441322670a199f05c9ae582f8.tar.xz
maven-nar-plugin-66e677ea889d6f2441322670a199f05c9ae582f8.zip
Added it0021, disabled for now
-rw-r--r--pom.xml26
-rw-r--r--src/it/it0021-executable-dep-lib-3rdparty/pom.xml69
-rw-r--r--src/it/it0021-executable-dep-lib-3rdparty/src/main/c/HelloWorldExe.c9
3 files changed, 80 insertions, 24 deletions
diff --git a/pom.xml b/pom.xml
index c55d48b..2ee919c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -162,30 +162,6 @@
<build>
<defaultGoal>install</defaultGoal>
- <plugins>
-<!-- FIXME NAR-73, wait for this plugin to be available
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-toolchains-plugin</artifactId>
- <version>1.0</version>
- <executions>
- <execution>
- <phase>validate</phase>
- <goals>
- <goal>toolchain</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <toolchains>
- <jdk>
- <version>[1.4)</version>
- </jdk>
- </toolchains>
- </configuration>
- </plugin>
--->
- </plugins>
</build>
<reporting>
@@ -243,12 +219,14 @@
<setupInclude>it0003-jni/pom.xml</setupInclude>
<setupInclude>it0007-lib-shared/pom.xml</setupInclude>
<setupInclude>it0010-lib-static/pom.xml</setupInclude>
+ <setupInclude>it0020-lib-3rdparty/pom.xml</setupInclude>
</setupIncludes>
<pomIncludes>
<pomInclude>*/pom.xml</pomInclude>
</pomIncludes>
<pomExcludes>
<pomExclude>it-parent/**</pomExclude>
+ <pomExclude>it0021-*/**</pomExclude>
</pomExcludes>
<localRepositoryPath>${project.build.directory}/it-repo</localRepositoryPath>
<settingsFile>src/it/settings.xml</settingsFile>
diff --git a/src/it/it0021-executable-dep-lib-3rdparty/pom.xml b/src/it/it0021-executable-dep-lib-3rdparty/pom.xml
new file mode 100644
index 0000000..b39096b
--- /dev/null
+++ b/src/it/it0021-executable-dep-lib-3rdparty/pom.xml
@@ -0,0 +1,69 @@
+<?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>it0021-executable-dep-lib-3rdparty</artifactId>
+ <packaging>nar</packaging>
+
+ <name>Maven NAR Executable dependent on 3rdParty Library</name>
+ <version>1.0-SNAPSHOT</version>
+ <description>
+ Executable depending on a shared 3rd party library.
+ </description>
+
+ <properties>
+ <skipTests>true</skipTests>
+ </properties>
+
+ <build>
+ <defaultGoal>integration-test</defaultGoal>
+ <plugins>
+ <plugin>
+ <artifactId>maven-nar-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <libraries>
+ <library>
+ <type>executable</type>
+ <run>true</run>
+ </library>
+ </libraries>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.nar</groupId>
+ <artifactId>it0020-lib-3rdparty</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/src/it/it0021-executable-dep-lib-3rdparty/src/main/c/HelloWorldExe.c b/src/it/it0021-executable-dep-lib-3rdparty/src/main/c/HelloWorldExe.c
new file mode 100644
index 0000000..4aa35d8
--- /dev/null
+++ b/src/it/it0021-executable-dep-lib-3rdparty/src/main/c/HelloWorldExe.c
@@ -0,0 +1,9 @@
+#include <stdio.h>
+#include "HelloWorldLib.h"
+
+int main(int argc, char *argv[]) {
+ printf("%s\n", HelloWorldLib_sayHello());
+ return 0;
+}
+
+