Merge branch 'development'

Repast · Oct 22, 2020 · 200de2e · 200de2e
2 parents 3028794 + 1360b57
commit 200de2e
Show file tree

Hide file tree

Showing 276 changed files with 4,226 additions and 2,213 deletions.
diff --git a/libs.bsf/META-INF/MANIFEST.MF b/libs.bsf/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Repast libs bsf
 Bundle-SymbolicName: libs.bsf
-Bundle-Version: 2.7.0
+Bundle-Version: 2.8.0
 Bundle-ClassPath: lib/bsf.jar,
  lib/bsh-2.0b4.jar
 Export-Package: bsh,

diff --git a/libs.bsf/plugin_jpf.xml b/libs.bsf/plugin_jpf.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE plugin PUBLIC "-//JPF//Java Plug-in Manifest 0.6" "http://jpf.sourceforge.net/plugin_0_6.dtd">
 <plugin id="libs.bsf" version="">
 	<attributes>
-         <attribute id="simphony" value="2.7.0"/>
+         <attribute id="simphony" value="2.8.0"/>
      </attributes>
 
 	<runtime>

diff --git a/libs.ext/.classpath b/libs.ext/.classpath
@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
-		<attributes>
-			<attribute name="module" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="lib/xml-apis-ext-1.3.04.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/batik-anim-1.8.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/batik-awt-util-1.8.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/batik-bridge-1.8.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/batik-codec-1.8.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/batik-css-1.8.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/batik-dom-1.8.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/batik-ext-1.8.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/batik-extension-1.8.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/batik-gui-util-1.8.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/batik-gvt-1.8.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/batik-parser-1.8.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/batik-script-1.8.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/batik-svg-dom-1.8.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/batik-svggen-1.8.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/batik-swing-1.8.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/batik-transcoder-1.8.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/batik-util-1.8.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/batik-xml-1.8.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/xml-apis-1.3.04.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/xmlgraphics-commons-2.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jogl-all.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/mlibwrapper_jai.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/vecmath.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/clibwrapper_jiio.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/gluegen-rt.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/j3dcore.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/j3dutils.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jai_codec.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jai_core.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jai_imageio.jar"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry exported="true" kind="lib" path="lib/j3dcore.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/j3dutils.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/vecmath.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jogl-all.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry exported="true" kind="lib" path="lib/xml-apis-ext-1.3.04.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/batik-anim-1.8.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/batik-awt-util-1.8.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/batik-bridge-1.8.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/batik-codec-1.8.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/batik-css-1.8.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/batik-dom-1.8.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/batik-ext-1.8.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/batik-extension-1.8.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/batik-gui-util-1.8.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/batik-gvt-1.8.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/batik-parser-1.8.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/batik-script-1.8.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/batik-svg-dom-1.8.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/batik-svggen-1.8.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/batik-swing-1.8.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/batik-transcoder-1.8.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/batik-util-1.8.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/batik-xml-1.8.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/xml-apis-1.3.04.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/xmlgraphics-commons-2.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/mlibwrapper_jai.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/clibwrapper_jiio.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/gluegen-rt.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jai_codec.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jai_core.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jai_imageio.jar"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/libs.ext/META-INF/MANIFEST.MF b/libs.ext/META-INF/MANIFEST.MF
@@ -2,17 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Repast libs ext
 Bundle-SymbolicName: libs.ext
-Bundle-Version: 2.7.0
+Bundle-Version: 2.8.0
 Bundle-ClassPath: lib/clibwrapper_jiio.jar,
  lib/gluegen-rt.jar,
- lib/j3dcore.jar,
- lib/j3dutils.jar,
  lib/jai_codec.jar,
  lib/jai_core.jar,
  lib/jai_imageio.jar,
- lib/jogl-all.jar,
  lib/mlibwrapper_jai.jar,
- lib/vecmath.jar,
  lib/batik-anim-1.8.jar,
  lib/batik-awt-util-1.8.jar,
  lib/batik-bridge-1.8.jar,
