diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..c6a80b42532a2401fa58aaa94e8df4dac592f797
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,58 @@
+### Java ###
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+### Linux ###
+*~
+
+# temporary files which can be created if a process still has a handle open of a deleted file
+.fuse_hidden*
+
+# KDE directory preferences
+.directory
+
+# Linux trash folder which might appear on any partition or disk
+.Trash-*
+
+# .nfs files are created when an open file is removed but is still being accessed
+.nfs*
+
+### macOS ###
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+# Thumbnails
+._*
+
+### Maven ###
+target/
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.versionsBackup
+pom.xml.next
+release.properties
+dependency-reduced-pom.xml
+buildNumber.properties
+.mvn/timing.properties
+.mvn/wrapper/maven-wrapper.jar
+
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 882a7745398fb05e191efe99262f3a46279ea267..d5fb0dbb05759b7d99517b69828f2336d2029fc7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,18 +4,16 @@ stages:
variables:
EXPORT_DIR: "/var/www/html/pages"
+ RELEASE_DIR: "release_target_211"
build-p2:
stage: build
tags:
- - docker
+ - docker # use
image: maven:3.6.3-adoptopenjdk-15
script:
- mvn --version
- - mkdir -p indriya_repo.tar de.hft-stuttgart.indriya.p2site/target/repository/
- - touch indriya_repo.tar de.hft-stuttgart.indriya.p2site/target/repository/p2.index
- - touch indriya_repo.tar de.hft-stuttgart.indriya.p2site/target/repository/p2.test
-# - mvn clean install
+ - mvn clean install
artifacts:
paths:
- de.hft-stuttgart.indriya.p2site/target/repository/
@@ -24,16 +22,10 @@ build-p2:
pages-master:
stage: deploy
tags:
- - production
+ - production # use special CLI runner for publishing to $EXPORT_DIR
script:
- rm -rf "$EXPORT_DIR/$CI_PROJECT_NAME"
- - mkdir -p "$EXPORT_DIR/$CI_PROJECT_NAME/release_target_211"
- - cp -r de.hft-stuttgart.indriya.p2site/target/repository/* "$EXPORT_DIR/$CI_PROJECT_NAME/release_target_211/"
-# - cp -r public/* "$EXPORT_DIR/$CI_PROJECT_NAME"
- artifacts:
- paths:
- - public
- expire_in: 1 day
- when: manual
+ - mkdir -p "$EXPORT_DIR/$CI_PROJECT_NAME/$RELEASE_DIR"
+ - cp -r de.hft-stuttgart.indriya.p2site/target/repository/* "$EXPORT_DIR/$CI_PROJECT_NAME/$RELEASE_DIR"
only:
- master
diff --git a/de.hft-stuttgart.indriya.feature/build.properties b/de.hft-stuttgart.indriya.feature/build.properties
new file mode 100644
index 0000000000000000000000000000000000000000..64f93a9f0b7328eb563aa5ad6cec7f828020e124
--- /dev/null
+++ b/de.hft-stuttgart.indriya.feature/build.properties
@@ -0,0 +1 @@
+bin.includes = feature.xml
diff --git a/de.hft-stuttgart.indriya.feature/feature.xml b/de.hft-stuttgart.indriya.feature/feature.xml
new file mode 100644
index 0000000000000000000000000000000000000000..db3e1cbe237eb4d3583ac5f0eedda0cfb99fa7f1
--- /dev/null
+++ b/de.hft-stuttgart.indriya.feature/feature.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="de.hft-stuttgart.indriya.feature"
+ label="Indriya P2"
+ version="1.0.0"
+ provider-name="HfT Stuttgart">
+
+ <description url="http://www.example.com/description">
+ Provides Indriya reference implementation of units of masurement (JSR 385) as P2 Repo.
+ </description>
+
+ <copyright url="http://www.example.com/copyright">
+ [Enter Copyright Description here.]
+ </copyright>
+
+ <license url="http://www.example.com/license">
+ [Enter License Description here.]
+ </license>
+
+ <requires>
+ <import plugin="org.eclipse.core.runtime" version="3.8.0" match="compatible"/>
+ <import plugin="tech.units.indriya" version="2.1.1" match="compatible"/>
+ <import plugin="javax.measure.unit-api" version="0.0.0" match="compatible"/>
+ <import plugin="uom-lib-common" version="0.0.0" match="compatible"/>
+ <import plugin="javax.inject"/>
+ </requires>
+
+ <plugin
+ id="tech.units.indriya"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="uom-lib-common"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="jakarta.annotation-api"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="jakarta.inject.jakarta.inject-api"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="javax.measure.unit-api"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+</feature>
diff --git a/de.hft-stuttgart.indriya.feature/pom.xml b/de.hft-stuttgart.indriya.feature/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1d1064b2f17886d8d54c53c0bdc1141d8f6b27eb
--- /dev/null
+++ b/de.hft-stuttgart.indriya.feature/pom.xml
@@ -0,0 +1,13 @@
+<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>de.hft-stuttgart.indriya.feature</artifactId>
+ <packaging>eclipse-feature</packaging>
+ <name>Indriya P2 site feature</name>
+ <parent>
+ <groupId>de.hft-stuttgart</groupId>
+ <artifactId>de.hft-stuttgart.indriya.parent</artifactId>
+ <version>1.0.0</version>
+ </parent>
+</project>
\ No newline at end of file
diff --git a/de.hft-stuttgart.indriya.p2site/category.xml b/de.hft-stuttgart.indriya.p2site/category.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6dfa0558c954234c814ed1435fd65426d8d74b8c
--- /dev/null
+++ b/de.hft-stuttgart.indriya.p2site/category.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+ <feature id="de.hft-stuttgart.indriya.feature">
+ <category name="Indriya"/>
+ </feature>
+ <category-def name="indriya" label="Indriya">
+ <description>
+ Provides Indriya reference implementation of units of masurement
+(JSR 385) as P2 repository.
+ </description>
+ </category-def>
+</site>
diff --git a/de.hft-stuttgart.indriya.p2site/pom.xml b/de.hft-stuttgart.indriya.p2site/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..456ebd9628568ee7dd73a48a634e52e623d07414
--- /dev/null
+++ b/de.hft-stuttgart.indriya.p2site/pom.xml
@@ -0,0 +1,13 @@
+<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>de.hft-stuttgart.indriya.p2site</artifactId>
+ <packaging>eclipse-repository</packaging>
+ <name>Indriya P2 site generation</name>
+ <parent>
+ <groupId>de.hft-stuttgart</groupId>
+ <artifactId>de.hft-stuttgart.indriya.parent</artifactId>
+ <version>1.0.0</version>
+ </parent>
+</project>
\ No newline at end of file
diff --git a/de.hft-stuttgart.indriya.p2site/site.xml b/de.hft-stuttgart.indriya.p2site/site.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8c5965b2c2f72bcc9dbb5bf262cd82bd69d0d523
--- /dev/null
+++ b/de.hft-stuttgart.indriya.p2site/site.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+</site>
diff --git a/de.hft-stuttgart.indriya.target/de.hft-stuttgart.indriya.target.target b/de.hft-stuttgart.indriya.target/de.hft-stuttgart.indriya.target.target
new file mode 100644
index 0000000000000000000000000000000000000000..b5a1165a05068ff774ac15b1b38dbf5291d18633
--- /dev/null
+++ b/de.hft-stuttgart.indriya.target/de.hft-stuttgart.indriya.target.target
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?>
+<target name="Equinox Runtime 2020-09">
+ <locations>
+ <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
+ <repository location="http://download.eclipse.org/releases/2020-09"/>
+ <unit id="org.eclipse.equinox.sdk.feature.group" version="3.20.300.v20200828-1034"/>
+ </location>
+ </locations>
+</target>
\ No newline at end of file
diff --git a/de.hft-stuttgart.indriya.target/pom.xml b/de.hft-stuttgart.indriya.target/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7e5c7b8af0115c14f954dbd7e4114a43bce73bfa
--- /dev/null
+++ b/de.hft-stuttgart.indriya.target/pom.xml
@@ -0,0 +1,13 @@
+<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>de.hft-stuttgart.indriya.target</artifactId>
+ <packaging>eclipse-target-definition</packaging>
+ <name>Indriya P2 site target definition</name>
+ <parent>
+ <groupId>de.hft-stuttgart</groupId>
+ <artifactId>de.hft-stuttgart.indriya.parent</artifactId>
+ <version>1.0.0</version>
+ </parent>
+</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..dbcc84286ed95c97b373c222a6f06fe4cd7bffea
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,78 @@
+<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>de.hft-stuttgart</groupId>
+ <artifactId>de.hft-stuttgart.indriya.parent</artifactId>
+ <version>1.0.0</version>
+ <packaging>pom</packaging>
+ <name>Indriya P2 site parent POM</name>
+
+ <properties>
+ <tycho-version>2.1.0</tycho-version>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-maven-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <source>15</source>
+ <target>15</target>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ <extensions>true</extensions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <pomDependencies>consider</pomDependencies>
+ <!-- executionEnvironment>JavaSE-15</executionEnvironment -->
+ <target>
+ <artifact>
+ <groupId>de.hft-stuttgart</groupId>
+ <artifactId>de.hft-stuttgart.indriya.target</artifactId>
+ <version>1.0.0</version>
+ </artifact>
+ </target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>tech.units</groupId>
+ <artifactId>indriya</artifactId>
+ <version>2.1.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
+ <version>2.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ <version>2.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>tech.uom.lib</groupId>
+ <artifactId>uom-lib-common</artifactId>
+ <version>2.1</version>
+ </dependency>
+ </dependencies>
+
+ <modules>
+ <module>de.hft-stuttgart.indriya.target</module>
+ <module>de.hft-stuttgart.indriya.feature</module>
+ <module>de.hft-stuttgart.indriya.p2site</module>
+ </modules>
+
+</project>
\ No newline at end of file
diff --git a/public/index.html b/public/index.html
deleted file mode 100644
index a7caf38834dc07a9e45d4bb605449cf102c1bd40..0000000000000000000000000000000000000000
--- a/public/index.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body>
-
-<h1>Eclipse P2 Repository for Indriya</h1>
-
-<p>This URL is an Eclipse P2 software repository for the Indriya Units of Measurement reference implementation of(JSR-385). You must use it in Eclipse (<a href="https://help.eclipse.org/2020-09/index.jsp?topic=/org.eclipse.platform.doc.user/tasks/tasks-127.htm">see how</a>) or add it to a target platform when developing Eclipse Plugins.<p>
-</body>
-</html>
diff --git a/public/release_target_211/artifacts.jar b/public/release_target_211/artifacts.jar
deleted file mode 100644
index 69987374471e5b8762db06dfe85de51e270db0f9..0000000000000000000000000000000000000000
Binary files a/public/release_target_211/artifacts.jar and /dev/null differ
diff --git a/public/release_target_211/artifacts.xml.xz b/public/release_target_211/artifacts.xml.xz
deleted file mode 100644
index a3fa1cca4ccf0f0994b48d605fcf118cc454eaa7..0000000000000000000000000000000000000000
Binary files a/public/release_target_211/artifacts.xml.xz and /dev/null differ
diff --git a/public/release_target_211/content.jar b/public/release_target_211/content.jar
deleted file mode 100644
index 5e5fd758cded9d3522fe62af85c16848137a7948..0000000000000000000000000000000000000000
Binary files a/public/release_target_211/content.jar and /dev/null differ
diff --git a/public/release_target_211/content.xml.xz b/public/release_target_211/content.xml.xz
deleted file mode 100644
index eb98c191a1ac98133290e8b2c18f4f751bffbdde..0000000000000000000000000000000000000000
Binary files a/public/release_target_211/content.xml.xz and /dev/null differ
diff --git a/public/release_target_211/p2.index b/public/release_target_211/p2.index
deleted file mode 100644
index c19d9d1a52f0798c283c71797503ed1f3af918d2..0000000000000000000000000000000000000000
--- a/public/release_target_211/p2.index
+++ /dev/null
@@ -1,4 +0,0 @@
-#Fri Dec 04 18:14:09 CET 2020
-artifact.repository.factory.order=artifacts.xml.xz,artifacts.xml,\!
-version=1
-metadata.repository.factory.order=content.xml.xz,content.xml,\!
diff --git a/public/release_target_211/plugins/jakarta.annotation-api_2.0.0.jar b/public/release_target_211/plugins/jakarta.annotation-api_2.0.0.jar
deleted file mode 100644
index a7f3008d3f54c3e7891a570004b4950bcaa4fe0c..0000000000000000000000000000000000000000
Binary files a/public/release_target_211/plugins/jakarta.annotation-api_2.0.0.jar and /dev/null differ
diff --git a/public/release_target_211/plugins/jakarta.inject.jakarta.inject-api_2.0.0.jar b/public/release_target_211/plugins/jakarta.inject.jakarta.inject-api_2.0.0.jar
deleted file mode 100644
index 8bbb03e9242ad505db0d06e1c6c7b89dbd3671d2..0000000000000000000000000000000000000000
Binary files a/public/release_target_211/plugins/jakarta.inject.jakarta.inject-api_2.0.0.jar and /dev/null differ
diff --git a/public/release_target_211/plugins/javax.measure.unit-api_2.1.1.jar b/public/release_target_211/plugins/javax.measure.unit-api_2.1.1.jar
deleted file mode 100644
index 41b6bf97f2234eba31b828356e2f506f3eae2855..0000000000000000000000000000000000000000
Binary files a/public/release_target_211/plugins/javax.measure.unit-api_2.1.1.jar and /dev/null differ
diff --git a/public/release_target_211/plugins/tech.units.indriya_2.1.1.jar b/public/release_target_211/plugins/tech.units.indriya_2.1.1.jar
deleted file mode 100644
index 24244139744fb74a434edf72e2483b8d46eb37dd..0000000000000000000000000000000000000000
Binary files a/public/release_target_211/plugins/tech.units.indriya_2.1.1.jar and /dev/null differ
diff --git a/public/release_target_211/plugins/uom-lib-common_2.1.0.jar b/public/release_target_211/plugins/uom-lib-common_2.1.0.jar
deleted file mode 100644
index fd7c3ad73c08a7bf0b05cffd5935b77f1453f00e..0000000000000000000000000000000000000000
Binary files a/public/release_target_211/plugins/uom-lib-common_2.1.0.jar and /dev/null differ