Skip to content

Commit fc77521

Browse files
author
Rob Blair
committed
Simplify java sample poms.
* remove scala references from the java client pom template files. * regenerate the petstore sample pom.xml, verify they can build properly.
1 parent 1522069 commit fc77521

File tree

4 files changed

+0
-248
lines changed

4 files changed

+0
-248
lines changed

‎samples/client/petstore/android-java/pom.xml‎

Lines changed: 0 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -104,55 +104,8 @@
104104
<target>1.6</target>
105105
</configuration>
106106
</plugin>
107-
<plugin>
108-
<groupId>net.alchim31.maven</groupId>
109-
<artifactId>scala-maven-plugin</artifactId>
110-
<version>${scala-maven-plugin-version}</version>
111-
<executions>
112-
<execution>
113-
<goals>
114-
<goal>compile</goal>
115-
<goal>testCompile</goal>
116-
</goals>
117-
</execution>
118-
</executions>
119-
<configuration>
120-
<configuration>
121-
<recompileMode>incremental</recompileMode>
122-
</configuration>
123-
<jvmArgs>
124-
<jvmArg>-Xmx384m</jvmArg>
125-
</jvmArgs>
126-
<args>
127-
<arg>-target:jvm-1.5</arg>
128-
<arg>-deprecation</arg>
129-
</args>
130-
<launchers>
131-
<launcher>
132-
<id>run-scalatest</id>
133-
<mainClass>org.scalatest.tools.Runner</mainClass>
134-
<args>
135-
<arg>-p</arg>
136-
<arg>${project.build.testOutputDirectory}</arg>
137-
</args>
138-
<jvmArgs>
139-
<jvmArg>-Xmx512m</jvmArg>
140-
</jvmArgs>
141-
</launcher>
142-
</launchers>
143-
</configuration>
144-
</plugin>
145107
</plugins>
146108
</build>
147-
<reporting>
148-
<plugins>
149-
<plugin>
150-
<groupId>net.alchim31.maven</groupId>
151-
<artifactId>scala-maven-plugin</artifactId>
152-
<version>${scala-maven-plugin-version}</version>
153-
</plugin>
154-
</plugins>
155-
</reporting>
156109
<dependencies>
157110
<dependency>
158111
<groupId>com.fasterxml.jackson.core</groupId>
@@ -180,18 +133,6 @@
180133
</dependency>
181134

182135
<!-- test dependencies -->
183-
<dependency>
184-
<groupId>org.scala-lang</groupId>
185-
<artifactId>scala-library</artifactId>
186-
<version>${scala-version}</version>
187-
<scope>test</scope>
188-
</dependency>
189-
<dependency>
190-
<groupId>org.scalatest</groupId>
191-
<artifactId>scalatest_2.9.1</artifactId>
192-
<version>${scala-test-version}</version>
193-
<scope>test</scope>
194-
</dependency>
195136
<dependency>
196137
<groupId>junit</groupId>
197138
<artifactId>junit</artifactId>
@@ -202,13 +143,10 @@
202143

203144
<properties>
204145
<jackson-version>2.1.4</jackson-version>
205-
<scala-version>2.9.1-1</scala-version>
206146
<junit-version>4.8.1</junit-version>
207147
<maven-plugin-version>1.0.0</maven-plugin-version>
208148
<junit-version>4.8.1</junit-version>
209-
<scala-test-version>1.6.1</scala-test-version>
210149
<httpclient-version>4.0</httpclient-version>
211-
<scala-maven-plugin-version>3.1.5</scala-maven-plugin-version>
212150
</properties>
213151
</project>
214152

‎samples/client/petstore/java/pom.xml‎