@@ -33,7 +29,11 @@ Bundle-ClassPath: lib/clibwrapper_jiio.jar,
  lib/batik-xml-1.8.jar,
  lib/xml-apis-1.3.04.jar,
  lib/xmlgraphics-commons-2.0.jar,
- lib/xml-apis-ext-1.3.04.jar
+ lib/xml-apis-ext-1.3.04.jar,
+ lib/jogl-all.jar,
+ lib/j3dcore.jar,
+ lib/j3dutils.jar,
+ lib/vecmath.jar
 Export-Package: com.jogamp.common,
  com.jogamp.common.jvm,
  com.jogamp.common.net,
@@ -55,20 +55,32 @@ Export-Package: com.jogamp.common,
  com.jogamp.nativewindow,
  com.jogamp.nativewindow.awt,
  com.jogamp.nativewindow.egl,
+ com.jogamp.nativewindow.ios,
+ com.jogamp.nativewindow.javafx,
  com.jogamp.nativewindow.macosx,
  com.jogamp.nativewindow.swt,
+ com.jogamp.nativewindow.util,
  com.jogamp.nativewindow.windows,
  com.jogamp.nativewindow.x11,
  com.jogamp.newt,
  com.jogamp.newt.awt,
  com.jogamp.newt.awt.applet,
  com.jogamp.newt.event,
  com.jogamp.newt.event.awt,
+ com.jogamp.newt.javafx,
  com.jogamp.newt.opengl,
+ com.jogamp.newt.opengl.util,
+ com.jogamp.newt.opengl.util.stereo,
  com.jogamp.newt.swt,
  com.jogamp.newt.util,
  com.jogamp.newt.util.applet,
  com.jogamp.opengl,
+ com.jogamp.opengl.awt,
+ com.jogamp.opengl.egl,
+ com.jogamp.opengl.fixedfunc,
+ com.jogamp.opengl.glu,
+ com.jogamp.opengl.glu.gl2,
+ com.jogamp.opengl.glu.gl2es1,
  com.jogamp.opengl.math,
  com.jogamp.opengl.math.geom,
  com.jogamp.opengl.swt,
@@ -81,46 +93,11 @@ Export-Package: com.jogamp.common,
  com.jogamp.opengl.util.glsl.sdk,
  com.jogamp.opengl.util.packrect,
  com.jogamp.opengl.util.stereo,
+ com.jogamp.opengl.util.stereo.generic,
  com.jogamp.opengl.util.texture,
  com.jogamp.opengl.util.texture.awt,
  com.jogamp.opengl.util.texture.spi,
  com.jogamp.opengl.util.texture.spi.awt,
- com.sun.j3d.audioengines,
- com.sun.j3d.audioengines.javasound,
- com.sun.j3d.exp.swing,
- com.sun.j3d.exp.swing.impl,
- com.sun.j3d.internal,
- com.sun.j3d.loaders,
- com.sun.j3d.loaders.lw3d,
- com.sun.j3d.loaders.objectfile,
- com.sun.j3d.utils.applet,
- com.sun.j3d.utils.audio,
- com.sun.j3d.utils.behaviors.interpolators,
- com.sun.j3d.utils.behaviors.keyboard,
- com.sun.j3d.utils.behaviors.mouse,
- com.sun.j3d.utils.behaviors.picking,
- com.sun.j3d.utils.behaviors.sensor,
- com.sun.j3d.utils.behaviors.vp,
- com.sun.j3d.utils.compression,
- com.sun.j3d.utils.geometry,
- com.sun.j3d.utils.geometry.compression,
- com.sun.j3d.utils.image,
- com.sun.j3d.utils.pickfast,
- com.sun.j3d.utils.pickfast.behaviors,
- com.sun.j3d.utils.picking,
- com.sun.j3d.utils.picking.behaviors,
- com.sun.j3d.utils.scenegraph.io,
- com.sun.j3d.utils.scenegraph.io.retained,
- com.sun.j3d.utils.scenegraph.io.state.com.sun.j3d.utils.behaviors.interpolators,
- com.sun.j3d.utils.scenegraph.io.state.com.sun.j3d.utils.behaviors.mouse,
- com.sun.j3d.utils.scenegraph.io.state.com.sun.j3d.utils.geometry,
- com.sun.j3d.utils.scenegraph.io.state.com.sun.j3d.utils.image,
- com.sun.j3d.utils.scenegraph.io.state.com.sun.j3d.utils.universe,
- com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d,
- com.sun.j3d.utils.scenegraph.transparency,
- com.sun.j3d.utils.shader,
- com.sun.j3d.utils.timer,
- com.sun.j3d.utils.universe,
  com.sun.media.imageio.plugins.bmp,
  com.sun.media.imageio.plugins.jpeg2000,
  com.sun.media.imageio.plugins.pnm,
