Skip to content
This repository
Browse code

2.5.2-SNAPSHOT

git-svn-id: https://svn.codehaus.org/groovy/eclipse/trunk@22833 a5544e8c-8a19-0410-ba12-f9af4593a198
  • Loading branch information...
commit dd91d32955c35a8b69983d625a7c988542667741 1 parent f477a3f
Andrew Eisenberg authored September 27, 2011
6  extras/groovy-eclipse-batch-builder/build.properties
@@ -16,10 +16,10 @@ jar.dest=/Users/andrew/Desktop/uberjar/lib
16 16
 extract.loc=${jar.dest}/../extract
17 17
 
18 18
 # version number for the 1.7 jar
19  
-version1.7=1.7.10-02
  19
+version1.7=1.7.10-03
20 20
 
21 21
 # version number for the 1.8 jar
22  
-version1.8=1.8.0-03
  22
+version1.8=1.8.2-01
23 23
 
24 24
 # uncomment to do a 1.7 build
25 25
 #do-17-build=true
@@ -28,7 +28,7 @@ version1.8=1.8.0-03
28 28
 do-18-build=true
29 29
 
30 30
 # Location of the plugins directory for the eclipse install
31  
-eclipse.install.plugins=/Users/andrew/Eclipse/Installations/sts-2.5.0.RC1/plugins
  31
+eclipse.install.plugins=/Users/andrew/Eclipse/Installations/Eclipse3.7/plugins
32 32
 
33 33
 # workspace location that contains the following plugins checked out and placed in the 
34 34
 # top level folder of the workspace
2  extras/groovy-eclipse-maven-tests/.settings/org.eclipse.core.resources.prefs
... ...
@@ -1,4 +1,4 @@
1  
-#Fri Sep 02 10:19:16 PDT 2011
  1
+#Tue Sep 20 14:55:45 PDT 2011
2 2
 eclipse.preferences.version=1
3 3
 encoding//src/main/java=UTF-8
4 4
 encoding//src/test/java=UTF-8
24  extras/groovy-eclipse-maven-tests/pom.xml
@@ -38,13 +38,13 @@
38 38
 				<configuration>
39 39
 					<compilerId>groovy-eclipse-compiler</compilerId>
40 40
 					<compilerArgument>nowarn</compilerArgument>
41  
-					<!--<verbose>true</verbose> -->
  41
+					<verbose>true</verbose>
42 42
 				</configuration>
43 43
 				<dependencies>
44 44
 					<dependency>
45 45
 						<groupId>org.codehaus.groovy</groupId>
46 46
 						<artifactId>groovy-eclipse-compiler</artifactId>
47  
-						<version>2.5.1</version>
  47
+						<version>2.5.1-1</version>
48 48
 					</dependency>
49 49
 					<!--  Uncomment to compile against Groovy 1.7.10 -->
50 50
 					<!-- <dependency>
@@ -54,26 +54,6 @@
54 54
 					</dependency> -->
55 55
 				</dependencies>
56 56
 			</plugin>
57  
-			<plugin>
58  
-				<groupId>org.codehaus.mojo</groupId>
59  
-				<artifactId>build-helper-maven-plugin</artifactId>
60  
-				<version>1.5</version>
61  
-				<executions>
62  
-					<execution>
63  
-						<id>add-source</id>
64  
-						<phase>generate-sources</phase>
65  
-						<goals>
66  
-							<goal>add-source</goal>
67  
-						</goals>
68  
-						<configuration>
69  
-							<sources>
70  
-								<source>src/main/groovy</source>
71  
-								<source>src/test/groovy</source>
72  
-							</sources>
73  
-						</configuration>
74  
-					</execution>
75  
-				</executions>
76  
-			</plugin>
77 57
 		</plugins>
78 58
 	</build>
79 59
 </project>
27  extras/groovy-eclipse-maven-tests/src/main/java/org/codehaus/groovy/eclipse/maven/testing/Bar.java
... ...
@@ -0,0 +1,27 @@
  1
+/*
  2
+ * Copyright 2003-2009 the original author or authors.
  3
+ *
  4
+ * Licensed under the Apache License, Version 2.0 (the "License");
  5
+ * you may not use this file except in compliance with the License.
  6
+ * You may obtain a copy of the License at
  7
+ *
  8
+ *     http://www.apache.org/licenses/LICENSE-2.0
  9
+ *
  10
+ * Unless required by applicable law or agreed to in writing, software
  11
+ * distributed under the License is distributed on an "AS IS" BASIS,
  12
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  13
+ * See the License for the specific language governing permissions and
  14
+ * limitations under the License.
  15
+ */
  16
