Skip to content

Commit bfc479d

Browse files
committed
Changes:
- moved to maven - removing keys
1 parent 66cf1c6 commit bfc479d

File tree

638 files changed

+625
-6222
lines changed

Some content is hidden

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

638 files changed

+625
-6222
lines changed

.classpath

+25-25
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,43 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="src" path="JMetaagents/javasourceTest"/>
4-
<classpathentry kind="src" path="JMetaagents/javasource"/>
5-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
64
<attributes>
7-
<attribute name="annotationpath" value="/jmetaagents/externalAnnotations"/>
5+
<attribute name="maven.pomderived" value="true"/>
6+
<attribute name="annotationpath" value="/jmetaagents/src/main/resources/externalAnnotations"/>
87
</attributes>
98
</classpathentry>
10-
<classpathentry kind="lib" path="lib/jackson-annotations-2.8.9-sources.jar"/>
11-
<classpathentry kind="lib" path="lib/jackson-annotations-2.8.9.jar" sourcepath="lib/jackson-annotations-2.8.9-sources.jar">
9+
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4">
1210
<attributes>
13-
<attribute name="annotationpath" value="/jmetaagents/externalAnnotations"/>
11+
<attribute name="annotationpath" value="/jmetaagents/src/main/resources/externalAnnotations"/>
1412
</attributes>
1513
</classpathentry>
16-
<classpathentry kind="lib" path="lib/jackson-core-2.8.9-sources.jar"/>
17-
<classpathentry kind="lib" path="lib/jackson-core-2.8.9.jar" sourcepath="lib/jackson-core-2.8.9-sources.jar">
14+
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
1815
<attributes>
19-
<attribute name="annotationpath" value="/JMediaInfo/externalAnnotations"/>
16+
<attribute name="maven.pomderived" value="true"/>
17+
<attribute name="annotationpath" value="/jmetaagents/src/main/resources/externalAnnotations"/>
2018
</attributes>
2119
</classpathentry>
22-
<classpathentry kind="lib" path="lib/jackson-databind-2.8.9-sources.jar"/>
23-
<classpathentry kind="lib" path="lib/jackson-databind-2.8.9.jar" sourcepath="lib/jackson-databind-2.8.9-sources.jar">
20+
<classpathentry kind="src" output="target/classes" path="src/main/java">
2421
<attributes>
25-
<attribute name="annotationpath" value="/jmetaagents/externalAnnotations"/>
22+
<attribute name="optional" value="true"/>
23+
<attribute name="maven.pomderived" value="true"/>
2624
</attributes>
2725
</classpathentry>
28-
<classpathentry kind="lib" path="lib/org.eclipse.jdt.annotation_2.0.0.v20140415-1436.jar"/>
29-
<classpathentry kind="lib" path="lib/SwissKnife-1.0.jar"/>
30-
<classpathentry kind="lib" path="lib/JHTTPRequest/commons-logging-1.1.1.jar"/>
31-
<classpathentry kind="lib" path="lib/JHTTPRequest/fluent-hc-4.2.3.jar"/>
32-
<classpathentry kind="lib" path="lib/JHTTPRequest/httpclient-4.2.3.jar"/>
33-
<classpathentry kind="lib" path="lib/JHTTPRequest/httpclient-cache-4.2.3.jar"/>
34-
<classpathentry kind="lib" path="lib/JHTTPRequest/httpcore-4.2.3.jar"/>
35-
<classpathentry kind="lib" path="lib/JHTTPRequest/httpmime-4.2.3.jar"/>
36-
<classpathentry kind="lib" path="lib/JHTTPRequest/JHTTPRequest.jar"/>
37-
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4">
26+
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
27+
<attributes>
28+
<attribute name="optional" value="true"/>
29+
<attribute name="maven.pomderived" value="true"/>
30+
</attributes>
31+
</classpathentry>
32+
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
33+
<attributes>
34+
<attribute name="maven.pomderived" value="true"/>
35+
</attributes>
36+
</classpathentry>
37+
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
3838
<attributes>
39-
<attribute name="annotationpath" value="/jmetaagents/externalAnnotations"/>
39+
<attribute name="maven.pomderived" value="true"/>
4040
</attributes>
4141
</classpathentry>
42-
<classpathentry kind="output" path="bin"/>
42+
<classpathentry kind="output" path="target/classes"/>
4343
</classpath>

.travis.yml

+16-17
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,22 @@
11
language: java
2-
sudo: false
3-
before_script:
4-
# Ant build tool configuration
5-
- cp build.properties.sample build.properties
6-
- mkdir ./bin
7-
- sed -i -e "s,jars_dest =,jars_dest =./," build.properties
8-
script:
9-
- ant run
10-
- sonar-scanner
11-
env:
12-
global:
13-
- classes=JMetadata/classes
14-
- jars_dest=./
2+
sudo: required
3+
install: true
154
jdk:
165
- oraclejdk8
17-
cache:
18-
directories:
19-
- '$HOME/.sonar/cache'
6+
before_script:
7+
- chmod +x ./.travis/upload-to-repo.sh
8+
- sed -i -e 's/\r$//' ./.travis/upload-to-repo.sh
9+
- sed -i -e "s,\"ALLOCINEAPIKEY_VALUE\",\"$ALLOCINE_API_KEY\"," ./src/test/java/aka/jmetaagents/test/resource/MetaagentConstants.java
10+
script:
11+
- mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent package sonar:sonar
12+
- mkdir -p /home/travis/repository
2013
addons:
2114
sonarcloud:
2215
organization: "welle-github" # the key of the org you chose at step #3
23-
16+
cache:
17+
directories:
18+
- '$HOME/.m2/repository'
19+
- '$HOME/.sonar/cache'
20+
after_success:
21+
- mvn -Denv=dev-travis -DperformRelease=true clean deploy
22+
- ./.travis/upload-to-repo.sh

.travis/upload-to-repo.sh

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#!/bin/sh
2+
3+
git config --global user.email "[email protected]"
4+
git config --global user.name "Welle Charlotte"
5+
cd /home/travis/repository
6+
git init
7+
git remote add origin https://welle:$GITHUB_API_KEY@github.com/welle/maven-repository.git
8+
git add .
9+
git commit -m "Travis build $TRAVIS_BUILD_NUMBER pushed [skip ci] "
10+
git fetch
11+
git merge origin/master -X ours --allow-unrelated-histories
12+
git push -fq origin master > /dev/null
13+
echo -e "Done\n"

JMetaagents/javasource/aka/jmetaagents/main/jrottentomatoes/JRottenTomatoes.java

-222
This file was deleted.

0 commit comments

Comments
 (0)