@@ -159,7 +136,6 @@ Export-Package: com.jogamp.common,
  com.sun.medialib.codec.jpeg,
  com.sun.medialib.codec.png,
  com.sun.medialib.mlib,
- javax.media.j3d,
  javax.media.jai,
  javax.media.jai.iterator,
  javax.media.jai.operator,
@@ -168,15 +144,6 @@ Export-Package: com.jogamp.common,
  javax.media.jai.tilecodec,
  javax.media.jai.util,
  javax.media.jai.widget,
- javax.media.nativewindow,
- javax.media.nativewindow.util,
- javax.media.opengl,
- javax.media.opengl.awt,
- javax.media.opengl.fixedfunc,
- javax.media.opengl.glu,
- javax.media.opengl.glu.gl2,
- javax.media.opengl.glu.gl2es1,
- javax.vecmath,
  jj2000.j2k,
  jj2000.j2k.codestream,
  jj2000.j2k.codestream.reader,
@@ -206,6 +173,7 @@ Export-Package: com.jogamp.common,
  jogamp.common.jvm,
  jogamp.common.os,
  jogamp.common.os.elf,
+ jogamp.common.util,
  jogamp.common.util.locks,
  jogamp.graph.curve.opengl,
  jogamp.graph.curve.opengl.shader,
@@ -220,6 +188,8 @@ Export-Package: com.jogamp.common,
  jogamp.graph.geom.plane,
  jogamp.nativewindow,
  jogamp.nativewindow.awt,
+ jogamp.nativewindow.drm,
+ jogamp.nativewindow.ios,
  jogamp.nativewindow.jawt,
  jogamp.nativewindow.jawt.macosx,
  jogamp.nativewindow.jawt.windows,
@@ -234,12 +204,15 @@ Export-Package: com.jogamp.common,
  jogamp.newt.driver,
  jogamp.newt.driver.awt,
  jogamp.newt.driver.bcm.vc.iv,
+ jogamp.newt.driver.egl.gbm,
+ jogamp.newt.driver.ios,
  jogamp.newt.driver.linux,
  jogamp.newt.driver.macosx,
  jogamp.newt.driver.opengl,
  jogamp.newt.driver.windows,
  jogamp.newt.driver.x11,
  jogamp.newt.event,
+ jogamp.newt.javafx,
  jogamp.newt.swt,
  jogamp.newt.swt.event,
  jogamp.opengl,
@@ -256,6 +229,7 @@ Export-Package: com.jogamp.common,
  jogamp.opengl.glu.nurbs,
  jogamp.opengl.glu.registry,
  jogamp.opengl.glu.tessellator,
+ jogamp.opengl.ios.eagl,
  jogamp.opengl.macosx.cgl,
  jogamp.opengl.macosx.cgl.awt,
  jogamp.opengl.openal.av,
@@ -267,6 +241,7 @@ Export-Package: com.jogamp.common,
  jogamp.opengl.util.jpeg,
  jogamp.opengl.util.pngj,
  jogamp.opengl.util.pngj.chunks,
