Skip to content

Commit 05979c1

Browse files
mlopezFCmlopezFC
committed
2 parents 24c807f + 5b8fbe4 commit 05979c1

File tree

8 files changed

+134
-119
lines changed

8 files changed

+134
-119
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,4 @@
1515
/node_modules
1616
/package-lock.json
1717
/.classpath
18+
/node

‎pom.xml‎

Lines changed: 54 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<modelVersion>4.0.0</modelVersion>
33
<groupId>com.flowingcode.vaadin.addons</groupId>
44
<artifactId>orgchart-addon</artifactId>
5-
<version>4.0.0-SNAPSHOT</version>
5+
<version>4.0.1-SNAPSHOT</version>
66
<name>OrgChart Add-on</name>
77

88
<properties>
@@ -28,14 +28,16 @@
2828
<developerConnection>scm:git:ssh://[email protected]:/FlowingCode/orgchart-addon.git</developerConnection>
2929
<tag>OrgChart add-on for Vaadin 14+</tag>
3030
</scm>
31-
31+
3232
<licenses>
3333
<license>
3434
<name>Apache 2</name>
3535
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
3636
<distribution>repo</distribution>
3737
</license>
3838
</licenses>
39+
<inceptionYear>2017</inceptionYear>
40+
3941
<dependencyManagement>
4042
<dependencies>
4143
<dependency>
@@ -81,7 +83,6 @@
8183
<dependencies>
8284
<dependency>
8385
<groupId>com.vaadin</groupId>
84-
<!-- Replace artifactId with vaadin-core to use only free components -->
8586
<artifactId>vaadin</artifactId>
8687
<exclusions>
8788
<!-- Webjars are only needed when running in Vaadin 13 compatibility mode in V14.
@@ -112,11 +113,6 @@
112113
<artifactId>*</artifactId>
113114
</exclusion>
114115
</exclusions>
115-
</dependency>
116-
<dependency>
117-
<groupId>org.webjars</groupId>
118-
<artifactId>font-awesome</artifactId>
119-
<version>4.7.0</version>
120116
</dependency>
121117
<dependency>
122118
<groupId>org.slf4j</groupId>
@@ -127,16 +123,64 @@
127123
<groupId>com.vaadin</groupId>
128124
<artifactId>vaadin-testbench</artifactId>
129125
<scope>test</scope>
126+
</dependency>
127+
<dependency>
128+
<groupId>org.webjars</groupId>
129+
<artifactId>font-awesome</artifactId>
130+
<version>4.7.0</version>
131+
<scope>test</scope>
132+
</dependency>
133+
<dependency>
134+
<groupId>com.fasterxml.jackson.core</groupId>
135+
<artifactId>jackson-databind</artifactId>
136+
<version>2.9.10.1</version>
130137
</dependency>
131138
</dependencies>
132139

133140
<build>
134141
<defaultGoal>jetty:run</defaultGoal>
142+
<pluginManagement>
143+
<plugins>
144+
<plugin>
145+
<groupId>org.apache.maven.plugins</groupId>
146+
<artifactId>maven-release-plugin</artifactId>
147+
<version>2.5.3</version>
148+
</plugin>
149+
<plugin>
150+
<groupId>org.apache.maven.plugins</groupId>
151+
<artifactId>maven-deploy-plugin</artifactId>
152+
<version>2.8.2</version>
153+
</plugin>
154+
<plugin>
155+
<groupId>org.apache.maven.plugins</groupId>
156+
<artifactId>maven-surefire-plugin</artifactId>
157+
<version>2.22.1</version>
158+
<configuration>
159+
<useSystemClassLoader>false</useSystemClassLoader>
160+
</configuration>
161+
</plugin>
162+
</plugins>
163+
</pluginManagement>
164+
135165
<plugins>
166+
167+
<plugin>
168+
<groupId>org.codehaus.mojo</groupId>
169+
<artifactId>license-maven-plugin</artifactId>
170+
<version>1.14</version>
171+
<configuration>
172+
<licenseName>apache_v2</licenseName>
173+
<addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage>
174+
<excludes>
175+
<exclude>**/font-awesome.css</exclude>
176+
</excludes>
177+
</configuration>
178+
</plugin>
179+
136180
<plugin>
137181
<groupId>org.apache.maven.plugins</groupId>
138182
<artifactId>maven-jar-plugin</artifactId>
139-
<version>3.1.0</version>
183+
<version>3.1.2</version>
140184
<configuration>
141185
<archive>
142186
<index>true</index>
@@ -267,7 +311,7 @@
267311
<artifactId>flow-server-production-mode</artifactId>
268312
</dependency>
269313
</dependencies>
270-
314+
271315
<build>
272316
<plugins>
273317
<plugin>

