You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by ro...@apache.org on 2019/05/28 16:10:45 UTC
[aries-component-dsl] 01/02: more build cleanup
This is an automated email from the ASF dual-hosted git repository.
rotty3000 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-component-dsl.git
commit f053ac50b135a042789cb2de63e3f5ebb3af1e28
Author: Raymond Augé <ra...@liferay.com>
AuthorDate: Tue May 28 12:05:13 2019 -0400
more build cleanup
Signed-off-by: Raymond Augé <ra...@liferay.com>
---
component-dsl/pom.xml | 22 +++-----
itests-run/pom.xml | 138 +++++++++++++++++++++++++-------------------------
itests/pom.xml | 16 ++----
pom.xml | 36 ++++++-------
4 files changed, 93 insertions(+), 119 deletions(-)
diff --git a/component-dsl/pom.xml b/component-dsl/pom.xml
index 09d4274..3a1eeac 100644
--- a/component-dsl/pom.xml
+++ b/component-dsl/pom.xml
@@ -57,7 +57,7 @@
<plugin>
<groupId>biz.aQute.bnd</groupId>
<artifactId>bnd-maven-plugin</artifactId>
- <version>3.4.0</version>
+ <version>${bnd.version}</version>
<executions>
<execution>
<goals>
@@ -69,7 +69,7 @@
<plugin>
<groupId>biz.aQute.bnd</groupId>
<artifactId>bnd-baseline-maven-plugin</artifactId>
- <version>3.4.0</version>
+ <version>${bnd.version}</version>
<configuration>
<base>
<version>1.2.0</version>
@@ -86,29 +86,19 @@
</plugin>
</plugins>
</build>
+
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>6.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
<artifactId>org.osgi.service.cm</artifactId>
<version>1.5.0</version>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<scm>
- <connection>scm:git:git@github.com:apache/aries-component-dsl.git/component-dsl</connection>
- <developerConnection>scm:git:git@github.com:apache/aries-component-dsl.git/component-dsl</developerConnection>
- <url>https://github.com/apache/aries-component-dsl/component-dsl</url>
+ <connection>scm:git:git@github.com:apache/aries-component-dsl.git</connection>
+ <developerConnection>scm:git:git@github.com:apache/aries-component-dsl.git</developerConnection>
+ <url>https://github.com/apache/aries-component-dsl</url>
</scm>
</project>
\ No newline at end of file
diff --git a/itests-run/pom.xml b/itests-run/pom.xml
index 5bd122d..ce177eb 100644
--- a/itests-run/pom.xml
+++ b/itests-run/pom.xml
@@ -16,91 +16,91 @@
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>
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.aries.component-dsl</groupId>
- <artifactId>org.apache.aries.component-dsl.parent</artifactId>
- <version>1.2.2-SNAPSHOT</version>
- <relativePath>..</relativePath>
- </parent>
+ <parent>
+ <groupId>org.apache.aries.component-dsl</groupId>
+ <artifactId>org.apache.aries.component-dsl.parent</artifactId>
+ <version>1.2.2-SNAPSHOT</version>
+ <relativePath>..</relativePath>
+ </parent>
- <artifactId>org.apache.aries.component-dsl.itests-run</artifactId>
- <description>Apache Aries Component DSL Integration Test Plan</description>
- <name>Apache Aries Component DSL Integration Test Plan</name>
- <packaging>pom</packaging>
+ <artifactId>org.apache.aries.component-dsl.itests-run</artifactId>
+ <description>Apache Aries Component DSL Integration Test Plan</description>
+ <name>Apache Aries Component DSL Integration Test Plan</name>
+ <packaging>pom</packaging>
- <build>
- <plugins>
- <plugin>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-testing-maven-plugin</artifactId>
- <version>3.4.0</version>
- <configuration>
- <failOnChanges>false</failOnChanges>
- <resolve>false</resolve>
- <bndruns>
- <bndrun>itest.bndrun</bndrun>
- </bndruns>
- <targetDir>.</targetDir>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>testing</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>org.apache.aries.component-dsl</groupId>
- <artifactId>org.apache.aries.component-dsl.itests</artifactId>
- <version>1.2.2-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.component-dsl</groupId>
- <artifactId>org.apache.aries.component-dsl.component-dsl</artifactId>
- <version>1.2.2-SNAPSHOT</version>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-testing-maven-plugin</artifactId>
+ <version>${bnd.version}</version>
+ <configuration>
+ <failOnChanges>false</failOnChanges>
+ <resolve>false</resolve>
+ <bndruns>
+ <bndrun>itest.bndrun</bndrun>
+ </bndruns>
+ <targetDir>.</targetDir>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>testing</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.aries.component-dsl</groupId>
+ <artifactId>org.apache.aries.component-dsl.itests</artifactId>
+ <version>1.2.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.component-dsl</groupId>
+ <artifactId>org.apache.aries.component-dsl.component-dsl</artifactId>
+ <version>1.2.2-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.configadmin</artifactId>
- <version>1.8.8</version>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.configadmin</artifactId>
+ <version>1.8.8</version>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.eclipse.osgi</artifactId>
- <version>3.10.100.v20150529-1857</version>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.eclipse.osgi</artifactId>
+ <version>3.10.100.v20150529-1857</version>
</dependency>
<dependency>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>biz.aQute.tester</artifactId>
- <version>3.4.0</version>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>biz.aQute.tester</artifactId>
+ <version>3.4.0</version>
</dependency>
<dependency>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>biz.aQute.launcher</artifactId>
- <version>3.4.0</version>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>biz.aQute.launcher</artifactId>
+ <version>3.4.0</version>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.enroute.junit.wrapper</artifactId>
- <version>4.12.0</version>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.enroute.junit.wrapper</artifactId>
+ <version>4.12.0</version>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.enroute.hamcrest.wrapper</artifactId>
- <version>1.3.0</version>
- </dependency>
- </dependencies>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.enroute.hamcrest.wrapper</artifactId>
+ <version>1.3.0</version>
+ </dependency>
+ </dependencies>
<scm>
- <connection>scm:git:git@github.com:apache/aries-component-dsl.git/itests-run</connection>
- <developerConnection>scm:git:git@github.com:apache/aries-component-dsl.git/itests-run</developerConnection>
- <url>https://github.com/apache/aries-component-dsl/itests-run</url>
+ <connection>scm:git:git@github.com:apache/aries-component-dsl.git</connection>
+ <developerConnection>scm:git:git@github.com:apache/aries-component-dsl.git</developerConnection>
+ <url>https://github.com/apache/aries-component-dsl</url>
</scm>
-
+
</project>
\ No newline at end of file
diff --git a/itests/pom.xml b/itests/pom.xml
index c199ce0..28bf87e 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -35,22 +35,12 @@
<artifactId>org.apache.aries.component-dsl.component-dsl</artifactId>
<version>1.2.2-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>6.0.0</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</version>
- </dependency>
</dependencies>
<scm>
- <connection>scm:git:git@github.com:apache/aries-component-dsl.git/itests</connection>
- <developerConnection>scm:git:git@github.com:apache/aries-component-dsl.git/itests</developerConnection>
- <url>https://github.com/apache/aries-component-dsl/itests</url>
+ <connection>scm:git:git@github.com:apache/aries-component-dsl.git</connection>
+ <developerConnection>scm:git:git@github.com:apache/aries-component-dsl.git</developerConnection>
+ <url>https://github.com/apache/aries-component-dsl</url>
</scm>
</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index b0a9dd7..f65aa70 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,6 +33,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <bnd.version>4.2.0</bnd.version>
</properties>
<build>
@@ -59,7 +60,7 @@
<plugin>
<groupId>biz.aQute.bnd</groupId>
<artifactId>bnd-maven-plugin</artifactId>
- <version>3.3.0</version>
+ <version>${bnd.version}</version>
<executions>
<execution>
<goals>
@@ -71,32 +72,25 @@
</plugins>
</build>
+ <dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.core</artifactId>
+ <version>6.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.12</version>
+ </dependency>
+ </dependencies>
+
<modules>
<module>component-dsl</module>
<module>itests</module>
<module>itests-run</module>
</modules>
- <repositories>
- <repository>
- <id>osgi-snapshots</id>
- <url>https://oss.sonatype.org/content/groups/osgi/</url>
- <layout>default</layout>
- </repository>
- <repository>
- <id>bnd-snapshots</id>
- <url>https://bndtools.ci.cloudbees.com/job/bnd.master/lastSuccessfulBuild/artifact/dist/bundles/</url>
- <layout>default</layout>
- </repository>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>bnd-snapshots</id>
- <url>https://bndtools.ci.cloudbees.com/job/bnd.master/lastSuccessfulBuild/artifact/dist/bundles/</url>
- <layout>default</layout>
- </pluginRepository>
- </pluginRepositories>
-
<scm>
<connection>scm:git:git@github.com:apache/aries-component-dsl.git</connection>
<developerConnection>scm:git:git@github.com:apache/aries-component-dsl.git</developerConnection>