+ jogamp.opengl.util.stereo,
  jogamp.opengl.windows.wgl,
  jogamp.opengl.windows.wgl.awt,
  jogamp.opengl.x11.glx,
@@ -373,6 +348,46 @@ Export-Package: com.jogamp.common,
  org.apache.xmlgraphics.xmp,
  org.apache.xmlgraphics.xmp.merge,
  org.apache.xmlgraphics.xmp.schemas,
- org.apache.xmlgraphics.xmp.schemas.pdf
+ org.apache.xmlgraphics.xmp.schemas.pdf,
+ org.jogamp.java3d,
+ org.jogamp.java3d.audioengines,
+ org.jogamp.java3d.audioengines.javasound,
+ org.jogamp.java3d.exp.swing,
+ org.jogamp.java3d.exp.swing.impl,
+ org.jogamp.java3d.internal,
+ org.jogamp.java3d.loaders,
+ org.jogamp.java3d.loaders.lw3d,
+ org.jogamp.java3d.loaders.objectfile,
+ org.jogamp.java3d.utils.applet,
+ org.jogamp.java3d.utils.audio,
+ org.jogamp.java3d.utils.behaviors.interpolators,
+ org.jogamp.java3d.utils.behaviors.keyboard,
+ org.jogamp.java3d.utils.behaviors.mouse,
+ org.jogamp.java3d.utils.behaviors.picking,
+ org.jogamp.java3d.utils.behaviors.sensor,
+ org.jogamp.java3d.utils.behaviors.vp,
+ org.jogamp.java3d.utils.compression,
+ org.jogamp.java3d.utils.geometry,
+ org.jogamp.java3d.utils.geometry.compression,
+ org.jogamp.java3d.utils.image,
+ org.jogamp.java3d.utils.pickfast,
+ org.jogamp.java3d.utils.pickfast.behaviors,
+ org.jogamp.java3d.utils.picking,
+ org.jogamp.java3d.utils.picking.behaviors,
+ org.jogamp.java3d.utils.scenegraph.io,
+ org.jogamp.java3d.utils.scenegraph.io.retained,
+ org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d,
+ org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d.utils.behaviors.interpolators,
+ org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d.utils.behaviors.mouse,
+ org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d.utils.geometry,
+ org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d.utils.image,
+ org.jogamp.java3d.utils.scenegraph.io.state.org.jogamp.java3d.utils.universe,
+ org.jogamp.java3d.utils.scenegraph.transparency,
+ org.jogamp.java3d.utils.shader,
+ org.jogamp.java3d.utils.timer,
+ org.jogamp.java3d.utils.universe,
+ org.jogamp.vecmath,
+ org.w3c.css.sac,
+ org.w3c.css.sac.helpers
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: Argonne National Laboratory
diff --git a/libs.ext/build.properties b/libs.ext/build.properties
@@ -3,14 +3,10 @@ bin.includes = META-INF/,\
                lib/,\
                lib/clibwrapper_jiio.jar,\
                lib/gluegen-rt.jar,\
-               lib/j3dcore.jar,\
-               lib/j3dutils.jar,\
                lib/jai_codec.jar,\
                lib/jai_core.jar,\
                lib/jai_imageio.jar,\
-               lib/jogl-all.jar,\
                lib/mlibwrapper_jai.jar,\
-               lib/vecmath.jar,\
                lib/batik-anim-1.8.jar,\
                lib/batik-awt-util-1.8.jar,\
                lib/batik-bridge-1.8.jar,\
@@ -31,4 +27,8 @@ bin.includes = META-INF/,\
                lib/batik-xml-1.8.jar,\
                lib/xml-apis-1.3.04.jar,\
                lib/xmlgraphics-commons-2.0.jar,\
