Skip to content

Commit 3246f44

Browse files
nygrenhnygrenh
committed
🔥 🎉 Merge branch 'core'
2 parents 4f06535 + c7e0754 commit 3246f44

File tree

149 files changed

+1311
-10442
lines changed

Some content is hidden

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

149 files changed

+1311
-10442
lines changed

‎build.xml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,44 +5,44 @@
55
<project name="tmc-netbeans" basedir=".">
66
<description>Builds the module suite tmc-netbeans.</description>
77
<import file="nbproject/build-impl.xml"/>
8-
8+
99
<!-- Pull maven wrapper into the 'mavenmodules' cluster. Build it first if needed. -->
10-
10+
1111
<target name="-check-mavenmodules">
1212
<uptodate property="mavenmodules.uptodate"
13-
srcfile="maven-wrapper/target/nbm/maven-wrapper-1.6.nbm"
13+
srcfile="maven-wrapper/target/nbm/maven-wrapper-1.9.nbm"
1414
targetfile="mavenmodules"/>
1515
</target>
16-
16+
1717
<condition property="mvn.exe" value="mvn.bat" else="mvn">
1818
<os family="windows"/>
1919
</condition>
20-
20+
2121
<target name="-build-mavenmodules" depends="-check-mavenmodules" unless="mavenmodules.uptodate">
2222
<echo>Building the mavenmodules cluster.</echo>
2323
<echo>NOTE: you may need to restart NetBeans for the editor to notice.</echo>
24-
24+
2525
<exec dir="maven-wrapper" executable="${mvn.exe}" failonerror="true">
2626
<arg value="package"/>
2727
</exec>
28-
28+
2929
<delete dir="mavenmodules"/>
3030
<copy todir="mavenmodules">
3131
<fileset dir="maven-wrapper/target/nbm/netbeans/tmcbeans"/>
3232
</copy>
3333
</target>
34-
34+
3535
<target name="-clean-mavenmodules">
3636
<delete dir="mavenmodules"/>
37-
37+
3838
<exec dir="maven-wrapper" executable="${mvn.exe}" failonerror="true">
3939
<arg value="clean"/>
4040
</exec>
4141
</target>
42-
42+
4343
<target name="build" depends="-build-mavenmodules,suite.build"/>
4444
<target name="clean" depends="suite.clean,-clean-mavenmodules"/>
45-
45+
4646
<!-- Include maven-wrapper NBM in autoupdate site. -->
4747
<target name="nbms" depends="-init,branding,release,-hide-excluded-modules" description="Build NBMs and an Auto Update site descriptor for all modules in the suite.">
4848
<mkdir dir="${suite.build.dir}/updates"/>

‎maven-wrapper/pom.xml

Lines changed: 23 additions & 201 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>fi.helsinki.cs.tmc</groupId>
66
<artifactId>maven-wrapper</artifactId>
7-
<version>1.6</version>
7+
<version>1.9</version>
88
<packaging>nbm</packaging>
99

1010
<name>TMC Maven Wrapper</name>
@@ -44,148 +44,19 @@
4444

