You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by al...@apache.org on 2017/02/17 23:04:01 UTC
svn commit: r1783475 - in /aries/trunk/blueprint/plugin: ./
blueprint-maven-plugin-itest/ blueprint-maven-plugin-itest/src/
blueprint-maven-plugin-itest/src/it/
blueprint-maven-plugin-itest/src/it/custom-destination/
blueprint-maven-plugin-itest/src/it...
Author: alien11689
Date: Fri Feb 17 23:04:01 2017
New Revision: 1783475
URL: http://svn.apache.org/viewvc?rev=1783475&view=rev
Log:
[ARIES-1685] Move BMP itests to separate module
Added:
aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/
aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/pom.xml
- copied, changed from r1783474, aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml
aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/src/
aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/src/it/
- copied from r1783474, aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/
Removed:
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/
Modified:
aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/src/it/custom-destination/pom.xml
aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/src/it/multiple-invocation/pom.xml
aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/src/it/scanpath-restrict/pom.xml
aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/src/it/simple-project/pom.xml
aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml
aries/trunk/blueprint/plugin/pom.xml
Copied: aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/pom.xml (from r1783474, aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml)
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/pom.xml?p2=aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/pom.xml&p1=aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml&r1=1783474&r2=1783475&rev=1783475&view=diff
==============================================================================
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml (original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/pom.xml Fri Feb 17 23:04:01 2017
@@ -29,26 +29,22 @@
</parent>
<groupId>org.apache.aries.blueprint</groupId>
- <artifactId>blueprint-maven-plugin</artifactId>
- <packaging>maven-plugin</packaging>
- <version>1.5.1-SNAPSHOT</version>
- <name>Apache Aries Blueprint Maven Plugin</name>
- <description>
- Maven plugin to create blueprint files from annotations
- </description>
+ <artifactId>blueprint-maven-plugin-itest</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0.0-SNAPSHOT</version>
+ <name>Apache Aries Blueprint Maven Plugin iTest</name>
<properties>
- <maven.version>3.0.5</maven.version>
- <aether.version>1.11</aether.version>
+ <blueprint-maven-plugin.version>1.5.1-SNAPSHOT</blueprint-maven-plugin.version>
</properties>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin
+ scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest
</developerConnection>
- <url>http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin</url>
+ <url>http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest</url>
</scm>
<build>
@@ -61,45 +57,6 @@
</configuration>
</plugin>
<plugin>
- <artifactId>maven-plugin-plugin</artifactId>
- <version>3.4</version>
- <executions>
- <execution>
- <id>default-descriptor</id>
- <goals>
- <goal>descriptor</goal>
- </goals>
- <phase>process-classes</phase>
- </execution>
- <execution>
- <id>help-descriptor</id>
- <goals>
- <goal>helpmojo</goal>
- </goals>
- <phase>process-classes</phase>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>resource-dependencies</id>
- <phase>process-test-resources</phase>
- <goals>
- <goal>unpack-dependencies</goal>
- </goals>
- <configuration>
- <!--<includeArtifactIds>org.apache.aries.blueprint.api</includeArtifactIds>-->
- <includes>**/aries/**/*.xsd</includes>
- <outputDirectory>${project.build.directory}/test-classes/schema</outputDirectory>
- <outputAbsoluteArtifactFilename>true</outputAbsoluteArtifactFilename>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
<version>1.10</version>
@@ -120,234 +77,5 @@
</executions>
</plugin>
</plugins>
- <pluginManagement>
- <plugins>
- <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build
- itself. -->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>
- org.apache.maven.plugins
- </groupId>
- <artifactId>
- maven-plugin-plugin
- </artifactId>
- <versionRange>
- [3.2,)
- </versionRange>
- <goals>
- <goal>descriptor</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore />
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
-
</build>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.aries.blueprint</groupId>
- <artifactId>blueprint-maven-plugin-spi</artifactId>
- <version>1.0.0</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.plugin-tools</groupId>
- <artifactId>maven-plugin-annotations</artifactId>
- <version>3.4</version>
- </dependency>
- <dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- <version>1</version>
- </dependency>
- <dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>javax.transaction-api</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
- <groupId>javax.enterprise</groupId>
- <artifactId>cdi-api</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
- <version>1.0.2</version>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.cdi</groupId>
- <artifactId>pax-cdi-api</artifactId>
- <version>0.8.0</version>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- <version>6.0.0</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.aries.blueprint</groupId>
- <artifactId>blueprint-maven-plugin-annotation</artifactId>
- <version>1.1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- <version>${maven.version}</version>
- </dependency>
- <dependency>
- <groupId>org.sonatype.aether</groupId>
- <artifactId>aether-api</artifactId>
- <version>${aether.version}</version>
- </dependency>
- <dependency>
- <groupId>org.sonatype.aether</groupId>
- <artifactId>aether-util</artifactId>
- <version>${aether.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact</artifactId>
- <version>${maven.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-core</artifactId>
- <version>${maven.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-compat</artifactId>
- <version>${maven.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-http-lightweight</artifactId>
- <version>2.6</version>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <version>1.7.7</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-filtering</artifactId>
- <version>1.0-beta-4</version>
- </dependency>
- <dependency>
- <groupId>org.sonatype.plexus</groupId>
- <artifactId>plexus-build-api</artifactId>
- <version>0.0.7</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <version>3.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-finder-shaded</artifactId>
- <version>4.5</version>
- </dependency>
-
- <!-- For the spring annotations -->
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>3.1.4.RELEASE</version>
- <exclusions>
- <exclusion>
- <artifactId>spring-aop</artifactId>
- <groupId>org.springframework</groupId>
- </exclusion>
- <exclusion>
- <artifactId>spring-core</artifactId>
- <groupId>org.springframework</groupId>
- </exclusion>
- <exclusion>
- <artifactId>spring-expression</artifactId>
- <groupId>org.springframework</groupId>
- </exclusion>
- <exclusion>
- <artifactId>spring-asm</artifactId>
- <groupId>org.springframework</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-tx</artifactId>
- <version>3.1.4.RELEASE</version>
- </dependency>
-
- <!-- For the CDI annotations -->
- <dependency>
- <groupId>javax.transaction.cdi</groupId>
- <artifactId>javax.transaction.cdi-api</artifactId>
- <version>1.2-b03</version>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.aries.blueprint</groupId>
- <artifactId>org.apache.aries.blueprint.api</artifactId>
- <version>1.0.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.blueprint</groupId>
- <artifactId>org.apache.aries.blueprint.core</artifactId>
- <version>1.7.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.transaction</groupId>
- <artifactId>org.apache.aries.transaction.blueprint</artifactId>
- <version>1.1.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.jpa</groupId>
- <artifactId>org.apache.aries.jpa.blueprint.aries</artifactId>
- <version>1.0.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.blueprint</groupId>
- <artifactId>org.apache.aries.blueprint.cm</artifactId>
- <version>1.0.9</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
</project>
Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/src/it/custom-destination/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/src/it/custom-destination/pom.xml?rev=1783475&r1=1783474&r2=1783475&view=diff
==============================================================================
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/src/it/custom-destination/pom.xml (original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/src/it/custom-destination/pom.xml Fri Feb 17 23:04:01 2017
@@ -39,7 +39,7 @@
<plugin>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>blueprint-maven-plugin</artifactId>
- <version>@project.version@</version>
+ <version>@blueprint-maven-plugin.version@</version>
<configuration>
<generatedFileName>blueprint.xml</generatedFileName>
<generatedDir>custom/my</generatedDir>
Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/src/it/multiple-invocation/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/src/it/multiple-invocation/pom.xml?rev=1783475&r1=1783474&r2=1783475&view=diff
==============================================================================
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/src/it/multiple-invocation/pom.xml (original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/src/it/multiple-invocation/pom.xml Fri Feb 17 23:04:01 2017
@@ -39,7 +39,7 @@
<plugin>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>blueprint-maven-plugin</artifactId>
- <version>@project.version@</version>
+ <version>@blueprint-maven-plugin.version@</version>
<executions>
<execution>
<id>p1</id>
Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/src/it/scanpath-restrict/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/src/it/scanpath-restrict/pom.xml?rev=1783475&r1=1783474&r2=1783475&view=diff
==============================================================================
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/src/it/scanpath-restrict/pom.xml (original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/src/it/scanpath-restrict/pom.xml Fri Feb 17 23:04:01 2017
@@ -39,7 +39,7 @@
<plugin>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>blueprint-maven-plugin</artifactId>
- <version>@project.version@</version>
+ <version>@blueprint-maven-plugin.version@</version>
<configuration>
<scanPaths>
<scanPath>p2</scanPath>
Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/src/it/simple-project/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/src/it/simple-project/pom.xml?rev=1783475&r1=1783474&r2=1783475&view=diff
==============================================================================
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/src/it/simple-project/pom.xml (original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/src/it/simple-project/pom.xml Fri Feb 17 23:04:01 2017
@@ -39,7 +39,7 @@
<plugin>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>blueprint-maven-plugin</artifactId>
- <version>@project.version@</version>
+ <version>@blueprint-maven-plugin.version@</version>
<executions>
<execution>
<goals>
Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml?rev=1783475&r1=1783474&r2=1783475&view=diff
==============================================================================
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml (original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml Fri Feb 17 23:04:01 2017
@@ -99,26 +99,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-invoker-plugin</artifactId>
- <version>1.10</version>
- <configuration>
- <projectsDirectory>src/it</projectsDirectory>
- <pomIncludes>
- <pomInclude>**/pom.xml</pomInclude>
- </pomIncludes>
- <postBuildHookScript>verify</postBuildHookScript>
- <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
<pluginManagement>
<plugins>
Modified: aries/trunk/blueprint/plugin/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/pom.xml?rev=1783475&r1=1783474&r2=1783475&view=diff
==============================================================================
--- aries/trunk/blueprint/plugin/pom.xml (original)
+++ aries/trunk/blueprint/plugin/pom.xml Fri Feb 17 23:04:01 2017
@@ -37,6 +37,7 @@
<module>blueprint-maven-plugin-spi</module>
<module>blueprint-maven-plugin-annotation</module>
<module>blueprint-maven-plugin</module>
+ <module>blueprint-maven-plugin-itest</module>
</modules>
</project>