Skip to content

Commit b3e5b73

Browse files
ctruedenctrueden
authored
Merge pull request #31 from scijava/scijava/scijava-struct/init
Initialize scijava-struct as a new module
2 parents 4aba8f3 + f6df62f commit b3e5b73

File tree

15 files changed

+134
-3
lines changed

15 files changed

+134
-3
lines changed

‎pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
<module>scijava/scijava-persist</module>
5151
<module>scijava/scijava-function</module>
5252
<module>scijava/scijava-ops</module>
53+
<module>scijava/scijava-struct</module>
5354
<module>scijava/scijava-taglets</module>
5455
<module>scijava/scijava-testutil</module>
5556
<module>scijava/scijava-types</module>

‎scijava/scijava-ops/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,11 @@
121121
<groupId>org.scijava</groupId>
122122
<artifactId>scijava-common</artifactId>
123123
</dependency>
124+
<dependency>
125+
<groupId>org.scijava</groupId>
126+
<artifactId>scijava-struct</artifactId>
127+
<version>${project.version}</version>
128+
</dependency>
124129
<dependency>
125130
<groupId>org.scijava</groupId>
126131
<artifactId>scijava-types</artifactId>

‎scijava/scijava-ops/src/main/java/module-info.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
exports org.scijava.ops.provenance;
1717
// TODO: move OpWrapper to its own package (org.scijava.ops.wrap??)
1818
exports org.scijava.ops.util; // contains OpWrapper interface
19-
exports org.scijava.struct;
2019
exports org.scijava.param;
2120

2221
opens org.scijava.ops.conversionLoss to therapi.runtime.javadoc;
@@ -35,7 +34,6 @@
3534
opens org.scijava.ops.adapt.functional to therapi.runtime.javadoc;
3635
opens org.scijava.ops to therapi.runtime.javadoc, org.scijava;
3736
opens org.scijava.ops.util to therapi.runtime.javadoc;
38-
opens org.scijava.struct to therapi.runtime.javadoc;
3937
opens org.scijava.ops.matcher to therapi.runtime.javadoc;
4038
opens org.scijava.ops.simplify to therapi.runtime.javadoc;
4139
opens org.scijava.ops.stats to therapi.runtime.javadoc;
@@ -50,6 +48,7 @@
5048

5149
requires org.scijava;
5250
requires org.scijava.function;
51+
requires org.scijava.struct;
5352
requires org.scijava.types;
5453
requires javassist;
5554
requires java.compiler;