Lines changed: 0 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -104,55 +104,8 @@
104104
<target>1.6</target>
105105
</configuration>
106106
</plugin>
107-
<plugin>
108-
<groupId>net.alchim31.maven</groupId>
109-
<artifactId>scala-maven-plugin</artifactId>
110-
<version>${scala-maven-plugin-version}</version>
111-
<executions>
112-
<execution>
113-
<goals>
114-
<goal>compile</goal>
115-
<goal>testCompile</goal>
116-
</goals>
117-
</execution>
118-
</executions>
119-
<configuration>
120-
<configuration>
121-
<recompileMode>incremental</recompileMode>
122-
</configuration>
123-
<jvmArgs>
124-
<jvmArg>-Xmx384m</jvmArg>
125-
</jvmArgs>
126-
<args>
127-
<arg>-target:jvm-1.5</arg>
128-
<arg>-deprecation</arg>
129-
</args>
130-
<launchers>
131-
<launcher>
132-
<id>run-scalatest</id>
133-
<mainClass>org.scalatest.tools.Runner</mainClass>
134-
<args>
135-
<arg>-p</arg>
136-
<arg>${project.build.testOutputDirectory}</arg>
137-
</args>
138-
<jvmArgs>
139-
<jvmArg>-Xmx512m</jvmArg>
140-
</jvmArgs>
141-
</launcher>
142-
</launchers>
143-
</configuration>
144-
</plugin>
145107
</plugins>
146108
</build>
147-
<reporting>
148-
<plugins>
149-
<plugin>
150-
<groupId>net.alchim31.maven</groupId>
151-
<artifactId>scala-maven-plugin</artifactId>
152-
<version>${scala-maven-plugin-version}</version>
153-
</plugin>
154-
</plugins>
155-
</reporting>
156109
<dependencies>
157110
<dependency>
158111
<groupId>com.sun.jersey</groupId>
@@ -197,18 +150,6 @@
197150
</dependency>
198151

199152
<!-- test dependencies -->
200-
<dependency>
201-
<groupId>org.scala-lang</groupId>
202-
<artifactId>scala-library</artifactId>
203-
<version>${scala-version}</version>
204-
<scope>test</scope>
205-
</dependency>
206-
<dependency>
207-
<groupId>org.scalatest</groupId>
208-
<artifactId>scalatest_2.9.1</artifactId>
209-
<version>${scala-test-version}</version>
210-
<scope>test</scope>
211-
</dependency>
212153
<dependency>
213154
<groupId>junit</groupId>
214155
<artifactId>junit</artifactId>
@@ -221,12 +162,9 @@
221162
<jersey-version>1.7</jersey-version>
222163
<jackson-version>2.1.4</jackson-version>
223164
<jodatime-version>2.3</jodatime-version>
224-
<scala-version>2.9.1-1</scala-version>
225165
<junit-version>4.8.1</junit-version>
226166
<maven-plugin-version>1.0.0</maven-plugin-version>
227167
<junit-version>4.8.1</junit-version>
228-
<scala-test-version>1.6.1</scala-test-version>
229-
<scala-maven-plugin-version>3.1.5</scala-maven-plugin-version>
230168
</properties>
231169
</project>
232170

‎src/main/resources/Java/pom.mustache‎

Lines changed: 0 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -104,55 +104,8 @@
104104
<target>1.6</target>
105105
</configuration>
106106
</plugin>
107-
<plugin>
108-
<groupId>net.alchim31.maven</groupId>
109-
<artifactId>scala-maven-plugin</artifactId>
110-
<version>${scala-maven-plugin-version}</version>
111-
<executions>
112-
<execution>
113-
<goals>
114-
<goal>compile</goal>
115-
<goal>testCompile</goal>
116-
</goals>
117-
</execution>
118-
</executions>
119-
<configuration>
120-
<configuration>
121-
<recompileMode>incremental</recompileMode>
122-
</configuration>
123-
<jvmArgs>
124-
<jvmArg>-Xmx384m</jvmArg>
125-
</jvmArgs>
126-
<args>
127-
<arg>-target:jvm-1.5</arg>
128-
<arg>-deprecation</arg>
129-
</args>
130-
<launchers>
131-
<launcher>
132-
<id>run-scalatest</id>
133-
<mainClass>org.scalatest.tools.Runner</mainClass>
134-
<args>
135-
<arg>-p</arg>
136-
<arg>${project.build.testOutputDirectory}</arg>
137-
</args>
138-
<jvmArgs>
139-
<jvmArg>-Xmx512m</jvmArg>
140-
</jvmArgs>
141-
</launcher>
142-
</launchers>
143-
</configuration>
144-
</plugin>
145107
</plugins>
146108
</build>
147-
<reporting>
148-
<plugins>
149-
<plugin>
150-
<groupId>net.alchim31.maven</groupId>
151-
<artifactId>scala-maven-plugin</artifactId>
152-
<version>${scala-maven-plugin-version}</version>
153-
</plugin>
154-
</plugins>
155-
</reporting>
156109
<dependencies>
157110
<dependency>
158111
<groupId>com.sun.jersey</groupId>
@@ -197,18 +150,6 @@
197150
</dependency>
198151

