Merge pull request #118 from Ericsson/uplift_68

Uplift 68
Ericsson · Nov 14, 2018 · ed094fc · ed094fc
2 parents b442a25 + a44d194
commit ed094fc
Show file tree

Hide file tree

Showing 159 changed files with 1,398 additions and 5,784 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,24 +2,18 @@ sudo: required
 dist: trusty
 language: java
 jdk:
-- oraclejdk7
+- oraclejdk8
 addons:
   apt:
     package: maven tar
 before_script:
-- cd ../;curl http://www-eu.apache.org/dist/thrift/0.9.3/thrift-0.9.3.tar.gz | tar
-  zx
-- cd thrift-0.9.3
-- "./configure --with-c_glib=yes --with-ruby=no"
-- make
-- export PATH=$PATH:$PWD/compiler/cpp/
 - cd ../CodeCheckerEclipsePlugin/eclipse-plugin/
-script: mvn test install
+script: mvn package
 deploy:
   provider: releases
   api_key:
     secure: PKQXSde1+GfeTJBQlYGCXFoXGy9LpMbD0oagpQtHk6d9NtZ9T9stx0gC3BODE9rGPCtKyQjOnOQ2V0GIMQMt0Qx22zSvGN4bwAYn0BHHXV56HLyZV2U8eW3a5eLt+yB7OhkARg7nflo9Yh1HDmxFtovsAz1TJ0Ri1UGmMMj03wNdc8CHJy6vuN3YljxBtZFLAH7sYkL5QC0jjFkF9/7bd9lF6nyLqBU5VqQcbGO3gRFnE46+KHkw0tC3F3H7HcYJJydRWAoTwD88UEzrJnCNGnYarwFRwix5/O2Wgjk5CbEie9IxtjeiBiiVbAS+/OxKEKw+4E2TV9ThyX4BwapcalBKoQqYAXDnZwD9EAT3+N+vKRHk/OI3IsD4lM8h2E5HrVEURY/wMvXH9dYrSnYGPmrAks1Ef3X1iMxCxqiR7k+vvKRAG2XXn92Dq9A3fMEZYQvh6YtBp7nC022Cpr11HyriC/C8WD4arfDekI7ICAZfWnaAwdUvr4u991DIRmApUC905lcP5NB/mGfc0rMeSwK2fpGcWqDkxYo7bDDoQHkImiLC3NRCY80NSO3tpcH3AlHRtF/WIy2Ln626PMIt98nDAiWZf+35GW0HoCyjo3SYbRtQMdQD85ZhbqVva+rtzN1j4AuoP/pCbChsICs0ebAdOavjOb/8cwFxBMuOPYA=
-  file: "/home/travis/build/Ericsson/CodeCheckerEclipsePlugin/eclipse-plugin/eclipse/cc.codechecker.eclipse.plugin/target/cc.codechecker.eclipse.plugin-0.0.1-SNAPSHOT.jar"
+  file: "/home/travis/build/Ericsson/CodeCheckerEclipsePlugin/eclipse-plugin/eclipse/cc.codechecker.eclipse.plugin/target/cc.codechecker.eclipse.plugin*.jar"
   skip_cleanup: true
   on:
     repo: Ericsson/CodeCheckerEclipsePlugin

