Skip to content

Commit ed094fc

Browse files
dkruppdkrupp
authored
Merge pull request #118 from Ericsson/uplift_68
Uplift 68
2 parents b442a25 + a44d194 commit ed094fc

File tree

159 files changed

+1398
-5784
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

159 files changed

+1398
-5784
lines changed

‎.travis.yml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,18 @@ sudo: required
22
dist: trusty
33
language: java
44
jdk:
5-
- oraclejdk7
5+
- oraclejdk8
66
addons:
77
apt:
88
package: maven tar
99
before_script:
10-
- cd ../;curl http://www-eu.apache.org/dist/thrift/0.9.3/thrift-0.9.3.tar.gz | tar
11-
zx
12-
- cd thrift-0.9.3
13-
- "./configure --with-c_glib=yes --with-ruby=no"
14-
- make
15-
- export PATH=$PATH:$PWD/compiler/cpp/
1610
- cd ../CodeCheckerEclipsePlugin/eclipse-plugin/
17-
script: mvn test install
11+
script: mvn package
1812
deploy:
1913
provider: releases
2014
api_key:
2115
secure: PKQXSde1+GfeTJBQlYGCXFoXGy9LpMbD0oagpQtHk6d9NtZ9T9stx0gC3BODE9rGPCtKyQjOnOQ2V0GIMQMt0Qx22zSvGN4bwAYn0BHHXV56HLyZV2U8eW3a5eLt+yB7OhkARg7nflo9Yh1HDmxFtovsAz1TJ0Ri1UGmMMj03wNdc8CHJy6vuN3YljxBtZFLAH7sYkL5QC0jjFkF9/7bd9lF6nyLqBU5VqQcbGO3gRFnE46+KHkw0tC3F3H7HcYJJydRWAoTwD88UEzrJnCNGnYarwFRwix5/O2Wgjk5CbEie9IxtjeiBiiVbAS+/OxKEKw+4E2TV9ThyX4BwapcalBKoQqYAXDnZwD9EAT3+N+vKRHk/OI3IsD4lM8h2E5HrVEURY/wMvXH9dYrSnYGPmrAks1Ef3X1iMxCxqiR7k+vvKRAG2XXn92Dq9A3fMEZYQvh6YtBp7nC022Cpr11HyriC/C8WD4arfDekI7ICAZfWnaAwdUvr4u991DIRmApUC905lcP5NB/mGfc0rMeSwK2fpGcWqDkxYo7bDDoQHkImiLC3NRCY80NSO3tpcH3AlHRtF/WIy2Ln626PMIt98nDAiWZf+35GW0HoCyjo3SYbRtQMdQD85ZhbqVva+rtzN1j4AuoP/pCbChsICs0ebAdOavjOb/8cwFxBMuOPYA=
22-
file: "/home/travis/build/Ericsson/CodeCheckerEclipsePlugin/eclipse-plugin/eclipse/cc.codechecker.eclipse.plugin/target/cc.codechecker.eclipse.plugin-0.0.1-SNAPSHOT.jar"
16+
file: "/home/travis/build/Ericsson/CodeCheckerEclipsePlugin/eclipse-plugin/eclipse/cc.codechecker.eclipse.plugin/target/cc.codechecker.eclipse.plugin*.jar"
2317
skip_cleanup: true
2418
on:
2519
repo: Ericsson/CodeCheckerEclipsePlugin

