Skip to content

Denis Volobuev / webnotifications

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 9d16a792 9d16a7923f241983f6f54e63d21fb2e18b89fcd8 by Denis Volobuev
Options

vaadin fix

1 parent 4427e3f0
Inline Side-by-side
Showing 7 changed files with 54 additions and 47 deletions
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
6 <artifactId>webnotifications-root</artifactId> 6 <artifactId>webnotifications-root</artifactId>
7 <packaging>pom</packaging> 7 <packaging>pom</packaging>
8 <version>1.0-SNAPSHOT</version> 8 <version>1.0-SNAPSHOT</version>
9 <name>MyComponent Add-on Root Project</name> 9 <name>WebNotification Add-on Root Project</name>
10 10
11 <modules> 11 <modules>
12 <module>webnotifications</module> 12 <module>webnotifications</module>
......
...@@ -43,6 +43,10 @@ ...@@ -43,6 +43,10 @@
43 43
44 <repositories> 44 <repositories>
45 <repository> 45 <repository>
46 <id>nexus</id>
47 <url>http://nexus.burokratgroup.ru:8081/nexus/content/repositories/releases/</url>
48 </repository>
49 <repository>
46 <id>vaadin-addons</id> 50 <id>vaadin-addons</id>
47 <url>http://maven.vaadin.com/vaadin-addons</url> 51 <url>http://maven.vaadin.com/vaadin-addons</url>
48 </repository> 52 </repository>
...@@ -87,7 +91,7 @@ ...@@ -87,7 +91,7 @@
87 <dependency> 91 <dependency>
88 <groupId>com.burokrat</groupId> 92 <groupId>com.burokrat</groupId>
89 <artifactId>webnotifications</artifactId> 93 <artifactId>webnotifications</artifactId>
90 <version>${version}</version> 94 <version>1.0</version>
91 </dependency> 95 </dependency>
92 <dependency> 96 <dependency>
93 <groupId>com.vaadin</groupId> 97 <groupId>com.vaadin</groupId>
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
7 --> 7 -->
8 8
9 <!-- Inherit add-on widgetset --> 9 <!-- Inherit add-on widgetset -->
10 <!--<inherits name="com.burokrat.WidgetSet" />--> 10 <inherits name="com.vaadin.DefaultWidgetSet" />
11 11
12 <!-- 12 <!--
13 Uncomment the following to compile the widgetset for one browser only. 13 Uncomment the following to compile the widgetset for one browser only.
...@@ -28,7 +28,4 @@ ...@@ -28,7 +28,4 @@
28 information and instructions. 28 information and instructions.
29 --> 29 -->
30 <!-- <set-configuration-property name="devModeRedirectEnabled" value="true" /> --> 30 <!-- <set-configuration-property name="devModeRedirectEnabled" value="true" /> -->
31
32
33 <inherits name="com.vaadin.DefaultWidgetSet" />
34 </module> 31 </module>
......
...@@ -11,9 +11,7 @@ ...@@ -11,9 +11,7 @@
11 </content> 11 </content>
12 <orderEntry type="inheritedJdk" /> 12 <orderEntry type="inheritedJdk" />
13 <orderEntry type="sourceFolder" forTests="false" /> 13 <orderEntry type="sourceFolder" forTests="false" />
14 <orderEntry type="module" module-name="webnotifications" /> 14 <orderEntry type="library" name="Maven: com.burokrat:webnotifications:1.0" level="project" />
15 <orderEntry type="library" name="Maven: com.vaadin:vaadin-server:7.4.6" level="project" />
16 <orderEntry type="library" name="Maven: org.jsoup:jsoup:1.8.1" level="project" />
17 <orderEntry type="library" name="Maven: com.vaadin:vaadin-push:7.4.6" level="project" /> 15 <orderEntry type="library" name="Maven: com.vaadin:vaadin-push:7.4.6" level="project" />
18 <orderEntry type="library" name="Maven: com.vaadin.external.atmosphere:atmosphere-runtime:2.2.4.vaadin5" level="project" /> 16 <orderEntry type="library" name="Maven: com.vaadin.external.atmosphere:atmosphere-runtime:2.2.4.vaadin5" level="project" />
19 <orderEntry type="library" name="Maven: com.vaadin.external.slf4j:vaadin-slf4j-jdk14:1.6.1" level="project" /> 17 <orderEntry type="library" name="Maven: com.vaadin.external.slf4j:vaadin-slf4j-jdk14:1.6.1" level="project" />
...@@ -22,6 +20,8 @@ ...@@ -22,6 +20,8 @@
22 <orderEntry type="library" name="Maven: com.vaadin.external.flute:flute:1.3.0.gg2" level="project" /> 20 <orderEntry type="library" name="Maven: com.vaadin.external.flute:flute:1.3.0.gg2" level="project" />
23 <orderEntry type="library" name="Maven: com.vaadin.external.streamhtmlparser:streamhtmlparser-jsilver:0.0.10.vaadin1" level="project" /> 21 <orderEntry type="library" name="Maven: com.vaadin.external.streamhtmlparser:streamhtmlparser-jsilver:0.0.10.vaadin1" level="project" />
24 <orderEntry type="library" name="Maven: com.vaadin.external.google:guava:16.0.1.vaadin1" level="project" /> 22 <orderEntry type="library" name="Maven: com.vaadin.external.google:guava:16.0.1.vaadin1" level="project" />
23 <orderEntry type="library" name="Maven: com.vaadin:vaadin-server:7.4.6" level="project" />
24 <orderEntry type="library" name="Maven: org.jsoup:jsoup:1.8.1" level="project" />
25 <orderEntry type="library" name="Maven: com.vaadin:vaadin-client:7.4.6" level="project" /> 25 <orderEntry type="library" name="Maven: com.vaadin:vaadin-client:7.4.6" level="project" />
26 <orderEntry type="library" name="Maven: org.w3c.css:sac:1.3" level="project" /> 26 <orderEntry type="library" name="Maven: org.w3c.css:sac:1.3" level="project" />
27 <orderEntry type="library" name="Maven: javax.validation:validation-api:1.0.0.GA" level="project" /> 27 <orderEntry type="library" name="Maven: javax.validation:validation-api:1.0.0.GA" level="project" />
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
6 <artifactId>webnotifications</artifactId> 6 <artifactId>webnotifications</artifactId>
7 <packaging>jar</packaging> 7 <packaging>jar</packaging>
8 <version>1.0-SNAPSHOT</version> 8 <version>1.0-SNAPSHOT</version>
9 <name>MyComponent Add-on</name> 9 <name>WebNotification Add-on</name>
10 10
11 <properties> 11 <properties>
12 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> 12 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
...@@ -22,12 +22,12 @@ ...@@ -22,12 +22,12 @@
22 <Vaadin-Addon>${artifactId}-${project.version}.jar</Vaadin-Addon> 22 <Vaadin-Addon>${artifactId}-${project.version}.jar</Vaadin-Addon>
23 </properties> 23 </properties>
24 24
25 <!-- 25 <!--
26 <organization> 26 <organization>
27 <name>My Name</name> 27 <name>My Name</name>
28 <url>https://github.com/mygithubaccount/MyComponent/</url> 28 <url>https://github.com/mygithubaccount/MyComponent/</url>
29 </organization> 29 </organization>
30 30
31 <scm> 31 <scm>
32 <url>git://github.com/mygithubaccount/MyComponent.git</url> 32 <url>git://github.com/mygithubaccount/MyComponent.git</url>
33 <connection>scm:git:git://github.com/mygithubaccount/MyComponent.git</connection> 33 <connection>scm:git:git://github.com/mygithubaccount/MyComponent.git</connection>
...@@ -51,10 +51,6 @@ ...@@ -51,10 +51,6 @@
51 51
52 <repositories> 52 <repositories>
53 <repository> 53 <repository>
54 <id>vaadin-addons</id>
55 <url>http://maven.vaadin.com/vaadin-addons</url>
56 </repository>
57 <repository>
58 <id>vaadin-snapshots</id> 54 <id>vaadin-snapshots</id>
59 <url>https://oss.sonatype.org/content/repositories/vaadin-snapshots/</url> 55 <url>https://oss.sonatype.org/content/repositories/vaadin-snapshots/</url>
60 <releases> 56 <releases>
...@@ -84,14 +80,9 @@ ...@@ -84,14 +80,9 @@
84 <groupId>com.vaadin</groupId> 80 <groupId>com.vaadin</groupId>
85 <artifactId>vaadin-server</artifactId> 81 <artifactId>vaadin-server</artifactId>
86 <version>${vaadin.version}</version> 82 <version>${vaadin.version}</version>
87 </dependency>
88 <dependency>
89 <groupId>com.vaadin</groupId>
90 <artifactId>vaadin-client</artifactId>
91 <version>${vaadin.version}</version>
92 <scope>provided</scope> 83 <scope>provided</scope>
93 </dependency> 84 </dependency>
94 85
95 <!-- This can be replaced with TestNG or some other test framework supported by the surefire plugin --> 86 <!-- This can be replaced with TestNG or some other test framework supported by the surefire plugin -->
96 <dependency> 87 <dependency>
97 <groupId>junit</groupId> 88 <groupId>junit</groupId>
...@@ -129,8 +120,8 @@ ...@@ -129,8 +120,8 @@
129 <!-- Package format version - do not change --> 120 <!-- Package format version - do not change -->
130 <Vaadin-Package-Version>1</Vaadin-Package-Version> 121 <Vaadin-Package-Version>1</Vaadin-Package-Version>
131 <Vaadin-License-Title>${Vaadin-License-Title}</Vaadin-License-Title> 122 <Vaadin-License-Title>${Vaadin-License-Title}</Vaadin-License-Title>
132 <Vaadin-Widgetsets>com.burokrat.WidgetSet</Vaadin-Widgetsets>
133 </manifestEntries> 123 </manifestEntries>
124 <addMavenDescriptor>false</addMavenDescriptor>
134 </archive> 125 </archive>
135 </configuration> 126 </configuration>
136 </plugin> 127 </plugin>
...@@ -183,6 +174,26 @@ ...@@ -183,6 +174,26 @@
183 </executions> 174 </executions>
184 </plugin> 175 </plugin>
185 176
177 <plugin>
178 <groupId>org.sonatype.plugins</groupId>
179 <artifactId>nexus-staging-maven-plugin</artifactId>
180 <version>1.5.1</version>
181 <executions>
182 <execution>
183 <id>default-deploy</id>
184 <phase>deploy</phase>
185 <goals>
186 <goal>deploy</goal>
187 </goals>
188 </execution>
189 </executions>
190 <configuration>
191 <serverId>nexus</serverId>
192 <nexusUrl>http://nexus.burokratgroup.ru:8081/nexus/</nexusUrl>
193 <skipStaging>true</skipStaging>
194 </configuration>
195 </plugin>
196
186 <!-- Testing --> 197 <!-- Testing -->
187 <plugin> 198 <plugin>
188 <groupId>org.apache.maven.plugins</groupId> 199 <groupId>org.apache.maven.plugins</groupId>
...@@ -207,4 +218,15 @@ ...@@ -207,4 +218,15 @@
207 218
208 </build> 219 </build>
209 220
221 <distributionManagement>
222 <repository>
223 <id>Releases</id>
224 <url>http://nexus.burokratgroup.ru:8081/nexus/content/repositories/releases/</url>
225 </repository>
226 <snapshotRepository>
227 <id>Snapshots</id>
228 <url>http://nexus.burokratgroup.ru:8081/nexus/content/repositories/snapshots/</url>
229 </snapshotRepository>
230 </distributionManagement>
231
210 </project> 232 </project>
......
1 package com.burokrat;
2
3 import junit.framework.Assert;
4 import org.junit.Test;
5
6 // JUnit tests here
7 public class MyComponentTest {
8
9 @Test
10 public void thisAlwaysPasses() {
11 Assert.assertEquals(true, true);
12 }
13 }
...@@ -11,17 +11,14 @@ ...@@ -11,17 +11,14 @@
11 </content> 11 </content>
12 <orderEntry type="inheritedJdk" /> 12 <orderEntry type="inheritedJdk" />
13 <orderEntry type="sourceFolder" forTests="false" /> 13 <orderEntry type="sourceFolder" forTests="false" />
14 <orderEntry type="library" name="Maven: com.vaadin:vaadin-server:7.4.6" level="project" /> 14 <orderEntry type="library" scope="PROVIDED" name="Maven: com.vaadin:vaadin-server:7.4.6" level="project" />
15 <orderEntry type="library" name="Maven: com.vaadin:vaadin-sass-compiler:0.9.12" level="project" /> 15 <orderEntry type="library" scope="PROVIDED" name="Maven: com.vaadin:vaadin-sass-compiler:0.9.12" level="project" />
16 <orderEntry type="library" name="Maven: com.vaadin.external.flute:flute:1.3.0.gg2" level="project" /> 16 <orderEntry type="library" scope="PROVIDED" name="Maven: org.w3c.css:sac:1.3" level="project" />
17 <orderEntry type="library" name="Maven: com.vaadin:vaadin-shared:7.4.6" level="project" /> 17 <orderEntry type="library" scope="PROVIDED" name="Maven: com.vaadin.external.flute:flute:1.3.0.gg2" level="project" />
18 <orderEntry type="library" name="Maven: com.vaadin.external.streamhtmlparser:streamhtmlparser-jsilver:0.0.10.vaadin1" level="project" /> 18 <orderEntry type="library" scope="PROVIDED" name="Maven: com.vaadin:vaadin-shared:7.4.6" level="project" />
19 <orderEntry type="library" name="Maven: com.vaadin.external.google:guava:16.0.1.vaadin1" level="project" /> 19 <orderEntry type="library" scope="PROVIDED" name="Maven: com.vaadin.external.streamhtmlparser:streamhtmlparser-jsilver:0.0.10.vaadin1" level="project" />
20 <orderEntry type="library" name="Maven: org.jsoup:jsoup:1.8.1" level="project" /> 20 <orderEntry type="library" scope="PROVIDED" name="Maven: com.vaadin.external.google:guava:16.0.1.vaadin1" level="project" />
21 <orderEntry type="library" scope="PROVIDED" name="Maven: com.vaadin:vaadin-client:7.4.6" level="project" /> 21 <orderEntry type="library" scope="PROVIDED" name="Maven: org.jsoup:jsoup:1.8.1" level="project" />
22 <orderEntry type="library" name="Maven: org.w3c.css:sac:1.3" level="project" />
23 <orderEntry type="library" scope="PROVIDED" name="Maven: javax.validation:validation-api:1.0.0.GA" level="project" />
24 <orderEntry type="library" scope="PROVIDED" name="Maven: javax.validation:validation-api:sources:1.0.0.GA" level="project" />
25 <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.8.1" level="project" /> 22 <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.8.1" level="project" />
26 </component> 23 </component>
27 </module> 24 </module>
...\ No newline at end of file ...\ No newline at end of file
......