Skip to content

Commit c322388

Browse files
niloc132niloc132
committed
Distinct relocation poms and script for gwtproject vs Google
The old script, being already used in Google-managed CI, continues to deploy poms with com.google groupId. A new script, maven/push-gwtproject.sh, has the same contents as the old one used to have, and deploys the org.gwtproject poms. Samples that use maven have also been updated to use the new ltgt gwt maven plugin and the new groupIds. Change-Id: I0f582304faf9546ac37616a78bc7735f8beeba26
1 parent 7803393 commit c322388

File tree

24 files changed

+609
-64
lines changed

24 files changed

+609
-64
lines changed

‎maven/google-poms/gwt/gwt-codeserver/pom-template.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
<groupId>com.google.gwt</groupId>
7+
<artifactId>gwt-codeserver</artifactId>
8+
<version>${gwtVersion}</version>
9+
<distributionManagement>
10+
<relocation>
11+
<groupId>org.gwtproject</groupId>
12+
</relocation>
13+
</distributionManagement>
14+
</project>

‎maven/google-poms/gwt/gwt-dev/pom-template.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
<groupId>com.google.gwt</groupId>
7+
<artifactId>gwt-dev</artifactId>
8+
<version>${gwtVersion}</version>
9+
<distributionManagement>
10+
<relocation>
11+
<groupId>org.gwtproject</groupId>
12+
</relocation>
13+
</distributionManagement>
14+
</project>

‎maven/google-poms/gwt/gwt-servlet/pom-template.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
<groupId>com.google.gwt</groupId>
7+
<artifactId>gwt-servlet</artifactId>
8+
<version>${gwtVersion}</version>
9+
<distributionManagement>
10+
<relocation>
11+
<groupId>org.gwtproject</groupId>
12+
</relocation>
13+
</distributionManagement>
14+
</project>

‎maven/google-poms/gwt/gwt-user/pom-template.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
<groupId>com.google.gwt</groupId>
7+
<artifactId>gwt-user</artifactId>
8+
<version>${gwtVersion}</version>
9+
<distributionManagement>
10+
<relocation>
11+
<groupId>org.gwtproject</groupId>
12+
</relocation>
13+
</distributionManagement>
14+
</project>

‎maven/google-poms/gwt/pom-template.xml