diff --git a/docs/developer.md b/docs/developer.md
@@ -12,6 +12,10 @@
 * Adherence to the [Google Java Style](https://google.github.io/styleguide/javaguide.html) is mandatory
     * An IntelliJ Idea autoformatter XML configuration file is included in the repo for convenience
 
+## Version Update
+
+Execute the following command in CodeCheckerEclipsePlugin/eclipse-plugin.
+``` mvn -Dtycho.mode=maven org.eclipse.tycho:tycho-versions-plugin:set-version -DnewVersion=X.X.X-SNAPSHOT -Dartifacts=cc.codechecker.eclipse.plugin ```
 
 ## Log
 

diff --git a/eclipse-plugin/.gitignore b/eclipse-plugin/.gitignore
@@ -2,6 +2,7 @@
 
 # vim
 *.swp
+*.swo
 
 # eclipse
 .project

diff --git a/eclipse-plugin/eclipse-depcopy/pom.xml b/eclipse-plugin/eclipse-depcopy/pom.xml
@@ -6,16 +6,37 @@
     <packaging>pom</packaging>
 
     <dependencies>
-        <dependency>
-            <groupId>cc.codechecker.service.thrift</groupId>
-            <artifactId>cc-thrift</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
-        </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
             <version>2.3.1</version>
         </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>26.0-jre</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-exec</artifactId>
+            <version>1.3</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.googlecode.plist</groupId>
+            <artifactId>dd-plist</artifactId>
+            <version>1.21</version>
+        </dependency>
+        <dependency>
+            <groupId>joda-time</groupId>
+            <artifactId>joda-time</artifactId>
+            <version>2.10.1</version>
+        </dependency>
+
     </dependencies>
 
     <build>

diff --git a/eclipse-plugin/eclipse/cc.codechecker.eclipse.parent/pom.xml b/eclipse-plugin/eclipse/cc.codechecker.eclipse.parent/pom.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="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
     http://maven.apache.org/xsd/maven-4.0.0.xsd"
-        xmlns="http://maven.apache.org/POM/4.0.0">
+    xmlns="http://maven.apache.org/POM/4.0.0">
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>cc.codechecker.eclipse</groupId>
@@ -14,13 +14,13 @@
     <properties>
         <tycho.version>0.22.0</tycho.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <luna-repo.url>http://download.eclipse.org/releases/mars</luna-repo.url>
+        <eclipse-repo.url>http://download.eclipse.org/releases/mars</eclipse-repo.url>
     </properties>
 
     <repositories>
         <repository>
-            <id>luna</id>
-            <url>${luna-repo.url}</url>
+            <id>eclipse-oxygen</id>
+            <url>${eclipse-repo.url}</url>
             <layout>p2</layout>
         </repository>
     </repositories>
@@ -33,7 +33,11 @@
                 <version>${tycho.version}</version>
                 <extensions>true</extensions>
             </plugin>
-
+            <plugin>
+                <groupId>org.eclipse.tycho</groupId>
+                <artifactId>tycho-surefire-plugin</artifactId>
+                <version>${tycho.version}</version>
+            </plugin>
             <plugin>
                 <groupId>org.eclipse.tycho</groupId>
                 <artifactId>target-platform-configuration</artifactId>

diff --git a/eclipse-plugin/eclipse/cc.codechecker.eclipse.plugin.tests/.classpath b/eclipse-plugin/eclipse/cc.codechecker.eclipse.plugin.tests/.classpath
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" output="target/test-classes" path="src">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/eclipse-plugin/eclipse/cc.codechecker.eclipse.plugin.tests/META-INF/MANIFEST.MF b/eclipse-plugin/eclipse/cc.codechecker.eclipse.plugin.tests/META-INF/MANIFEST.MF
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Tests
+Bundle-SymbolicName: cc.codechecker.eclipse.plugin.tests
+Bundle-Version: 1.0.0.qualifier
+Fragment-Host: cc.codechecker.eclipse.plugin;bundle-version="0.0.1"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Import-Package: cc.codechecker.plugin,
+ cc.codechecker.plugin.runtime,
+ org.junit;version="4.12.0"
diff --git a/eclipse-plugin/eclipse/cc.codechecker.eclipse.plugin.tests/build.properties b/eclipse-plugin/eclipse/cc.codechecker.eclipse.plugin.tests/build.properties
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .
diff --git a/eclipse-plugin/eclipse/cc.codechecker.eclipse.plugin.tests/pom.xml b/eclipse-plugin/eclipse/cc.codechecker.eclipse.plugin.tests/pom.xml
@@ -0,0 +1,75 @@
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>cc.codechecker.eclipse.plugin.tests</artifactId>
+	<version>1.0.0-SNAPSHOT</version>
+	<parent>
+		<artifactId>cc.codechecker.eclipse.parent</artifactId>
+		<groupId>cc.codechecker.eclipse</groupId>
+		<version>0.0.1-SNAPSHOT</version>
+		<relativePath>../cc.codechecker.eclipse.parent</relativePath>
+	</parent>
+	<build>
+		<testSourceDirectory>src</testSourceDirectory>
+		<testResources>
+			<testResource>
+				<directory>resources</directory>
+			</testResource>
+		</testResources>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>2.3.2</version>
+				<configuration>
+					<source>1.6</source>
+					<target>1.6</target>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>2.22.1</version>
+				<configuration>
+					<additionalClasspathElements>
+						<additionalClasspathElement>resources</additionalClasspathElement>
+					</additionalClasspathElements>
+					<printSummary>true</printSummary>
+					<trimStacktrace>false</trimStacktrace>
+					<!--https://stackoverflow.com/questions/53010200/maven-surefire-could-not-find-forkedbooter-class-->
+					<useSystemClassLoader>false</useSystemClassLoader>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+	<dependencies>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.12</version>
+		</dependency>
+		<dependency>
+			<groupId>org.hamcrest</groupId>
+			<artifactId>hamcrest-all</artifactId>
+			<version>1.3</version>
+		</dependency>
+		<dependency>
+			<groupId>cc.codechecker.eclipse</groupId>
+			<artifactId>cc.codechecker.eclipse.plugin</artifactId>
+			<version>0.0.6-SNAPSHOT</version>
+			<type>eclipse-plugin</type>
+		</dependency>
+		<dependency>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+			<version>26.0-jre</version>
+		</dependency>
+		<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-exec -->
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-exec</artifactId>
+			<version>1.3</version>
+		</dependency>
+	</dependencies>
+</project>
+
+
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,7 @@ @@
     # vim
     *.swp
+    *.swo
     # eclipse
     .project
@@ Expand Down @@