Skip to content

Commit b3663cc

Browse files
Henri SaraVaadin Code Review
Henri Sara
authored and
Vaadin Code Review
committed
Support publishing to Maven Central instead of Directory
Change-Id: Ida921f362b508e23e77a7144b718856ff1856dae
1 parent 5bd6a5e commit b3663cc

File tree

10 files changed

+171
-658
lines changed

10 files changed

+171
-658
lines changed

‎vaadin-spring/checkstyle/header renamed to ‎checkstyle/header

File renamed without changes.

‎vaadin-spring/checkstyle/vaadin-checkstyle.xml renamed to ‎checkstyle/vaadin-checkstyle.xml

File renamed without changes.

‎pom.xml

Lines changed: 144 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
</parent>
1111

1212
<groupId>com.vaadin</groupId>
13-
<artifactId>vaadin-spring-main</artifactId>
13+
<artifactId>vaadin-spring-parent</artifactId>
1414
<version>0.0.1-SNAPSHOT</version>
1515
<packaging>pom</packaging>
1616

17-
<name>vaadin-spring-main</name>
17+
<name>vaadin-spring-parent</name>
1818
<description>
19-
Provides Spring integration for Vaadin applications.
19+
Parent module for Spring integration for Vaadin applications.
2020
</description>
2121
<url>https://github.com/vaadin/spring</url>
2222

@@ -38,27 +38,161 @@
3838
<developerConnection>scm:git:[email protected]:vaadin/spring.git</developerConnection>
3939
</scm>
4040

41+
<developers>
42+
<!-- In alphabetical order -->
43+
<developer>
44+
<name>AMahdy AbdElAziz</name>
45+
<organization>Vaadin</organization>
46+
<email>[email protected]</email>
47+
</developer>
48+
<developer>
49+
<name>Chris Phillipson</name>
50+
<email>[email protected]</email>
51+
</developer>
52+
<developer>
53+
<name>Henri Sara</name>
54+
<organization>Vaadin</organization>
55+
<email>[email protected]</email>
56+
</developer>
57+
<developer>
58+
<name>Josh Long</name>
59+
<email>[email protected]</email>
60+
</developer>
61+
<developer>
62+
<name>Matti Tahvonen</name>
63+
<organization>Vaadin</organization>
64+
<email>[email protected]</email>
65+
</developer>
66+
<developer>
67+
<name>Nicolas Frankel</name>
68+
<email>[email protected]</email>
69+
</developer>
70+
<developer>
71+
<name>Peter Lehto</name>
72+
<organization>Vaadin</organization>
73+
<email>[email protected]</email>
74+
</developer>
75+
<developer>
76+
<name>Petter Holmström</name>
77+
<organization>Vaadin</organization>
78+
<email>[email protected]</email>
79+
</developer>
80+
</developers>
81+
82+
<properties>
83+
<project.build.encoding>UTF-8</project.build.encoding>
84+
<project.build.target>1.6</project.build.target>
85+
<project.build.source>1.6</project.build.source>
86+
87+
<!-- These are typically overridden with BOMs -->
88+
<vaadin.version>7.4.2</vaadin.version>
89+
<spring.version>4.1.6.RELEASE</spring.version>
90+
<spring.boot.version>1.2.2.RELEASE</spring.boot.version>
91+
92+
<slf4j.version>1.7.7</slf4j.version>
93+
94+
<!-- Additional manifest fields -->
95+
<Vaadin-License-Title>Apache License 2.0</Vaadin-License-Title>
96+
</properties>
97+
4198
<build>
4299
<plugins>
43-
<!-- Do not deploy top level pom. The vaadin-spring module does
44-
not depend on it so no need for it to end up in Maven repositories -->
45100
<plugin>
46101
<groupId>org.apache.maven.plugins</groupId>
47-
<artifactId>maven-deploy-plugin</artifactId>
48-
<version>2.8.2</version>
102+
<artifactId>maven-compiler-plugin</artifactId>
103+
<version>3.1</version>
104+
<configuration>
105+
<encoding>${project.build.encoding}</encoding>
106+
<target>${project.build.target}</target>
107+
<source>${project.build.source}</source>
108+
</configuration>
109+
</plugin>
110+
<plugin>
111+
<groupId>org.apache.maven.plugins</groupId>
112+
<artifactId>maven-checkstyle-plugin</artifactId>
113+
<version>2.14</version>
49114
<configuration>
50-
<skip>true</skip>
115+
<enableRulesSummary>false</enableRulesSummary>
116+
<includeTestSourceDirectory>true</includeTestSourceDirectory>
117+
<configLocation>checkstyle/vaadin-checkstyle.xml</configLocation>
118+
<violationSeverity>error</violationSeverity>
119+
<headerLocation>checkstyle/header</headerLocation>
51120
</configuration>
121+
<executions>
122+
<execution>
123+
<id>validate</id>
124+
<phase>validate</phase>
125+
<goals>
126+
<goal>check</goal>
127+
</goals>
128+
</execution>
129+
</executions>
52130
</plugin>
53131
<plugin>
54132
<groupId>org.apache.maven.plugins</groupId>
55-
<artifactId>maven-assembly-plugin</artifactId>
133+
<artifactId>maven-source-plugin</artifactId>
56134
<version>2.2.1</version>
57135
<configuration>
58-
<skipAssembly>true</skipAssembly>
136+
<excludeResources>true</excludeResources>
59137
</configuration>
138+
<executions>
139+
<execution>
140+
<id>attach-sources</id>
141+
<goals>
142+
<goal>jar-no-fork</goal>
143+
</goals>
144+
</execution>
145+
</executions>
146+
</plugin>
147+
<plugin>
148+
<groupId>org.apache.maven.plugins</groupId>
149+
<artifactId>maven-javadoc-plugin</artifactId>
150+
<version>2.9</version>
151+
<executions>
152+
<execution>
153+
<phase>package</phase>
154+
<goals>
155+
<goal>jar</goal>
156+
</goals>
157+
</execution>
158+
</executions>
60159
</plugin>
61160
</plugins>
161+
<pluginManagement>
162+
<plugins>
163+
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
164+
<plugin>
165+
<groupId>org.eclipse.m2e</groupId>
166+
<artifactId>lifecycle-mapping</artifactId>
167+
<version>1.0.0</version>
168+
<configuration>
169+
<lifecycleMappingMetadata>
170+
<pluginExecutions>
171+
<pluginExecution>
172+
<pluginExecutionFilter>
173+
<groupId>
174+
org.apache.maven.plugins
175+
</groupId>
176+
<artifactId>
177+
maven-checkstyle-plugin
178+
</artifactId>
179+
<versionRange>
180+
[2.14,)
181+
</versionRange>
182+
<goals>
183+
<goal>check</goal>
184+
</goals>
185+
</pluginExecutionFilter>
186+
<action>
187+
<ignore></ignore>
188+
</action>
189+
</pluginExecution>
190+
</pluginExecutions>
191+
</lifecycleMappingMetadata>
192+
</configuration>
193+
</plugin>
194+
</plugins>
195+
</pluginManagement>
62196
</build>
63197

