Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
FROM maven:3.9-eclipse-temurin-17 AS build
WORKDIR /app
COPY . .
RUN mvn install
RUN mvn package
RUN mvn verify

FROM eclipse-temurin:17-jre
WORKDIR /app
COPY --from=build /app/target/*.jar app.jar
ENTRYPOINT ["java", "-jar", "app.jar"]
3 changes: 1 addition & 2 deletions application/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.sis</groupId>
<artifactId>parent</artifactId>
<version>1.2-SNAPSHOT</version>
<version>1.2</version>
</parent>


Expand Down Expand Up @@ -118,7 +118,6 @@
=========================================================== -->
<modules>
<module>sis-console</module>
<module>sis-webapp</module>
<module>sis-openoffice</module>
</modules>
<profiles>
Expand Down
2 changes: 1 addition & 1 deletion application/sis-console/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.sis</groupId>
<artifactId>application</artifactId>
<version>1.2-SNAPSHOT</version>
<version>1.2</version>
</parent>


Expand Down
2 changes: 1 addition & 1 deletion application/sis-console/src/main/artifact/bin/sis
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ SIS_DATA="${SIS_DATA:-$BASE_DIR/data}"
export SIS_DATA

# Execute SIS with any optional JAR that the user may put in the 'lib' directory.
java -classpath "$BASE_DIR/lib/sis-console-1.2-SNAPSHOT.jar" \
java -classpath "$BASE_DIR/lib/sis-console-1.2.jar" \
-Djava.util.logging.config.file="$BASE_DIR/conf/logging.properties" \
-Dderby.stream.error.file="$BASE_DIR/log/derby.log" \
org.apache.sis.console.Command $SIS_OPTS "$@"
2 changes: 1 addition & 1 deletion application/sis-javafx/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.sis</groupId>
<artifactId>application</artifactId>
<version>1.2-SNAPSHOT</version>
<version>1.2</version>
</parent>


Expand Down
2 changes: 1 addition & 1 deletion application/sis-javafx/src/main/artifact/bin/sisfx
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ fi
java -splash:"$BASE_DIR/lib/logo.jpg" \
--add-modules javafx.graphics,javafx.controls,javafx.web \
--module-path "$PATH_TO_FX" \
--class-path "$BASE_DIR/lib/sis-javafx-1.2-SNAPSHOT.jar" \
--class-path "$BASE_DIR/lib/sis-javafx-1.2.jar" \
-Djava.util.logging.config.class="org.apache.sis.internal.setup.LoggingConfiguration" \
-Djava.util.logging.config.file="$BASE_DIR/conf/logging.properties" \
-Dderby.stream.error.file="$BASE_DIR/log/derby.log" \
Expand Down
2 changes: 1 addition & 1 deletion application/sis-javafx/src/main/artifact/bin/sisfx.bat
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ IF "%PATH_TO_FX%"=="" (
java -splash:"%BASE_DIR%\lib\logo.jpg"^
--add-modules javafx.graphics,javafx.controls,javafx.web^
--module-path "%PATH_TO_FX%"^
--class-path "%BASE_DIR%\lib\sis-javafx-1.2-SNAPSHOT.jar"^
--class-path "%BASE_DIR%\lib\sis-javafx-1.2.jar"^
-Djava.util.logging.config.class=org.apache.sis.internal.setup.LoggingConfiguration^
-Djava.util.logging.config.file="%BASE_DIR%\conf\logging.properties"^
-Dderby.stream.error.file="%BASE_DIR%\log\derby.log"^
Expand Down
2 changes: 1 addition & 1 deletion application/sis-openoffice/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.sis</groupId>
<artifactId>application</artifactId>
<version>1.2-SNAPSHOT</version>
<version>1.2</version>
</parent>


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ <h2>Build:</h2>
<h2>Test in Apache OpenOffice:</h2>
<p>Launch:</p>
<blockquote><pre>cd target
unopkg add apache-sis-1.2-SNAPSHOT.oxt --log-file log.txt
unopkg add apache-sis-1.2.oxt --log-file log.txt
scalc -env:RTL_LOGFILE=log.txt</pre></blockquote>

<p>If not already done, configure Java runtime with
Expand Down
47 changes: 0 additions & 47 deletions application/sis-webapp/pom.xml

This file was deleted.

This file was deleted.

This file was deleted.

26 changes: 0 additions & 26 deletions application/sis-webapp/src/main/webapp/META-INF/context.xml

This file was deleted.

24 changes: 0 additions & 24 deletions application/sis-webapp/src/main/webapp/WEB-INF/web.xml

This file was deleted.

2 changes: 1 addition & 1 deletion cloud/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.sis</groupId>
<artifactId>parent</artifactId>
<version>1.2-SNAPSHOT</version>
<version>1.2</version>
</parent>


Expand Down
2 changes: 1 addition & 1 deletion cloud/sis-cloud-aws/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.sis</groupId>
<artifactId>cloud</artifactId>
<version>1.2-SNAPSHOT</version>
<version>1.2</version>
</parent>


Expand Down
2 changes: 1 addition & 1 deletion core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.sis</groupId>
<artifactId>parent</artifactId>
<version>1.2-SNAPSHOT</version>
<version>1.2</version>
</parent>


Expand Down
2 changes: 1 addition & 1 deletion core/sis-build-helper/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<parent>
<groupId>org.apache.sis</groupId>
<artifactId>parent</artifactId>
<version>1.2-SNAPSHOT</version>
<version>1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
44 changes: 0 additions & 44 deletions core/sis-build-helper/src/main/ant/prepare-release.xml

This file was deleted.

2 changes: 1 addition & 1 deletion core/sis-feature/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.sis</groupId>
<artifactId>core</artifactId>
<version>1.2-SNAPSHOT</version>
<version>1.2</version>
</parent>


Expand Down
2 changes: 1 addition & 1 deletion core/sis-metadata/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.sis</groupId>
<artifactId>core</artifactId>
<version>1.2-SNAPSHOT</version>
<version>1.2</version>
</parent>


Expand Down
2 changes: 1 addition & 1 deletion core/sis-portrayal/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.sis</groupId>
<artifactId>core</artifactId>
<version>1.2-SNAPSHOT</version>
<version>1.2</version>
</parent>


Expand Down
2 changes: 1 addition & 1 deletion core/sis-referencing-by-identifiers/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.sis</groupId>
<artifactId>core</artifactId>
<version>1.2-SNAPSHOT</version>
<version>1.2</version>
</parent>

<groupId>org.apache.sis.core</groupId>
Expand Down
2 changes: 1 addition & 1 deletion core/sis-referencing/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.sis</groupId>
<artifactId>core</artifactId>
<version>1.2-SNAPSHOT</version>
<version>1.2</version>
</parent>

<groupId>org.apache.sis.core</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ <h2>How to apply EPSG geodetic dataset updates</h2>
mvn clean install
export CLASSPATH=~/.m2/repository/org/apache/derby/derby/10.14.2.0/derby-10.14.2.0.jar
export CLASSPATH=$PWD/core/sis-metadata/target/test-classes:$CLASSPATH
export CLASSPATH=$PWD/target/binaries/sis-referencing-1.2-SNAPSHOT.jar:$CLASSPATH
export CLASSPATH=$PWD/target/binaries/sis-referencing-1.2.jar:$CLASSPATH
export CLASSPATH=$PWD/core/sis-metadata/target/test-classes:$CLASSPATH
export CLASSPATH=$PWD/core/sis-referencing/target/test-classes:$CLASSPATH
cd <i>&lt;path to local copy of <a href="http://svn.apache.org/repos/asf/sis/data/non-free/">http://svn.apache.org/repos/asf/sis/data/non-free/</a>&gt;</i>
Expand Down
2 changes: 1 addition & 1 deletion core/sis-utility/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.sis</groupId>
<artifactId>core</artifactId>
<version>1.2-SNAPSHOT</version>
<version>1.2</version>
</parent>


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public class Version implements CharSequence, Comparable<Version>, Serializable
/**
* The version of this Apache SIS distribution.
*/
public static final Version SIS = new Version(MAJOR_VERSION + "." + MINOR_VERSION + "-SNAPSHOT");
public static final Version SIS = new Version(MAJOR_VERSION + "." + MINOR_VERSION);

/**
* A few commonly used version numbers. This list is based on SIS needs, e.g. in {@code DataStore} implementations.
Expand Down
Loading