+package org.codehaus.groovy.eclipse.maven.testing;
  17
+
  18
+/**
  19
+ * 
  20
+ * @author Andrew Eisenberg
  21
+ * @created Sep 26, 2011
  22
+ */
  23
+public class Bar {
  24
+private void meth() {
  25
+    Foo.getInstance();
  26
+}
  27
+}
25  extras/groovy-eclipse-maven-tests/src/main/java/org/codehaus/groovy/eclipse/maven/testing/Foo.groovy
... ...
@@ -0,0 +1,25 @@
  1
+/*
  2
+ * Copyright 2003-2009 the original author or authors.
  3
+ *
  4
+ * Licensed under the Apache License, Version 2.0 (the "License");
  5
+ * you may not use this file except in compliance with the License.
  6
+ * You may obtain a copy of the License at
  7
+ *
  8
+ *     http://www.apache.org/licenses/LICENSE-2.0
  9
+ *
  10
+ * Unless required by applicable law or agreed to in writing, software
  11
+ * distributed under the License is distributed on an "AS IS" BASIS,
  12
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  13
+ * See the License for the specific language governing permissions and
  14
+ * limitations under the License.
  15
+ */
  16
+package org.codehaus.groovy.eclipse.maven.testing
  17
+
  18
+/**
  19
+ * 
  20
+ * @author Andrew Eisenberg
  21
+ * @created Sep 26, 2011
  22
+ */
  23
+@Singleton
  24
+class Foo {
  25
+}
2  ...s/groovy/eclipse/maven/testing/ExampleTest.groovy → ...s/groovy/eclipse/maven/testing/ExampleTest.groovy
@@ -10,6 +10,8 @@
10 10
  *******************************************************************************/
11 11
 package org.codehaus.groovy.eclipse.maven.testing
12 12
 
  13
+import groovy.util.GroovyTestCase
  14
+
13 15
 /**
14 16
  * Tests for the {@link Example} class.
15 17
  */
2  extras/groovy-eclipse-quickstart/.classpath
... ...
@@ -1,7 +1,7 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2 2
 <classpath>
3 3
 	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
4  
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
  4
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
5 5
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
6 6
 	<classpathentry kind="output" path="target/classes"/>
7 7
 </classpath>
2  extras/groovy-eclipse-quickstart/.settings/org.maven.ide.eclipse.prefs
... ...
@@ -1,4 +1,4 @@
1  
-#Wed Jun 01 09:05:26 PDT 2011
  1
+#Tue Sep 20 09:44:54 PDT 2011
2 2
 activeProfiles=
3 3
 eclipse.preferences.version=1
4 4
 fullBuildGoals=process-test-resources
2  extras/groovy-eclipse-quickstart/pom.xml
@@ -3,7 +3,7 @@
3 3
   <modelVersion>4.0.0</modelVersion>
4 4
   <groupId>org.codehaus.groovy</groupId>
5 5
   <artifactId>groovy-eclipse-quickstart</artifactId>
6  
-  <version>2.5.1-M3-SNAPSHOT</version>
  6
+  <version>2.5.2-SNAPSHOT</version>
7 7
   <name>Archetype - groovy-eclipse-quickstart</name>
8 8
   <description>Creates an archetype project that uses the groovy-eclipse-compiler to compile a few Groovy and Java classes.</description>
9 9
 	<url>http://groovy.codehaus.org/Eclipse+Plugin</url>
125  extras/groovy-eclipse-quickstart/src/main/resources/archetype-resources/pom.xml
... ...
@@ -1,84 +1,47 @@
1 1
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2  
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3  
-  <modelVersion>4.0.0</modelVersion>
4  
-  <groupId>${groupId}</groupId>
5  
-  <artifactId>${artifactId}</artifactId>
6  
-  <version>${version}</version>
7  
-  <name>${artifactId} Groovy Eclipse Maven Java App</name>
8  
-  <build>
9  
-    <plugins>
10  
-      <plugin>
11  
-        <groupId>org.apache.maven.plugins</groupId>
12  
-        <artifactId>maven-compiler-plugin</artifactId>
13  
-		<version>2.3.2</version>
14  
-        <configuration>
15  
-          <compilerId>groovy-eclipse-compiler</compilerId>
16  
-        </configuration>
17  
-        <dependencies>
18  
-          <dependency>
19  
-            <groupId>org.codehaus.groovy</groupId>
20  
-            <artifactId>groovy-eclipse-compiler</artifactId>
21  
-            <version>2.5.1-M3</version>
22  
-            <exclusions>
23  
-              <exclusion>
24  
-                <groupId>org.codehaus.groovy</groupId>
25  
-                <artifactId>groovy-eclipse-batch</artifactId>
26  
-              </exclusion>
27  
-            </exclusions>
28  
-          </dependency>
29  
-          <dependency>
30  
-            <groupId>org.codehaus.groovy</groupId>
31  
-            <artifactId>groovy-eclipse-batch</artifactId>
32  
-            <version>1.8.0-03</version>
33  
-          </dependency>
34  
-        </dependencies>
35  
-      </plugin>
  2
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
  3