‎docs/developer.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@
1212
* Adherence to the [Google Java Style](https://google.github.io/styleguide/javaguide.html) is mandatory
1313
* An IntelliJ Idea autoformatter XML configuration file is included in the repo for convenience
1414

15+
## Version Update
16+
17+
Execute the following command in CodeCheckerEclipsePlugin/eclipse-plugin.
18+
``` mvn -Dtycho.mode=maven org.eclipse.tycho:tycho-versions-plugin:set-version -DnewVersion=X.X.X-SNAPSHOT -Dartifacts=cc.codechecker.eclipse.plugin ```
1519

1620
## Log
1721

‎eclipse-plugin/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
# vim
44
*.swp
5+
*.swo
56

67
# eclipse
78
.project

‎eclipse-plugin/eclipse-depcopy/pom.xml

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,37 @@
66
<packaging>pom</packaging>
77

88
<dependencies>
9-
<dependency>
10-
<groupId>cc.codechecker.service.thrift</groupId>
11-
<artifactId>cc-thrift</artifactId>
12-
<version>0.0.1-SNAPSHOT</version>
13-
</dependency>
149
<dependency>
1510
<groupId>com.google.code.gson</groupId>
1611
<artifactId>gson</artifactId>
1712
<version>2.3.1</version>
1813
</dependency>
14+
<dependency>
15+
<groupId>com.google.guava</groupId>
16+
<artifactId>guava</artifactId>
17+
<version>26.0-jre</version>
18+
</dependency>
19+
<dependency>
20+
<groupId>org.apache.commons</groupId>
21+
<artifactId>commons-exec</artifactId>
22+
<version>1.3</version>
23+
</dependency>
24+
<dependency>
25+
<groupId>org.apache.commons</groupId>
26+
<artifactId>commons-lang3</artifactId>
27+
<version>3.0</version>
28+
</dependency>
29+
<dependency>
30+
<groupId>com.googlecode.plist</groupId>
31+
<artifactId>dd-plist</artifactId>
32+
<version>1.21</version>
33+
</dependency>
34+
<dependency>
35+
<groupId>joda-time</groupId>
36+
<artifactId>joda-time</artifactId>
37+
<version>2.10.1</version>
38+
</dependency>
39+
1940
</dependencies>
2041

2142
<build>

‎eclipse-plugin/eclipse/cc.codechecker.eclipse.parent/pom.xml

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
55
http://maven.apache.org/xsd/maven-4.0.0.xsd"
6-
xmlns="http://maven.apache.org/POM/4.0.0">
6+
xmlns="http://maven.apache.org/POM/4.0.0">
77

88
<modelVersion>4.0.0</modelVersion>
99
<groupId>cc.codechecker.eclipse</groupId>
@@ -14,13 +14,13 @@
1414
<properties>
1515
<tycho.version>0.22.0</tycho.version>
1616
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
17-
<luna-repo.url>http://download.eclipse.org/releases/mars</luna-repo.url>
17+
<eclipse-repo.url>http://download.eclipse.org/releases/mars</eclipse-repo.url>
1818
</properties>
1919

2020
<repositories>
2121
<repository>
22-
<id>luna</id>
23-
<url>${luna-repo.url}</url>
22+
<id>eclipse-oxygen</id>
23+
<url>${eclipse-repo.url}</url>
2424
<layout>p2</layout>
2525
</repository>
2626
</repositories>
@@ -33,7 +33,11 @@
3333
<version>${tycho.version}</version>
3434
<extensions>true</extensions>
3535
</plugin>
36-
36+
<plugin>
37+
<groupId>org.eclipse.tycho</groupId>
38+
<artifactId>tycho-surefire-plugin</artifactId>
39+
<version>${tycho.version}</version>
40+
</plugin>
3741
<plugin>
3842
<groupId>org.eclipse.tycho</groupId>
3943
<artifactId>target-platform-configuration</artifactId>

‎eclipse-plugin/eclipse/cc.codechecker.eclipse.plugin.tests/.classpath

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
4+
<attributes>
5+
<attribute name="maven.pomderived" value="true"/>
6+
</attributes>
7+
</classpathentry>
8+
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
9+
<classpathentry kind="src" output="target/test-classes" path="src">
10+
<attributes>
11+
<attribute name="optional" value="true"/>
12+
<attribute name="maven.pomderived" value="true"/>
13+
<attribute name="test" value="true"/>
14+
</attributes>
15+
</classpathentry>
16+
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
17+
<attributes>
18+
<attribute name="maven.pomderived" value="true"/>
19+
</attributes>
20+
</classpathentry>
21+
<classpathentry excluding="**" kind="src" output="target/test-classes" path="resources">
22+
<attributes>
23+
<attribute name="maven.pomderived" value="true"/>
24+
<attribute name="test" value="true"/>
25+
</attributes>
26+
</classpathentry>
27+
<classpathentry kind="output" path="target/classes"/>
28+
</classpath>

‎eclipse-plugin/eclipse/cc.codechecker.eclipse.plugin.tests/META-INF/MANIFEST.MF

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
Manifest-Version: 1.0
2+
Bundle-ManifestVersion: 2
3+
Bundle-Name: Tests
4+
Bundle-SymbolicName: cc.codechecker.eclipse.plugin.tests
5+
Bundle-Version: 1.0.0.qualifier
6+
Fragment-Host: cc.codechecker.eclipse.plugin;bundle-version="0.0.1"
7+
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
8+
Import-Package: cc.codechecker.plugin,
9+
cc.codechecker.plugin.runtime,
10+
org.junit;version="4.12.0"

‎eclipse-plugin/eclipse/cc.codechecker.eclipse.plugin.tests/build.properties

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
source.. = src/
2+
output.. = bin/
3+
bin.includes = META-INF/,\
4+
.

‎eclipse-plugin/eclipse/cc.codechecker.eclipse.plugin.tests/pom.xml

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
<project>
2+
<modelVersion>4.0.0</modelVersion>
3+
<artifactId>cc.codechecker.eclipse.plugin.tests</artifactId>
4+
<version>1.0.0-SNAPSHOT</version>
5+
<parent>
6+
<artifactId>cc.codechecker.eclipse.parent</artifactId>
7+
<groupId>cc.codechecker.eclipse</groupId>
8+
<version>0.0.1-SNAPSHOT</version>
9+
<relativePath>../cc.codechecker.eclipse.parent</relativePath>
10+
</parent>
11+
<build>
12+
<testSourceDirectory>src</testSourceDirectory>
13+
<testResources>
14+
<testResource>
15+
<directory>resources</directory>
16+
</testResource>
17+
</testResources>
18+
<plugins>
19+
<plugin>
20+
<groupId>org.apache.maven.plugins</groupId>
21+
<artifactId>maven-compiler-plugin</artifactId>
22+
<version>2.3.2</version>
23+
<configuration>
24+
<source>1.6</source>
25+
<target>1.6</target>
26+
</configuration>
27+
</plugin>
28+
<plugin>
29+
<groupId>org.apache.maven.plugins</groupId>
30+
<artifactId>maven-surefire-plugin</artifactId>
31+
<version>2.22.1</version>
32+
<configuration>
33+
<additionalClasspathElements>
34+
<additionalClasspathElement>resources</additionalClasspathElement>
35+
</additionalClasspathElements>
36+
<printSummary>true</printSummary>
37+
<trimStacktrace>false</trimStacktrace>
38+
<!--https://stackoverflow.com/questions/53010200/maven-surefire-could-not-find-forkedbooter-class-->
39+
<useSystemClassLoader>false</useSystemClassLoader>
40+
</configuration>
41+
</plugin>
42+
</plugins>
43+
</build>
44+
<dependencies>
45+
<dependency>
46+
<groupId>junit</groupId>
47+
<artifactId>junit</artifactId>
48+
<version>4.12</version>
49+
</dependency>
50+
<dependency>
51+
<groupId>org.hamcrest</groupId>
52+
<artifactId>hamcrest-all</artifactId>
53+
<version>1.3</version>
54+
</dependency>
55+
<dependency>
56+
<groupId>cc.codechecker.eclipse</groupId>
57+
<artifactId>cc.codechecker.eclipse.plugin</artifactId>
58+
<version>0.0.6-SNAPSHOT</version>
59+
<type>eclipse-plugin</type>
60+
</dependency>
61+
<dependency>
62+
<groupId>com.google.guava</groupId>
63+
<artifactId>guava</artifactId>
64+
<version>26.0-jre</version>
65+
</dependency>
66+
<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-exec -->
67+
<dependency>
68+
<groupId>org.apache.commons</groupId>
69+
<artifactId>commons-exec</artifactId>
70+
<version>1.3</version>
71+
</dependency>
72+
</dependencies>
73+
</project>
74+
75+

0 commit comments

Comments
 (0)