Skip to content

Commit 6a3aada

Browse files
FibreFoXFibreFoX
committed
Updated to current version of javafx-maven-plugin
* upgraded some dependencies * compile-fix for client: uses class MappingJackson2HttpMessageConverter now * updated README.md
1 parent 5d1e048 commit 6a3aada

File tree

8 files changed

+133
-74
lines changed

8 files changed

+133
-74
lines changed

‎.editorconfig‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# this is the main configuration file
2+
root = true
3+
4+
# unix-style line-endings with empty line ending
5+
[*]
6+
end_of_line = lf
7+
insert_final_newline = true
8+
charset = utf-8
9+
10+
# indent is spaces (4 spaces = 1 tab)
11+
[*.java]
12+
indent_style = space
13+
indent_size = 4

‎.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
/.classpath
2+
/.project
3+
/.settings/
4+
/target/

‎README.md‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
JavaFX REST Archetype
22
=====================
33

4-
A Maven archetype for generating a basic JavaFX REST client-server starter project.
4+
A Maven archetype for generating a basic JavaFX REST client-server starter project using Jetty and SpringFramework.
55

66
Usage
77
======
88

99
```
10-
mvn archetype:generate -DarchetypeGroupId=com.zenjava -DarchetypeArtifactId=javafx-rest-archetype -DarchetypeVersion=1.0
10+
mvn archetype:generate -DarchetypeGroupId=com.zenjava -DarchetypeArtifactId=javafx-rest-archetype
1111
```
1212

1313
This will generate a multi-module Maven project with three modules:
@@ -24,9 +24,7 @@ Run the server from the base directory of the **server module** using:
2424

2525
mvn jetty:run
2626

27-
Run the client from the base directory of the **client module** using:
28-
29-
mvn jfx:run
27+
Run the client from the base directory of the **client module** (using `mvn jfx:run` is **deprecated**, because it does not respect launcher-settings).
3028

3129

3230
Development and Deployment
@@ -44,12 +42,9 @@ And then copy the WAR file from the target directory and deploy this to your web
4442
To build a deployment bundle for your client, run one of the JavaFX distribution mechanisms from the **client module**
4543
base directory, such as:
4644

47-
mvn clean jfx:build-jar
48-
49-
Which will build an executable JAR that you can double click to launch your client application. Alternatively see the
50-
JavaFX Maven Plugin for alternate ways to deploy, including Webstart and native installers:
45+
mvn clean jfx:jar
5146

52-
https://github.com/zonski/javafx-maven-plugin/wiki
47+
Which will build an executable JAR that you can execute(e.g. via double-clicking) to launch your client application.
5348

5449

5550
Licence

‎pom.xml‎

Lines changed: 95 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,14 @@
2525

2626
<modelVersion>4.0.0</modelVersion>
2727

28-
<parent>
29-
<groupId>org.sonatype.oss</groupId>
30-
<artifactId>oss-parent</artifactId>
31-
<version>7</version>
32-
</parent>
33-
3428
<groupId>com.zenjava</groupId>
3529
<artifactId>javafx-rest-archetype</artifactId>
36-
<version>2.0.2-SNAPSHOT</version>
30+
<version>8.1.5-SNAPSHOT</version>
3731
<packaging>maven-archetype</packaging>
3832

3933
<name>JavaFX REST Archetype</name>
4034

41-
<url>https://github.com/zonski/javafx-rest-archetype</url>
35+
<url>https://github.com/javafx-maven-plugin/javafx-rest-archetype</url>
4236
<description>
4337
The JavaFX Basic Archetype provides a Maven archetype for generating a basic JavaFX REST client-server starter
4438
project.
@@ -61,70 +55,123 @@
6155
<roles>
6256
<role>Original Author</role>
6357
</roles>
58+
</developer>
59+
<developer>
60+
<id>fibrefox</id>
61+
<name>Danny Althoff</name>
62+
<email>fibrefox@dynamicfiles.de</email>
63+
<roles>
64+
<role>Maintainer</role>
65+
</roles>
6466
</developer>
6567
</developers>
6668

