Skip to content

Commit b137032

Browse files
jjYBdx4ILjjYBdx4IL
jjYBdx4IL
authored and
jjYBdx4IL
committed
bump some versions and require dependency convergence
1 parent fb07340 commit b137032

File tree

4 files changed

+188
-94
lines changed

4 files changed

+188
-94
lines changed

‎gwt-example-2/README.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,13 @@ mvn -f example-server wildfly:shutdown
5656
```
5757

5858
Caveats: currently runs against the packaged war file, therefore this mode is currently not suitable for server-side
59-
development. There is kind of a workaround for this though: https://github.com/jjYBdx4IL/snippets/blob/master/bash/jee_autodeploy.sh
59+
development. There is kind of a workaround for this though:
60+
61+
https://github.com/jjYBdx4IL/snippets/blob/master/java/jee_autodeploy.sh
62+
6063
scans for changes on disk, and
6164
Wildfire allows to deploy ecploded WARs and add external classpaths to them:
6265
https://developer.jboss.org/wiki/HowToPutAnExternalFileInTheClasspath. That should make it possible to include
63-
the build paths of other workspace modules in order to avoid having to rebuild and deploy them.
66+
the build paths of other workspace modules in order to avoid having to rebuild and deploy them.
67+
68+

‎gwt-example-2/example-server/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,19 +37,19 @@
3737
<dependency>
3838
<groupId>org.seleniumhq.selenium</groupId>
3939
<artifactId>selenium-chrome-driver</artifactId>
40-
<version>3.141.5</version>
40+
<version>3.141.59</version>
4141
<scope>test</scope>
4242
</dependency>
4343
<dependency>
4444
<groupId>org.seleniumhq.selenium</groupId>
4545
<artifactId>selenium-support</artifactId>
46-
<version>3.141.5</version>
46+
<version>3.141.59</version>
4747
<scope>test</scope>
4848
</dependency>
4949
<dependency>
5050
<groupId>io.github.bonigarcia</groupId>
5151
<artifactId>webdrivermanager</artifactId>
52-
<version>3.0.0</version>
52+
<version>3.3.0</version>
5353
<scope>test</scope>
5454
</dependency>
5555
</dependencies>

‎gwt-example-2/pom.xml

Lines changed: 176 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -1,93 +1,182 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3-
<modelVersion>4.0.0</modelVersion>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4+
<modelVersion>4.0.0</modelVersion>
45

5-
<groupId>my.example</groupId>
6-
<artifactId>example</artifactId>
7-
<version>1.0-SNAPSHOT</version>
8-
<packaging>pom</packaging>
6+
<groupId>my.example</groupId>
7+
<artifactId>example</artifactId>
8+
<version>1.0-SNAPSHOT</version>
9+
<packaging>pom</packaging>
910

10-
<properties>
11-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
12-
</properties>
11+
<properties>
12+
<default.encoding>UTF-8</default.encoding>
13+
<project.build.sourceEncoding>${default.encoding}</project.build.sourceEncoding>
14+
<project.reporting.outputEncoding>${default.encoding}</project.reporting.outputEncoding>
15+
<maven.compiler.plugin.encoding>${default.encoding}</maven.compiler.plugin.encoding>
16+
<maven.compiler.source>1.8</maven.compiler.source>
17+
<maven.compiler.target>1.8</maven.compiler.target>
18+
<jetty.version>9.4.15.v20190215</jetty.version>
19+
<wildfly.version>16.0.0.Final</wildfly.version>
20+
</properties>
1321

14-
<dependencyManagement>
15-
<dependencies>
16-
<dependency>
17-
<groupId>com.google.gwt</groupId>
18-
<artifactId>gwt</artifactId>
19-
<version>2.8.2</version>
20-
<type>pom</type>
21-
<scope>import</scope>
22-
</dependency>
23-
<dependency>
24-
<groupId>javax.servlet</groupId>
25-
<artifactId>javax.servlet-api</artifactId>
26-
<version>3.1.0</version>
27-
</dependency>
28-
</dependencies>
29-
</dependencyManagement>
22+
<build>
23+
<plugins>
24+
<plugin>
25+
<groupId>net.ltgt.gwt.maven</groupId>
26+
<artifactId>gwt-maven-plugin</artifactId>
27+
<inherited>false</inherited>
28+
<configuration>
29+
<launcherDir>${project.build.directory}/gwt/launcherDir</launcherDir>
30+
</configuration>
31+
</plugin>
32+
<plugin>
33+
<artifactId>maven-enforcer-plugin</artifactId>
34+
<version>1.4.1</version>
35+
<executions>
36+
<execution>
37+
<id>enforce</id>
38+
<goals>
39+
<goal>enforce</goal>
40+
</goals>
41+
<phase>verify</phase>
42+
</execution>
43+
</executions>
44+
<configuration>
45+
<rules>
46+
<requireNoRepositories />
47+
<requirePluginVersions />
48+
<dependencyConvergence />
49+
<requireUpperBoundDeps />
50+
<requireReleaseDeps>
51+
<message>No Snapshots Allowed!</message>
52+
<onlyWhenRelease>true</onlyWhenRelease>
53+
</requireReleaseDeps>
54+
<requireJavaVersion>
55+
<version>[1.8,)</version>
56+
</requireJavaVersion>
57+
<requireMavenVersion>
58+
<version>[3.0,)</version>
59+
</requireMavenVersion>
60+
</rules>
61+
</configuration>
62+
</plugin>
63+
</plugins>
64+
<pluginManagement>
65+
<plugins>
66+
<plugin>
67+
<artifactId>maven-clean-plugin</artifactId>
68+
<version>3.1.0</version>
69+
</plugin>
70+
<plugin>
71+
<artifactId>maven-compiler-plugin</artifactId>
72+
<version>3.8.0</version>
73+
</plugin>
74+
<plugin>
75+
<artifactId>maven-install-plugin</artifactId>
76+
<version>3.0.0-M1</version>
77+
</plugin>
78+
<plugin>
79+
<artifactId>maven-site-plugin</artifactId>
80+
<version>3.7.1</version>
81+
</plugin>
82+
<plugin>
83+
<artifactId>maven-deploy-plugin</artifactId>
84+
<version>3.0.0-M1</version>
85+
</plugin>
86+
<plugin>
87+
<artifactId>maven-surefire-plugin</artifactId>
88+
<version>3.0.0-M3</version>
89+
</plugin>
90+
<plugin>
91+
<artifactId>maven-failsafe-plugin</artifactId>
92+
<version>3.0.0-M3</version>
93+
</plugin>
94+
<plugin>
95+
<artifactId>maven-jar-plugin</artifactId>
96+
<version>3.1.1</version>
97+
</plugin>
98+
<plugin>
99+
<artifactId>maven-resources-plugin</artifactId>
100+
<version>3.1.0</version>
101+
</plugin>
102+
<plugin>
103+
<groupId>org.eclipse.jetty</groupId>
104+
<artifactId>jetty-maven-plugin</artifactId>
105+
<version>${jetty.version}</version>
106+
</plugin>
107+
<plugin>
108+
<groupId>net.ltgt.gwt.maven</groupId>
109+
<artifactId>gwt-maven-plugin</artifactId>
110+
<version>1.0-rc-10</version>
111+
<extensions>true</extensions>
112+
<configuration>
113+
<failOnError>true</failOnError>
114+
</configuration>
115+
</plugin>
116+
<plugin>
117+
<artifactId>maven-source-plugin</artifactId>
118+
<version>3.0.1</version>
119+
<executions>
120+
<execution>
121+
<id>attach-sources</id>
122+
<phase>package</phase>
123+
<goals>
124+
<goal>jar-no-fork</goal>
125+
</goals>
126+
</execution>
127+
</executions>
128+
</plugin>
129+
<plugin>
130+
<groupId>org.apache.tomcat.maven</groupId>
131+
<artifactId>tomcat7-maven-plugin</artifactId>
132+
<version>2.2</version>
133+
</plugin>
134+
</plugins>
135+
</pluginManagement>
136+
</build>
137+
138+
<modules>
139+
<module>example-client</module>
140+
<module>example-shared</module>
141+
<module>example-server</module>
142+
</modules>
143+
144+
<dependencyManagement>
145+
<dependencies>
146+
<dependency>
147+
<groupId>com.google.gwt</groupId>
148+
<artifactId>gwt</artifactId>
149+
<version>2.8.2</version>
150+
<type>pom</type>
151+
<scope>import</scope>
152+
</dependency>
153+
154+
<dependency>
155+
<groupId>commons-codec</groupId>
156+
<artifactId>commons-codec</artifactId>
157+
<version>1.10</version>
158+
</dependency>
159+
<dependency>
160+
<groupId>commons-io</groupId>
161+
<artifactId>commons-io</artifactId>
162+
<version>2.6</version>
163+
</dependency>
164+
<dependency>
165+
<groupId>com.google.code.gson</groupId>
166+
<artifactId>gson</artifactId>
167+
<version>2.8.5</version>
168+
</dependency>
169+
<dependency>
170+
<groupId>javax.servlet</groupId>
171+
<artifactId>javax.servlet-api</artifactId>
172+
<version>3.1.0</version>
173+
</dependency>
174+
<dependency>
175+
<groupId>xml-apis</groupId>
176+
<artifactId>xml-apis</artifactId>
177+
<version>1.4.01</version>
178+
</dependency>
179+
</dependencies>
180+
</dependencyManagement>
30181

31-
<build>
32-
<plugins>
33-
<plugin>
34-
<groupId>net.ltgt.gwt.maven</groupId>
35-
<artifactId>gwt-maven-plugin</artifactId>
36-
<inherited>false</inherited>
37-
<configuration>
38-
<launcherDir>${project.build.directory}/gwt/launcherDir</launcherDir>
39-
</configuration>
40-
</plugin>
41-
</plugins>
42-
<pluginManagement>
43-
<plugins>
44-
<plugin>
45-
<artifactId>maven-compiler-plugin</artifactId>
46-
<version>3.8.0</version>
47-
<configuration>
48-
<source>1.8</source>
49-
<target>1.8</target>
50-
</configuration>
51-
</plugin>
52-
<plugin>
53-
<groupId>org.eclipse.jetty</groupId>
54-
<artifactId>jetty-maven-plugin</artifactId>
55-
<version>9.4.14.v20181114</version>
56-
</plugin>
57-
<plugin>
58-
<groupId>net.ltgt.gwt.maven</groupId>
59-
<artifactId>gwt-maven-plugin</artifactId>
60-
<version>1.0-rc-10</version>
61-
<extensions>true</extensions>
62-
<configuration>
63-
<sourceLevel>1.8</sourceLevel>
64-
<failOnError>true</failOnError>
65-
</configuration>
66-
</plugin>
67-
<plugin>
68-
<artifactId>maven-source-plugin</artifactId>
69-
<version>3.0.1</version>
70-
<executions>
71-
<execution>
72-
<id>attach-sources</id>
73-
<phase>package</phase>
74-
<goals>
75-
<goal>jar-no-fork</goal>
76-
</goals>
77-
</execution>
78-
</executions>
79-
</plugin>
80-
<plugin>
81-
<groupId>org.apache.tomcat.maven</groupId>
82-
<artifactId>tomcat7-maven-plugin</artifactId>
83-
<version>2.2</version>
84-
</plugin>
85-
</plugins>
86-
</pluginManagement>
87-
</build>
88-
<modules>
89-
<module>example-client</module>
90-
<module>example-shared</module>
91-
<module>example-server</module>
92-
</modules>
93182
</project>

‎gwt-example-2/startDev.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ echo "Hit ENTER to STOP, go to http://localhost:8080 for development."
2525
tail -n0 -F target/*.log &
2626
tailpid=$!
2727
trap "kill $tailpid" EXIT
28-
screen -d -m -S gwtcodeserver -L -Logfile target/gwtcodeserver.log mvn gwt:codeserver
28+
screen -c /dev/null -dmS gwtcodeserver -L -Logfile target/gwtcodeserver.log mvn gwt:codeserver
2929
# haven't had problems with the two maven processes starting up in parallel yet, but
3030
# it should be problematic at least in principle.
3131
# Also, in a clean environment, the codeserver seems to create directories that make jetty
@@ -34,7 +34,7 @@ screen -d -m -S gwtcodeserver -L -Logfile target/gwtcodeserver.log mvn gwt:codes
3434
if [[ -n "$SLOW" ]]; then
3535
while ! curl -s -o /dev/null http://localhost:9876; do sleep 1; done
3636
fi
37-
screen -d -m -S webserver -L -Logfile target/webserver.log mvn jetty:run -Denv=dev
37+
screen -c /dev/null -dmS webserver -L -Logfile target/webserver.log mvn jetty:run -Denv=dev
3838
read
3939
kill `screen -ls | perl -ne '/^\s+(\d+)\.(webserver|gwtcodeserver)\s+.*$/&&print $1.$/'`
4040

0 commit comments

Comments
 (0)