Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Codecentric rename #7

Merged
merged 3 commits into from
Feb 25, 2021
Merged

Codecentric rename #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
60eeff5
refactor to package root de.codecentric and set version to 1.1.0-SNAP…
danielkocot Feb 14, 2021
2ed3673
changed build order and set version for maven plugin to revision
danielkocot Feb 15, 2021
d9e7f26
Changed pom.xml in reference to Github Action
danielkocot Feb 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
65 changes: 65 additions & 0 deletions .github/workflows/release-to-maven-central.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
name: release-to-maven-central
on:
workflow_dispatch:
inputs:
releaseversion:
description: 'Release version'
required: true
default: '1.1.0'
jobs:
publish:
runs-on: ubuntu-latest
steps:
- run: echo "Will start a Maven Central upload with version ${{ github.event.inputs.releaseversion }}"

- uses: actions/checkout@v2

- name: Set up settings.xml for Maven Central Repository
uses: actions/setup-java@v1
with:
java-version: 11
server-id: oss.sonatype.org
server-username: MAVEN_USERNAME
server-password: MAVEN_PASSWORD
gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
gpg-passphrase: MAVEN_GPG_PASSPHRASE

- name: Set projects Maven version to GitHub Action GUI set version
run: mvn versions:set "-DnewVersion=${{ github.event.inputs.releaseversion }}" --no-transfer-progress

- name: Publish package
run: mvn --batch-mode clean deploy --no-transfer-progress -P central-deploy -DskipTests=true
env:
MAVEN_USERNAME: ${{ secrets.OSS_SONATYPE_USERNAME }}
MAVEN_PASSWORD: ${{ secrets.OSS_SONATYPE_PASSWORD }}
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}

- name: Generate changelog
id: changelog
uses: metcalfc/changelog-generator@v0.4.4
with:
myToken: ${{ secrets.GITHUB_TOKEN }}

- name: Create GitHub Release
id: create_release
uses: actions/create-release@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: ${{ github.event.inputs.releaseversion }}
release_name: ${{ github.event.inputs.releaseversion }}
body: |
Grab the new version from Maven central https://repo1.maven.org/maven2/de/codecentric/cxf-spring-boot-starter/${{ github.event.inputs.releaseversion }}/ by using it in your deps (also use the newest cxf-spring-boot-starter-maven-plugin https://github.com/codecentric/cxf-spring-boot-starter-maven-plugin):
```
<dependencies>
<dependency>
<groupId>de.codecentric</groupId>
<artifactId>cxf-spring-boot-starter</artifactId>
<version>${{ github.event.inputs.releaseversion }}</version>
</dependency>
</dependencies>
```
### Things that changed in this release
${{ steps.changelog.outputs.changelog }}
draft: false
prerelease: false
4 changes: 2 additions & 2 deletions module-descriptor/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>com.reedelk</groupId>
<groupId>de.codecentric.reedelk</groupId>
<artifactId>reedelk-runtime</artifactId>
<version>${revision}</version>
<relativePath>../pom.xml</relativePath>
Expand All @@ -25,7 +25,7 @@

<dependencies>
<dependency>
<groupId>com.reedelk</groupId>
<groupId>de.codecentric.reedelk</groupId>
<artifactId>runtime-api</artifactId>
<version>${revision}</version>
<scope>provided</scope>
Expand Down
16 changes: 0 additions & 16 deletions ...riptor/src/main/java/com/reedelk/module/descriptor/analyzer/property/ExampleAnalyzer.java
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions ...ptor/src/main/java/com/reedelk/module/descriptor/analyzer/property/FieldInfoAnalyzer.java
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions ...scriptor/src/main/java/com/reedelk/module/descriptor/analyzer/property/GroupAnalyzer.java
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions ...escriptor/src/main/java/com/reedelk/module/descriptor/analyzer/property/HintAnalyzer.java
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions ...ptor/src/main/java/com/reedelk/module/descriptor/analyzer/property/MandatoryAnalyzer.java
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions ...le-descriptor/src/main/java/com/reedelk/module/descriptor/model/property/Collapsible.java
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions module-descriptor/src/main/java/com/reedelk/module/descriptor/model/property/Shared.java
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ...descriptor/ModuleDescriptorException.java → ...descriptor/ModuleDescriptorException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.reedelk.module.descriptor;
package de.codecentric.reedelk.module.descriptor;

