diff options
30 files changed, 73 insertions, 31 deletions
@@ -20,13 +20,14 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>maven-plugins</artifactId> - <groupId>org.apache.maven.plugins</groupId> - <version>18</version> + <groupId>org.sonatype.oss</groupId> + <artifactId>oss-parent</artifactId> + <version>7</version> </parent> + <groupId>io.trygvis.usb</groupId> <artifactId>maven-nar-plugin</artifactId> - <version>2.1-SNAPSHOT</version> + <version>2.1-trygvis-1-SNAPSHOT</version> <packaging>maven-plugin</packaging> <name>Maven NAR Plugin</name> @@ -36,6 +37,7 @@ <url>http://duns.github.com/maven-nar-plugin/</url> <!-- deploy to duns' github repository --> +<!-- <distributionManagement> <repository> <id>duns-maven-releases</id> @@ -48,22 +50,29 @@ <name>Duns' Maven Snapshots</name> <url>file:///Users/duns/sonatype/git/maven-snapshots</url> </snapshotRepository> - <!-- temporarily until we have a fixed site --> + <site> <id>local</id> <url>file:///Users/duns/sonatype/git/maven-nar-plugin-site</url> </site> </distributionManagement> +--> <prerequisites> <maven>2.0.9</maven> </prerequisites> +<!-- <scm> <connection>scm:git:git://github.com/duns/maven-nar-plugin.git</connection> <developerConnection>scm:git:git://github.com/duns/maven-nar-plugin.git</developerConnection> <url>http://github.com/duns/maven-nar-plugin</url> </scm> +--> + <scm> + <connection>scm:git:ssh://trygvis.io/~trygvis/git/2013/01/maven-nar-plugin.git</connection> + <developerConnection>scm:git:ssh://trygvis.io/~trygvis/git/2013/01/maven-nar-plugin.git</developerConnection> + </scm> <issueManagement> <system>jira</system> <url>http://issues.sonatype.org/browse/NAR</url> @@ -139,9 +148,12 @@ </exclusions> </dependency> <dependency> +<!-- <groupId>net.sf.antcontrib</groupId> +--> + <groupId>io.trygvis.usb</groupId> <artifactId>cpptasks-parallel</artifactId> - <version>1.0-beta-5-parallel-1-SNAPSHOT</version> + <version>1.0-beta-5-parallel-1-trygvis-1</version> </dependency> <dependency> <groupId>org.apache.bcel</groupId> diff --git a/src/it/it-parent/pom.xml b/src/it/it-parent/pom.xml index 9cbb2e2..06b8cf2 100644 --- a/src/it/it-parent/pom.xml +++ b/src/it/it-parent/pom.xml @@ -61,6 +61,7 @@ under the License. <pluginManagement> <plugins> <plugin> + <groupId>io.trygvis.usb</groupId> <artifactId>maven-nar-plugin</artifactId> <version>2.1-SNAPSHOT</version> </plugin> diff --git a/src/it/it0001-executable/pom.xml b/src/it/it0001-executable/pom.xml index 312b13f..cbc243e 100644 --- a/src/it/it0001-executable/pom.xml +++ b/src/it/it0001-executable/pom.xml @@ -47,6 +47,7 @@ under the License. <defaultGoal>integration-test</defaultGoal> <plugins> <plugin> + <groupId>io.trygvis.usb</groupId> <artifactId>maven-nar-plugin</artifactId> <extensions>true</extensions> <configuration> diff --git a/src/it/it0002-executable-static/pom.xml b/src/it/it0002-executable-static/pom.xml index 7c49baf..910f63a 100644 --- a/src/it/it0002-executable-static/pom.xml +++ b/src/it/it0002-executable-static/pom.xml @@ -46,6 +46,7 @@ under the License. <defaultGoal>integration-test</defaultGoal> <plugins> <plugin> + <groupId>io.trygvis.usb</groupId> <artifactId>maven-nar-plugin</artifactId> <extensions>true</extensions> <configuration> diff --git a/src/it/it0003-jni/pom.xml b/src/it/it0003-jni/pom.xml index e5086d5..f558bc9 100644 --- a/src/it/it0003-jni/pom.xml +++ b/src/it/it0003-jni/pom.xml @@ -47,6 +47,7 @@ under the License. <defaultGoal>install</defaultGoal> <plugins> <plugin> + <groupId>io.trygvis.usb</groupId> <artifactId>maven-nar-plugin</artifactId> <extensions>true</extensions> <configuration> diff --git a/src/it/it0004-java-dep-jni/pom.xml b/src/it/it0004-java-dep-jni/pom.xml index fc7a90d..1535ae6 100644 --- a/src/it/it0004-java-dep-jni/pom.xml +++ b/src/it/it0004-java-dep-jni/pom.xml @@ -45,6 +45,7 @@ under the License. <defaultGoal>integration-test</defaultGoal> <plugins> <plugin> + <groupId>io.trygvis.usb</groupId> <artifactId>maven-nar-plugin</artifactId> <extensions>true</extensions> </plugin> diff --git a/src/it/it0005-jni-static/pom.xml b/src/it/it0005-jni-static/pom.xml index 60d7ac0..905cb75 100644 --- a/src/it/it0005-jni-static/pom.xml +++ b/src/it/it0005-jni-static/pom.xml @@ -51,6 +51,7 @@ <defaultGoal>install</defaultGoal> <plugins> <plugin> + <groupId>io.trygvis.usb</groupId> <artifactId>maven-nar-plugin</artifactId> <extensions>true</extensions> <configuration> @@ -96,6 +97,7 @@ </configuration> </plugin> <plugin> + <groupId>io.trygvis.usb</groupId> <artifactId>maven-nar-plugin</artifactId> <extensions>true</extensions> <configuration> diff --git a/src/it/it0006-jni-3rdparty/pom.xml b/src/it/it0006-jni-3rdparty/pom.xml index addbc0f..2283376 100644 --- a/src/it/it0006-jni-3rdparty/pom.xml +++ b/src/it/it0006-jni-3rdparty/pom.xml @@ -47,6 +47,7 @@ under the License. <defaultGoal>integration-test</defaultGoal> <plugins> <plugin> + <groupId>io.trygvis.usb</groupId> <artifactId>maven-nar-plugin</artifactId> <extensions>true</extensions> <configuration> diff --git a/src/it/it0007-lib-shared/pom.xml b/src/it/it0007-lib-shared/pom.xml index 71bf48d..2b55c6f 100644 --- a/src/it/it0007-lib-shared/pom.xml +++ b/src/it/it0007-lib-shared/pom.xml @@ -47,6 +47,7 @@ under the License. <defaultGoal>install</defaultGoal> <plugins> <plugin> + <groupId>io.trygvis.usb</groupId> <artifactId>maven-nar-plugin</artifactId> <extensions>true</extensions> <configuration> diff --git a/src/it/it0008-executable-dep-lib-shared/pom.xml b/src/it/it0008-executable-dep-lib-shared/pom.xml index 8abea53..16f0f80 100644 --- a/src/it/it0008-executable-dep-lib-shared/pom.xml +++ b/src/it/it0008-executable-dep-lib-shared/pom.xml @@ -46,6 +46,7 @@ under the License. <defaultGoal>integration-test</defaultGoal> <plugins> <plugin> + <groupId>io.trygvis.usb</groupId> <artifactId>maven-nar-plugin</artifactId> <extensions>true</extensions> <configuration> diff --git a/src/it/it0009-jni-dep-lib-shared/pom.xml b/src/it/it0009-jni-dep-lib-shared/pom.xml index f893424..c27a3c6 100644 --- a/src/it/it0009-jni-dep-lib-shared/pom.xml +++ b/src/it/it0009-jni-dep-lib-shared/pom.xml @@ -46,6 +46,7 @@ under the License. <defaultGoal>integration-test</defaultGoal> <plugins> <plugin> + <groupId>io.trygvis.usb</groupId> <artifactId>maven-nar-plugin</artifactId> <extensions>true</extensions> <configuration> diff --git a/src/it/it0010-lib-static/pom.xml b/src/it/it0010-lib-static/pom.xml index 209c5f4..38c0a25 100644 --- a/src/it/it0010-lib-static/pom.xml +++ b/src/it/it0010-lib-static/pom.xml @@ -47,6 +47,7 @@ under the License. <defaultGoal>install</defaultGoal> <plugins> <plugin> + <groupId>io.trygvis.usb</groupId> <artifactId>maven-nar-plugin</artifactId> <extensions>true</extensions> <configuration> diff --git a/src/it/it0011-executable-dep-lib-static/pom.xml b/src/it/it0011-executable-dep-lib-static/pom.xml index 95a11a6..2182641 100644 --- a/src/it/it0011-executable-dep-lib-static/pom.xml +++ b/src/it/it0011-executable-dep-lib-static/pom.xml @@ -46,6 +46,7 @@ under the License. <defaultGoal>integration-test</defaultGoal> <plugins> <plugin> + <groupId>io.trygvis.usb</groupId> <artifactId>maven-nar-plugin</artifactId> <extensions>true</extensions> <configuration> diff --git a/src/it/it0012-jni-dep-lib-static/pom.xml b/src/it/it0012-jni-dep-lib-static/pom.xml index adee1ac..48be211 100644 --- a/src/it/it0012-jni-dep-lib-static/pom.xml +++ b/src/it/it0012-jni-dep-lib-static/pom.xml @@ -46,6 +46,7 @@ under the License. <defaultGoal>integration-test</defaultGoal> <plugins> <plugin> + <groupId>io.trygvis.usb</groupId> <artifactId>maven-nar-plugin</artifactId> <extensions>true</extensions> <configuration> diff --git a/src/it/it0013-gnu-executable/pom.xml b/src/it/it0013-gnu-executable/pom.xml index 5f36ada..81ad71f 100644 --- a/src/it/it0013-gnu-executable/pom.xml +++ b/src/it/it0013-gnu-executable/pom.xml @@ -47,6 +47,7 @@ under the License. <defaultGoal>integration-test</defaultGoal> <plugins> <plugin> + <groupId>io.trygvis.usb</groupId> <artifactId>maven-nar-plugin</artifactId> <extensions>true</extensions> <configuration> diff --git a/src/it/it0014-multi-module/it0014-jni-dep-lib-shared/pom.xml b/src/it/it0014-multi-module/it0014-jni-dep-lib-shared/pom.xml index 90439ad..ea19c0a 100644 --- a/src/it/it0014-multi-module/it0014-jni-dep-lib-shared/pom.xml +++ b/src/it/it0014-multi-module/it0014-jni-dep-lib-shared/pom.xml @@ -44,6 +44,7 @@ under the License. <build> <plugins> <plugin> + <groupId>io.trygvis.usb</groupId> <artifactId>maven-nar-plugin</artifactId> <extensions>true</extensions> <configuration> diff --git a/src/it/it0014-multi-module/it0014-lib-shared/pom.xml b/src/it/it0014-multi-module/it0014-lib-shared/pom.xml index 8a71389..0025a44 100644 --- a/src/it/it0014-multi-module/it0014-lib-shared/pom.xml +++ b/src/it/it0014-multi-module/it0014-lib-shared/pom.xml @@ -45,6 +45,7 @@ under the License. <build> <plugins> <plugin> + <groupId>io.trygvis.usb</groupId> <artifactId>maven-nar-plugin</artifactId> <extensions>true</extensions> <configuration> diff --git a/src/it/it0015-cpp-executable/pom.xml b/src/it/it0015-cpp-executable/pom.xml index 84b1f8c..b555e78 100644 --- a/src/it/it0015-cpp-executable/pom.xml +++ b/src/it/it0015-cpp-executable/pom.xml @@ -47,6 +47,7 @@ under the License. <defaultGoal>integration-test</defaultGoal> <plugins> <plugin> + <groupId>io.trygvis.usb</groupId> <artifactId>maven-nar-plugin</artifactId> <extensions>true</extensions> <configuration> diff --git a/src/it/it0016-layout/it0016-exe-dep-lib-layout20/pom.xml b/src/it/it0016-layout/it0016-exe-dep-lib-layout20/pom.xml index e1d4b26..350ec5d 100644 --- a/src/it/it0016-layout/it0016-exe-dep-lib-layout20/pom.xml +++ b/src/it/it0016-layout/it0016-exe-dep-lib-layout20/pom.xml @@ -45,6 +45,7 @@ under the License. <defaultGoal>integration-test</defaultGoal> <plugins> <plugin> + <groupId>io.trygvis.usb</groupId> <artifactId>maven-nar-plugin</artifactId> <extensions>true</extensions> <configuration> diff --git a/src/it/it0016-layout/it0016-exe-dep-lib-layout21/pom.xml b/src/it/it0016-layout/it0016-exe-dep-lib-layout21/pom.xml index f620fae..a5db918 100644 --- a/src/it/it0016-layout/it0016-exe-dep-lib-layout21/pom.xml +++ b/src/it/it0016-layout/it0016-exe-dep-lib-layout21/pom.xml @@ -45,6 +45,7 @@ under the License. <defaultGoal>integration-test</defaultGoal> <plugins> <plugin> + <groupId>io.trygvis.usb</groupId> <artifactId>maven-nar-plugin</artifactId> <extensions>true</extensions> <configuration> diff --git a/src/it/it0016-layout/it0016-lib-layout20/pom.xml b/src/it/it0016-layout/it0016-lib-layout20/pom.xml index 36971d0..f4d1bfc 100644 --- a/src/it/it0016-layout/it0016-lib-layout20/pom.xml +++ b/src/it/it0016-layout/it0016-lib-layout20/pom.xml @@ -46,6 +46,7 @@ under the License. <defaultGoal>install</defaultGoal> <plugins> <plugin> + <groupId>io.trygvis.usb</groupId> <artifactId>maven-nar-plugin</artifactId> <extensions>true</extensions> <configuration> diff --git a/src/it/it0016-layout/it0016-lib-layout21/pom.xml b/src/it/it0016-layout/it0016-lib-layout21/pom.xml index 1bf9af4..16809b3 100644 --- a/src/it/it0016-layout/it0016-lib-layout21/pom.xml +++ b/src/it/it0016-layout/it0016-lib-layout21/pom.xml @@ -46,6 +46,7 @@ under the License. <defaultGoal>install</defaultGoal> <plugins> <plugin> + <groupId>io.trygvis.usb</groupId> <artifactId>maven-nar-plugin</artifactId> <extensions>true</extensions> <configuration> diff --git a/src/it/it0017-toolchain/pom.xml b/src/it/it0017-toolchain/pom.xml index f674f40..9ef5b4a 100644 --- a/src/it/it0017-toolchain/pom.xml +++ b/src/it/it0017-toolchain/pom.xml @@ -67,6 +67,7 @@ under the License. </configuration> </plugin> <plugin> + <groupId>io.trygvis.usb</groupId> <artifactId>maven-nar-plugin</artifactId> <extensions>true</extensions> <configuration> diff --git a/src/it/it0018-fortran/pom.xml b/src/it/it0018-fortran/pom.xml index 88d3d91..b890340 100644 --- a/src/it/it0018-fortran/pom.xml +++ b/src/it/it0018-fortran/pom.xml @@ -53,6 +53,7 @@ under the License. <defaultGoal>install</defaultGoal> <plugins> <plugin> + <groupId>io.trygvis.usb</groupId> <artifactId>maven-nar-plugin</artifactId> <extensions>true</extensions> <configuration> @@ -84,6 +85,7 @@ under the License. <defaultGoal>install</defaultGoal> <plugins> <plugin> + <groupId>io.trygvis.usb</groupId> <artifactId>maven-nar-plugin</artifactId> <extensions>true</extensions> <configuration> diff --git a/src/it/it0019-compiler/pom.xml b/src/it/it0019-compiler/pom.xml index 40c199b..3bf4cb0 100644 --- a/src/it/it0019-compiler/pom.xml +++ b/src/it/it0019-compiler/pom.xml @@ -47,6 +47,7 @@ under the License. <defaultGoal>integration-test</defaultGoal> <plugins> <plugin> + <groupId>io.trygvis.usb</groupId> <artifactId>maven-nar-plugin</artifactId> <extensions>true</extensions> <configuration> diff --git a/src/it/it0020-lib-3rdparty/pom.xml b/src/it/it0020-lib-3rdparty/pom.xml index b81bc07..81359fe 100644 --- a/src/it/it0020-lib-3rdparty/pom.xml +++ b/src/it/it0020-lib-3rdparty/pom.xml @@ -46,6 +46,7 @@ under the License. <defaultGoal>install</defaultGoal> <plugins> <plugin> + <groupId>io.trygvis.usb</groupId> <artifactId>maven-nar-plugin</artifactId> <extensions>true</extensions> <configuration> diff --git a/src/it/it0021-executable-dep-lib-3rdparty/pom.xml b/src/it/it0021-executable-dep-lib-3rdparty/pom.xml index 60e5504..5ebb3c5 100644 --- a/src/it/it0021-executable-dep-lib-3rdparty/pom.xml +++ b/src/it/it0021-executable-dep-lib-3rdparty/pom.xml @@ -46,6 +46,7 @@ under the License. <defaultGoal>integration-test</defaultGoal> <plugins> <plugin> + <groupId>io.trygvis.usb</groupId> <artifactId>maven-nar-plugin</artifactId> <extensions>true</extensions> <configuration> diff --git a/src/it/it0022-objective-c-executable/pom.xml b/src/it/it0022-objective-c-executable/pom.xml index b202183..c19a115 100644 --- a/src/it/it0022-objective-c-executable/pom.xml +++ b/src/it/it0022-objective-c-executable/pom.xml @@ -47,6 +47,7 @@ under the License. <defaultGoal>integration-test</defaultGoal> <plugins> <plugin> + <groupId>io.trygvis.usb</groupId> <artifactId>maven-nar-plugin</artifactId> <extensions>true</extensions> <configuration> diff --git a/src/it/it0023-local-aol-properties/pom.xml b/src/it/it0023-local-aol-properties/pom.xml index f74649d..d814f65 100644 --- a/src/it/it0023-local-aol-properties/pom.xml +++ b/src/it/it0023-local-aol-properties/pom.xml @@ -47,6 +47,7 @@ under the License. <defaultGoal>install</defaultGoal> <plugins> <plugin> + <groupId>io.trygvis.usb</groupId> <artifactId>maven-nar-plugin</artifactId> <extensions>true</extensions> <configuration> diff --git a/src/main/resources/META-INF/plexus/components.xml b/src/main/resources/META-INF/plexus/components.xml index 6030fbe..44882e4 100644 --- a/src/main/resources/META-INF/plexus/components.xml +++ b/src/main/resources/META-INF/plexus/components.xml @@ -24,42 +24,42 @@ </implementation> <configuration> <phases> - <validate>org.apache.maven.plugins:maven-nar-plugin:nar-validate</validate> + <validate>io.trygvis.usb:maven-nar-plugin:nar-validate</validate> <initialize></initialize> - <generate-sources>org.apache.maven.plugins:maven-nar-plugin:nar-download + <generate-sources>io.trygvis.usb:maven-nar-plugin:nar-download </generate-sources> - <process-sources>org.apache.maven.plugins:maven-nar-plugin:nar-unpack, - org.apache.maven.plugins:maven-nar-plugin:nar-gnu-configure + <process-sources>io.trygvis.usb:maven-nar-plugin:nar-unpack, + io.trygvis.usb:maven-nar-plugin:nar-gnu-configure </process-sources> - <generate-resources>org.apache.maven.plugins:maven-nar-plugin:nar-system-generate + <generate-resources>io.trygvis.usb:maven-nar-plugin:nar-system-generate </generate-resources> <process-resources>org.apache.maven.plugins:maven-resources-plugin:resources, - org.apache.maven.plugins:maven-nar-plugin:nar-resources, - org.apache.maven.plugins:maven-nar-plugin:nar-gnu-resources, - org.apache.maven.plugins:maven-nar-plugin:nar-vcproj + io.trygvis.usb:maven-nar-plugin:nar-resources, + io.trygvis.usb:maven-nar-plugin:nar-gnu-resources, + io.trygvis.usb:maven-nar-plugin:nar-vcproj </process-resources> <compile>org.apache.maven.plugins:maven-compiler-plugin:compile, - org.apache.maven.plugins:maven-nar-plugin:nar-javah, - org.apache.maven.plugins:maven-nar-plugin:nar-gnu-make, - org.apache.maven.plugins:maven-nar-plugin:nar-compile + io.trygvis.usb:maven-nar-plugin:nar-javah, + io.trygvis.usb:maven-nar-plugin:nar-gnu-make, + io.trygvis.usb:maven-nar-plugin:nar-compile </compile> - <process-classes>org.apache.maven.plugins:maven-nar-plugin:nar-gnu-process + <process-classes>io.trygvis.usb:maven-nar-plugin:nar-gnu-process </process-classes> - <generate-test-sources>org.apache.maven.plugins:maven-nar-plugin:nar-testDownload</generate-test-sources> - <process-test-sources>org.apache.maven.plugins:maven-nar-plugin:nar-testUnpack</process-test-sources> + <generate-test-sources>io.trygvis.usb:maven-nar-plugin:nar-testDownload</generate-test-sources> + <process-test-sources>io.trygvis.usb:maven-nar-plugin:nar-testUnpack</process-test-sources> <generate-test-resources></generate-test-resources> <process-test-resources>org.apache.maven.plugins:maven-resources-plugin:testResources </process-test-resources> <test-compile>org.apache.maven.plugins:maven-compiler-plugin:testCompile </test-compile> - <process-test-classes>org.apache.maven.plugins:maven-nar-plugin:nar-testCompile + <process-test-classes>io.trygvis.usb:maven-nar-plugin:nar-testCompile </process-test-classes> <test>org.apache.maven.plugins:maven-surefire-plugin:test, - org.apache.maven.plugins:maven-nar-plugin:nar-test</test> - <package>org.apache.maven.plugins:maven-nar-plugin:nar-package, + io.trygvis.usb:maven-nar-plugin:nar-test</test> + <package>io.trygvis.usb:maven-nar-plugin:nar-package, org.apache.maven.plugins:maven-jar-plugin:jar</package> <pre-integration-test></pre-integration-test> - <integration-test>org.apache.maven.plugins:maven-nar-plugin:nar-integration-test + <integration-test>io.trygvis.usb:maven-nar-plugin:nar-integration-test </integration-test> <post-integration-test></post-integration-test> <verify></verify> @@ -71,20 +71,20 @@ </configuration> </component> -<!-- Do not declare the NarArtifactHandler here for role-hint nar, as we really use the DefaultArtifactHandler, except for packing --> + <!-- Do not declare the NarArtifactHandler here for role-hint nar, as we really use the DefaultArtifactHandler, except for packing --> <component> <role>org.apache.maven.artifact.handler.ArtifactHandler</role> -<!-- NAR-121 - <role-hint>nar-package</role-hint> - --> + <!-- NAR-121 + <role-hint>nar-package</role-hint> + --> <role-hint>nar</role-hint> <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler </implementation> <configuration> <type>nar</type> -<!-- NAR-121 - <extension>jar</extension> ---> + <!-- NAR-121 + <extension>jar</extension> + --> <extension>nar</extension> <packaging>nar</packaging> <language>java</language> |