Skip to content

Commit cb90ce5

Browse files
committed
Use profiles to compile jsquery and samples, so as they are not copmpiled by default. Other adjustments in poms and gitignore
1 parent 9430eb3 commit cb90ce5

File tree

3 files changed

+33
-24
lines changed

3 files changed

+33
-24
lines changed

.gitignore

+8
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,11 @@ target
1818
*.ipr
1919
*.iml
2020
*.iws
21+
gen
22+
.gwt
23+
gwt-unitCache
24+
25+
#eclipse
26+
.project
27+
.classpath
28+
.settings

jsquery/pom.xml

+3-14
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,9 @@
1111
<packaging>war</packaging>
1212

1313
<properties>
14-
<gwtversion>2.5.0</gwtversion>
15-
<gwtmaven>2.5.0</gwtmaven>
14+
<gwtExporterVersion>2.4.0</gwtExporterVersion>
1615
</properties>
1716

18-
<profiles>
19-
<profile>
20-
<id>clos</id>
21-
<properties>
22-
<gwt.enableClosureCompiler>true</gwt.enableClosureCompiler>
23-
</properties>
24-
</profile>
25-
</profiles>
26-
2717
<dependencies>
2818
<dependency>
2919
<groupId>${groupId}</groupId>
@@ -35,7 +25,7 @@
3525
<dependency>
3626
<groupId>org.timepedia.exporter</groupId>
3727
<artifactId>gwtexporter</artifactId>
38-
<version>2.4.0-SNAPSHOT</version>
28+
<version>${gwtExporterVersion}</version>
3929
<scope>provided</scope>
4030
</dependency>
4131
<dependency>
@@ -72,12 +62,11 @@
7262
<version>${gwtmaven}</version>
7363
<configuration>
7464
<logLevel>${gwt.loglevel}</logLevel>
75-
<enableClosureCompiler>${gwt.enableClosureCompiler}</enableClosureCompiler>
65+
<enableClosureCompiler>true</enableClosureCompiler>
7666
<optimizationLevel>9</optimizationLevel>
7767
<gwtVersion>${gwtversion}</gwtVersion>
7868
<compileReport>true</compileReport>
7969
<disableClassMetadata>true</disableClassMetadata>
80-
<!-- Consider this in module <inherits name='com.google.gwt.user.RemoteServiceObfuscateTypeNames' /> -->
8170
<disableCastChecking>true</disableCastChecking>
8271
<modules>
8372
<module>com.google.gwt.query.jsquery.JsQueryApi</module>

pom.xml

+22-10
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,6 @@
6464

6565
<modules>
6666
<module>gwtquery-core</module>
67-
<!-- <module>gwtquery-core-2.1.0</module> -->
68-
<!-- <module>gwtquery-core-2.0.1</module> -->
69-
<!-- <module>samples</module> -->
70-
<!-- <module>devtest</module> -->
7167
</modules>
7268

7369
<pluginRepositories>
@@ -136,18 +132,18 @@
136132
</snapshots>
137133
</repository>
138134
<repository>
139-
<id>gwtquery-plugins</id>
140-
<url>http://gwtquery-plugins.googlecode.com/svn/mavenrepo</url>
135+
<id>sonatype</id>
136+
<url>http://oss.sonatype.org/content/repositories/snapshots</url>
137+
<snapshots><enabled>true</enabled></snapshots>
138+
<releases><enabled>false</enabled></releases>
141139
</repository>
142140
<repository>
143-
<id>maven2-repository.dev.java.net</id>
144-
<name>Java.net Repository for Maven</name>
145-
<url>http://download.java.net/maven/2/</url>
141+
<id>gwtquery-plugins</id>
142+
<url>http://gwtquery-plugins.googlecode.com/svn/mavenrepo</url>
146143
</repository>
147144
</repositories>
148145

149146
<properties>
150-
<!-- <gwtversion>2.4.0-dollarpatch</gwtversion> -->
151147
<gwtversion>2.5.1</gwtversion>
152148
<gwtmaven>2.5.1</gwtmaven>
153149
<gqueryclassifier />
@@ -159,13 +155,28 @@
159155
</properties>
160156

161157
<profiles>
158+
<profile>
159+
<id>jsquery</id>
160+
<modules>
161+
<module>gwtquery-core</module>
162+
<module>jsquery</module>
163+
</modules>
164+
</profile>
165+
<profile>
166+
<id>samples</id>
167+
<modules>
168+
<module>gwtquery-core</module>
169+
<module>samples</module>
170+
</modules>
171+
</profile>
162172
<profile>
163173
<id>2.1.0</id>
164174
<properties>
165175
<gwtversion>2.1.0</gwtversion>
166176
<gwtmaven>2.1.0</gwtmaven>
167177
<gqueryclassifier>2.1.0</gqueryclassifier>
168178
</properties>
179+
<modules><module>gwtquery-core-2.0.1</module></modules>
169180
</profile>
170181
<profile>
171182
<id>2.0.1</id>
@@ -174,6 +185,7 @@
174185
<gwtmaven>1.1</gwtmaven>
175186
<gqueryclassifier>2.0.1</gqueryclassifier>
176187
</properties>
188+
<modules><module>gwtquery-core-2.1.0</module></modules>
177189
</profile>
178190
<profile>
179191
<id>prod</id>

0 commit comments

Comments
 (0)