Lines changed: 251 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,251 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
5+
<parent>
6+
<groupId>org.sonatype.oss</groupId>
7+
<artifactId>oss-parent</artifactId>
8+
<version>4</version>
9+
</parent>
10+
<modelVersion>4.0.0</modelVersion>
11+
<groupId>com.google.gwt</groupId>
12+
<artifactId>gwt</artifactId>
13+
<packaging>pom</packaging>
14+
<name>GWT</name>
15+
<url>http://www.gwtproject.org/</url>
16+
<version>${gwtVersion}</version>
17+
<licenses>
18+
<license>
19+
<name>GWT Terms</name>
20+
<url>http://www.gwtproject.org/terms.html</url>
21+
</license>
22+
</licenses>
23+
<properties>
24+
<jetty.version>9.4.44.v20210927</jetty.version>
25+
<asm.version>9.2</asm.version>
26+
</properties>
27+
<dependencyManagement>
28+
<dependencies>
29+
<dependency>
30+
<groupId>org.gwtproject</groupId>
31+
<artifactId>gwt-user</artifactId>
32+
<version>${project.version}</version>
33+
</dependency>
34+
<dependency>
35+
<groupId>org.gwtproject</groupId>
36+
<artifactId>gwt-dev</artifactId>
37+
<version>${project.version}</version>
38+
</dependency>
39+
<dependency>
40+
<groupId>org.gwtproject</groupId>
41+
<artifactId>gwt-codeserver</artifactId>
42+
<version>${project.version}</version>
43+
</dependency>
44+
<dependency>
45+
<groupId>org.gwtproject</groupId>
46+
<artifactId>gwt-servlet</artifactId>
47+
<version>${project.version}</version>
48+
</dependency>
49+
<dependency>
50+
<groupId>com.google.gwt</groupId>
51+
<artifactId>gwt-user</artifactId>
52+
<version>${project.version}</version>
53+
</dependency>
54+
<dependency>
55+
<groupId>com.google.gwt</groupId>
56+
<artifactId>gwt-dev</artifactId>
57+
<version>${project.version}</version>
58+
</dependency>
59+
<dependency>
60+
<groupId>com.google.gwt</groupId>
61+
<artifactId>gwt-codeserver</artifactId>
62+
<version>${project.version}</version>
63+
</dependency>
64+
<dependency>
65+
<groupId>com.google.gwt</groupId>
66+
<artifactId>gwt-servlet</artifactId>
67+
<version>${project.version}</version>
68+
</dependency>
69+
<dependency>
70+
<groupId>com.google.web.bindery</groupId>
71+
<artifactId>requestfactory</artifactId>
72+
<version>${project.version}</version>
73+
<type>pom</type>
74+
<scope>import</scope>
75+
</dependency>
76+
<dependency>
77+
<groupId>com.google.jsinterop</groupId>
78+
<artifactId>jsinterop-annotations</artifactId>
79+
<version>2.0.0</version>
80+
</dependency>
81+
<dependency>
82+
<groupId>javax.servlet</groupId>
83+
<artifactId>javax.servlet-api</artifactId>
84+
<version>3.1.0</version>
85+
</dependency>
86+
<dependency>
87+
<groupId>javax.validation</groupId>
88+
<artifactId>validation-api</artifactId>
89+
<version>1.0.0.GA</version>
90+
</dependency>
91+
<dependency>
92+
<groupId>javax.validation</groupId>
93+
<artifactId>validation-api</artifactId>
94+
<version>1.0.0.GA</version>
95+
<!-- Note: use classifier=sources rather than type=java-sources so they're added to the classpath -->
96+
<classifier>sources</classifier>
97+
</dependency>
98+
<dependency>
99+
<groupId>com.google.code.gson</groupId>
100+
<artifactId>gson</artifactId>
101+
<version>2.6.2</version>
102+
</dependency>
103+
<dependency>
104+
<groupId>org.ow2.asm</groupId>
105+
<artifactId>asm</artifactId>
106+
<version>${asm.version}</version>
107+
</dependency>
108+
<dependency>
109+
<groupId>org.ow2.asm</groupId>
110+
<artifactId>asm-commons</artifactId>
111+
<version>${asm.version}</version>
112+
</dependency>
113+
<dependency>
114+
<groupId>org.ow2.asm</groupId>
115+
<artifactId>asm-util</artifactId>
116+
<version>${asm.version}</version>
117+
</dependency>
118+
<dependency>
119+
<groupId>colt</groupId>
120+
<artifactId>colt</artifactId>
121+
<version>1.2.0</version>
122+
</dependency>
123+
<dependency>
124+
<groupId>commons-collections</groupId>
125+
<artifactId>commons-collections</artifactId>
126+
<version>3.2.2</version>
127+
</dependency>
128+
<dependency>
129+
<groupId>commons-io</groupId>
130+
<artifactId>commons-io</artifactId>
131+
<version>2.4</version>
132+
</dependency>
133+
<dependency>
134+
<groupId>com.ibm.icu</groupId>
135+
<artifactId>icu4j</artifactId>
136+
<version>63.1</version>
137+
</dependency>
138+
<dependency>
139+
<groupId>net.sourceforge.htmlunit</groupId>
140+
<artifactId>htmlunit</artifactId>
141+
<version>2.19</version>
142+
</dependency>
143+
<dependency>
144+
<groupId>org.w3c.css</groupId>
145+
<artifactId>sac</artifactId>
146+
<version>1.3</version>
147+
</dependency>
148+
<dependency>
149+
<groupId>tapestry</groupId>
150+
<artifactId>tapestry</artifactId>
151+
<version>4.0.2</version>
152+
</dependency>
153+
<dependency>
154+
<groupId>com.google.code.findbugs</groupId>
155+
<artifactId>jsr305</artifactId>
156+
<version>1.3.9</version>
157+
</dependency>
158+
<!-- For DevMode / JUnitShell (transitive dependency on jetty-server for CodeServer) -->
159+
<dependency>
160+
<groupId>org.eclipse.jetty</groupId>
161+
<artifactId>jetty-webapp</artifactId>
162+
<version>${jetty.version}</version>
163+
</dependency>
164+
<!-- For CodeServer (GZip support) -->
165+
<dependency>
166+
<groupId>org.eclipse.jetty</groupId>
167+
<artifactId>jetty-servlets</artifactId>
168+
<version>${jetty.version}</version>
169+
</dependency>
170+
<!-- For JSPs (and annotations scanning) in DevMode -->
171+
<!-- Those two dependencies are actually optional, included here mostly for backwards compatibility -->
172+
<dependency>
173+
<groupId>org.eclipse.jetty</groupId>
174+
<artifactId>jetty-annotations</artifactId>
175+
<version>${jetty.version}</version>
176+
</dependency>
177+
<dependency>
178+
<groupId>org.eclipse.jetty</groupId>
179+
<artifactId>apache-jsp</artifactId>
180+
<version>${jetty.version}</version>
181+
<exclusions>
182+
<exclusion>
183+
<groupId>org.eclipse.jetty.orbit</groupId>
184+
<artifactId>org.eclipse.jdt.core</artifactId>
185+
</exclusion>
186+
</exclusions>
187+
</dependency>
188+
<!-- Some transitive dependencies of the above, to (tentatively) prevent conflicts -->
189+
<dependency>
190+
<groupId>org.eclipse.jetty.websocket</groupId>
191+
<artifactId>websocket-api</artifactId>
192+
<version>${jetty.version}</version>
193+
</dependency>
194+
<dependency>
195+
<groupId>org.eclipse.jetty.websocket</groupId>
196+
<artifactId>websocket-common</artifactId>
197+
<version>${jetty.version}</version>
198+
</dependency>
199+
<dependency>
200+
<groupId>org.eclipse.jetty</groupId>
201+
<artifactId>jetty-continuation</artifactId>
202+
<version>${jetty.version}</version>
203+
</dependency>
204+
<dependency>
205+
<groupId>org.eclipse.jetty</groupId>
206+
<artifactId>jetty-http</artifactId>
207+
<version>${jetty.version}</version>
208+
</dependency>
209+
<dependency>
210+
<groupId>org.eclipse.jetty</groupId>
211+
<artifactId>jetty-io</artifactId>
212+
<version>${jetty.version}</version>
213+
</dependency>
214+
<dependency>
215+
<groupId>org.eclipse.jetty</groupId>
216+
<artifactId>jetty-jndi</artifactId>
217+
<version>${jetty.version}</version>
218+
</dependency>
219+
<dependency>
220+
<groupId>org.eclipse.jetty</groupId>
221+
<artifactId>jetty-plus</artifactId>
222+
<version>${jetty.version}</version>
223+
</dependency>
224+
<dependency>
225+
<groupId>org.eclipse.jetty</groupId>
226+
<artifactId>jetty-util</artifactId>
227+
<version>${jetty.version}</version>
228+
</dependency>
229+
<dependency>
230+
<groupId>org.eclipse.jetty</groupId>
231+
<artifactId>jetty-security</artifactId>
232+
<version>${jetty.version}</version>
233+
</dependency>
234+
<dependency>
235+
<groupId>org.eclipse.jetty</groupId>
236+
<artifactId>jetty-server</artifactId>
237+
<version>${jetty.version}</version>
238+
</dependency>
239+
<dependency>
240+
<groupId>org.eclipse.jetty</groupId>
241+
<artifactId>jetty-servlet</artifactId>
242+
<version>${jetty.version}</version>
243+
</dependency>
244+
<dependency>
245+
<groupId>org.eclipse.jetty</groupId>
246+
<artifactId>jetty-xml</artifactId>
247+
<version>${jetty.version}</version>
248+
</dependency>
249+
</dependencies>
250+
</dependencyManagement>
251+
</project>

‎maven/google-poms/requestfactory/apt/pom-template.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
<groupId>com.google.web.bindery</groupId>
7+
<artifactId>requestfactory-apt</artifactId>
8+
<version>${gwtVersion}</version>
9+
<distributionManagement>
10+
<relocation>
11+
<groupId>org.gwtproject.web.bindery</groupId>
12+
</relocation>
13+
</distributionManagement>
14+
</project>

‎maven/google-poms/requestfactory/client/pom-template.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
<groupId>com.google.web.bindery</groupId>
7+
<artifactId>requestfactory-client</artifactId>
8+
<version>${gwtVersion}</version>
9+
<distributionManagement>
10+
<relocation>
11+
<groupId>org.gwtproject.web.bindery</groupId>
12+
</relocation>
13+
</distributionManagement>
14+
</project>

0 commit comments

Comments
 (0)