diff --git a/.mvn/wrapper/MavenWrapperDownloader.java b/.mvn/wrapper/MavenWrapperDownloader.java deleted file mode 100644 index e76d1f3241d38db9b28f05133823bbed1ad289ff..0000000000000000000000000000000000000000 --- a/.mvn/wrapper/MavenWrapperDownloader.java +++ /dev/null @@ -1,117 +0,0 @@ -/* - * Copyright 2007-present the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -import java.net.*; -import java.io.*; -import java.nio.channels.*; -import java.util.Properties; - -public class MavenWrapperDownloader { - - private static final String WRAPPER_VERSION = "0.5.6"; - /** - * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided. - */ - private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/" - + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar"; - - /** - * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to - * use instead of the default one. - */ - private static final String MAVEN_WRAPPER_PROPERTIES_PATH = - ".mvn/wrapper/maven-wrapper.properties"; - - /** - * Path where the maven-wrapper.jar will be saved to. - */ - private static final String MAVEN_WRAPPER_JAR_PATH = - ".mvn/wrapper/maven-wrapper.jar"; - - /** - * Name of the property which should be used to override the default download url for the wrapper. - */ - private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl"; - - public static void main(String args[]) { - System.out.println("- Downloader started"); - File baseDirectory = new File(args[0]); - System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath()); - - // If the maven-wrapper.properties exists, read it and check if it contains a custom - // wrapperUrl parameter. - File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH); - String url = DEFAULT_DOWNLOAD_URL; - if(mavenWrapperPropertyFile.exists()) { - FileInputStream mavenWrapperPropertyFileInputStream = null; - try { - mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile); - Properties mavenWrapperProperties = new Properties(); - mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream); - url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url); - } catch (IOException e) { - System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'"); - } finally { - try { - if(mavenWrapperPropertyFileInputStream != null) { - mavenWrapperPropertyFileInputStream.close(); - } - } catch (IOException e) { - // Ignore ... - } - } - } - System.out.println("- Downloading from: " + url); - - File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH); - if(!outputFile.getParentFile().exists()) { - if(!outputFile.getParentFile().mkdirs()) { - System.out.println( - "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'"); - } - } - System.out.println("- Downloading to: " + outputFile.getAbsolutePath()); - try { - downloadFileFromURL(url, outputFile); - System.out.println("Done"); - System.exit(0); - } catch (Throwable e) { - System.out.println("- Error downloading"); - e.printStackTrace(); - System.exit(1); - } - } - - private static void downloadFileFromURL(String urlString, File destination) throws Exception { - if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) { - String username = System.getenv("MVNW_USERNAME"); - char[] password = System.getenv("MVNW_PASSWORD").toCharArray(); - Authenticator.setDefault(new Authenticator() { - @Override - protected PasswordAuthentication getPasswordAuthentication() { - return new PasswordAuthentication(username, password); - } - }); - } - URL website = new URL(urlString); - ReadableByteChannel rbc; - rbc = Channels.newChannel(website.openStream()); - FileOutputStream fos = new FileOutputStream(destination); - fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE); - fos.close(); - rbc.close(); - } - -} diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar deleted file mode 100644 index 2cc7d4a55c0cd0092912bf49ae38b3a9e3fd0054..0000000000000000000000000000000000000000 Binary files a/.mvn/wrapper/maven-wrapper.jar and /dev/null differ diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties deleted file mode 100644 index 642d572ce90e5085986bdd9c9204b9404f028084..0000000000000000000000000000000000000000 --- a/.mvn/wrapper/maven-wrapper.properties +++ /dev/null @@ -1,2 +0,0 @@ -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip -wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar diff --git a/common/pom.xml b/common/pom.xml index e491b4cb0421a27a5ad4259a2373810945e2058c..2bdfbf447d0a29bac8df22e7260158197667eec1 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -29,9 +29,9 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>de.itvsh.kop.eingangsadapter</groupId> - <artifactId>parent</artifactId> - <version>1.15.0-SNAPSHOT</version> + <groupId>de.ozgcloud.eingang</groupId> + <artifactId>eingang-manager</artifactId> + <version>2.0.0-SNAPSHOT</version> <relativePath>../</relativePath> </parent> <artifactId>common</artifactId> diff --git a/enterprise-adapter/pom.xml b/enterprise-adapter/pom.xml index bb4c9b695d06bba86598f0da08d48179ece9bbe9..087694ce0450c2d56f32fb917b607562b228759e 100644 --- a/enterprise-adapter/pom.xml +++ b/enterprise-adapter/pom.xml @@ -2,9 +2,9 @@ <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> <parent> - <groupId>de.itvsh.kop.eingangsadapter</groupId> - <artifactId>parent</artifactId> - <version>1.15.0-SNAPSHOT</version> + <groupId>de.ozgcloud.eingang</groupId> + <artifactId>eingang-manager</artifactId> + <version>2.0.0-SNAPSHOT</version> </parent> <artifactId>enterprise-adapter</artifactId> <name>EM - Enterprise Interface Adapter</name> @@ -18,14 +18,14 @@ <dependencies> <!--ozg-Cloud--> <dependency> - <groupId>de.itvsh.kop.eingangsadapter</groupId> + <groupId>de.ozgcloud.eingang</groupId> <artifactId>common</artifactId> </dependency> <dependency> - <groupId>de.itvsh.kop.eingangsadapter</groupId> + <groupId>de.ozgcloud.eingang</groupId> <artifactId>semantik-adapter</artifactId> </dependency> - + <!--spring--> <dependency> @@ -36,7 +36,7 @@ <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-actuator</artifactId> </dependency> - + <!--dev tools--> @@ -47,7 +47,7 @@ <!--test --> <dependency> - <groupId>de.itvsh.kop.eingangsadapter</groupId> + <groupId>de.ozgcloud.eingang</groupId> <artifactId>common</artifactId> <type>test-jar</type> <scope>test</scope> diff --git a/formcycle-adapter/formcycle-adapter-impl/pom.xml b/formcycle-adapter/formcycle-adapter-impl/pom.xml index 8603b9cd57f84ca4025bb1c856de2dcbe9988200..484e3c3178ede3fe76f9fa19b13527c9e05df3c1 100644 --- a/formcycle-adapter/formcycle-adapter-impl/pom.xml +++ b/formcycle-adapter/formcycle-adapter-impl/pom.xml @@ -27,9 +27,9 @@ <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> <parent> - <groupId>de.itvsh.kop.eingangsadapter</groupId> + <groupId>de.ozgcloud.eingang</groupId> <artifactId>formcycle-adapter</artifactId> - <version>1.15.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <relativePath>../</relativePath> </parent> @@ -53,7 +53,7 @@ <scope>test</scope> </dependency> <dependency> - <groupId>de.itvsh.kop.eingangsadapter</groupId> + <groupId>de.ozgcloud.eingang</groupId> <artifactId>common</artifactId> <type>test-jar</type> <scope>test</scope> @@ -71,12 +71,12 @@ <dependency> - <groupId>de.itvsh.kop.eingangsadapter</groupId> + <groupId>de.ozgcloud.eingang</groupId> <artifactId>formcycle-adapter-interface</artifactId> <version>${formcycle-interface.version}</version> </dependency> <dependency> - <groupId>de.itvsh.kop.eingangsadapter</groupId> + <groupId>de.ozgcloud.eingang</groupId> <artifactId>semantik-adapter</artifactId> </dependency> </dependencies> diff --git a/formcycle-adapter/formcycle-adapter-interface/pom.xml b/formcycle-adapter/formcycle-adapter-interface/pom.xml index 8f401158aa84c6fd291d48693093cbc4c6794ee2..cafc2e5117696358f841e596cc7aec39202b246a 100644 --- a/formcycle-adapter/formcycle-adapter-interface/pom.xml +++ b/formcycle-adapter/formcycle-adapter-interface/pom.xml @@ -33,10 +33,10 @@ <relativePath/> </parent> - <groupId>de.itvsh.kop.eingangsadapter</groupId> + <groupId>de.ozgcloud.eingang</groupId> <artifactId>formcycle-adapter-interface</artifactId> <name>EM - Formcycle Adapter - Interface</name> - <version>1.15.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <properties> <pluto.version>1.11.0</pluto.version> diff --git a/formcycle-adapter/pom.xml b/formcycle-adapter/pom.xml index 013873d6a569dc595707af70b4f2272946294b15..8a957f0e2000c0fe4fbbfef27ee7bf62d942d8e5 100644 --- a/formcycle-adapter/pom.xml +++ b/formcycle-adapter/pom.xml @@ -27,9 +27,9 @@ <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> <parent> - <groupId>de.itvsh.kop.eingangsadapter</groupId> - <artifactId>parent</artifactId> - <version>1.15.0-SNAPSHOT</version> + <groupId>de.ozgcloud.eingang</groupId> + <artifactId>eingang-manager</artifactId> + <version>2.0.0-SNAPSHOT</version> </parent> <artifactId>formcycle-adapter</artifactId> diff --git a/formsolutions-adapter/pom.xml b/formsolutions-adapter/pom.xml index 9003e17736efec45755af031f598fef3db1fe357..a34d992d4028a248b839a9f66db2f8763a1ba9da 100644 --- a/formsolutions-adapter/pom.xml +++ b/formsolutions-adapter/pom.xml @@ -30,9 +30,9 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>de.itvsh.kop.eingangsadapter</groupId> - <artifactId>parent</artifactId> - <version>1.15.0-SNAPSHOT</version> + <groupId>de.ozgcloud.eingang</groupId> + <artifactId>eingang-manager</artifactId> + <version>2.0.0-SNAPSHOT</version> <relativePath>../</relativePath> </parent> @@ -41,24 +41,22 @@ <packaging>jar</packaging> <properties> - <spring-boot.build-image.imageName> - docker.ozg-sh.de/formsolutions-adapter:build-latest</spring-boot.build-image.imageName> + <spring-boot.build-image.imageName>docker.ozg-sh.de/formsolutions-adapter:build-latest</spring-boot.build-image.imageName> </properties> <dependencies> <!-- own projects --> <dependency> - <groupId>de.itvsh.kop.eingangsadapter</groupId> + <groupId>de.ozgcloud.eingang</groupId> <artifactId>common</artifactId> </dependency> <dependency> - <groupId>de.itvsh.kop.eingangsadapter</groupId> + <groupId>de.ozgcloud.eingang</groupId> <artifactId>router</artifactId> </dependency> <dependency> - <groupId>de.itvsh.kop.common</groupId> - <artifactId>kop-common-test</artifactId> - <scope>test</scope> + <groupId>de.ozgcloud.eingang</groupId> + <artifactId>semantik-adapter</artifactId> </dependency> <!-- Spring --> @@ -110,7 +108,12 @@ <scope>test</scope> </dependency> <dependency> - <groupId>de.itvsh.kop.eingangsadapter</groupId> + <groupId>de.itvsh.kop.common</groupId> + <artifactId>kop-common-test</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>de.ozgcloud.eingang</groupId> <artifactId>common</artifactId> <type>test-jar</type> <scope>test</scope> @@ -126,10 +129,6 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>de.itvsh.kop.eingangsadapter</groupId> - <artifactId>semantik-adapter</artifactId> - </dependency> </dependencies> <build> diff --git a/forwarder/pom.xml b/forwarder/pom.xml index 8449c26ef172af1e618f62bcb650fade36da8496..4818124cf9f6d5bb6ccc63325a14de47a830159d 100644 --- a/forwarder/pom.xml +++ b/forwarder/pom.xml @@ -27,9 +27,9 @@ <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> <parent> - <groupId>de.itvsh.kop.eingangsadapter</groupId> - <artifactId>parent</artifactId> - <version>1.15.0-SNAPSHOT</version> + <groupId>de.ozgcloud.eingang</groupId> + <artifactId>eingang-manager</artifactId> + <version>2.0.0-SNAPSHOT</version> <relativePath>../</relativePath> </parent> @@ -44,11 +44,11 @@ <dependencies> <!-- own projects --> <dependency> - <groupId>de.itvsh.kop.eingangsadapter</groupId> + <groupId>de.ozgcloud.eingang</groupId> <artifactId>common</artifactId> </dependency> <dependency> - <groupId>de.itvsh.kop.eingangsadapter</groupId> + <groupId>de.ozgcloud.eingang</groupId> <artifactId>router</artifactId> </dependency> <dependency> diff --git a/intelliform-adapter/pom.xml b/intelliform-adapter/pom.xml index db1a4efb0338c31ab83e2b00ef0053f74428c06e..e9086dc1add897c613aa9a079d4dc4277e2ca164 100644 --- a/intelliform-adapter/pom.xml +++ b/intelliform-adapter/pom.xml @@ -29,9 +29,9 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>de.itvsh.kop.eingangsadapter</groupId> - <artifactId>parent</artifactId> - <version>1.15.0-SNAPSHOT</version> + <groupId>de.ozgcloud.eingang</groupId> + <artifactId>eingang-manager</artifactId> + <version>2.0.0-SNAPSHOT</version> <relativePath>../</relativePath> </parent> @@ -47,15 +47,15 @@ <dependencies> <!-- own projects --> <dependency> - <groupId>de.itvsh.kop.eingangsadapter</groupId> + <groupId>de.ozgcloud.eingang</groupId> <artifactId>common</artifactId> </dependency> <dependency> - <groupId>de.itvsh.kop.eingangsadapter</groupId> + <groupId>de.ozgcloud.eingang</groupId> <artifactId>router</artifactId> </dependency> <dependency> - <groupId>de.itvsh.kop.eingangsadapter</groupId> + <groupId>de.ozgcloud.eingang</groupId> <artifactId>semantik-adapter</artifactId> </dependency> @@ -163,7 +163,7 @@ </dependency> <dependency> - <groupId>de.itvsh.kop.eingangsadapter</groupId> + <groupId>de.ozgcloud.eingang</groupId> <artifactId>common</artifactId> <type>test-jar</type> <scope>test</scope> diff --git a/pom.xml b/pom.xml index 6f6efe33526d09fb8712f0adb6dbf5e32657969b..82d0f5a2d6825c23ec2cb3bf551c12c75f95ce8e 100644 --- a/pom.xml +++ b/pom.xml @@ -35,11 +35,11 @@ <relativePath/> <!-- lookup parent from repository --> </parent> - <groupId>de.itvsh.kop.eingangsadapter</groupId> - <artifactId>parent</artifactId> - <version>1.15.0-SNAPSHOT</version> + <groupId>de.ozgcloud.eingang</groupId> + <artifactId>eingang-manager</artifactId> + <version>2.0.0-SNAPSHOT</version> <packaging>pom</packaging> - <name>Eingangs Adapter - Parent</name> + <name>OZG-Cloud Eingang Manager</name> <modules> <module>common</module> @@ -73,17 +73,17 @@ <!-- own projects --> <dependency> - <groupId>de.itvsh.kop.eingangsadapter</groupId> + <groupId>de.ozgcloud.eingang</groupId> <artifactId>common</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>de.itvsh.kop.eingangsadapter</groupId> + <groupId>de.ozgcloud.eingang</groupId> <artifactId>router</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>de.itvsh.kop.eingangsadapter</groupId> + <groupId>de.ozgcloud.eingang</groupId> <artifactId>semantik-adapter</artifactId> <version>${project.version}</version> </dependency> @@ -112,7 +112,7 @@ <!-- Test --> <dependency> - <groupId>de.itvsh.kop.eingangsadapter</groupId> + <groupId>de.ozgcloud.eingang</groupId> <artifactId>common</artifactId> <type>test-jar</type> <scope>test</scope> diff --git a/router/pom.xml b/router/pom.xml index 8580cc1f6424910e311babef4f6cfee54128fa23..8cb237bd05186a0816293542779fd685449c5719 100644 --- a/router/pom.xml +++ b/router/pom.xml @@ -27,9 +27,9 @@ <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> <parent> - <groupId>de.itvsh.kop.eingangsadapter</groupId> - <artifactId>parent</artifactId> - <version>1.15.0-SNAPSHOT</version> + <groupId>de.ozgcloud.eingang</groupId> + <artifactId>eingang-manager</artifactId> + <version>2.0.0-SNAPSHOT</version> <relativePath>../</relativePath> </parent> @@ -39,7 +39,7 @@ <dependencies> <!-- own Projects --> <dependency> - <groupId>de.itvsh.kop.eingangsadapter</groupId> + <groupId>de.ozgcloud.eingang</groupId> <artifactId>common</artifactId> </dependency> <dependency> @@ -71,7 +71,7 @@ <!-- Test --> <dependency> - <groupId>de.itvsh.kop.eingangsadapter</groupId> + <groupId>de.ozgcloud.eingang</groupId> <artifactId>common</artifactId> <type>test-jar</type> <scope>test</scope> diff --git a/semantik-adapter/pom.xml b/semantik-adapter/pom.xml index 72c404cf4f013e5a046f8928686710499554b853..c6f87a717ed4beaa09a51cee063383fc2425c6fc 100644 --- a/semantik-adapter/pom.xml +++ b/semantik-adapter/pom.xml @@ -28,9 +28,9 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>de.itvsh.kop.eingangsadapter</groupId> - <artifactId>parent</artifactId> - <version>1.15.0-SNAPSHOT</version> + <groupId>de.ozgcloud.eingang</groupId> + <artifactId>eingang-manager</artifactId> + <version>2.0.0-SNAPSHOT</version> </parent> <artifactId>semantik-adapter</artifactId> @@ -39,7 +39,7 @@ <dependencies> <!-- own projects --> <dependency> - <groupId>de.itvsh.kop.eingangsadapter</groupId> + <groupId>de.ozgcloud.eingang</groupId> <artifactId>router</artifactId> </dependency> @@ -56,7 +56,7 @@ <!-- test --> <dependency> - <groupId>de.itvsh.kop.eingangsadapter</groupId> + <groupId>de.ozgcloud.eingang</groupId> <artifactId>common</artifactId> <type>test-jar</type> <scope>test</scope> diff --git a/xta-adapter/pom.xml b/xta-adapter/pom.xml index 30765ca3bcf51b6db6a107af6d637f933c916e60..60bf2129fd8cf9804da55c30005efd2e384a9929 100644 --- a/xta-adapter/pom.xml +++ b/xta-adapter/pom.xml @@ -2,9 +2,9 @@ <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> <parent> - <groupId>de.itvsh.kop.eingangsadapter</groupId> - <artifactId>parent</artifactId> - <version>1.15.0-SNAPSHOT</version> + <groupId>de.ozgcloud.eingang</groupId> + <artifactId>eingang-manager</artifactId> + <version>2.0.0-SNAPSHOT</version> </parent> <artifactId>xta-adapter</artifactId> <name>Eingangs Adapter - XTA</name> @@ -35,11 +35,11 @@ </dependency> <!-- own projects --> <dependency> - <groupId>de.itvsh.kop.eingangsadapter</groupId> + <groupId>de.ozgcloud.eingang</groupId> <artifactId>common</artifactId> </dependency> <dependency> - <groupId>de.itvsh.kop.eingangsadapter</groupId> + <groupId>de.ozgcloud.eingang</groupId> <artifactId>semantik-adapter</artifactId> </dependency> <!--mapstruct-->