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 15:53:06 UTC
[aries-component-dsl] branch master updated: fix duplicate scm tag
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
The following commit(s) were added to refs/heads/master by this push:
new 685accc fix duplicate scm tag
685accc is described below
commit 685acccd91d87b37314564e7a14fc21719853b73
Author: Raymond Augé <ra...@liferay.com>
AuthorDate: Tue May 28 11:52:39 2019 -0400
fix duplicate scm tag
Signed-off-by: Raymond Augé <ra...@liferay.com>
---
component-dsl/pom.xml | 36 +++++++++++++++---------------
itests/pom.xml | 46 +++++++++++++++++++-------------------
pom.xml | 62 +++++++++++++++++++++++----------------------------
3 files changed, 69 insertions(+), 75 deletions(-)
diff --git a/component-dsl/pom.xml b/component-dsl/pom.xml
index e513afe..09d4274 100644
--- a/component-dsl/pom.xml
+++ b/component-dsl/pom.xml
@@ -8,7 +8,7 @@
"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
+ 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
@@ -21,14 +21,14 @@
<modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.aries.component-dsl</groupId>
+ <parent>
+ <groupId>org.apache.aries.component-dsl</groupId>
<artifactId>org.apache.aries.component-dsl.parent</artifactId>
<version>1.2.2-SNAPSHOT</version>
- </parent>
+ </parent>
<artifactId>org.apache.aries.component-dsl.component-dsl</artifactId>
-
+
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
@@ -87,28 +87,28 @@
</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>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>
-
+ </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>
</scm>
-
+
</project>
\ No newline at end of file
diff --git a/itests/pom.xml b/itests/pom.xml
index 0a0a07f..c199ce0 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -17,40 +17,40 @@
-->
<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>
- </parent>
+ <parent>
+ <groupId>org.apache.aries.component-dsl</groupId>
+ <artifactId>org.apache.aries.component-dsl.parent</artifactId>
+ <version>1.2.2-SNAPSHOT</version>
+ </parent>
- <artifactId>org.apache.aries.component-dsl.itests</artifactId>
- <description>Apache Aries Component DSL Integration Tests</description>
- <name>Apache Aries Component DSL Integration Tests</name>
+ <artifactId>org.apache.aries.component-dsl.itests</artifactId>
+ <description>Apache Aries Component DSL Integration Tests</description>
+ <name>Apache Aries Component DSL Integration Tests</name>
- <dependencies>
- <dependency>
- <groupId>org.apache.aries.component-dsl</groupId>
- <artifactId>org.apache.aries.component-dsl.component-dsl</artifactId>
- <version>1.2.2-SNAPSHOT</version>
+ <dependencies>
+ <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.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>6.0.0</version>
+ <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>
+ <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>
</scm>
-
+
</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index f028b59..b0a9dd7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,16 +25,16 @@
<packaging>pom</packaging>
<parent>
- <groupId>org.apache</groupId>
- <artifactId>apache</artifactId>
- <version>17</version>
- <relativePath />
- </parent>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>17</version>
+ <relativePath />
+ </parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
-
+
<build>
<plugins>
<plugin>
@@ -72,41 +72,35 @@
</build>
<modules>
- <module>component-dsl</module>
- <module>itests</module>
- <module>itests-run</module>
- </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>
+ <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>
-
+ <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>
<url>https://github.com/apache/aries-component-dsl</url>
</scm>
- <scm>
- <connection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/component-dsl</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/component-dsl</developerConnection>
- <url>http://svn.apache.org/viewvc/aries/trunk/component-dsl</url>
- </scm>
-
</project>
\ No newline at end of file