JavaTX/Plugin_JCC
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	JavaCompilerPlugin/bundles/JavaCompilerPlugin.Plugin/META-INF/MANIFEST.MF
This commit is contained in:
Michael Uhl 2018-12-09 11:17:58 +01:00
commit d6184cca91
11 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
JavaCompilerPlugin/bundles/JavaCompilerPlugin.Plugin/META-INF/MANIFEST.MF
View File

@ -2,8 +2,9 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Plugin
Bundle-SymbolicName: JavaCompilerPlugin.Plugin;singleton:=true
Bundle-Version: 1.0.0.qualifier
Bundle-Activator: typinferenzplugin.Activator
Bundle-Version: 0.1.0.qualifier
Bundle-Vendor: de.dhbwstuttgart
Automatic-Module-Name: JavaCompilerPlugin.Plugin;singleton:=true
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.jface.text,
@ -14,4 +15,4 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.ui.views,
de.dhbwstuttgart.JavaCompilerCoreOsgi
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: JavaCompilerPlugin.Plugin;singleton:=true
Bundle-Activator: typinferenzplugin.Activator

4
JavaCompilerPlugin/bundles/pom.xml
View File

@ -2,13 +2,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>de.dhbwstuttgart</groupId>
<artifactId>JavaCompilerPlugin.bundles</artifactId>
<version>0.1.0</version>
<version>0.1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
<groupId>de.dhbwstuttgart</groupId>
<artifactId>JavaCompilerPlugin</artifactId>
<version>0.1.0</version>
<version>0.1.0-SNAPSHOT</version>
</parent>
<modules>

2
JavaCompilerPlugin/features/JavaCompilerPlugin.Feature/feature.xml
View File

@ -2,7 +2,7 @@
<feature
id="JavaCompilerPlugin.Feature"
label="Typinferenz.Feature"
version="0.1.0">
version="0.1.0.qualifier">
<description url="http://www.example.com/description">
[Enter Feature Description here.]

4
JavaCompilerPlugin/features/pom.xml
View File

@ -3,13 +3,13 @@
<groupId>de.dhbwstuttgart</groupId>
<artifactId>JavaCompilerPlugin.features</artifactId>
<version>0.1.0</version>
<version>0.1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
<groupId>de.dhbwstuttgart</groupId>
<artifactId>JavaCompilerPlugin</artifactId>
<version>0.1.0</version>
<version>0.1.0-SNAPSHOT</version>
</parent>
<modules>

4
JavaCompilerPlugin/pom.xml
View File

@ -2,12 +2,12 @@
<modelVersion>4.0.0</modelVersion>
<groupId>de.dhbwstuttgart</groupId>
<artifactId>JavaCompilerPlugin</artifactId>
<version>0.1.0</version>
<version>0.1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
<groupId>de.dhbwstuttgart</groupId>
<artifactId>JavaCompilerPlugin.configuration</artifactId>
<version>0.1.0</version>
<version>0.1.0-SNAPSHOT</version>
<relativePath>./releng/JavaCompilerPlugin.configuration</relativePath>
</parent>

2
JavaCompilerPlugin/releng/JavaCompilerPlugin.Configuration/pom.xml
View File

@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>de.dhbwstuttgart</groupId>
<artifactId>JavaCompilerPlugin.configuration</artifactId>
<version>0.1.0</version>
<version>0.1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>

4
JavaCompilerPlugin/releng/JavaCompilerPlugin.Target/JavaCompilerPlugin.Target.target
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?><target name="JavaCompilerPlugin.Target" sequenceNumber="1">
<?pde version="3.8"?><target name="JavaCompilerPlugin.Target" sequenceNumber="2">
<locations>
<location path="/Users/michaeluhl/Developement/horb/typinferenz/JavaCompilerPlugin/releng/JavaCompilerPlugin.Update/target/repository/plugins" type="Directory"/>
<location path="/Users/michaeluhl/git/JavaCompilerPlugin/JavaCompilerPlugin/releng/JavaCompilerPlugin.Update/target/repository" type="Directory"/>
</locations>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/Java SE 9.0.4 [9.0.4]"/>
</target>

4
JavaCompilerPlugin/releng/JavaCompilerPlugin.Target/pom.xml
View File

@ -2,12 +2,12 @@
<modelVersion>4.0.0</modelVersion>
<groupId>de.dhbwstuttgart</groupId>
<artifactId>JavaCompilerPlugin.Target</artifactId>
<version>0.0.1</version>
<version>0.1.0-SNAPSHOT</version>
<packaging>eclipse-target-definition</packaging>
<parent>
<groupId>de.dhbwstuttgart</groupId>
<artifactId>JavaCompilerPlugin.releng</artifactId>
<version>0.1.0</version>
<version>0.1.0-SNAPSHOT</version>
</parent>
</project>

2
JavaCompilerPlugin/releng/JavaCompilerPlugin.Update/category.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
<feature url="features/JavaCompilerPlugin.Feature_0.1.0.jar" id="JavaCompilerPlugin.Feature" version="0.1.0">
<feature url="features/JavaCompilerPlugin.Feature_0.1.0.jar" id="JavaCompilerPlugin.Feature" version="0.1.0.qualifier">
<category name="JavaCompilerPlugin"/>
</feature>
<category-def name="JavaCompilerPlugin" label="JavaCompilerPlugin"/>

4
JavaCompilerPlugin/releng/JavaCompilerPlugin.Update/pom.xml
View File

@ -3,11 +3,11 @@
<parent>
<groupId>de.dhbwstuttgart</groupId>
<artifactId>JavaCompilerPlugin.releng</artifactId>
<version>0.1.0</version>
<version>0.1.0-SNAPSHOT</version>
</parent>
<artifactId>JavaCompilerPlugin.Update</artifactId>
<version>0.1.0</version>
<version>0.1.0-SNAPSHOT</version>
<packaging>eclipse-repository</packaging>
<groupId>de.dhbwstuttgart</groupId>

4
JavaCompilerPlugin/releng/pom.xml
View File

@ -2,13 +2,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>de.dhbwstuttgart</groupId>
<artifactId>JavaCompilerPlugin.releng</artifactId>
<version>0.1.0</version>
<version>0.1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
<groupId>de.dhbwstuttgart</groupId>
<artifactId>JavaCompilerPlugin</artifactId>
<version>0.1.0</version>
<version>0.1.0-SNAPSHOT</version>
</parent>
<modules>