From 447cf937fc92065d5601c7823d00b3ae43e12115 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 26 Sep 2014 14:55:35 -0500 Subject: [PATCH] Use a better value for the default groupId This project migrated from ImageJ2, where net.imagej was an intuitive choice for default groupId. But the project is part of the Scijava scripting framework now, so a groupId matching that fact makes more sense. We use org.scijava.scripting.java, rather than only org.scijava, to avoid potential name clashes with actual SciJava projects such as scijava-common, scripting-java, etc. --- .../java/org/scijava/plugins/scripting/java/JavaEngine.java | 2 +- .../org/scijava/plugins/scripting/java/JavaEngineTest.java | 2 +- .../java/org/scijava/plugins/scripting/java/MakeJarTest.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/scijava/plugins/scripting/java/JavaEngine.java b/src/main/java/org/scijava/plugins/scripting/java/JavaEngine.java index 1686d50..0afe033 100644 --- a/src/main/java/org/scijava/plugins/scripting/java/JavaEngine.java +++ b/src/main/java/org/scijava/plugins/scripting/java/JavaEngine.java @@ -93,7 +93,7 @@ */ public class JavaEngine extends AbstractScriptEngine { - private final static String DEFAULT_GROUP_ID = "net.imagej"; + private final static String DEFAULT_GROUP_ID = "org.scijava.scripting.java"; private final static String DEFAULT_VERSION = "1.0.0-SNAPSHOT"; /** diff --git a/src/test/java/org/scijava/plugins/scripting/java/JavaEngineTest.java b/src/test/java/org/scijava/plugins/scripting/java/JavaEngineTest.java index ad8f8c9..8715acf 100644 --- a/src/test/java/org/scijava/plugins/scripting/java/JavaEngineTest.java +++ b/src/test/java/org/scijava/plugins/scripting/java/JavaEngineTest.java @@ -198,7 +198,7 @@ private File makeProject(final String mainClass, final String... args) " xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0\n" + // " http://maven.apache.org/xsd/maven-4.0.0.xsd\">\n" + // " 4.0.0\n" + // - " net.imagej\n" + // + " org.scijava.scripting.java\n" + // " MinimalTest\n" + // " 1.0.0\n" + // " \n" + // diff --git a/src/test/java/org/scijava/plugins/scripting/java/MakeJarTest.java b/src/test/java/org/scijava/plugins/scripting/java/MakeJarTest.java index 81bc517..76c994a 100644 --- a/src/test/java/org/scijava/plugins/scripting/java/MakeJarTest.java +++ b/src/test/java/org/scijava/plugins/scripting/java/MakeJarTest.java @@ -58,10 +58,10 @@ public void testSingle() throws Exception { final File output = new File(tmpDir, "test.jar"); engine.makeJar(file, false, output, writer); assertJarEntries(output, "META-INF/MANIFEST.MF", - "META-INF/maven/net.imagej/Dummy/pom.xml", "Dummy.class"); + "META-INF/maven/org.scijava.scripting.java/Dummy/pom.xml", "Dummy.class"); engine.makeJar(file, true, output, writer); assertJarEntries(output, "META-INF/MANIFEST.MF", - "META-INF/maven/net.imagej/Dummy/pom.xml", "Dummy.class", + "META-INF/maven/org.scijava.scripting.java/Dummy/pom.xml", "Dummy.class", "pom.xml", "src/main/java/Dummy.java"); }