Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
etatara committed Dec 21, 2022
2 parents fd7abca + fdf0cf3 commit 6e55124
Show file tree
Hide file tree
Showing 554 changed files with 1,609 additions and 15,631 deletions.
2 changes: 1 addition & 1 deletion libs.bsf/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Repast libs bsf
Bundle-SymbolicName: libs.bsf
Bundle-Version: 2.9.1
Bundle-Version: 2.10.0
Bundle-ClassPath: lib/bsf.jar,
lib/bsh-2.0b4.jar
Export-Package: bsh,
Expand Down
2 changes: 1 addition & 1 deletion libs.bsf/plugin_jpf.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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.9.1"/>
<attribute id="simphony" value="2.10.0"/>
</attributes>

<runtime>
Expand Down
2 changes: 1 addition & 1 deletion libs.ext/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Repast libs ext
Bundle-SymbolicName: libs.ext
Bundle-Version: 2.9.1
Bundle-Version: 2.10.0
Bundle-ClassPath: lib/clibwrapper_jiio.jar,
lib/gluegen-rt.jar,
lib/jai_codec.jar,
Expand Down
Binary file not shown.
Binary file added libs.ext/lib/gluegen-rt-natives-macosx-amd64.jar
Binary file not shown.
Binary file removed libs.ext/lib/gluegen-rt-natives-macosx-universal.jar
Binary file not shown.
Binary file modified libs.ext/lib/gluegen-rt.jar
Binary file not shown.
Binary file added libs.ext/lib/jogl-all-natives-macosx-aarch64.jar
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion libs.ext/plugin_jpf.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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.9.1"/>
<attribute id="simphony" value="2.10.0"/>
</attributes>

<runtime>
Expand Down
2 changes: 1 addition & 1 deletion libs.piccolo/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Repast libs piccolo
Bundle-SymbolicName: libs.piccolo
Bundle-Version: 2.9.1
Bundle-Version: 2.10.0
Bundle-ClassPath: lib/piccolo2d-core-3.0.jar,
lib/piccolo2d-extras-3.0.jar
Export-Package: org.piccolo2d,
Expand Down
2 changes: 1 addition & 1 deletion libs.piccolo/plugin_jpf.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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.9.1"/>
<attribute id="simphony" value="2.10.0"/>
</attributes>

<runtime>
Expand Down
2 changes: 1 addition & 1 deletion repast.simphony.R/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Repast R
Bundle-SymbolicName: repast.simphony.R
Bundle-Version: 2.9.1
Bundle-Version: 2.10.0
Require-Bundle: repast.simphony.gui,
repast.simphony.data,
repast.simphony.core,
Expand Down
2 changes: 1 addition & 1 deletion repast.simphony.R/plugin_jpf.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<plugin id="repast.simphony.R" version="">

<attributes>
<attribute id="simphony" value="2.9.1"/>
<attribute id="simphony" value="2.10.0"/>
</attributes>

<requires>
Expand Down
2 changes: 1 addition & 1 deletion repast.simphony.batch/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Repast batch
Bundle-SymbolicName: repast.simphony.batch;singleton:=true
Bundle-Version: 2.9.1
Bundle-Version: 2.10.0
Require-Bundle: libs.bsf,
repast.simphony.dataLoader,
repast.simphony.data,
Expand Down
2 changes: 1 addition & 1 deletion repast.simphony.batch/plugin_jpf.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!DOCTYPE plugin PUBLIC "-//JPF//Java Plug-in Manifest 0.6" "http://jpf.sourceforge.net/plugin_0_6.dtd">
<plugin id="repast.simphony.batch" version="">
<attributes>
<attribute id="simphony" value="2.9.1"/>
<attribute id="simphony" value="2.10.0"/>
</attributes>

<requires>
Expand Down
2 changes: 1 addition & 1 deletion repast.simphony.bin_and_src/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Repast bin and src
Bundle-SymbolicName: repast.simphony.bin_and_src
Bundle-Version: 2.9.1
Bundle-Version: 2.10.0
Bundle-Vendor: Argonne National Laboratory
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
2 changes: 1 addition & 1 deletion repast.simphony.chart/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Repast chart
Bundle-SymbolicName: repast.simphony.chart
Bundle-Version: 2.9.1
Bundle-Version: 2.10.0
Bundle-ClassPath: lib/jcommon-1.0.23.jar,
lib/jfreechart-1.0.19.jar
Export-Package: com.keypoint,
Expand Down
2 changes: 1 addition & 1 deletion repast.simphony.chart/plugin_jpf.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!DOCTYPE plugin PUBLIC "-//JPF//Java Plug-in Manifest 0.6" "http://jpf.sourceforge.net/plugin_0_6.dtd">
<plugin id="repast.simphony.chart" version="">
<attributes>
<attribute id="simphony" value="2.9.1"/>
<attribute id="simphony" value="2.10.0"/>
</attributes>

