Skip to content
Snippets Groups Projects
Commit 63cd8370 authored by Jari-Matti Mäkelä's avatar Jari-Matti Mäkelä
Browse files

Switch to gitlab package registry

parent 48de644d
No related branches found
No related tags found
No related merge requests found
Pipeline #74767 failed
Stage: build
Stage: test
Show whitespace changes
Inline Side-by-side
.gitlab-ci.yml
+ 13
− 4
View file @ 63cd8370
image: maven:latest image: maven:3.9.6-eclipse-temurin-22
variables: variables:
# This will supress any download for dependencies and plugins or upload messages which would clutter the console log. # This will supress any download for dependencies and plugins or upload messages which would clutter the console log.
# `showDateTime` will show the passed time in milliseconds. You need to specify `--batch-mode` to make this work. # `showDateTime` will show the passed time in milliseconds. You need to specify `--batch-mode` to make this work.
MAVEN_OPTS: "-Dhttps.protocols=TLSv1.2 -Dmaven.repo.local=$CI_PROJECT_DIR/.m2/repository -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true" MAVEN_OPTS: "-Dhttps.protocols=TLSv1.2 -Dmaven.repo.local=$CI_PROJECT_DIR/.m2/repository -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true"
MAVEN_CLI_OPTS: "--batch-mode --errors --fail-at-end --show-version" MAVEN_CLI_OPTS: "--batch-mode --errors --fail-at-end --show-version"
# -DinstallAtEnd=true -DdeployAtEnd=true"
# Cache downloaded dependencies and plugins between builds.
# To keep cache across branches add ''
cache: cache:
key: "$CI_JOB_NAME" key: "$CI_JOB_NAME"
paths: paths:
- .m2/repository - .m2/repository
stages:
- build
- test
- deploy
build: build:
stage: build stage: build
script: script:
...@@ -23,3 +25,10 @@ test: ...@@ -23,3 +25,10 @@ test:
stage: test stage: test
script: script:
- mvn test - mvn test
deploy:
stage: deploy
rules:
- if: $CI_COMMIT_TAG
script:
- mvn deploy -s ci_settings.xml
ci_settings.xml 0 → 100644
+ 16
− 0
View file @ 63cd8370
<settings xmlns="http://maven.apache.org/SETTINGS/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.1.0 http://maven.apache.org/xsd/settings-1.1.0.xsd">
<servers>
<server>
<id>gitlab-maven</id>
<configuration>
<httpHeaders>
<property>
<name>Job-Token</name>
<value>${env.CI_JOB_TOKEN}</value>
</property>
</httpHeaders>
</configuration>
</server>
</servers>
</settings>
hotreload-demo/src/main/java/fi/utu/tech/demo/Main.java deleted 100644 → 0
+ 0
− 7
View file @ 48de644d
package fi.utu.tech.demo;
public class Main {
public static void main(String[] args) {
MainApp.launch(MainApp.class, args);
}
}
hotreload-demo/src/main/java/fi/utu/tech/demo/MainApp.java
+ 4
− 0
View file @ 63cd8370
...@@ -69,4 +69,8 @@ public class MainApp extends Application implements ReloadableApplication { ...@@ -69,4 +69,8 @@ public class MainApp extends Application implements ReloadableApplication {
// should work even without hot reloading // should work even without hot reloading
setScene(stage); setScene(stage);
} }
public static void main(String[] args) {
MainApp.launch(MainApp.class, args);
}
} }
pom.xml
+ 30
− 154
View file @ 63cd8370
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project>
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> <modelVersion>4.0.0</modelVersion>
<groupId>fi.utu.tech</groupId> <groupId>fi.utu.tech</groupId>
<artifactId>hotreload-meta</artifactId> <artifactId>hotreload-meta</artifactId>
<version>2.0.1</version> <version>2.0.2</version>
<name>Hot reload meta</name> <name>Hot reload meta</name>
<url>https://gitlab.utu.fi/tech/education/gui/hotreload</url> <url>https://gitlab.utu.fi/tech/education/gui/hotreload</url>
<packaging>pom</packaging> <packaging>pom</packaging>
<modules> <modules>
...@@ -17,32 +13,27 @@ ...@@ -17,32 +13,27 @@
</modules> </modules>
<properties> <properties>
<project.mainclass>fi.utu.tech.demo.Main</project.mainclass> <project.mainclass>fi.utu.tech.demo.MainApp</project.mainclass>
<project.mainmodule>fi.utu.tech.demo</project.mainmodule> <project.mainmodule>fi.utu.tech.demo</project.mainmodule>
<project.launcher>hotreload</project.launcher>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jdk.version>17</jdk.version>
<jdk.version>11</jdk.version> <junit.version>5.10.2</junit.version>
<jqwik.version>1.5.1</jqwik.version> <junitplatform.version>1.10.2</junitplatform.version>
<junit.version>5.7.1</junit.version> <javafx.version>22</javafx.version>
<junitplatform.version>1.7.1</junitplatform.version> <classloader.version>1.2.1</classloader.version>
<javafx.version>16</javafx.version>
<classloader.version>1.2.0</classloader.version>
</properties> </properties>
<repositories> <repositories>
<repository> <repository>
<snapshots>
<enabled>false</enabled>
</snapshots>
<id>central</id> <id>central</id>
<name>Central Repository</name> <name>Central Repository</name>
<url>https://repo.maven.apache.org/maven2</url> <url>https://repo.maven.apache.org/maven2</url>
</repository> </repository>
<!-- classloader -->
<repository> <repository>
<id>ftdev</id> <id>gitlab-classloader</id>
<name>ftdev</name> <url>https://gitlab.utu.fi/api/v4/projects/4566/packages/maven</url>
<url>https://ftdev.utu.fi/maven2</url>
</repository> </repository>
</repositories> </repositories>
...@@ -71,14 +62,6 @@ ...@@ -71,14 +62,6 @@
<version>${junitplatform.version}</version> <version>${junitplatform.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>net.jqwik</groupId>
<artifactId>jqwik</artifactId>
<version>${jqwik.version}</version>
<scope>test</scope>
</dependency>
<!-- JavaFX (remove if not needed to speed up dep downloads)-->
<dependency> <dependency>
<groupId>org.openjfx</groupId> <groupId>org.openjfx</groupId>
<artifactId>javafx-base</artifactId> <artifactId>javafx-base</artifactId>
...@@ -94,8 +77,6 @@ ...@@ -94,8 +77,6 @@
<artifactId>javafx-graphics</artifactId> <artifactId>javafx-graphics</artifactId>
<version>${javafx.version}</version> <version>${javafx.version}</version>
</dependency> </dependency>
<!-- UTU libraries -->
<dependency> <dependency>
<groupId>fi.utu.tech</groupId> <groupId>fi.utu.tech</groupId>
<artifactId>distributed-classloader</artifactId> <artifactId>distributed-classloader</artifactId>
...@@ -105,11 +86,10 @@ ...@@ -105,11 +86,10 @@
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.openjfx</groupId> <groupId>org.openjfx</groupId>
<artifactId>javafx-maven-plugin</artifactId> <artifactId>javafx-maven-plugin</artifactId>
<version>0.0.6</version> <version>0.0.8</version>
<configuration> <configuration>
<mainClass>${project.mainmodule}/${project.mainclass}</mainClass> <mainClass>${project.mainmodule}/${project.mainclass}</mainClass>
<stripDebug>true</stripDebug> <stripDebug>true</stripDebug>
...@@ -119,25 +99,11 @@ ...@@ -119,25 +99,11 @@
<launcher>${project.launcher}</launcher> <launcher>${project.launcher}</launcher>
</configuration> </configuration>
</plugin> </plugin>
<!-- Make the packaged jar executable -->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>3.2.0</version> <version>3.2.0</version>
<configuration>
<!-- DO NOT include log4j.properties file in your Jar -->
<excludes>
<exclude>**/log4j.properties</exclude>
</excludes>
<archive>
<manifest>
</manifest>
</archive>
</configuration>
</plugin> </plugin>
<!-- JDK source/target versions -->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
...@@ -147,7 +113,6 @@ ...@@ -147,7 +113,6 @@
<target>${jdk.version}</target> <target>${jdk.version}</target>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId> <artifactId>maven-source-plugin</artifactId>
...@@ -161,121 +126,32 @@ ...@@ -161,121 +126,32 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<version>3.2.0</version> <version>3.3.0</version>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
<configuration>
<tags>
<tag>
<name>toDo</name>
<placement>a</placement>
<head>To&nbsp;do:</head>
</tag>
<tag>
<name>classInvariant</name>
<placement>t</placement>
<head>Class&nbsp;invariant:</head>
</tag>
<tag>
<name>classInvariantProtected</name>
<placement>t</placement>
<head>Protected&nbsp;class&nbsp;invariant:</head>
</tag>
<tag>
<name>classInvariantPrivate</name>
<placement>t</placement>
<head>Private&nbsp;class&nbsp;invariant:</head>
</tag>
<tag>
<name>abstractionFunction</name>
<placement>t</placement>
<head>Abstraction&nbsp;function:</head>
</tag>
<tag>
<name>pre</name>
<placement>cm</placement>
<head>Precondition:</head>
</tag>
<tag>
<name>post</name>
<placement>cm</placement>
<head>Postcondition:</head>
</tag>
<tag>
<name>postProtected</name>
<placement>cm</placement>
<head>Protected&nbsp;postcondition:</head>
</tag>
<tag>
<name>postPrivate</name>
<placement>cm</placement>
<head>Private&nbsp;postcondition:</head>
</tag>
<tag>
<name>time</name>
<placement>cmf</placement>
<head>Time&nbsp;complexity:</head>
</tag>
<tag>
<name>space</name>
<placement>cmf</placement>
<head>Space&nbsp;complexity:</head>
</tag>
<tag>
<name>correspondence</name>
<placement>a</placement>
<head>Correspondence:</head>
</tag>
<tag>
<name>download</name>
<placement>a</placement>
<head>Download:</head>
</tag>
</tags>
<show>protected</show>
<failOnError>false</failOnError>
<sourceFileExcludes>
<sourceFileExclude>**/module-info.java</sourceFileExclude>
</sourceFileExcludes>
</configuration>
</plugin> </plugin>
<!-- JUnit & JQwik test integration -->
<plugin> <plugin>
<groupId>de.sormuras.junit</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>junit-platform-maven-plugin</artifactId> <artifactId>maven-failsafe-plugin</artifactId>
<version>1.1.0</version> <version>3.3.0</version>
<extensions>true</extensions> </plugin>
<configuration> <plugin>
<executor>JAVA</executor> <groupId>org.apache.maven.plugins</groupId>
</configuration> <artifactId>maven-surefire-report-plugin</artifactId>
<version>3.3.0</version>
</plugin> </plugin>
</plugins> </plugins>
<extensions>
<!-- Enables the use of SSH for deployments -->
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh</artifactId>
<version>3.4.1</version>
</extension>
</extensions>
</build> </build>
<distributionManagement> <distributionManagement>
<repository> <repository>
<id>ftdev</id> <id>gitlab-maven</id>
<name>UTU tech ftdev repository</name> <url>${env.CI_API_V4_URL}/projects/${env.CI_PROJECT_ID}/packages/maven</url>
<url>scp://localhost:2222/var/www/maven2</url>
</repository> </repository>
<snapshotRepository>
<id>gitlab-maven</id>
<url>${env.CI_API_V4_URL}/projects/${env.CI_PROJECT_ID}/packages/maven</url>
</snapshotRepository>
</distributionManagement> </distributionManagement>
</project> </project>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment