Skip to content

Commit

Permalink
Added server credentials configuration in IDE (#38)
Browse files Browse the repository at this point in the history
* Added Sechub preferences view

* updated gradle version 

* renamed daimler to mercedesbenz

* added actions instead of SWT copmonents

* Changed server tree view ui behavior

---------

Co-authored-by: Albert Tregnaghi <albert.tregnaghi@mercedes-benz.com>
  • Loading branch information
lorriborri and de-jcup authored Sep 24, 2024
1 parent 9968fda commit 02ddccb
Show file tree
Hide file tree
Showing 159 changed files with 1,098 additions and 6,271 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: adopt
java-version: 8
java-version: 17
- name: "Gradle clean build"
run: ./gradlew clean build

2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2020 Daimler TSS GmbH
Copyright (c) 2020 Mercedes-Benz Tech Innovation GmbH

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
15 changes: 9 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ def doAutomateEclipseSetup = ['sechub-eclipse-other'];

subprojects {
apply plugin: 'java'
apply plugin: 'java-library'

if (doAutomateEclipseSetup.contains(project.name)){
apply plugin: 'eclipse'
Expand All @@ -29,27 +30,29 @@ subprojects {
}
}
}
apply plugin: "maven"
// apply plugin: "maven"

/* Setup UTF-8 for compile AND test compilation*/
[ compileJava, compileTestJava ]*.options*.encoding = 'UTF-8'

sourceCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = '17'
targetCompatibility = '17'


dependencies{

testCompile library.junit
testCompile library.mockito_all
testImplementation library.junit
testImplementation library.mockito_all
}

task sourcesJar(type: Jar, dependsOn:classes) {
classifier = 'sources'
archiveClassifier = 'sources'
duplicatesStrategy = DuplicatesStrategy.INCLUDE
from sourceSets.main.allSource
}

task javadocJar(type: Jar, dependsOn:javadoc) {
classifier = 'javadoc'
archiveClassifier = 'javadoc'
from javadoc.destinationDir
}

Expand Down
16 changes: 8 additions & 8 deletions docs/update-site/site.xml
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
<feature url="features/com.daimler.sechub.feature_0.1.2.jar" id="com.daimler.sechub.feature" version="0.1.2">
<category name="com.daimler.sechub.category.alpha"/>
<feature url="features/com.mercedesbenz.sechub.feature_0.1.2.jar" id="com.mercedesbenz.sechub.feature" version="0.1.2">
<category name="com.mercedesbenz.sechub.category.alpha"/>
</feature>
<feature url="features/com.daimler.sechub.feature_0.2.0.jar" id="com.daimler.sechub.feature" version="0.2.0">
<category name="com.daimler.sechub.category.alpha"/>
<feature url="features/com.mercedesbenz.sechub.feature_0.2.0.jar" id="com.mercedesbenz.sechub.feature" version="0.2.0">
<category name="com.mercedesbenz.sechub.category.alpha"/>
</feature>
<feature url="features/com.daimler.sechub.feature_0.2.1.jar" id="com.daimler.sechub.feature" version="0.2.1">
<category name="com.daimler.sechub.category.alpha"/>
<feature url="features/com.mercedesbenz.sechub.feature_0.2.1.jar" id="com.mercedesbenz.sechub.feature" version="0.2.1">
<category name="com.mercedesbenz.sechub.category.alpha"/>
</feature>
<category-def name="com.daimler.sechub.category.alpha" label="Alpha">
<category-def name="com.mercedesbenz.sechub.category.alpha" label="Alpha">
<description>
Alpha versions
</description>
</category-def>
<category-def name="com.daimler.sechub.category.beta" label="Beta">
<category-def name="com.mercedesbenz.sechub.category.beta" label="Beta">
<description>
Beta versions
</description>
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# SPDX-License-Identifier: MIT
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
23 changes: 10 additions & 13 deletions sechub-eclipse-feature/feature.xml
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="com.daimler.sechub.feature"
id="com.mercedesbenz.sechub.feature"
label="SecHub"
version="0.2.1"
provider-name="Daimler TSS GmbH">
version="0.3.0"
provider-name="Mercedes-Benz Tech Innovation GmbH">

<description url="https://github.com/daimler/sechub-plugin-eclipse">
<description url="https://github.com/mercedesbenz/sechub-plugin-eclipse">
An eclipse plugin for SecHub
</description>

<copyright url="https://github.com/Daimler/sechub-plugin-eclipse/blob/master/LICENSE">
<copyright url="https://github.com/mercedesbenz/sechub-plugin-eclipse/blob/master/LICENSE">
MIT License

Copyright (c) 2020 Daimler TSS GmbH
Copyright (c) 2020 mercedesbenz TSS GmbH

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the &quot;Software&quot;), to deal
Expand All @@ -33,10 +33,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
</copyright>

<license url="https://github.com/Daimler/sechub-plugin-eclipse/blob/master/LICENSE">
<license url="https://github.com/mercedesbenz/sechub-plugin-eclipse/blob/master/LICENSE">
MIT License

Copyright (c) 2020 Daimler TSS GmbH
Copyright (c) 2020 mercedesbenz TSS GmbH

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the &quot;Software&quot;), to deal
Expand All @@ -58,10 +58,7 @@ SOFTWARE.
</license>

<plugin
id="com.daimler.sechub.plugin"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
id="com.mercedesbenz.sechub.plugin"
version="0.0.0"/>

</feature>
1 change: 1 addition & 0 deletions sechub-eclipse-other/.gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.classpath
.project
.settings/
build
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 0 additions & 2 deletions sechub-eclipse-other/build/tmp/jar/MANIFEST.MF

This file was deleted.

2 changes: 0 additions & 2 deletions sechub-eclipse-other/build/tmp/javadocJar/MANIFEST.MF

This file was deleted.

2 changes: 0 additions & 2 deletions sechub-eclipse-other/build/tmp/sourcesJar/MANIFEST.MF

This file was deleted.

2 changes: 1 addition & 1 deletion sechub-eclipse-plugin/.classpath
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
<classpathentry kind="src" path="src/main/java-eclipse"/>
<classpathentry kind="src" path="src/test/java"/>
<classpathentry kind="src" path="src/test/resources"/>
<classpathentry exported="true" kind="lib" path="lib/sechub-java-api-all-0.0.0.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="lib" path="lib/sechub-client-all.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
17 changes: 9 additions & 8 deletions sechub-eclipse-plugin/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
@@ -1,24 +1,25 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: SecHub
Bundle-SymbolicName: com.daimler.sechub.plugin;singleton:=true
Bundle-Version: 0.2.1
Bundle-Activator: com.daimler.sechub.SecHubActivator
Bundle-SymbolicName: com.mercedesbenz.sechub.plugin;singleton:=true
Bundle-Version: 0.3.0
Bundle-Activator: com.mercedesbenz.sechub.SecHubActivator
Bundle-Vendor: Mercedes-Benz Tech Innovation GmbH
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.core.resources,
org.eclipse.ui.ide,
org.eclipse.ui.editors,
org.eclipse.text,
org.eclipse.jface.text,
org.eclipse.core.filesystem,
org.eclipse.jface,
org.eclipse.core.expressions
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: com.daimler.sechub.plugin
org.eclipse.core.expressions,
org.eclipse.equinox.security,
org.eclipse.core.runtime
Bundle-RequiredExecutionEnvironment: JavaSE-17
Automatic-Module-Name: com.mercedesbenz.sechub.plugin
Import-Package: javax.inject,
org.eclipse.e4.core.services.log
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .,
lib/sechub-client-all.jar
lib/sechub-java-api-all-0.0.0.jar
2 changes: 1 addition & 1 deletion sechub-eclipse-plugin/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT
dependencies {
compile fileTree(dir: 'lib', include: '*.jar')
implementation fileTree(dir: 'lib', include: '*.jar')
}


2 changes: 1 addition & 1 deletion sechub-eclipse-plugin/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ bin.includes = plugin.xml,\
html/,\
*.xml,\
contexts.xml,\
lib/sechub-client-all.jar
lib/sechub-java-api-all-0.0.0.jar
src.excludes = src/test/resources/,\
src/test/java/
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
24 changes: 0 additions & 24 deletions sechub-eclipse-plugin/build/docs/javadoc/allclasses-frame.html

This file was deleted.

24 changes: 0 additions & 24 deletions sechub-eclipse-plugin/build/docs/javadoc/allclasses-noframe.html

This file was deleted.

Loading

0 comments on commit 02ddccb

Please sign in to comment.