<requires>
Expand Down
77 changes: 41 additions & 36 deletions repast.simphony.core/.classpath
Original file line number Diff line number Diff line change
@@ -1,36 +1,41 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry exported="true" kind="lib" path="lib/stack-alloc.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" output="test_bin" path="test"/>
<classpathentry kind="src" path="test_watcher"/>
<classpathentry exported="true" kind="lib" path="lib/commons-io-2.5.jar"/>
<classpathentry exported="true" kind="lib" path="lib/commons-collections-3.2.2.jar"/>
<classpathentry exported="true" kind="lib" path="lib/commons-math3-3.6.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jscience-4.3.1-no_ogis.jar"/>
<classpathentry exported="true" kind="lib" path="lib/hsqldb-2.3.2.jar"/>
<classpathentry exported="true" kind="lib" path="lib/poi-ooxml-3.9-20121203.jar"/>
<classpathentry exported="true" kind="lib" path="lib/poi-3.9-20121203.jar"/>
<classpathentry exported="true" kind="lib" path="lib/cglib-nodep-2.2.3.jar"/>
<classpathentry exported="true" kind="lib" path="lib/commons-lang3-3.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/opencsv-2.3.jar"/>
<classpathentry exported="true" kind="lib" path="lib/dom4j-1.6.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/xmlbeans-2.3.0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/velocity-1.4.jar"/>
<classpathentry exported="true" kind="lib" path="lib/colt-1.2.0-no_hep.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jbullet.jar"/>
<classpathentry exported="true" kind="lib" path="lib/collections-generic-4.01.jar"/>
<classpathentry exported="true" kind="lib" path="lib/concurrent-1.3.4.jar"/>
<classpathentry kind="lib" path="lib/ooxml-schemas-1.1.jar"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry exported="true" kind="lib" path="lib/jung-algorithms-2.0.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jung-api-2.0.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jung-graph-impl-2.0.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jung-io-2.0.1.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry exported="true" kind="lib" path="lib/si-quantity-2.0.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/si-units-2.0.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/systems-common-2.0.2.jar"/>
<classpathentry exported="true" kind="lib" path="lib/unit-api-2.0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/uom-lib-common-2.0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/indriya-2.0.2.jar"/>
<classpathentry exported="true" kind="lib" path="lib/commons-lang3-3.8.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/stack-alloc.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" output="test_bin" path="test"/>
<classpathentry kind="src" path="test_watcher"/>
<classpathentry exported="true" kind="lib" path="lib/commons-io-2.5.jar"/>
<classpathentry exported="true" kind="lib" path="lib/commons-collections-3.2.2.jar"/>
<classpathentry exported="true" kind="lib" path="lib/commons-math3-3.6.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/hsqldb-2.3.2.jar"/>
<classpathentry exported="true" kind="lib" path="lib/poi-ooxml-3.9-20121203.jar"/>
<classpathentry exported="true" kind="lib" path="lib/poi-3.9-20121203.jar"/>
<classpathentry exported="true" kind="lib" path="lib/cglib-nodep-2.2.3.jar"/>
<classpathentry exported="true" kind="lib" path="lib/opencsv-2.3.jar"/>
<classpathentry exported="true" kind="lib" path="lib/dom4j-1.6.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/xmlbeans-2.3.0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/velocity-1.4.jar"/>
<classpathentry exported="true" kind="lib" path="lib/colt-1.2.0-no_hep.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jbullet.jar"/>
<classpathentry exported="true" kind="lib" path="lib/collections-generic-4.01.jar"/>
<classpathentry exported="true" kind="lib" path="lib/concurrent-1.3.4.jar"/>
<classpathentry kind="lib" path="lib/ooxml-schemas-1.1.jar"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry exported="true" kind="lib" path="lib/jung-algorithms-2.0.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jung-api-2.0.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jung-graph-impl-2.0.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jung-io-2.0.1.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
61 changes: 33 additions & 28 deletions repast.simphony.core/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Repast core
Bundle-SymbolicName: repast.simphony.core
Bundle-Version: 2.9.1
Bundle-Version: 2.10.0
Bundle-ClassPath: lib/jsr108-0.01.jar,
lib/concurrent-1.3.4.jar,
lib/collections-generic-4.01.jar,
Expand All @@ -17,17 +17,22 @@ Bundle-ClassPath: lib/jsr108-0.01.jar,
lib/dom4j-1.6.1.jar,
lib/xmlbeans-2.3.1.jar,
lib/opencsv-2.3.jar,
lib/commons-lang3-3.1.jar,
lib/cglib-nodep-2.2.3.jar,
lib/poi-3.9-20121203.jar,
lib/poi-ooxml-3.9-20121203.jar,
lib/ooxml-schemas-1.1.jar,
lib/hsqldb-2.3.2.jar,
lib/jscience-4.3.1-no_ogis.jar,
lib/commons-math3-3.6.1.jar,
lib/commons-collections-3.2.2.jar,
lib/commons-io-2.5.jar,
lib/stack-alloc.jar
lib/stack-alloc.jar,
lib/commons-lang3-3.8.1.jar,
lib/indriya-2.0.2.jar,
lib/si-quantity-2.0.1.jar,
lib/si-units-2.0.1.jar,
lib/systems-common-2.0.2.jar,
lib/unit-api-2.0.jar,
lib/uom-lib-common-2.0.jar
Bundle-Localization: plugin
Export-Package: .,
EDU.oswego.cs.dl.util.concurrent,
Expand Down Expand Up @@ -89,21 +94,9 @@ Export-Package: .,
edu.uci.ics.jung.io.graphml,
edu.uci.ics.jung.io.graphml.parser,
javax.measure,
javax.measure.converter,
javax.measure.format,
javax.measure.quantity,
javax.measure.unit,
javax.realtime,
javolution,
javolution.context,
javolution.io,
javolution.lang,
javolution.testing,
javolution.text,
javolution.util,
javolution.xml,
javolution.xml.sax,
javolution.xml.stream,
javolution.xml.ws,
javax.measure.spi,
net.sf.cglib.asm,
net.sf.cglib.asm.signature,
net.sf.cglib.beans,
Expand Down Expand Up @@ -146,6 +139,7 @@ Export-Package: .,
org.apache.commons.io.output,
org.apache.commons.io.serialization,
org.apache.commons.lang3,
org.apache.commons.lang3.arch,
org.apache.commons.lang3.builder,
org.apache.commons.lang3.concurrent,
org.apache.commons.lang3.event,
Expand Down Expand Up @@ -420,16 +414,6 @@ Export-Package: .,
org.hsqldb.server,
org.hsqldb.types,
org.hsqldb.util,
org.jscience,
org.jscience.economics.money,
org.jscience.geography.coordinates,
org.jscience.geography.coordinates.crs,
org.jscience.mathematics.function,
org.jscience.mathematics.number,
org.jscience.mathematics.structure,
org.jscience.mathematics.vector,
org.jscience.physics.amount,
org.jscience.physics.model,
org.openxmlformats.schemas.drawingml.x2006.chart,
org.openxmlformats.schemas.drawingml.x2006.chart.impl,
org.openxmlformats.schemas.drawingml.x2006.main,
Expand Down Expand Up @@ -505,6 +489,27 @@ Export-Package: .,
schemasMicrosoftComOfficeOffice.impl,
schemasMicrosoftComVml,
schemasMicrosoftComVml.impl,
si.uom,
si.uom.quantity,
si.uom.quantity.impl,
systems.uom.common,
systems.uom.common.ancient,
systems.uom.common.spi,
tech.units.indriya,
tech.units.indriya.format,
tech.units.indriya.function,
tech.units.indriya.internal.format,
tech.units.indriya.internal.format.l10n,
tech.units.indriya.internal.function,
tech.units.indriya.internal.function.calc,
tech.units.indriya.internal.function.radix,
tech.units.indriya.internal.function.simplify,
tech.units.indriya.quantity,
tech.units.indriya.quantity.time,
tech.units.indriya.spi,
tech.units.indriya.unit,
tech.uom.lib.common.function,
tech.uom.lib.common.util,
watcherOOP.test
Require-Bundle: repast.simphony.runtime,
org.junit,
Expand Down
11 changes: 8 additions & 3 deletions repast.simphony.core/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,22 @@ bin.includes = META-INF/,\
lib/dom4j-1.6.1.jar,\
lib/xmlbeans-2.3.0.jar,\
lib/opencsv-2.3.jar,\
lib/commons-lang3-3.1.jar,\
lib/cglib-nodep-2.2.3.jar,\
lib/poi-3.9-20121203.jar,\
lib/poi-ooxml-3.9-20121203.jar,\
lib/ooxml-schemas-1.1.jar,\
lib/hsqldb-2.3.2.jar,\
lib/jscience-4.3.1-no_ogis.jar,\
lib/commons-math3-3.6.1.jar,\
lib/commons-collections-3.2.2.jar,\
lib/commons-io-2.5.jar,\
lib/stack-alloc.jar
lib/stack-alloc.jar,\
lib/commons-lang3-3.8.1.jar,\
lib/indriya-2.0.2.jar,\
lib/si-quantity-2.0.1.jar,\
lib/si-units-2.0.1.jar,\
lib/systems-common-2.0.2.jar,\
lib/unit-api-2.0.jar,\
lib/uom-lib-common-2.0.jar
src.includes = src/,\
test/
jars.compile.order =
Binary file removed repast.simphony.core/lib/commons-lang3-3.1.jar
Binary file not shown.
Binary file added repast.simphony.core/lib/commons-lang3-3.8.1.jar
Binary file not shown.
Binary file added repast.simphony.core/lib/indriya-2.0.2.jar
Binary file not shown.
Binary file removed repast.simphony.core/lib/jscience-4.3.1-no_ogis.jar
Binary file not shown.
Binary file added repast.simphony.core/lib/si-quantity-2.0.1.jar
Binary file not shown.
Binary file added repast.simphony.core/lib/si-units-2.0.1.jar
Binary file not shown.
Binary file not shown.
Binary file added repast.simphony.core/lib/unit-api-2.0.jar
Binary file not shown.
Binary file added repast.simphony.core/lib/uom-lib-common-2.0.jar
Binary file not shown.
13 changes: 10 additions & 3 deletions repast.simphony.core/plugin_jpf.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!DOCTYPE plugin PUBLIC "-//JPF//Java Plug-in Manifest 0.6" "http://jpf.sourceforge.net/plugin_0_6.dtd">
<plugin id="repast.simphony.core" version="">
<attributes>
<attribute id="simphony" value="2.9.1"/>
<attribute id="simphony" value="2.10.0"/>
</attributes>

