Skip to content
This repository has been archived by the owner on Mar 5, 2021. It is now read-only.

Commit

Permalink
Update project metadata
Browse files Browse the repository at this point in the history 
Conflicts:
	bundles/org.eclipse.packagedrone.repo.api/secondary.pom
	bundles/org.eclipse.packagedrone.repo/secondary.pom
	bundles/org.eclipse.packagedrone.utils.converter/secondary.pom
	bundles/org.eclipse.packagedrone.utils.rpm/secondary.pom
	bundles/org.eclipse.packagedrone.utils.security/secondary.pom
	bundles/org.eclipse.packagedrone.utils/secondary.pom
	secondary/pom.xml
  • Loading branch information
@ctron
ctron committed Nov 15, 2017
1 parent 50786a6 commit b8c4859
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 10 deletions.
2 changes: 1 addition & 1 deletion bundles/org.eclipse.packagedrone.repo.api/secondary.pom
View file
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.packagedrone</groupId>
<artifactId>secondary-parent</artifactId>
<version>0.14.0-SNAPSHOT</version>
<version>0.14.1-SNAPSHOT</version>
<relativePath>../../secondary</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion bundles/org.eclipse.packagedrone.repo/secondary.pom
View file
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.packagedrone</groupId>
<artifactId>secondary-parent</artifactId>
<version>0.14.0-SNAPSHOT</version>
<version>0.14.1-SNAPSHOT</version>
<relativePath>../../secondary</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion bundles/org.eclipse.packagedrone.utils.converter/secondary.pom
View file
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.packagedrone</groupId>
<artifactId>secondary-parent</artifactId>
<version>0.14.0-SNAPSHOT</version>
<version>0.14.1-SNAPSHOT</version>
<relativePath>../../secondary</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion bundles/org.eclipse.packagedrone.utils.deb/secondary.pom
View file
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.packagedrone</groupId>
<artifactId>secondary-parent</artifactId>
<version>0.14.0-SNAPSHOT</version>
<version>0.14.1-SNAPSHOT</version>
<relativePath>../../secondary</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion bundles/org.eclipse.packagedrone.utils.rpm/secondary.pom
View file
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.packagedrone</groupId>
<artifactId>secondary-parent</artifactId>
<version>0.14.0-SNAPSHOT</version>
<version>0.14.1-SNAPSHOT</version>
<relativePath>../../secondary</relativePath>
</parent>

Expand Down
4 changes: 4 additions & 0 deletions bundles/org.eclipse.packagedrone.utils.security/secondary.pom
View file
Expand Up @@ -6,7 +6,11 @@
<parent>
<groupId>org.eclipse.packagedrone</groupId>
<artifactId>secondary-parent</artifactId>
<<<<<<< HEAD
<version>0.14.0-SNAPSHOT</version>
=======
<version>0.14.1</version>
>>>>>>> a241ba4... Update project metadata
<relativePath>../../secondary</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion bundles/org.eclipse.packagedrone.utils/secondary.pom
View file
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.packagedrone</groupId>
<artifactId>secondary-parent</artifactId>
<version>0.14.0-SNAPSHOT</version>
<version>0.14.1-SNAPSHOT</version>
<relativePath>../../secondary</relativePath>
</parent>

Expand Down
8 changes: 4 additions & 4 deletions secondary/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@

<groupId>org.eclipse.packagedrone</groupId>
<artifactId>secondary-parent</artifactId>
<version>0.14.0-SNAPSHOT</version>
<version>0.14.1-SNAPSHOT</version>
<packaging>pom</packaging>

<url>https://eclipse.org/package-drone</url>
Expand All @@ -16,10 +16,10 @@
<developers>
<developer>
<name>Jens Reimann</name>
<email>ctron@dentrassi.de</email>
<email>jreimann@redhat.com</email>
<id>ctron</id>
<organization>IBH SYSTEMS GmbH</organization>
<organizationUrl>http://ibh-systems.com</organizationUrl>
<organization>Red Hat Inc</organization>
<organizationUrl>http://redhat.com</organizationUrl>
<url>http://dentrassi.de</url>
<roles>
<role>Project Lead</role>
Expand Down

0 comments on commit b8c4859

Please sign in to comment.