+	<modelVersion>4.0.0</modelVersion>
  4
+	<groupId>${groupId}</groupId>
  5
+	<artifactId>${artifactId}</artifactId>
  6
+	<version>${version}</version>
  7
+	<name>${artifactId} Groovy Eclipse Maven Java App</name>
  8
+	<build>
  9
+		<plugins>
  10
+			<plugin>
  11
+				<groupId>org.apache.maven.plugins</groupId>
  12
+				<artifactId>maven-compiler-plugin</artifactId>
  13
+				<version>2.3.2</version>
  14
+				<configuration>
  15
+					<compilerId>groovy-eclipse-compiler</compilerId>
  16
+				</configuration>
  17
+				<dependencies>
  18
+					<dependency>
  19
+						<groupId>org.codehaus.groovy</groupId>
  20
+						<artifactId>groovy-eclipse-compiler</artifactId>
  21
+						<version>2.5.2-SNAPSHOT</version>
  22
+						<exclusions>
  23
+							<exclusion>
  24
+								<groupId>org.codehaus.groovy</groupId>
  25
+								<artifactId>groovy-eclipse-batch</artifactId>
  26
+							</exclusion>
  27
+						</exclusions>
  28
+					</dependency>
  29
+				</dependencies>
  30
+			</plugin>
  31
+		</plugins>
  32
+	</build>
36 33
 
37  
-      <plugin>
38  
-        <groupId>org.codehaus.mojo</groupId>
39  
-        <artifactId>build-helper-maven-plugin</artifactId>
40  
-        <version>1.5</version>
41  
-        <executions>
42  
-          <execution>
43  
-            <id>add-source</id>
44  
-            <phase>generate-sources</phase>
45  
-            <goals>
46  
-              <goal>add-source</goal>
47  
-            </goals>
48  
-            <configuration>
49  
-              <sources>
50  
-                <source>src/main/groovy</source>
51  
-              </sources>
52  
-            </configuration>
53  
-          </execution>
54  
-          <execution>
55  
-            <id>add-test-source</id>
56  
-            <phase>generate-test-sources</phase>
57  
-            <goals>
58  
-              <goal>add-test-source</goal>
59  
-            </goals>
60  
-            <configuration>
61  
-              <sources>
62  
-                <source>src/test/groovy</source>
63  
-              </sources>
64  
-            </configuration>
65  
-          </execution>
66  
-        </executions>
67  
-      </plugin>
68  
-    </plugins>
69  
-  </build>
70  
-
71  
-  <dependencies>
72  
-    <dependency>
73  
-      <groupId>org.codehaus.groovy</groupId>
74  
-      <artifactId>groovy-all</artifactId>
75  
-      <version>1.8.0</version>
76  
-    </dependency>
77  
-    <dependency>
78  
-      <groupId>junit</groupId>
79  
-      <artifactId>junit</artifactId>
80  
-      <version>4.8.2</version>
81  
-      <scope>test</scope>
82  
-    </dependency>
83  
-  </dependencies>
  34
+	<dependencies>
  35
+		<dependency>
  36
+			<groupId>org.codehaus.groovy</groupId>
  37
+			<artifactId>groovy-all</artifactId>
  38
+			<version>1.8.0</version>
  39
+		</dependency>
  40
+		<dependency>
  41
+			<groupId>junit</groupId>
  42
+			<artifactId>junit</artifactId>
  43
+			<version>4.8.2</version>
  44
+			<scope>test</scope>
  45
+		</dependency>
  46
+	</dependencies>
84 47
 </project>

0 notes on commit dd91d32

Please sign in to comment.
Something went wrong with that request. Please try again.