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 @@
<artifactId>webnotifications-root</artifactId>
<packaging>pom</packaging>
<version>1.0-SNAPSHOT</version>
<name>MyComponent Add-on Root Project</name>
<name>WebNotification Add-on Root Project</name>
<modules>
<module>webnotifications</module>
......
......@@ -43,6 +43,10 @@
<repositories>
<repository>
<id>nexus</id>
<url>http://nexus.burokratgroup.ru:8081/nexus/content/repositories/releases/</url>
</repository>
<repository>
<id>vaadin-addons</id>
<url>http://maven.vaadin.com/vaadin-addons</url>
</repository>
......@@ -87,7 +91,7 @@
<dependency>
<groupId>com.burokrat</groupId>
<artifactId>webnotifications</artifactId>
<version>${version}</version>
<version>1.0</version>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
......
......@@ -7,7 +7,7 @@
-->
<!-- Inherit add-on widgetset -->
<!--<inherits name="com.burokrat.WidgetSet" />-->
<inherits name="com.vaadin.DefaultWidgetSet" />
<!--
Uncomment the following to compile the widgetset for one browser only.
......@@ -28,7 +28,4 @@
information and instructions.
-->
<!-- <set-configuration-property name="devModeRedirectEnabled" value="true" /> -->
<inherits name="com.vaadin.DefaultWidgetSet" />
</module>
......
......@@ -11,9 +11,7 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="webnotifications" />
<orderEntry type="library" name="Maven: com.vaadin:vaadin-server:7.4.6" level="project" />
<orderEntry type="library" name="Maven: org.jsoup:jsoup:1.8.1" level="project" />
<orderEntry type="library" name="Maven: com.burokrat:webnotifications:1.0" level="project" />
<orderEntry type="library" name="Maven: com.vaadin:vaadin-push:7.4.6" level="project" />
<orderEntry type="library" name="Maven: com.vaadin.external.atmosphere:atmosphere-runtime:2.2.4.vaadin5" level="project" />
<orderEntry type="library" name="Maven: com.vaadin.external.slf4j:vaadin-slf4j-jdk14:1.6.1" level="project" />
......@@ -22,6 +20,8 @@
<orderEntry type="library" name="Maven: com.vaadin.external.flute:flute:1.3.0.gg2" level="project" />
<orderEntry type="library" name="Maven: com.vaadin.external.streamhtmlparser:streamhtmlparser-jsilver:0.0.10.vaadin1" level="project" />
<orderEntry type="library" name="Maven: com.vaadin.external.google:guava:16.0.1.vaadin1" level="project" />
<orderEntry type="library" name="Maven: com.vaadin:vaadin-server:7.4.6" level="project" />
<orderEntry type="library" name="Maven: org.jsoup:jsoup:1.8.1" level="project" />
<orderEntry type="library" name="Maven: com.vaadin:vaadin-client:7.4.6" level="project" />
<orderEntry type="library" name="Maven: org.w3c.css:sac:1.3" level="project" />
<orderEntry type="library" name="Maven: javax.validation:validation-api:1.0.0.GA" level="project" />
......
......@@ -6,7 +6,7 @@
<artifactId>webnotifications</artifactId>
<packaging>jar</packaging>
<version>1.0-SNAPSHOT</version>
<name>MyComponent Add-on</name>
<name>WebNotification Add-on</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
......@@ -22,12 +22,12 @@
<Vaadin-Addon>${artifactId}-${project.version}.jar</Vaadin-Addon>
</properties>
<!--
<!--
<organization>
<name>My Name</name>
<url>https://github.com/mygithubaccount/MyComponent/</url>
</organization>
<scm>
<url>git://github.com/mygithubaccount/MyComponent.git</url>
<connection>scm:git:git://github.com/mygithubaccount/MyComponent.git</connection>
......@@ -51,10 +51,6 @@
<repositories>
<repository>
<id>vaadin-addons</id>
<url>http://maven.vaadin.com/vaadin-addons</url>
</repository>
<repository>
<id>vaadin-snapshots</id>
<url>https://oss.sonatype.org/content/repositories/vaadin-snapshots/</url>
<releases>
......@@ -84,14 +80,9 @@
<groupId>com.vaadin</groupId>
<artifactId>vaadin-server</artifactId>
<version>${vaadin.version}</version>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-client</artifactId>
<version>${vaadin.version}</version>
<scope>provided</scope>
</dependency>
<!-- This can be replaced with TestNG or some other test framework supported by the surefire plugin -->
<dependency>
<groupId>junit</groupId>
......@@ -129,8 +120,8 @@
<!-- Package format version - do not change -->
<Vaadin-Package-Version>1</Vaadin-Package-Version>
<Vaadin-License-Title>${Vaadin-License-Title}</Vaadin-License-Title>
<Vaadin-Widgetsets>com.burokrat.WidgetSet</Vaadin-Widgetsets>
</manifestEntries>
<addMavenDescriptor>false</addMavenDescriptor>
</archive>
</configuration>
</plugin>
......@@ -183,6 +174,26 @@
</executions>
</plugin>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.5.1</version>
<executions>
<execution>
<id>default-deploy</id>
<phase>deploy</phase>
<goals>
<goal>deploy</goal>
</goals>
</execution>
</executions>
<configuration>
<serverId>nexus</serverId>
<nexusUrl>http://nexus.burokratgroup.ru:8081/nexus/</nexusUrl>
<skipStaging>true</skipStaging>
</configuration>
</plugin>
<!-- Testing -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
......@@ -207,4 +218,15 @@
</build>
<distributionManagement>
<repository>
<id>Releases</id>
<url>http://nexus.burokratgroup.ru:8081/nexus/content/repositories/releases/</url>
</repository>
<snapshotRepository>
<id>Snapshots</id>
<url>http://nexus.burokratgroup.ru:8081/nexus/content/repositories/snapshots/</url>
</snapshotRepository>
</distributionManagement>
</project>
......
package com.burokrat;
import junit.framework.Assert;
import org.junit.Test;
// JUnit tests here
public class MyComponentTest {
@Test
public void thisAlwaysPasses() {
Assert.assertEquals(true, true);
}
}
......@@ -11,17 +11,14 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: com.vaadin:vaadin-server:7.4.6" level="project" />
<orderEntry type="library" name="Maven: com.vaadin:vaadin-sass-compiler:0.9.12" level="project" />
<orderEntry type="library" name="Maven: com.vaadin.external.flute:flute:1.3.0.gg2" level="project" />
<orderEntry type="library" name="Maven: com.vaadin:vaadin-shared:7.4.6" level="project" />
<orderEntry type="library" name="Maven: com.vaadin.external.streamhtmlparser:streamhtmlparser-jsilver:0.0.10.vaadin1" level="project" />
<orderEntry type="library" name="Maven: com.vaadin.external.google:guava:16.0.1.vaadin1" level="project" />
<orderEntry type="library" name="Maven: org.jsoup:jsoup:1.8.1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.vaadin:vaadin-client:7.4.6" level="project" />
<orderEntry type="library" name="Maven: org.w3c.css:sac:1.3" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: javax.validation:validation-api:1.0.0.GA" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: javax.validation:validation-api:sources:1.0.0.GA" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.vaadin:vaadin-server:7.4.6" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.vaadin:vaadin-sass-compiler:0.9.12" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.w3c.css:sac:1.3" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.vaadin.external.flute:flute:1.3.0.gg2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.vaadin:vaadin-shared:7.4.6" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.vaadin.external.streamhtmlparser:streamhtmlparser-jsilver:0.0.10.vaadin1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.vaadin.external.google:guava:16.0.1.vaadin1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.jsoup:jsoup:1.8.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.8.1" level="project" />
</component>
</module>
\ No newline at end of file
......