-               lib/xml-apis-ext-1.3.04.jar
+               lib/xml-apis-ext-1.3.04.jar,\
+               lib/jogl-all.jar,\
+               lib/j3dcore.jar,\
+               lib/j3dutils.jar,\
+               lib/vecmath.jar
diff --git a/libs.ext/lib/gluegen-rt-natives-linux-amd64.jar b/libs.ext/lib/gluegen-rt-natives-linux-amd64.jar
diff --git a/libs.ext/lib/gluegen-rt-natives-linux-i586.jar b/libs.ext/lib/gluegen-rt-natives-linux-i586.jar
diff --git a/libs.ext/lib/gluegen-rt-natives-macosx-universal.jar b/libs.ext/lib/gluegen-rt-natives-macosx-universal.jar
diff --git a/libs.ext/lib/gluegen-rt-natives-windows-amd64.jar b/libs.ext/lib/gluegen-rt-natives-windows-amd64.jar
diff --git a/libs.ext/lib/gluegen-rt-natives-windows-i586.jar b/libs.ext/lib/gluegen-rt-natives-windows-i586.jar
diff --git a/libs.ext/lib/gluegen-rt.jar b/libs.ext/lib/gluegen-rt.jar
diff --git a/libs.ext/lib/j3dcore.jar b/libs.ext/lib/j3dcore.jar
diff --git a/libs.ext/lib/j3dutils.jar b/libs.ext/lib/j3dutils.jar
diff --git a/libs.ext/lib/jogl-all-natives-linux-amd64.jar b/libs.ext/lib/jogl-all-natives-linux-amd64.jar
diff --git a/libs.ext/lib/jogl-all-natives-linux-i586.jar b/libs.ext/lib/jogl-all-natives-linux-i586.jar
diff --git a/libs.ext/lib/jogl-all-natives-macosx-universal.jar b/libs.ext/lib/jogl-all-natives-macosx-universal.jar
diff --git a/libs.ext/lib/jogl-all-natives-windows-amd64.jar b/libs.ext/lib/jogl-all-natives-windows-amd64.jar
diff --git a/libs.ext/lib/jogl-all-natives-windows-i586.jar b/libs.ext/lib/jogl-all-natives-windows-i586.jar
diff --git a/libs.ext/lib/jogl-all.jar b/libs.ext/lib/jogl-all.jar
diff --git a/libs.ext/lib/vecmath.jar b/libs.ext/lib/vecmath.jar
diff --git a/libs.ext/plugin_jpf.xml b/libs.ext/plugin_jpf.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE plugin PUBLIC "-//JPF//Java Plug-in Manifest 0.6" "http://jpf.sourceforge.net/plugin_0_6.dtd">
 <plugin id="libs.ext" version="">
 	<attributes>
-		<attribute id="simphony" value="2.7.0"/>
+		<attribute id="simphony" value="2.8.0"/>
 	</attributes>
 
 	<runtime>

diff --git a/libs.piccolo/META-INF/MANIFEST.MF b/libs.piccolo/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Repast libs piccolo
 Bundle-SymbolicName: libs.piccolo
-Bundle-Version: 2.7.0
+Bundle-Version: 2.8.0
 Bundle-ClassPath: lib/piccolo2d-core-3.0.jar,
  lib/piccolo2d-extras-3.0.jar
 Export-Package: org.piccolo2d,

diff --git a/libs.piccolo/plugin_jpf.xml b/libs.piccolo/plugin_jpf.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE plugin PUBLIC "-//JPF//Java Plug-in Manifest 0.6" "http://jpf.sourceforge.net/plugin_0_6.dtd">
 <plugin id="libs.piccolo" version="">
 	<attributes>
-         <attribute id="simphony" value="2.7.0"/>
+         <attribute id="simphony" value="2.8.0"/>
      </attributes>
 
 	<runtime>

diff --git a/repast.simphony.R/META-INF/MANIFEST.MF b/repast.simphony.R/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Repast R
 Bundle-SymbolicName: repast.simphony.R
-Bundle-Version: 2.7.0
+Bundle-Version: 2.8.0
 Require-Bundle: repast.simphony.gui,
  repast.simphony.data,
  repast.simphony.core,