Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Updated the default project files to JDK 7 and Groovy 2.2.2
  • Loading branch information
vaclav committed Apr 26, 2014
1 parent 4644d67 commit 1660815
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 19 deletions.
3 changes: 2 additions & 1 deletion GPars_CI_only.iml
Expand Up @@ -30,11 +30,12 @@
<orderEntry type="library" name="Maven: org.spockframework:spock-core:0.7-groovy-2.0" level="project" />
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.2.2" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:guava:14.0.1" level="project" />
<orderEntry type="library" name="Maven: org.codehaus.groovy:groovy-all:2.1.9" level="project" />
<orderEntry type="library" name="Maven: org.codehaus.groovy:groovy-all:2.2.2" level="project" />
</component>
<component name="copyright">
<Base>
<setting name="state" value="2" />
</Base>
</component>
</module>

26 changes: 13 additions & 13 deletions GPars_CI_only.ipr
Expand Up @@ -9506,7 +9506,7 @@
<component name="ProjectResources">
<default-html-doctype>http://www.w3.org/1999/xhtml</default-html-doctype>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="$project_jdk_name$" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
<component name="ProjectRunConfigurationManager">
Expand Down Expand Up @@ -9585,37 +9585,37 @@
<root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.8.2/junit-4.8.2-sources.jar!/" />
</SOURCES>
</library>
<library name="Maven: org.codehaus.gpars:gpars:1.1.0">
<library name="Maven: org.codehaus.gpars:gpars:1.2.0">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/codehaus/gpars/gpars/1.1.0/gpars-1.1.0.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/codehaus/gpars/gpars/1.2.0/gpars-1.2.0.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/codehaus/gpars/gpars/1.1.0/gpars-1.1.0-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/codehaus/gpars/gpars/1.2.0/gpars-1.2.0-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/codehaus/gpars/gpars/1.1.0/gpars-1.1.0-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/codehaus/gpars/gpars/1.2.0/gpars-1.2.0-sources.jar!/" />
</SOURCES>
</library>
<library name="Maven: org.codehaus.groovy:groovy-all:2.0.7">
<library name="Maven: org.codehaus.groovy:groovy-all:2.1.9">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/codehaus/groovy/groovy-all/2.0.7/groovy-all-2.0.7.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/codehaus/groovy/groovy-all/2.1.9/groovy-all-2.1.9.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/codehaus/groovy/groovy-all/2.0.7/groovy-all-2.0.7-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/codehaus/groovy/groovy-all/2.1.9/groovy-all-2.1.9-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/codehaus/groovy/groovy-all/2.0.7/groovy-all-2.0.7-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/codehaus/groovy/groovy-all/2.1.9/groovy-all-2.1.9-sources.jar!/" />
</SOURCES>
</library>
<library name="Maven: org.codehaus.groovy:groovy-all:2.1.9">
<library name="Maven: org.codehaus.groovy:groovy-all:2.2.2">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/codehaus/groovy/groovy-all/2.1.9/groovy-all-2.1.9.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/codehaus/groovy/groovy-all/2.2.2/groovy-all-2.2.2.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/codehaus/groovy/groovy-all/2.1.9/groovy-all-2.1.9-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/codehaus/groovy/groovy-all/2.2.2/groovy-all-2.2.2-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/codehaus/groovy/groovy-all/2.1.9/groovy-all-2.1.9-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/codehaus/groovy/groovy-all/2.2.2/groovy-all-2.2.2-sources.jar!/" />
</SOURCES>
</library>
<library name="Maven: org.codehaus.jcsp:jcsp:1.1-rc5">
Expand Down
10 changes: 6 additions & 4 deletions java-demo/gpars-java-demo.iml
Expand Up @@ -5,17 +5,19 @@
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/target/generated-sources/annotations" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/target/classes" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/target/test-classes" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.8.2" level="project" />
<orderEntry type="library" name="Maven: org.codehaus.gpars:gpars:1.1.0" level="project" />
<orderEntry type="library" name="Maven: org.codehaus.gpars:gpars:1.2.0" level="project" />
<orderEntry type="library" name="Maven: org.multiverse:multiverse-core:0.7.0" level="project" />
<orderEntry type="library" name="Maven: org.codehaus.jsr166-mirror:jsr166y:1.7.0" level="project" />
<orderEntry type="library" name="Maven: org.codehaus.groovy:groovy-all:2.0.7" level="project" />
<orderEntry type="library" name="Maven: org.codehaus.groovy:groovy-all:2.2.2" level="project" />
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.2.2" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:guava:14.0.1" level="project" />
</component>
</module>

2 changes: 1 addition & 1 deletion java-demo/pom.xml
Expand Up @@ -45,7 +45,7 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
<version>2.1.9</version>
<version>2.2.2</version>
</dependency>

<!--Optional dependencies-->
Expand Down

0 comments on commit 1660815

Please sign in to comment.