-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #9 from SBU-BMI/develop
What is Nanoborb Text
- Loading branch information
Showing
6 changed files
with
113 additions
and
124 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule caMicroscope
updated
79 files
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| call mvn install:install-file -Dfile=ImageBox-1.1.1.jar -DgroupId=com.ebremer -DartifactId=ImageBox -Dversion=1.1.1 -Dpackaging=jar -DgeneratePom=true | ||
| call mvn install:install-file -Dfile=jcef.jar -DgroupId=jcef -DartifactId=jcef -Dversion=1.0 -Dpackaging=jar -DgeneratePom=true | ||
| call mvn install:install-file -Dfile=jogl-all.jar -DgroupId=jogl-all -DartifactId=jogl-all -Dversion=1.0 -Dpackaging=jar -DgeneratePom=true | ||
| call mvn install:install-file -Dfile=jogl-all-natives-windows-amd64.jar -DgroupId=jogl-all-natives-windows-amd64 -DartifactId=jogl-all-natives-windows-amd64 -Dversion=1.0 -Dpackaging=jar -DgeneratePom=true | ||
| call mvn install:install-file -Dfile=gluegen-rt.jar -DgroupId=gluegen-rt -DartifactId=gluegen-rt -Dversion=1.0 -Dpackaging=gluegen-rt -DgeneratePom=true | ||
| call mvn install:install-file -Dfile=gluegen-rt-natives-windows-amd64.jar -DgroupId=gluegen-rt-natives-windows-amd64 -DartifactId=gluegen-rt-natives-windows-amd64 -Dversion=1.0 -Dpackaging=jar -DgeneratePom=true |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,110 +1,92 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <groupId>edu.stonybrook.bmi</groupId> | ||
| <artifactId>Nanoborb</artifactId> | ||
| <version>1.0</version> | ||
| <packaging>jar</packaging> | ||
| <dependencies> | ||
| <dependency> | ||
| <groupId>jcef</groupId> | ||
| <artifactId>jcef</artifactId> | ||
| <version>1.0</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>jogl-all-natives-windows-amd64</groupId> | ||
| <artifactId>jogl-all-natives-windows-amd64</artifactId> | ||
| <version>1.0</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>jogl-all</groupId> | ||
| <artifactId>jogl-all</artifactId> | ||
| <version>1.0</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>gluegen-rt</groupId> | ||
| <artifactId>gluegen-rt</artifactId> | ||
| <version>1.0</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>gluegen-rt-natives-windows-amd64</groupId> | ||
| <artifactId>gluegen-rt-natives-windows-amd64</artifactId> | ||
| <version>1.0</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.ebremer</groupId> | ||
| <artifactId>ImageBox</artifactId> | ||
| <version>1.0.5</version> | ||
| </dependency> | ||
| </dependencies> | ||
| <properties> | ||
| <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> | ||
| <maven.compiler.source>1.8</maven.compiler.source> | ||
| <maven.compiler.target>1.8</maven.compiler.target> | ||
| </properties> | ||
| <build> | ||
| <resources> | ||
| <resource> | ||
| <directory>files/</directory> | ||
| <includes> | ||
| <include>**/*.js</include> | ||
| <include>**/*.html</include> | ||
| <include>**/*.svs</include> | ||
| <include>**/*.png</include> | ||
| </includes> | ||
| </resource> | ||
| </resources> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-shade-plugin</artifactId> | ||
| <version>2.4.3</version> | ||
| <configuration> | ||
| <shadedArtifactAttached>false</shadedArtifactAttached> | ||
| <transformers> | ||
| <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> | ||
| <mainClass>edu.stonybrook.bmi.nanoborb.MainFrame</mainClass> | ||
| </transformer> | ||
| <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" /> | ||
| <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer" /> | ||
| <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer"> | ||
| <addHeader>false</addHeader> | ||
| </transformer> | ||
| </transformers> | ||
| <filters> | ||
| <filter> | ||
| <artifact>*:*</artifact> | ||
| <excludes> | ||
| <!-- Some jars are signed but shading breaks that. | ||
| Don't include signing files. | ||
| --> | ||
| <exclude>META-INF/*.SF</exclude> | ||
| <exclude>META-INF/*.DSA</exclude> | ||
| <exclude>META-INF/*.RSA</exclude> | ||
| </excludes> | ||
| </filter> | ||
| </filters> | ||
| </configuration> | ||
| <executions> | ||
| <execution> | ||
| <phase>package</phase> | ||
| <!--<phase /><!- - Switch off --> | ||
| <goals> | ||
| <goal>shade</goal> | ||
| </goals> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| <plugin> | ||
| <artifactId>maven-surefire-plugin</artifactId> | ||
| <version>2.22.1</version> | ||
| <configuration> | ||
| <systemPropertyVariables> | ||
| <propertyName>java.library.path</propertyName> | ||
| <buildDirectory>lib/win64</buildDirectory> | ||
| </systemPropertyVariables> | ||
| </configuration> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <groupId>edu.stonybrook.bmi</groupId> | ||
| <artifactId>Nanoborb</artifactId> | ||
| <version>1.5.0</version> | ||
| <packaging>jar</packaging> | ||
| <dependencies> | ||
| <dependency> | ||
| <groupId>com.ebremer</groupId> | ||
| <artifactId>ImageBox</artifactId> | ||
| <version>1.1.1</version> | ||
| <type>jar</type> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>jcef</groupId> | ||
| <artifactId>jcef</artifactId> | ||
| <version>1.0</version> | ||
| <type>jar</type> | ||
| </dependency> | ||
| </dependencies> | ||
| <properties> | ||
| <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> | ||
| <maven.compiler.source>1.8</maven.compiler.source> | ||
| <maven.compiler.target>1.8</maven.compiler.target> | ||
| </properties> | ||
| <build> | ||
| <resources> | ||
| <resource> | ||
| <directory>files/</directory> | ||
| <includes> | ||
| <include>**/*.js</include> | ||
| <include>**/*.html</include> | ||
| <include>**/*.svs</include> | ||
| <include>**/*.png</include> | ||
| </includes> | ||
| </resource> | ||
| </resources> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-shade-plugin</artifactId> | ||
| <version>2.4.3</version> | ||
| <configuration> | ||
| <shadedArtifactAttached>false</shadedArtifactAttached> | ||
| <transformers> | ||
| <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> | ||
| <mainClass>edu.stonybrook.bmi.nanoborb.MainFrame</mainClass> | ||
| </transformer> | ||
| <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" /> | ||
| <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer" /> | ||
| <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer"> | ||
| <addHeader>false</addHeader> | ||
| </transformer> | ||
| </transformers> | ||
| <filters> | ||
| <filter> | ||
| <artifact>*:*</artifact> | ||
| <excludes> | ||
| <!-- Some jars are signed but shading breaks that. | ||
| Don't include signing files. | ||
| --> | ||
| <exclude>META-INF/*.SF</exclude> | ||
| <exclude>META-INF/*.DSA</exclude> | ||
| <exclude>META-INF/*.RSA</exclude> | ||
| </excludes> | ||
| </filter> | ||
| </filters> | ||
| </configuration> | ||
| <executions> | ||
| <execution> | ||
| <phase>package</phase> | ||
| <!--<phase /><!- - Switch off --> | ||
| <goals> | ||
| <goal>shade</goal> | ||
| </goals> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| <plugin> | ||
| <artifactId>maven-surefire-plugin</artifactId> | ||
| <version>2.22.2</version> | ||
| <configuration> | ||
| <systemPropertyVariables> | ||
| <propertyName>java.library.path</propertyName> | ||
| <buildDirectory>lib/win64</buildDirectory> | ||
| </systemPropertyVariables> | ||
| </configuration> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| </project> |