4545
<dependencies>
4646
<dependency>
47-
<groupId>org.apache.maven</groupId>
48-
<artifactId>apache-maven</artifactId>
49-
<version>${maven.version}</version>
50-
<type>pom</type>
51-
</dependency>
52-
<dependency>
53-
<artifactId>aether-api</artifactId>
54-
<groupId>org.sonatype.aether</groupId>
55-
<type>jar</type>
56-
<version>1.13.1</version>
57-
</dependency>
58-
<dependency>
59-
<artifactId>aether-connector-wagon</artifactId>
60-
<groupId>org.sonatype.aether</groupId>
61-
<type>jar</type>
62-
<version>1.13.1</version>
63-
</dependency>
64-
<dependency>
65-
<artifactId>aether-impl</artifactId>
66-
<groupId>org.sonatype.aether</groupId>
67-
<type>jar</type>
68-
<version>1.13.1</version>
69-
</dependency>
70-
<dependency>
71-
<artifactId>aether-spi</artifactId>
72-
<groupId>org.sonatype.aether</groupId>
73-
<type>jar</type>
74-
<version>1.13.1</version>
75-
</dependency>
76-
<dependency>
77-
<artifactId>aether-util</artifactId>
78-
<groupId>org.sonatype.aether</groupId>
79-
<type>jar</type>
80-
<version>1.13.1</version>
81-
</dependency>
82-
<dependency>
83-
<artifactId>commons-cli</artifactId>
84-
<groupId>commons-cli</groupId>
85-
<type>jar</type>
86-
<version>1.2</version>
87-
</dependency>
88-
<dependency>
89-
<artifactId>maven-aether-provider</artifactId>
90-
<groupId>org.apache.maven</groupId>
91-
<type>jar</type>
92-
<version>${maven.version}</version>
93-
</dependency>
94-
<dependency>
95-
<artifactId>maven-artifact</artifactId>
96-
<groupId>org.apache.maven</groupId>
97-
<type>jar</type>
98-
<version>${maven.version}</version>
99-
</dependency>
100-
<dependency>
101-
<artifactId>maven-compat</artifactId>
102-
<groupId>org.apache.maven</groupId>
103-
<type>jar</type>
104-
<version>${maven.version}</version>
105-
</dependency>
106-
<dependency>
107-
<artifactId>maven-core</artifactId>
108-
<groupId>org.apache.maven</groupId>
109-
<type>jar</type>
110-
<version>${maven.version}</version>
111-
</dependency>
112-
<dependency>
113-
<artifactId>maven-embedder</artifactId>
114-
<groupId>org.apache.maven</groupId>
115-
<type>jar</type>
116-
<version>${maven.version}</version>
117-
</dependency>
118-
<dependency>
119-
<artifactId>maven-model</artifactId>
120-
<groupId>org.apache.maven</groupId>
121-
<type>jar</type>
122-
<version>${maven.version}</version>
123-
</dependency>
124-
<dependency>
125-
<artifactId>maven-model-builder</artifactId>
126-
<groupId>org.apache.maven</groupId>
127-
<type>jar</type>
128-
<version>${maven.version}</version>
129-
</dependency>
130-
<dependency>
131-
<artifactId>maven-plugin-api</artifactId>
132-
<groupId>org.apache.maven</groupId>
133-
<type>jar</type>
134-
<version>${maven.version}</version>
135-
</dependency>
136-
<dependency>
137-
<artifactId>maven-repository-metadata</artifactId>
138-
<groupId>org.apache.maven</groupId>
139-
<type>jar</type>
140-
<version>${maven.version}</version>
141-
</dependency>
142-
<dependency>
143-
<artifactId>maven-settings</artifactId>
144-
<groupId>org.apache.maven</groupId>
145-
<type>jar</type>
146-
<version>${maven.version}</version>
147-
</dependency>
148-
<dependency>
149-
<artifactId>maven-settings-builder</artifactId>
150-
<groupId>org.apache.maven</groupId>
151-
<type>jar</type>
152-
<version>${maven.version}</version>
153-
</dependency>
154-
<dependency>
155-
<artifactId>plexus-cipher</artifactId>
156-
<groupId>org.sonatype.plexus</groupId>
157-
<type>jar</type>
158-
<version>1.7</version>
159-
</dependency>
160-
<dependency>
161-
<artifactId>plexus-classworlds</artifactId>
162-
<groupId>org.codehaus.plexus</groupId>
163-
<type>jar</type>
164-
<version>2.4</version>
165-
</dependency>
166-
<dependency>
167-
<artifactId>plexus-component-annotations</artifactId>
168-
<groupId>org.codehaus.plexus</groupId>
169-
<type>jar</type>
170-
<version>1.5.5</version>
171-
</dependency>
172-
<dependency>
173-
<artifactId>plexus-interpolation</artifactId>
174-
<groupId>org.codehaus.plexus</groupId>
175-
<type>jar</type>
176-
<version>1.14</version>
47+
<groupId>${project.groupId}</groupId>
48+
<artifactId>core</artifactId>
49+
<version>0.9.5-SNAPSHOT</version>
17750
</dependency>
17851
<dependency>
179-
<artifactId>plexus-sec-dispatcher</artifactId>
180-
<groupId>org.sonatype.plexus</groupId>
181-
<type>jar</type>
182-
<version>1.3</version>
52+
<groupId>${project.groupId}</groupId>
53+
<artifactId>tmc-langs-abstraction</artifactId>
54+
<version>1.0.0</version>
18355
</dependency>
18456
<dependency>
185-
<artifactId>plexus-utils</artifactId>
186-
<groupId>org.codehaus.plexus</groupId>
187-
<type>jar</type>
188-
<version>2.0.6</version>
57+
<groupId>fi.helsinki.cs.tmc</groupId>
58+
<artifactId>tmc-checkstyle-runner</artifactId>
59+
<version>3.0.1</version>
18960
</dependency>
19061
<dependency>
19162
<artifactId>sisu-guava</artifactId>
@@ -212,52 +83,16 @@
21283
<type>jar</type>
21384
<version>2.3.0</version>
21485
</dependency>
215-
<dependency>
216-
<artifactId>wagon-file</artifactId>
217-
<groupId>org.apache.maven.wagon</groupId>
218-
<type>jar</type>
219-
<version>2.2</version>
220-
</dependency>
221-
<dependency>
222-
<artifactId>wagon-http</artifactId>
223-
<groupId>org.apache.maven.wagon</groupId>
224-
<type>jar</type>
225-
<version>2.2</version>
226-
<classifier>shaded</classifier>
227-
</dependency>
228-
<dependency>
229-
<artifactId>wagon-provider-api</artifactId>
230-
<groupId>org.apache.maven.wagon</groupId>
231-
<type>jar</type>
232-
<version>2.2</version>
233-
</dependency>
23486
<dependency>
23587
<groupId>com.google.code.gson</groupId>
23688
<artifactId>gson</artifactId>
23789
<version>2.2.2</version>
23890
</dependency>
239-
<dependency>
240-
<groupId>org.apache.httpcomponents</groupId>
241-
<artifactId>httpmime</artifactId>
242-
<version>4.3.1</version>
243-
</dependency>
24491
<dependency>
24592
<groupId>org.yaml</groupId>
24693
<artifactId>snakeyaml</artifactId>
24794
<version>1.10</version>
24895
</dependency>
249-
<dependency>
250-
<groupId>org.apache.httpcomponents</groupId>
251-
<artifactId>httpcore</artifactId>
252-
<version>4.3.2</version>
253-
</dependency>
254-
<dependency>
255-
<groupId>org.apache.httpcomponents</groupId>
256-
<artifactId>httpclient</artifactId>
257-
<type>jar</type>
258-
<version>4.3.4</version>
259-
</dependency>
260-
26196
<dependency>
26297
<groupId>org.apache.commons</groupId>
26398
<artifactId>commons-lang3</artifactId>
@@ -268,36 +103,11 @@
268103
<artifactId>commons-io</artifactId>
269104
<version>2.4</version>
270105
</dependency>
271-
<dependency>
272-
<groupId>commons-codec</groupId>
273-
<artifactId>commons-codec</artifactId>
274-
<version>1.6</version>
275-
</dependency>
276106
<dependency>
277107
<groupId>org.mockito</groupId>
278108
<artifactId>mockito-all</artifactId>
279109
<version>1.9.0</version>
280-
</dependency>
281-
<dependency>
282-
<groupId>junit</groupId>
283-
<artifactId>junit</artifactId>
284-
<version>4.11</version>
285-
</dependency>
286-
<dependency>
287-
<groupId>${project.groupId}</groupId>
288-
<artifactId>tmc-checkstyle-runner</artifactId>
289-
<version>1.0.2</version>
290-
<exclusions>
291-
<exclusion>
292-
<groupId>com.puppycrawl.tools</groupId>
293-
<artifactId>checkstyle</artifactId>
294-
</exclusion>
295-
</exclusions>
296-
</dependency>
297-
<dependency>
298-
<groupId>${project.groupId}</groupId>
299-
<artifactId>tmc-junit-runner</artifactId>
300-
<version>0.2.5</version>
110+
<scope>test</scope>
301111
</dependency>
302112
<dependency>
303113
<groupId>org.cometd.java</groupId>
@@ -309,6 +119,11 @@
309119
<artifactId>cometd-java-websocket-javax-client</artifactId>
310120
<version>3.0.3</version>
311121
</dependency>
122+
<dependency>
123+
<groupId>org.slf4j</groupId>
124+
<artifactId>slf4j-jdk14</artifactId>
125+
<version>1.7.21</version>
126+
</dependency>
312127
<!-- required by cometd -->
313128
<dependency>
314129
<groupId>org.eclipse.jetty.websocket</groupId>
@@ -333,9 +148,16 @@
333148
<publicPackage>org.yaml.snakeyaml</publicPackage>
334149
<publicPackage>org.apache.http.*</publicPackage>
335150
<publicPackage>org.apache.commons.*</publicPackage>
151+
<publicPackage>fi.helsinki.cs.tmc.core.*</publicPackage>
152+
<publicPackage>fi.helsinki.cs.tmc.spyware.*</publicPackage>
153+
<publicPackage>fi.helsinki.cs.tmc.langs.abstraction.*</publicPackage>
154+
<publicPackage>fi.helsinki.cs.tmc.langs.domain.*</publicPackage>
155+
<publicPackage>fi.helsinki.cs.tmc.langs.util.*</publicPackage>
336156
<publicPackage>fi.helsinki.cs.tmc.stylerunner.*</publicPackage>
337157
<publicPackage>fi.helsinki.cs.tmc.testrunner.*</publicPackage>
338158
<publicPackage>fi.helsinki.cs.tmc.testscanner.*</publicPackage>
159+
<publicPackage>com.puppycrawl.*</publicPackage>
160+
<publicPackage>name.fraser.neil.plaintext.*</publicPackage>
339161
<publicPackage>org.cometd.*</publicPackage>
340162
<publicPackage>org.eclipse.jetty.*</publicPackage>
341163
<publicPackage>org.slf4j.*</publicPackage>