64198
<modules>

‎vaadin-spring-boot-starter/pom.xml

Lines changed: 8 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
22
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
4-
<groupId>com.vaadin</groupId>
54
<artifactId>vaadin-spring-boot-starter</artifactId>
6-
<version>0.0.1-SNAPSHOT</version>
75

86
<parent>
97
<groupId>com.vaadin</groupId>
10-
<artifactId>vaadin-parent</artifactId>
11-
<version>1.0.0</version>
12-
<!-- Parent POM is not in the containing directory -->
13-
<relativePath></relativePath>
8+
<artifactId>vaadin-spring-parent</artifactId>
9+
<version>0.0.1-SNAPSHOT</version>
1410
</parent>
1511

1612
<name>vaadin-spring-boot-starter</name>
@@ -19,34 +15,18 @@
1915
</description>
2016
<url>https://github.com/vaadin/spring</url>
2117

22-
<organization>
23-
<name>Vaadin Ltd</name>
24-
<url>http://vaadin.com</url>
25-
</organization>
26-
27-
<licenses>
28-
<license>
29-
<name>Apache License 2.0</name>
30-
<url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
31-
</license>
32-
</licenses>
33-
34-
<scm>
35-
<url>https://github.com/vaadin/spring</url>
36-
<connection>scm:git:[email protected]:vaadin/spring.git</connection>
37-
<developerConnection>scm:git:[email protected]:vaadin/spring.git</developerConnection>
38-
</scm>
39-
40-
<properties>
41-
<vaadin.version>7.4.2</vaadin.version>
42-
</properties>
43-
4418
<dependencies>
4519
<dependency>
4620
<groupId>com.vaadin</groupId>
4721
<artifactId>vaadin-spring-boot</artifactId>
4822
<version>${project.version}</version>
4923
</dependency>
24+
25+
<dependency>
26+
<groupId>org.springframework.boot</groupId>
27+
<artifactId>spring-boot-starter-web</artifactId>
28+
<version>${spring.boot.version}</version>
29+
</dependency>
5030

5131
<dependency>
5232
<groupId>com.vaadin</groupId>
@@ -60,17 +40,4 @@
6040
</dependency>
6141
</dependencies>
6242

63-
<build>
64-
<plugins>
65-
<plugin>
66-
<groupId>org.apache.maven.plugins</groupId>
67-
<artifactId>maven-assembly-plugin</artifactId>
68-
<version>2.2.1</version>
69-
<configuration>
70-
<skipAssembly>true</skipAssembly>
71-
</configuration>
72-
</plugin>
73-
</plugins>
74-
</build>
75-
7643
</project>

‎vaadin-spring-boot/assembly/MANIFEST.MF

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎vaadin-spring-boot/assembly/assembly.xml

Lines changed: 0 additions & 44 deletions
This file was deleted.

0 commit comments

Comments
 (0)