‎scijava/scijava-ops/templates/main/java/module-info.vm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ module org.scijava.ops {
2222
exports org.scijava.ops.provenance;
2323
// TODO: move OpWrapper to its own package (org.scijava.ops.wrap??)
2424
exports org.scijava.ops.util; // contains OpWrapper interface
25-
exports org.scijava.struct;
2625
exports org.scijava.param;
2726

2827
#foreach($package in $packages)
@@ -36,6 +35,7 @@ module org.scijava.ops {
3635

3736
requires org.scijava;
3837
requires org.scijava.function;
38+
requires org.scijava.struct;
3939
requires org.scijava.types;
4040
requires javassist;
4141
requires java.compiler;

‎scijava/scijava-struct/pom.xml‎

Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<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">
3+
<modelVersion>4.0.0</modelVersion>
4+
5+
<parent>
6+
<groupId>org.scijava</groupId>
7+
<artifactId>scijava-incubator</artifactId>
8+
<version>0-SNAPSHOT</version>
9+
<relativePath>../..</relativePath>
10+
</parent>
11+
12+
<artifactId>scijava-struct</artifactId>
13+
14+
<name>SciJava Struct</name>
15+
<description>A lightweight framework for collecting Members</description>
16+
<url>https://github.com/scijava/incubator</url>
17+
<inceptionYear>2021</inceptionYear>
18+
<organization>
19+
<name>SciJava</name>
20+
<url>https://scijava.org/</url>
21+
</organization>
22+
<licenses>
23+
<license>
24+
<name>Simplified BSD License</name>
25+
<distribution>repo</distribution>
26+
</license>
27+
</licenses>
28+
29+
<developers>
30+
<developer>
31+
<id>ctrueden</id>
32+
<name>Curtis Rueden</name>
33+
<url>https://imagej.net/User:Rueden</url>
34+
<roles>
35+
<role>founder</role>
36+
<role>lead</role>
37+
<role>reviewer</role>
38+
<role>support</role>
39+
<role>maintainer</role>
40+
</roles>
41+
</developer>
42+
<developer>
43+
<id>gselzer</id>
44+
<name>Gabriel Selzer</name>
45+
<roles>
46+
<role>founder</role>
47+
<role>developer</role>
48+
<role>debugger</role>
49+
<role>reviewer</role>
50+
<role>support</role>
51+
</roles>
52+
</developer>
53+
</developers>
54+
<contributors>
55+
<!--
56+
NB: Need at least one element to override the parent.
57+
See: https://issues.apache.org/jira/browse/MNG-5220
58+
-->
59+
<contributor>
60+
<name>None</name>
61+
</contributor>
62+
</contributors>
63+
64+
<mailingLists>
65+
<mailingList>
66+
<name>Image.sc Forum</name>
67+
<archive>https://forum.image.sc/tags/scijava-struct</archive>
68+
</mailingList>
69+
</mailingLists>
70+
71+
<scm>
72+
<connection>scm:git:git://github.com/scijava/incubator</connection>
73+
<developerConnection>scm:git:git@github.com:scijava/incubator</developerConnection>
74+
<tag>HEAD</tag>
75+
<url>https://github.com/scijava/incubator</url>
76+
</scm>
77+
<issueManagement>
78+
<system>GitHub Issues</system>
79+
<url>https://github.com/scijava/scijava-struct/issues</url>
80+
</issueManagement>
81+
<ciManagement>
82+
<system>Travis CI</system>
83+
<url>https://travis-ci.com/scijava/incubator</url>
84+
</ciManagement>
85+
86+
<properties>
87+
<package-name>org.scijava.struct</package-name>
88+
89+
<license.licenseName>bsd_2</license.licenseName>
90+
<license.copyrightOwners>SciJava developers.</license.copyrightOwners>
91+
</properties>
92+
93+
<dependencies>
94+
<!-- SciJava dependencies -->
95+
<dependency>
96+
<groupId>org.scijava</groupId>
97+
<artifactId>scijava-types</artifactId>
98+
<version>${project.version}</version>
99+
</dependency>
100+
101+
<!-- Third-party dependencies -->
102+
103+
<!-- Test scope dependencies -->
104+
<dependency>
105+
<groupId>org.junit.jupiter</groupId>
106+
<artifactId>junit-jupiter-api</artifactId>
107+
<scope>test</scope>
108+
</dependency>
109+
<dependency>
110+
<groupId>org.junit.jupiter</groupId>
111+
<artifactId>junit-jupiter-engine</artifactId>
112+
<scope>test</scope>
113+
</dependency>
114+
<dependency>
115+
<groupId>org.junit.vintage</groupId>
116+
<artifactId>junit-vintage-engine</artifactId>
117+
<scope>test</scope>
118+
</dependency>
119+
</dependencies>
120+
</project>

‎scijava/scijava-struct/src/main/java/module-info.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
module org.scijava.struct {
2+
3+
exports org.scijava.struct;
4+
5+
requires org.scijava.types;
6+
}

scijava/scijava-ops/src/main/java/org/scijava/struct/DefaultStructInstance.java renamed to scijava/scijava-struct/src/main/java/org/scijava/struct/DefaultStructInstance.java

File renamed without changes.

scijava/scijava-ops/src/main/java/org/scijava/struct/ItemIO.java renamed to scijava/scijava-struct/src/main/java/org/scijava/struct/ItemIO.java

File renamed without changes.

scijava/scijava-ops/src/main/java/org/scijava/struct/Member.java renamed to scijava/scijava-struct/src/main/java/org/scijava/struct/Member.java

File renamed without changes.

scijava/scijava-ops/src/main/java/org/scijava/struct/MemberInstance.java renamed to scijava/scijava-struct/src/main/java/org/scijava/struct/MemberInstance.java

File renamed without changes.

0 commit comments

Comments
 (0)