‎nbproject/genfiles.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ nbproject/build-impl.xml.script.CRC32=416371d0
88
nbproject/build-impl.xml.stylesheet.CRC32=[email protected]
99
nbproject/platform.xml.data.CRC32=b49f54e7
1010
nbproject/platform.xml.script.CRC32=6dcbd131
11-
nbproject/platform.xml.stylesheet.CRC32=4e1f53d4@2.62.1
11+
nbproject/platform.xml.stylesheet.CRC32=45ddf0e0@2.72.1

‎nbproject/platform.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,4 @@ extcluster.mavenmodules.sources=
3838
# org.openide.execution,\
3939
# org.openide.options,\
4040
# org.openide.util.enumerations
41-
nbplatform.active=nb81
41+
nbplatform.active=nb82

‎nbproject/project.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ project.fi.helsinki.cs.tmc.application=tmc-application
1616
run.args=-J-client -J-Xss2m -J-Xms32m -J-XX:PermSize=256m -J-Dapple.laf.useScreenMenuBar=true -J-Dapple.awt.graphics.UseQuartz=true -J-Dsun.java2d.noddraw=true -J-Dsun.zip.disableMemoryMapping=true
1717
run.jvmargs= -J-XX:PermSize=1024m -J-XX:MaxPermSize=2048m -XX:+CMSClassUnloadingEnabled -XX:+CMSPermGenSweepingEnabled
1818
# NB version
19-
app.version=8.1.0
19+
app.version=8.2.0