public class ModuleDescriptorException extends RuntimeException {

Expand Down
47 changes: 23 additions & 24 deletions ...or/analyzer/ModuleDescriptorAnalyzer.java → ...or/analyzer/ModuleDescriptorAnalyzer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
package com.reedelk.module.descriptor.analyzer;

import com.reedelk.module.descriptor.ModuleDescriptorException;
import com.reedelk.module.descriptor.analyzer.commons.AssetUtils;
import com.reedelk.module.descriptor.analyzer.commons.Messages.Scan;
import com.reedelk.module.descriptor.analyzer.commons.ReadModuleDescriptor;
import com.reedelk.module.descriptor.analyzer.commons.ScannerUtils;
import com.reedelk.module.descriptor.analyzer.component.ComponentAnalyzer;
import com.reedelk.module.descriptor.analyzer.component.ComponentAnalyzerFactory;
import com.reedelk.module.descriptor.analyzer.type.TypeAnalyzer;
import com.reedelk.module.descriptor.json.JsonProvider;
import com.reedelk.module.descriptor.model.ModuleDescriptor;
import com.reedelk.module.descriptor.model.component.ComponentDescriptor;
import com.reedelk.module.descriptor.model.component.ComponentType;
import com.reedelk.module.descriptor.model.type.TypeDescriptor;
import com.reedelk.runtime.api.RuntimeApi;
import com.reedelk.runtime.api.annotation.Description;
import com.reedelk.runtime.api.annotation.Module;
import com.reedelk.runtime.api.annotation.ModuleComponent;
package de.codecentric.reedelk.module.descriptor.analyzer;

import de.codecentric.reedelk.module.descriptor.ModuleDescriptorException;
import de.codecentric.reedelk.module.descriptor.analyzer.commons.AssetUtils;
import de.codecentric.reedelk.module.descriptor.analyzer.commons.Messages;
import de.codecentric.reedelk.module.descriptor.analyzer.commons.ReadModuleDescriptor;
import de.codecentric.reedelk.module.descriptor.analyzer.commons.ScannerUtils;
import de.codecentric.reedelk.module.descriptor.analyzer.component.ComponentAnalyzer;
import de.codecentric.reedelk.module.descriptor.analyzer.component.ComponentAnalyzerFactory;
import de.codecentric.reedelk.module.descriptor.analyzer.type.TypeAnalyzer;
import de.codecentric.reedelk.module.descriptor.json.JsonProvider;
import de.codecentric.reedelk.module.descriptor.model.component.ComponentDescriptor;
import de.codecentric.reedelk.module.descriptor.model.component.ComponentType;
import de.codecentric.reedelk.module.descriptor.model.ModuleDescriptor;
import de.codecentric.reedelk.module.descriptor.model.type.TypeDescriptor;
import de.codecentric.reedelk.runtime.api.RuntimeApi;
import de.codecentric.reedelk.runtime.api.annotation.Description;
import de.codecentric.reedelk.runtime.api.annotation.Module;
import de.codecentric.reedelk.runtime.api.annotation.ModuleComponent;
import io.github.classgraph.ClassGraph;
import io.github.classgraph.ClassInfo;
import io.github.classgraph.ClassInfoList;
Expand All @@ -29,7 +29,6 @@
import java.util.Optional;
import java.util.function.Function;

import static com.reedelk.module.descriptor.analyzer.commons.Messages.Analyzer.*;
import static java.util.stream.Collectors.toList;

public class ModuleDescriptorAnalyzer {
Expand All @@ -50,7 +49,7 @@ public Optional<ModuleDescriptor> from(String targetJarPath) {
} catch (ModuleDescriptorException exception) {
throw exception;
} catch (Exception exception) {
String error = ERROR_FROM_JAR_PATH.format(targetJarPath, exception.getMessage());
String error = Messages.Analyzer.ERROR_FROM_JAR_PATH.format(targetJarPath, exception.getMessage());
throw new ModuleDescriptorException(error, exception);
}
});
Expand All @@ -74,7 +73,7 @@ public ModuleDescriptor fromDirectory(String directory, String moduleName, boole
} catch (ModuleDescriptorException exception) {
throw exception;
} catch (Exception exception) {
String error = ERROR_FROM_DIRECTORY.format(directory, moduleName, resolveImages, exception.getMessage());
String error = Messages.Analyzer.ERROR_FROM_DIRECTORY.format(directory, moduleName, resolveImages, exception.getMessage());
throw new ModuleDescriptorException(error, exception);
}
}
Expand Down Expand Up @@ -105,7 +104,7 @@ public List<TypeDescriptor> scanRuntimeApiTypes() {
} catch (ModuleDescriptorException exception) {
throw exception;
} catch (Exception exception) {
String error = ERROR_SCAN_API_TYPES.format(exception.getMessage());
String error = Messages.Analyzer.ERROR_SCAN_API_TYPES.format(exception.getMessage());
throw new ModuleDescriptorException(error, exception);
}
}
Expand Down Expand Up @@ -135,7 +134,7 @@ private List<ComponentDescriptor> moduleComponentsOf(ScanResult scanResult) {
ComponentAnalyzer componentAnalyzer = ComponentAnalyzerFactory.get(scanResult);
return componentAnalyzer.analyze(classInfo);
} catch (Exception exception) {
String message = Scan.ERROR_SCAN_COMPONENT.format(classInfo.getName(), exception.getMessage());
String message = Messages.Scan.ERROR_SCAN_COMPONENT.format(classInfo.getName(), exception.getMessage());
throw new ModuleDescriptorException(message, exception);
}
})
Expand Down
2 changes: 1 addition & 1 deletion ...scriptor/analyzer/commons/AssetUtils.java → ...scriptor/analyzer/commons/AssetUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.reedelk.module.descriptor.analyzer.commons;
package de.codecentric.reedelk.module.descriptor.analyzer.commons;