‎src/main/java/com/flowingcode/vaadin/addons/orgchart/extra/TemplateLiteralRewriter.java‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,22 @@
1+
/*-
2+
* #%L
3+
* OrgChart Add-on
4+
* %%
5+
* Copyright (C) 2017 - 2019 Flowing Code S.A.
6+
* %%
7+
* Licensed under the Apache License, Version 2.0 (the "License");
8+
* you may not use this file except in compliance with the License.
9+
* You may obtain a copy of the License at
10+
*
11+
* http://www.apache.org/licenses/LICENSE-2.0
12+
*
13+
* Unless required by applicable law or agreed to in writing, software
14+
* distributed under the License is distributed on an "AS IS" BASIS,
15+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
* See the License for the specific language governing permissions and
17+
* limitations under the License.
18+
* #L%
19+
*/
120
package com.flowingcode.vaadin.addons.orgchart.extra;
221

322
/**

‎src/main/resources/META-INF/frontend/fc-orgchart.js‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,22 @@
1+
/*-
2+
* #%L
3+
* OrgChart Add-on
4+
* %%
5+
* Copyright (C) 2017 - 2019 Flowing Code S.A.
6+
* %%
7+
* Licensed under the Apache License, Version 2.0 (the "License");
8+
* you may not use this file except in compliance with the License.
9+
* You may obtain a copy of the License at
10+
*
11+
* http://www.apache.org/licenses/LICENSE-2.0
12+
*
13+
* Unless required by applicable law or agreed to in writing, software
14+
* distributed under the License is distributed on an "AS IS" BASIS,
15+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
* See the License for the specific language governing permissions and
17+
* limitations under the License.
18+
* #L%
19+
*/
120
import {html, PolymerElement} from '@polymer/polymer/polymer-element.js';
221
import jQuery from "jquery";
322
import html2canvas from 'html2canvas';

src/test/java/org/vaadin/test/View.java renamed to src/test/java/com/flowingcode/vaadin/addons/orgchart/DemoView.java

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,23 @@
1-
package org.vaadin.test;
1+
/*-
2+
* #%L
3+
* OrgChart Add-on
4+
* %%
5+
* Copyright (C) 2017 - 2019 Flowing Code S.A.
6+
* %%
7+
* Licensed under the Apache License, Version 2.0 (the "License");
8+
* you may not use this file except in compliance with the License.
9+
* You may obtain a copy of the License at
10+
*
11+
* http://www.apache.org/licenses/LICENSE-2.0
12+
*
13+
* Unless required by applicable law or agreed to in writing, software
14+
* distributed under the License is distributed on an "AS IS" BASIS,
15+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
* See the License for the specific language governing permissions and
17+
* limitations under the License.
18+
* #L%
19+
*/
20+
package com.flowingcode.vaadin.addons.orgchart;
221

322
import java.util.Arrays;
423

@@ -16,9 +35,9 @@
1635
@Route("")
1736
@CssImport(value = "./demo-styles.css")
1837
@CssImport(value = "./font-awesome.css")
19-
public class View extends Div {
38+
public class DemoView extends Div {
2039

21-
public View() {
40+
public DemoView() {
2241
// org chart 1
2342
OrgChart component1 = getExample1();
2443
String nodeTemplate = "<div class='title'>${item.title}</div>"+

‎src/test/java/org/vaadin/test/AbstractViewTest.java‎

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

‎src/test/java/org/vaadin/test/ViewIT.java‎

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

‎src/test/resources/META-INF/resources/frontend/demo-styles.css‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,22 @@
1+
/*-
2+
* #%L
3+
* OrgChart Add-on
4+
* %%
5+
* Copyright (C) 2017 - 2019 Flowing Code S.A.
6+
* %%
7+
* Licensed under the Apache License, Version 2.0 (the "License");
8+
* you may not use this file except in compliance with the License.
9+
* You may obtain a copy of the License at
10+
*
11+
* http://www.apache.org/licenses/LICENSE-2.0
12+
*
13+
* Unless required by applicable law or agreed to in writing, software
14+
* distributed under the License is distributed on an "AS IS" BASIS,
15+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
* See the License for the specific language governing permissions and
17+
* limitations under the License.
18+
* #L%
19+
*/
120

221
.chart-container {
322
position: relative;

0 commit comments

Comments
 (0)