‎tmc-plugin/manifest.mf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ OpenIDE-Module-Requires:
66
org.openide.windows.IOProvider,
77
org.openide.windows.WindowManager
88
OpenIDE-Module-Install: fi/helsinki/cs/tmc/actions/TmcModuleInstall.class
9-
OpenIDE-Module-Specification-Version: 0.9.2
9+
OpenIDE-Module-Specification-Version: 1.1.0

‎tmc-plugin/nbproject/genfiles.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ build.xml.script.CRC32=84aa6cb9
33
build.xml.stylesheet.CRC32=[email protected]
44
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
55
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
6-
nbproject/build-impl.xml.data.CRC32=76201e38
6+
nbproject/build-impl.xml.data.CRC32=71dc5f8e
77
nbproject/build-impl.xml.script.CRC32=72a9c69e
8-
nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.67.1
8+
nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.72.1

‎tmc-plugin/nbproject/project.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<build-prerequisite/>
1212
<compile-dependency/>
1313
<run-dependency>
14-
<specification-version>1.6</specification-version>
14+
<specification-version>1.8</specification-version>
1515
</run-dependency>
1616
</dependency>
1717
<dependency>

‎tmc-plugin/src/fi/helsinki/cs/tmc/actions/.DownloadExercisesAction.java.swp

16 KB
Binary file not shown.

‎tmc-plugin/src/fi/helsinki/cs/tmc/actions/AbstractExerciseSensitiveAction.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
package fi.helsinki.cs.tmc.actions;
22

3-
import fi.helsinki.cs.tmc.data.Exercise;
4-
import fi.helsinki.cs.tmc.events.TmcEventBus;
5-
import fi.helsinki.cs.tmc.events.TmcEventListener;
3+
import fi.helsinki.cs.tmc.core.domain.Exercise;
4+
import fi.helsinki.cs.tmc.core.events.TmcEventBus;
5+
import fi.helsinki.cs.tmc.core.events.TmcEventListener;
66
import fi.helsinki.cs.tmc.model.CourseDb;
77
import fi.helsinki.cs.tmc.model.ProjectMediator;
8+
89
import java.util.ArrayList;
910
import java.util.Collection;
1011
import java.util.Iterator;

0 commit comments

Comments
 (0)