import org.apache.log4j.Logger;

Expand Down
4 changes: 2 additions & 2 deletions ...descriptor/analyzer/commons/Messages.java → ...descriptor/analyzer/commons/Messages.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.reedelk.module.descriptor.analyzer.commons;
package de.codecentric.reedelk.module.descriptor.analyzer.commons;

import com.reedelk.runtime.api.commons.FormattedMessage;
import de.codecentric.reedelk.runtime.api.commons.FormattedMessage;

public class Messages {

Expand Down
6 changes: 3 additions & 3 deletions ...nalyzer/commons/ReadModuleDescriptor.java → ...nalyzer/commons/ReadModuleDescriptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.reedelk.module.descriptor.analyzer.commons;
package de.codecentric.reedelk.module.descriptor.analyzer.commons;

import com.reedelk.module.descriptor.ModuleDescriptorException;
import com.reedelk.module.descriptor.model.ModuleDescriptor;
import de.codecentric.reedelk.module.descriptor.ModuleDescriptorException;
import de.codecentric.reedelk.module.descriptor.model.ModuleDescriptor;

import java.io.IOException;
import java.io.InputStream;
Expand Down
32 changes: 16 additions & 16 deletions ...riptor/analyzer/commons/ScannerUtils.java → ...riptor/analyzer/commons/ScannerUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package com.reedelk.module.descriptor.analyzer.commons;

import com.reedelk.module.descriptor.analyzer.component.ComponentAnalyzerContext;
import com.reedelk.module.descriptor.analyzer.component.UnsupportedType;
import com.reedelk.runtime.api.annotation.*;
import com.reedelk.runtime.api.resource.ResourceBinary;
import com.reedelk.runtime.api.resource.ResourceText;
import com.reedelk.runtime.api.script.Script;
import com.reedelk.runtime.api.script.dynamicmap.DynamicMap;
import com.reedelk.runtime.api.script.dynamicvalue.DynamicValue;
package de.codecentric.reedelk.module.descriptor.analyzer.commons;

import de.codecentric.reedelk.module.descriptor.analyzer.component.ComponentAnalyzerContext;
import de.codecentric.reedelk.module.descriptor.analyzer.component.UnsupportedType;
import de.codecentric.reedelk.runtime.api.annotation.*;
import de.codecentric.reedelk.runtime.api.resource.ResourceBinary;
import de.codecentric.reedelk.runtime.api.resource.ResourceText;
import de.codecentric.reedelk.runtime.api.script.Script;
import de.codecentric.reedelk.runtime.api.script.dynamicmap.DynamicMap;
import de.codecentric.reedelk.runtime.api.script.dynamicvalue.DynamicValue;
import io.github.classgraph.*;

import java.util.ArrayList;
Expand Down Expand Up @@ -221,14 +221,14 @@ public static boolean isScript(Class<?> clazz) {
return Script.class.equals(clazz);
}

public static com.reedelk.module.descriptor.model.property.Shared isShareable(ClassInfo classInfo) {
return classInfo.hasAnnotation(com.reedelk.runtime.api.annotation.Shared.class.getName()) ?
com.reedelk.module.descriptor.model.property.Shared.YES : com.reedelk.module.descriptor.model.property.Shared.NO;
public static de.codecentric.reedelk.module.descriptor.model.property.Shared isShareable(ClassInfo classInfo) {
return classInfo.hasAnnotation(Shared.class.getName()) ?
de.codecentric.reedelk.module.descriptor.model.property.Shared.YES : de.codecentric.reedelk.module.descriptor.model.property.Shared.NO;
}

public static com.reedelk.module.descriptor.model.property.Collapsible isCollapsible(ClassInfo classInfo) {
return classInfo.hasAnnotation(com.reedelk.runtime.api.annotation.Collapsible.class.getName()) ?
com.reedelk.module.descriptor.model.property.Collapsible.YES : com.reedelk.module.descriptor.model.property.Collapsible.NO;
public static de.codecentric.reedelk.module.descriptor.model.property.Collapsible isCollapsible(ClassInfo classInfo) {
return classInfo.hasAnnotation(Collapsible.class.getName()) ?
de.codecentric.reedelk.module.descriptor.model.property.Collapsible.YES : de.codecentric.reedelk.module.descriptor.model.property.Collapsible.NO;
}

public static boolean isHidden(ClassInfo classInfo) {
Expand Down
20 changes: 10 additions & 10 deletions ...analyzer/component/ComponentAnalyzer.java → ...analyzer/component/ComponentAnalyzer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package com.reedelk.module.descriptor.analyzer.component;
package de.codecentric.reedelk.module.descriptor.analyzer.component;

import com.reedelk.module.descriptor.analyzer.commons.ScannerUtils;
import com.reedelk.module.descriptor.analyzer.property.PropertyAnalyzer;
import com.reedelk.module.descriptor.model.component.ComponentDescriptor;
import com.reedelk.module.descriptor.model.component.ComponentInputDescriptor;
import com.reedelk.module.descriptor.model.component.ComponentOutputDescriptor;
import com.reedelk.module.descriptor.model.component.ComponentType;
import com.reedelk.module.descriptor.model.property.PropertyDescriptor;
import com.reedelk.runtime.api.annotation.Description;
import com.reedelk.runtime.api.annotation.ModuleComponent;
import de.codecentric.reedelk.module.descriptor.analyzer.commons.ScannerUtils;
import de.codecentric.reedelk.module.descriptor.analyzer.property.PropertyAnalyzer;
import de.codecentric.reedelk.module.descriptor.model.component.ComponentDescriptor;
import de.codecentric.reedelk.module.descriptor.model.component.ComponentInputDescriptor;
import de.codecentric.reedelk.module.descriptor.model.component.ComponentOutputDescriptor;
import de.codecentric.reedelk.module.descriptor.model.component.ComponentType;
import de.codecentric.reedelk.module.descriptor.model.property.PropertyDescriptor;
import de.codecentric.reedelk.runtime.api.annotation.Description;
import de.codecentric.reedelk.runtime.api.annotation.ModuleComponent;
import io.github.classgraph.ClassInfo;

import java.util.List;
Expand Down
2 changes: 1 addition & 1 deletion ...r/component/ComponentAnalyzerContext.java → ...r/component/ComponentAnalyzerContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.reedelk.module.descriptor.analyzer.component;
package de.codecentric.reedelk.module.descriptor.analyzer.component;

import io.github.classgraph.ClassInfo;
import io.github.classgraph.ScanResult;
Expand Down
4 changes: 2 additions & 2 deletions ...r/component/ComponentAnalyzerFactory.java → ...r/component/ComponentAnalyzerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.reedelk.module.descriptor.analyzer.component;
package de.codecentric.reedelk.module.descriptor.analyzer.component;

import com.reedelk.module.descriptor.analyzer.property.PropertyAnalyzer;
import de.codecentric.reedelk.module.descriptor.analyzer.property.PropertyAnalyzer;
import io.github.classgraph.ScanResult;

public class ComponentAnalyzerFactory {
Expand Down
Loading