6769
<scm>
68-
<connection>scm:git:git://github.com/zonski/javafx-rest-archetype.git</connection>
69-
<developerConnection>scm:git:git@github.com:zonski/javafx-rest-archetype.git</developerConnection>
70-
<url>https://github.com/zonski/javafx-rest-archetype.git</url>
70+
<connection>scm:git:git://github.com/javafx-maven-plugin/javafx-rest-archetype.git</connection>
71+
<developerConnection>scm:git:git@github.com:javafx-maven-plugin/javafx-rest-archetype.git</developerConnection>
72+
<url>https://github.com/javafx-maven-plugin/javafx-rest-archetype.git</url>
7173
</scm>
7274

7375
<issueManagement>
7476
<system>GitHub</system>
75-
<url>https://github.com/zonski/javafx-rest-archetype/issues</url>
76-
</issueManagement>
77-
77+
<url>https://github.com/javafx-maven-plugin/javafx-rest-archetype/issues</url>
78+
</issueManagement>
79+
80+
<distributionManagement>
81+
<snapshotRepository>
82+
<id>ossrh</id>
83+
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
84+
</snapshotRepository>
85+
<repository>
86+
<id>ossrh</id>
87+
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
88+
</repository>
89+
</distributionManagement>
7890

7991
<build>
8092
<extensions>
8193
<extension>
8294
<groupId>org.apache.maven.archetype</groupId>
8395
<artifactId>archetype-packaging</artifactId>
84-
<version>2.2</version>
96+
<version>2.4</version>
8597
</extension>
8698
</extensions>
8799

88100
<pluginManagement>
89101
<plugins>
90102
<plugin>
91103
<artifactId>maven-archetype-plugin</artifactId>
92-
<version>2.2</version>
104+
<version>2.4</version>
93105
</plugin>
94106
</plugins>
95107
</pluginManagement>
96-
</build>
97-
98-
<profiles>
99-
<profile>
100-
<id>release-sign-artifacts</id>
101-
<activation>
102-
<property>
103-
<name>performRelease</name>
104-
<value>true</value>
105-
</property>
106-
</activation>
107-
<build>
108-
<plugins>
109-
<plugin>
110-
<artifactId>maven-gpg-plugin</artifactId>
111-
<version>1.2</version>
112-
<executions>
113-
<execution>
114-
<id>sign-artifacts</id>
115-
<phase>verify</phase>
116-
<goals>
117-
<goal>sign</goal>
118-
</goals>
119-
</execution>
120-
</executions>
121-
<configuration>
122-
<mavenExecutorId>forked-path</mavenExecutorId>
123-
</configuration>
124-
</plugin>
125-
</plugins>
126-
</build>
127-
</profile>
108+
</build>
109+
110+
<properties>
111+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
112+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
113+
114+
<maven.compiler.target>1.8</maven.compiler.target>
115+
<maven.compiler.source>1.8</maven.compiler.source>
116+
117+
<!-- profile-triggers -->
118+
<doSign>false</doSign>
119+
<doRelease>false</doRelease>
120+
</properties>
121+
122+
<profiles>
123+
<profile>
124+
<id>generate-signed-files</id>
125+
<activation>
126+
<property>
127+
<name>doSign</name>
128+
<value>true</value>
129+
</property>
130+
</activation>
131+
<build>
132+
<plugins>
133+
<!-- sign stuff for maven-central via OSSRH/Sonatype -->
134+
<plugin>
135+
<groupId>org.apache.maven.plugins</groupId>
136+
<artifactId>maven-gpg-plugin</artifactId>
137+
<version>1.6</version>
138+
<executions>
139+
<execution>
140+
<id>sign-artifacts</id>
141+
<phase>verify</phase>
142+
<goals>
143+
<goal>sign</goal>
144+
</goals>
145+
</execution>
146+
</executions>
147+
</plugin>
148+
</plugins>
149+
</build>
150+
</profile>
151+
<profile>
152+
<id>release-to-ossrh</id>
153+
<activation>
154+
<property>
155+
<name>doRelease</name>
156+
<value>true</value>
157+
</property>
158+
</activation>
159+
<build>
160+
<plugins>
161+
<plugin>
162+
<groupId>org.sonatype.plugins</groupId>
163+
<artifactId>nexus-staging-maven-plugin</artifactId>
164+
<version>1.6.5</version>
165+
<extensions>true</extensions>
166+
<configuration>
167+
<serverId>ossrh</serverId>
168+
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
169+
<autoReleaseAfterClose>false</autoReleaseAfterClose>
170+
</configuration>
171+
</plugin>
172+
</plugins>
173+
</build>
174+
</profile>
128175
</profiles>
129176