199152
<!-- test dependencies -->
200-
<dependency>
201-
<groupId>org.scala-lang</groupId>
202-
<artifactId>scala-library</artifactId>
203-
<version>${scala-version}</version>
204-
<scope>test</scope>
205-
</dependency>
206-
<dependency>
207-
<groupId>org.scalatest</groupId>
208-
<artifactId>scalatest_2.9.1</artifactId>
209-
<version>${scala-test-version}</version>
210-
<scope>test</scope>
211-
</dependency>
212153
<dependency>
213154
<groupId>junit</groupId>
214155
<artifactId>junit</artifactId>
@@ -221,11 +162,8 @@
221162
<jersey-version>1.7</jersey-version>
222163
<jackson-version>2.1.4</jackson-version>
223164
<jodatime-version>2.3</jodatime-version>
224-
<scala-version>2.9.1-1</scala-version>
225165
<junit-version>4.8.1</junit-version>
226166
<maven-plugin-version>1.0.0</maven-plugin-version>
227167
<junit-version>4.8.1</junit-version>
228-
<scala-test-version>1.6.1</scala-test-version>
229-
<scala-maven-plugin-version>3.1.5</scala-maven-plugin-version>
230168
</properties>
231169
</project>

‎src/main/resources/android-java/pom.mustache‎

Lines changed: 0 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -104,55 +104,8 @@
104104
<target>1.6</target>
105105
</configuration>
106106
</plugin>
107-
<plugin>
108-
<groupId>net.alchim31.maven</groupId>
109-
<artifactId>scala-maven-plugin</artifactId>
110-
<version>${scala-maven-plugin-version}</version>
111-
<executions>
112-
<execution>
113-
<goals>
114-
<goal>compile</goal>
115-
<goal>testCompile</goal>
116-
</goals>
117-
</execution>
118-
</executions>
119-
<configuration>
120-
<configuration>
121-
<recompileMode>incremental</recompileMode>
122-
</configuration>
123-
<jvmArgs>
124-
<jvmArg>-Xmx384m</jvmArg>
125-
</jvmArgs>
126-
<args>
127-
<arg>-target:jvm-1.5</arg>
128-
<arg>-deprecation</arg>
129-
</args>
130-
<launchers>
131-
<launcher>
132-
<id>run-scalatest</id>
133-
<mainClass>org.scalatest.tools.Runner</mainClass>
134-
<args>
135-
<arg>-p</arg>
136-
<arg>${project.build.testOutputDirectory}</arg>
137-
</args>
138-
<jvmArgs>
139-
<jvmArg>-Xmx512m</jvmArg>
140-
</jvmArgs>
141-
</launcher>
142-
</launchers>
143-
</configuration>
144-
</plugin>
145107
</plugins>
146108
</build>
147-
<reporting>
148-
<plugins>
149-
<plugin>
150-
<groupId>net.alchim31.maven</groupId>
151-
<artifactId>scala-maven-plugin</artifactId>
152-
<version>${scala-maven-plugin-version}</version>
153-
</plugin>
154-
</plugins>
155-
</reporting>
156109
<dependencies>
157110
<dependency>
158111
<groupId>com.fasterxml.jackson.core</groupId>
@@ -180,18 +133,6 @@
180133
</dependency>
181134

182135
<!-- test dependencies -->
183-
<dependency>
184-
<groupId>org.scala-lang</groupId>
185-
<artifactId>scala-library</artifactId>
186-
<version>${scala-version}</version>
187-
<scope>test</scope>
188-
</dependency>
189-
<dependency>
190-
<groupId>org.scalatest</groupId>
191-
<artifactId>scalatest_2.9.1</artifactId>
192-
<version>${scala-test-version}</version>
193-
<scope>test</scope>
194-
</dependency>
195136
<dependency>
196137
<groupId>junit</groupId>
197138
<artifactId>junit</artifactId>
@@ -202,12 +143,9 @@
202143

203144
<properties>
204145
<jackson-version>2.1.4</jackson-version>
205-
<scala-version>2.9.1-1</scala-version>
206146
<junit-version>4.8.1</junit-version>
207147
<maven-plugin-version>1.0.0</maven-plugin-version>
208148
<junit-version>4.8.1</junit-version>
209-
<scala-test-version>1.6.1</scala-test-version>
210149
<httpclient-version>4.0</httpclient-version>
211-
<scala-maven-plugin-version>3.1.5</scala-maven-plugin-version>
212150
</properties>
213151
</project>

0 commit comments

Comments
 (0)