summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenri Sara <hesara@vaadin.com>2016-04-12 13:40:22 +0300
committerHenri Sara <hesara@vaadin.com>2016-04-13 08:07:56 +0000
commitf39691dddeaab84d7249cee22fb11888f3ff83e2 (patch)
treea1c669b94e504575038b21fe9bb440a6455fa529
parent2beb030674199b9568a7d3bdb4ab3b31ec10752d (diff)
downloadvaadin-framework-f39691dddeaab84d7249cee22fb11888f3ff83e2.tar.gz
vaadin-framework-f39691dddeaab84d7249cee22fb11888f3ff83e2.zip
Move organization, license and SCM to parent POM
This change also cleans up some redundant POM metaadata. Even though Maven documentation does not list it, also the organization section is inherited to the effective POM. pom-template.xml is still in the project for a longer description and a repositories section until publishing to staging is cleaned up. Change-Id: I76b71aec1d2812e2f9ef321c3b4131c613a29cb7
-rw-r--r--all/pom.xml3
-rw-r--r--bom/pom.xml43
-rw-r--r--buildhelpers/pom.xml3
-rw-r--r--client-compiled/pom.xml3
-rw-r--r--client-compiler/pom.xml3
-rw-r--r--client/pom.xml3
-rw-r--r--liferay/pom.xml5
-rw-r--r--pom.xml13
-rw-r--r--push/pom.xml3
-rw-r--r--server/pom.xml3
-rw-r--r--shared/pom.xml3
-rw-r--r--themes/pom.xml3
-rw-r--r--uitest/pom.xml5
-rw-r--r--widgets/pom.xml5
14 files changed, 16 insertions, 82 deletions
diff --git a/all/pom.xml b/all/pom.xml
index 0e6f5ab9d5..92c5437f1d 100644
--- a/all/pom.xml
+++ b/all/pom.xml
@@ -18,9 +18,6 @@
<maven.build.timestamp.format>yyyy-MM-dd</maven.build.timestamp.format>
</properties>
- <organization>
- <name>Vaadin Ltd</name>
- </organization>
<url>https://vaadin.com/</url>
<description>Vaadin All package</description>
diff --git a/bom/pom.xml b/bom/pom.xml
index 7762121889..124b604382 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -11,50 +11,7 @@
<packaging>pom</packaging>
<name>Vaadin Framework (Bill of Materials)</name>
<description>Vaadin Framework (Bill of Materials)</description>
- <organization>
- <name>Vaadin Ltd</name>
- <url>http://vaadin.com</url>
- </organization>
<url>http://vaadin.com</url>
- <licenses>
- <license>
- <name>Apache License Version 2.0</name>
- <distribution>repo</distribution>
- <url>http://www.apache.org/licenses/LICENSE-2.0</url>
- </license>
- </licenses>
- <scm>
- <connection>scm:https:https://github.com/vaadin/vaadin.git</connection>
- <developerConnection>scm:https:https://github.com/vaadin/vaadin.git</developerConnection>
- <url>https://github.com/vaadin/vaadin</url>
- </scm>
- <developers>
- <developer>
- <id>artur</id>
- <name>Artur Signell</name>
- <email>artur.signell@vaadin.com</email>
- <url>http://vaadin.com/web/artur</url>
- <organization>Vaadin Ltd</organization>
- <organizationUrl>http://vaadin.com/</organizationUrl>
- <roles>
- <role>architect</role>
- <role>developer</role>
- <role>team manager</role>
- </roles>
- <timezone>2</timezone>
- </developer>
- <developer>
- <id>hesara</id>
- <name>Henri Sara</name>
- <email>hesara@vaadin.com</email>
- <organization>Vaadin Ltd</organization>
- <organizationUrl>http://vaadin.com/</organizationUrl>
- <roles>
- <role>developer</role>
- </roles>
- <timezone>2</timezone>
- </developer>
- </developers>
<dependencyManagement>
<dependencies>
<dependency>
diff --git a/buildhelpers/pom.xml b/buildhelpers/pom.xml
index 48b558b932..c37ab61b35 100644
--- a/buildhelpers/pom.xml
+++ b/buildhelpers/pom.xml
@@ -12,9 +12,6 @@
<name>vaadin-buildhelpers</name>
<packaging>jar</packaging>
- <organization>
- <name>Vaadin Ltd</name>
- </organization>
<url>https://vaadin.com/</url>
<description>Vaadin build helpers</description>
diff --git a/client-compiled/pom.xml b/client-compiled/pom.xml
index 815fd87261..8972b7a9ad 100644
--- a/client-compiled/pom.xml
+++ b/client-compiled/pom.xml
@@ -18,9 +18,6 @@
<widgetset.local.workers>6</widgetset.local.workers>
</properties>
- <organization>
- <name>Vaadin Ltd</name>
- </organization>
<url>https://vaadin.com/</url>
<description>Vaadin client compiled</description>
diff --git a/client-compiler/pom.xml b/client-compiler/pom.xml
index fbdd0d81a4..699dbac757 100644
--- a/client-compiler/pom.xml
+++ b/client-compiler/pom.xml
@@ -11,9 +11,6 @@
<name>vaadin-client-compiler</name>
<packaging>jar</packaging>
- <organization>
- <name>Vaadin Ltd</name>
- </organization>
<url>https://vaadin.com/</url>
<description>Vaadin client compiler</description>
diff --git a/client/pom.xml b/client/pom.xml
index 4cd5c5b384..dcf190c7f0 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -12,9 +12,6 @@
<name>vaadin-client</name>
<packaging>jar</packaging>
- <organization>
- <name>Vaadin Ltd</name>
- </organization>
<url>https://vaadin.com/</url>
<description>Vaadin client</description>
diff --git a/liferay/pom.xml b/liferay/pom.xml
index 9f30b4ea7e..02ec48d857 100644
--- a/liferay/pom.xml
+++ b/liferay/pom.xml
@@ -11,10 +11,7 @@
<name>vaadin-liferay</name>
<packaging>pom</packaging>
- <organization>
- <name>Vaadin Ltd</name>
- </organization>
- <url>https://vaadin.com/</url>
+ <url>https://vaadin.com/</url>
<description>Vaadin Liferay package</description>
<dependencies>
diff --git a/pom.xml b/pom.xml
index f4f76ced02..605e68300a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,6 +61,19 @@
</organization>
<url>https://vaadin.com/</url>
<description>Vaadin Framework Root Pom</description>
+ <licenses>
+ <license>
+ <name>Apache License Version 2.0</name>
+ <distribution>repo</distribution>
+ <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+ </license>
+ </licenses>
+ <scm>
+ <connection>scm:https:https://github.com/vaadin/vaadin.git</connection>
+ <developerConnection>scm:https:https://github.com/vaadin/vaadin.git</developerConnection>
+ <url>https://github.com/vaadin/vaadin</url>
+ </scm>
+
<modules>
<module>all</module>
diff --git a/push/pom.xml b/push/pom.xml
index 35bfb27c6e..31131653f8 100644
--- a/push/pom.xml
+++ b/push/pom.xml
@@ -14,9 +14,6 @@
</properties>
- <organization>
- <name>Vaadin Ltd</name>
- </organization>
<url>https://vaadin.com/</url>
<description>Vaadin server push support</description>
diff --git a/server/pom.xml b/server/pom.xml
index b713d949fc..6419b31dc0 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -12,9 +12,6 @@
<name>vaadin-server</name>
<packaging>jar</packaging>
- <organization>
- <name>Vaadin Ltd</name>
- </organization>
<url>https://vaadin.com/</url>
<description>Vaadin server</description>
diff --git a/shared/pom.xml b/shared/pom.xml
index 21ea7fc9bf..0dc923d314 100644
--- a/shared/pom.xml
+++ b/shared/pom.xml
@@ -16,9 +16,6 @@
<streamhtmlparser.version>0.0.10.vaadin1</streamhtmlparser.version>
</properties>
- <organization>
- <name>Vaadin Ltd</name>
- </organization>
<url>https://vaadin.com/</url>
<description>Vaadin shared</description>
diff --git a/themes/pom.xml b/themes/pom.xml
index c75a491bb4..3472acd671 100644
--- a/themes/pom.xml
+++ b/themes/pom.xml
@@ -12,9 +12,6 @@
<name>vaadin-themes</name>
<packaging>jar</packaging>
- <organization>
- <name>Vaadin Ltd</name>
- </organization>
<url>https://vaadin.com/</url>
<description>Vaadin themes</description>
diff --git a/uitest/pom.xml b/uitest/pom.xml
index 3f73d51253..b75e33fafd 100644
--- a/uitest/pom.xml
+++ b/uitest/pom.xml
@@ -14,10 +14,7 @@
<jetty.version>8.1.12.v20130726</jetty.version>
</properties>
- <organization>
- <name>Vaadin Ltd</name>
- </organization>
- <url>https://vaadin.com/</url>
+ <url>https://vaadin.com/</url>
<description>Vaadin UI tests</description>
<repositories>
diff --git a/widgets/pom.xml b/widgets/pom.xml
index 43d0b21c34..5bef76aab5 100644
--- a/widgets/pom.xml
+++ b/widgets/pom.xml
@@ -11,10 +11,7 @@
<name>vaadin-widgets</name>
<packaging>jar</packaging>
- <organization>
- <name>Vaadin Ltd</name>
- </organization>
- <url>https://vaadin.com/</url>
+ <url>https://vaadin.com/</url>
<description>Vaadin widgets</description>
<dependencies>