Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: hharrison/java3d-utils
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: scijava/java3d-utils
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 18 commits
  • 406 files changed
  • 1 contributor

Commits on Oct 21, 2015

  1. Build the project using Maven

    This introduces a pom.xml which tells Maven how the
    project is structured. To avoid a boatload of disruptive
    renames, we override some of Maven's default settings.
    
    It also removes the Ant build files to avoid maintaining
    multiple build systems.
    ctrueden committed Oct 21, 2015
    Configuration menu
    Copy the full SHA
    bcf57c4 View commit details
    Browse the repository at this point in the history
  2. Change the groupId to org.scijava

    This change is only for the lifetime of the SciJava fork;
    I am really hoping the Mavenization will be merged upstream.
    ctrueden committed Oct 21, 2015
    Configuration menu
    Copy the full SHA
    bdd3399 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    d0dbfb4 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    098f053 View commit details
    Browse the repository at this point in the history
  5. Add numbered 'scijava' suffix to the version

    This hopefully avoids any possible confusion with official versions.
    ctrueden committed Oct 21, 2015
    Configuration menu
    Copy the full SHA
    213699e View commit details
    Browse the repository at this point in the history
  6. Add SCM section

    ctrueden committed Oct 21, 2015
    Configuration menu
    Copy the full SHA
    35966fd View commit details
    Browse the repository at this point in the history
  7. Add project name, description and URL

    These sections are required for OSS Sonatype.
    ctrueden committed Oct 21, 2015
    Configuration menu
    Copy the full SHA
    e5ed128 View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2015

  1. Explicitly pin to release versions

    Unfortunately, the maven-release-plugin does not seem to like the soft
    ${project.version} references, since they appear to be SNAPSHOTs until
    after the project version is actually bumped to the release version.
    ctrueden committed Oct 22, 2015
    Configuration menu
    Copy the full SHA
    99445c6 View commit details
    Browse the repository at this point in the history
  2. Bump to next development cycle

    Signed-off-by: Jenkins <jenkins@imagej.net>
    ctrueden authored and Jenkins committed Oct 22, 2015
    Configuration menu
    Copy the full SHA
    0eed840 View commit details
    Browse the repository at this point in the history

Commits on Nov 18, 2015

  1. Configuration menu
    Copy the full SHA
    09b0d3d View commit details
    Browse the repository at this point in the history
  2. POM: fix license

    Unlike vecmath and j3dcore, j3dutils is not licensed under the
    GPLv2 + Classpath exception, but rather a BSD 2-clause license.
    ctrueden committed Nov 18, 2015
    Configuration menu
    Copy the full SHA
    34ba665 View commit details
    Browse the repository at this point in the history
  3. Update vecmath and j3dcore to 1.6.0-scijava-2

    This version has renamed package prefixes:
    * javax.vecmath -> org.scijava.vecmath
    * javax.media.j3d -> org.scijava.java3d
    
    For a rationale, see:
    * scijava/vecmath@f9291bc
    * scijava/java3d-core@925def3
    ctrueden committed Nov 18, 2015
    Configuration menu
    Copy the full SHA
    5b3d499 View commit details
    Browse the repository at this point in the history
  4. Relocate package prefix to org.scijava.java3d

    This avoids a serious problem with Java 3D on OS X 10.11 "El Capitan":
    it is no longer possible for users to easily delete the Java 3D 1.3
    artifacts out of /System/Library/Java/Extensions, thanks to El Capitan's
    new System Integrity Protection (SIP, a.k.a "rootless") feature.
    
    So, even with the new Java 3D 1.6 on the classpath, the old Java 3D 1.3
    always takes precedence because /System/Library/Java/Extensions is on
    OS X's java.ext.path by default. Worse, the old Java 3D 1.3 crashes
    Oracle Java 8.
    
    I thought of two different ways to address this new difficulty:
    
    1. Change the package prefix to avoid a clash.
    2. Manually manipulate the java.ext.path.
    
    Option 2 is a deployment-centric solution, which only solves the problem
    in environments where tweaking the Java runtime parameters is possible.
    It is also a pain because there is no way to simply blacklist the
    undesirable directory; instead, the java.ext.path must be built from the
    ground up to include all the directories which Java includes by default,
    except for /System/Java/Library/Extensions. Furthermore, there _are_
    libraries in said directory that might continue to be useful for ImageJ
    users, such as the support for AppleScript. It would be a shame to lose
    access to _all_ Apple-specific Java extensions, just because of three
    bad apples (the old Java 3D 1.3 JARs).
    
    Therefore, this commit opts for option 1.
    ctrueden committed Nov 18, 2015
    Configuration menu
    Copy the full SHA
    dbc4418 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    71c466b View commit details
    Browse the repository at this point in the history
  6. POM: change the maintainer

    I am maintaining this fork; Harvey Harrison maintains upstream.
    ctrueden committed Nov 18, 2015
    Configuration menu
    Copy the full SHA
    c638239 View commit details
    Browse the repository at this point in the history
  7. Bump to next development cycle

    Signed-off-by: Jenkins <jenkins@imagej.net>
    ctrueden authored and Jenkins committed Nov 18, 2015
    Configuration menu
    Copy the full SHA
    b7cad57 View commit details
    Browse the repository at this point in the history

Commits on Nov 25, 2015

  1. README: correct minor issues

    ctrueden committed Nov 25, 2015
    Configuration menu
    Copy the full SHA
    fb5d0e7 View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2021

  1. Configuration menu
    Copy the full SHA
    820c65a View commit details
    Browse the repository at this point in the history
Loading