130177
</project>

‎src/main/resources/archetype-resources/__rootArtifactId__-client/pom.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<plugin>
3737
<groupId>com.zenjava</groupId>
3838
<artifactId>javafx-maven-plugin</artifactId>
39-
<version>2.0</version>
39+
<version>8.1.5</version>
4040
<configuration>
4141

4242
<!-- we need to tell the plugin which class to launch but it figures out most of the rest -->
@@ -96,11 +96,11 @@
9696
<version>1</version>
9797
</dependency>
9898

99-
<!-- Jackson JSON Mapper -->
100-
<dependency>
101-
<groupId>org.codehaus.jackson</groupId>
102-
<artifactId>jackson-mapper-asl</artifactId>
103-
<version>${org.codehaus.jackson.version}</version>
99+
<!-- Jackson JSON Mapper -->
100+
<dependency>
101+
<groupId>com.fasterxml.jackson.core</groupId>
102+
<artifactId>jackson-databind</artifactId>
103+
<version>${jackson.version}</version>
104104
</dependency>
105105

106106
<!-- Logging -->

‎src/main/resources/archetype-resources/__rootArtifactId__-client/src/main/java/client/SimpleRestAppFactory.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import org.springframework.context.annotation.PropertySource;
1111
import org.springframework.core.env.Environment;
1212
import org.springframework.http.converter.HttpMessageConverter;
13-
import org.springframework.http.converter.json.MappingJacksonHttpMessageConverter;
13+
import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
1414
import org.springframework.web.client.RestTemplate;
1515

1616
import java.io.IOException;
@@ -55,7 +55,7 @@ public class SimpleRestAppFactory {
5555
public RestTemplate restTemplate() {
5656
RestTemplate restTemplate = new RestTemplate();
5757
List<HttpMessageConverter<?>> converters = new ArrayList<HttpMessageConverter<?>>();
58-
converters.add(new MappingJacksonHttpMessageConverter());
58+
converters.add(new MappingJackson2HttpMessageConverter());
5959
restTemplate.setMessageConverters(converters);
6060
return restTemplate;
6161
}

‎src/main/resources/archetype-resources/__rootArtifactId__-server/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<plugin>
4040
<groupId>org.mortbay.jetty</groupId>
4141
<artifactId>maven-jetty-plugin</artifactId>
42-
<version>6.1.10</version>
42+
<version>6.1.26</version>
4343
</plugin>
4444
</plugins>
4545

@@ -75,9 +75,9 @@
7575

7676
<!-- Jackson JSON Mapper -->
7777
<dependency>
78-
<groupId>org.codehaus.jackson</groupId>
79-
<artifactId>jackson-mapper-asl</artifactId>
80-
<version>${org.codehaus.jackson.version}</version>
78+
<groupId>com.fasterxml.jackson.core</groupId>
79+
<artifactId>jackson-databind</artifactId>
80+
<version>${jackson.version}</version>
8181
</dependency>
8282

8383
<!-- Logging -->

‎src/main/resources/archetype-resources/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222

2323
<!-- define the common properties used throughout the modules - allows us to keep things consistent -->
2424
<properties>
25-
<org.springframework.version>3.1.3.RELEASE</org.springframework.version>
26-
<org.slf4j.version>1.6.1</org.slf4j.version>
27-
<org.codehaus.jackson.version>1.9.5</org.codehaus.jackson.version>
28-
<log4j.version>1.2.16</log4j.version>
25+
<org.springframework.version>4.2.1.RELEASE</org.springframework.version>
26+
<org.slf4j.version>1.7.12</org.slf4j.version>
27+
<jackson.version>2.6.2</jackson.version>
28+
<log4j.version>1.2.17</log4j.version>
2929
</properties>
3030

3131
<!-- define the sub-modules - Maven will work out the build order based on their inter-dependencies -->

0 commit comments

Comments
 (0)