<requires>
Expand All @@ -25,14 +25,13 @@
<library id="collections-generic-4.01" path="./lib/collections-generic-4.01.jar" type="code"/>
<library id="colt-1.2.0-no_hep" path="./lib/colt-1.2.0-no_hep.jar" type="code"/>
<library id="commons-collections" path="./lib/commons-collections-3.2.2.jar" type="code"/>
<library id="commons-lang3-3.1" path="./lib/commons-lang3-3.1.jar" type="code"/>
<library id="commons-lang3-3.8.11" path="./lib/commons-lang3-3.8.1.jar" type="code"/>
<library id="commons-math3-3.6.1" path="./lib/commons-math3-3.6.1.jar" type="code"/>
<library id="commons-io-2.5" path="./lib/commons-io-2.5.jar" type="code"/>
<library id="concurrent-1.3.4" path="./lib/concurrent-1.3.4.jar" type="code"/>
<library id="dom4j-1.6.1" path="./lib/dom4j-1.6.1.jar" type="code"/>
<library id="hsqldb-2.3.2" path="./lib/hsqldb-2.3.2.jar" type="code"/>
<library id="jbullet" path="./lib/jbullet.jar" type="code"/>
<library id="jscience" path="./lib/jscience-4.3.1-no_ogis.jar" type="code"/>
<library id="jung-algorithms-2.0.1" path="./lib/jung-algorithms-2.0.1.jar" type="code"/>
<library id="jung-api-2.0.1" path="./lib/jung-api-2.0.1.jar" type="code"/>
<library id="jung-graph-impl-2.0.1" path="./lib/jung-graph-impl-2.0.1.jar" type="code"/>
Expand All @@ -44,6 +43,14 @@
<library id="ooxml-schemas-1.1" path="./lib/ooxml-schemas-1.1.jar" type="code"/>
<library id="velocity-1.4" path="./lib/velocity-1.4.jar" type="code"/>
<library id="xmlbeans-2.3.0" path="./lib/xmlbeans-2.3.0.jar" type="code"/>

<!-- Java Units API 2.0 Should match version distributed with GeoTools -->
<library id="unit-api" path="./lib/unit-api-2.0.jar" type="code"/>
<library id="uom-lib-common" path="./lib/uom-lib-common-2.0.jar" type="code"/>
<library id="indriya" path="./lib/indriya-2.0.2.jar" type="code"/>
<library id="systems-common" path="./lib/systems-common-2.0.2.jar" type="code"/>
<library id="si-units" path="./lib/si-units-2.0.1.jar" type="code"/>
<library id="si-quantitys" path="./lib/si-quantity-2.0.1.jar" type="code"/>

</runtime>

Expand Down
Loading

0 comments on commit 6e55124

Please sign in to comment.