Skip to content

Commit 77afb40

Browse files
andrei1058andrei1058
committed
Mvnfix
1 parent 49073f5 commit 77afb40

72 files changed

Lines changed: 136 additions & 65 deletions

Some content is hidden

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

‎.gitignore‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ proxy.iml
66
/dependency-reduced-pom.xml
77
/proxy (1).iml
88
/proxy (2).iml
9-
/bwp-plugin/bwp-plugin.iml
10-
/bwp-api/bwp-api.iml
11-
/bwp-plugin/proxy-plugin.iml
9+
/proxy-plugin/bwp-plugin.iml
10+
/proxy-api/bwp-api.iml
11+
/proxy-plugin/proxy-plugin.iml

‎.gitlab-ci.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
variables:
2-
MAVEN_OPTS: "-Dhttps.protocols=TLSv1.2 -Dmaven.repo.local=$CI_PROJECT_DIR/.m2/repository -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true"
2+
MAVEN_OPTS: "-Dhttps.protocols=TLSv1.2 -Dmaven.repo.local=$CI_PROJECT_DIR/.m2/repos -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true"
33
MAVEN_CLI_OPTS: "--batch-mode --errors --fail-at-end --show-version -DinstallAtEnd=true -DdeployAtEnd=true"
44

55

6-
image: "maven:3.6.3-jdk-8-slim"
6+
image: "maven:3.6.3-jdk-8"
77

88
development-job:
99
except:
1010
- 'tags'
1111
script:
1212
- 'mvn versions:set -DnewVersion=1.2.0-SNAPSHOT'
1313
- 'mvn versions:update-child-modules'
14-
- 'mvn -DgitVer=git-$CI_COMMIT_SHORT_SHA- clean install -s ci_settings.xml'
14+
- 'mvn -DgitVer=git-$CI_COMMIT_SHORT_SHA- -U clean install -s ci_settings.xml'
1515
artifacts:
1616
paths:
1717
- '*/target/*.jar'
18-
- 'bwp-api/target/apidocs'
18+
- 'proxy-api/target/apidocs'
1919

2020
release-job:
2121
only:
2222
- 'tags'
2323
script:
2424
- 'mvn versions:set -DnewVersion=1.2.0'
2525
- 'mvn versions:update-child-modules'
26-
- 'mvn -DgitVer='''' clean deploy -s ci_settings.xml'
26+
- 'mvn -DgitVer='''' -U clean deploy -s ci_settings.xml'
2727
after_script:
2828
- 'apt-get update && apt-get install -y -qq lftp'
29-
- 'lftp -c "set ftp:ssl-allow no; open -u $APIDOCS_USER,$APIDOCS_PASS andrei1058.com; mirror -Rev bwp-api/target/apidocs ./$CI_PROJECT_TITLE --ignore-time --parallel=10 --exclude-glob .git* --exclude .git/"'
29+
- 'lftp -c "set ftp:ssl-allow no; open -u $APIDOCS_USER,$APIDOCS_PASS andrei1058.com; mirror -Rev proxy-api/target/apidocs ./$CI_PROJECT_TITLE --ignore-time --parallel=10 --exclude-glob .git* --exclude .git/"'
3030
artifacts:
3131
paths:
3232
- '*/target/*.jar'
33-
- 'bwp-api/target/apidocs'
33+
- 'proxy-api/target/apidocs'

‎pom.xml‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66

77
<groupId>com.andrei1058.bedwars</groupId>
88
<artifactId>proxy</artifactId>
9-
<version>1.1.3-SNAPSHOT</version>
9+
<version>1.2.0-SNAPSHOT</version>
1010
<modules>
11-
<module>bwp-api</module>
12-
<module>bwp-plugin</module>
11+
<module>proxy-api</module>
12+
<module>proxy-plugin</module>
1313
</modules>
1414

1515
<properties>
@@ -26,12 +26,6 @@
2626
</repositories>
2727

2828
<dependencies>
29-
<dependency>
30-
<groupId>org.spigotmc</groupId>
31-
<artifactId>spigot-api</artifactId>
32-
<version>1.15-R0.1-SNAPSHOT</version>
33-
<scope>provided</scope>
34-
</dependency>
3529
<dependency>
3630
<groupId>com.google.code.findbugs</groupId>
3731
<artifactId>jsr305</artifactId>
@@ -54,7 +48,15 @@
5448
<configuration>
5549
<source>1.8</source>
5650
<target>1.8</target>
51+
<compilerId>eclipse</compilerId>
5752
</configuration>
53+
<dependencies>
54+
<dependency>
55+
<groupId>org.codehaus.plexus</groupId>
56+
<artifactId>plexus-compiler-eclipse</artifactId>
57+
<version>2.8.8</version>
58+
</dependency>
59+
</dependencies>
5860
</plugin>
5961
<plugin>
6062
<groupId>org.apache.maven.plugins</groupId>

bwp-api/pom.xml renamed to proxy-api/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
<parent>
66
<artifactId>proxy</artifactId>
77
<groupId>com.andrei1058.bedwars</groupId>
8-
<version>1.1.3-SNAPSHOT</version>
8+
<version>1.2.0-SNAPSHOT</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

12-
<artifactId>bwp-api</artifactId>
12+
<artifactId>proxy-api</artifactId>
1313
<version>${parent.version}</version>
1414

1515
<repositories>

bwp-api/src/main/java/com/andrei1058/bedwars/proxy/api/ArenaStatus.java renamed to proxy-api/src/main/java/com/andrei1058/bedwars/proxy/api/ArenaStatus.java

File renamed without changes.

bwp-api/src/main/java/com/andrei1058/bedwars/proxy/api/BedWars.java renamed to proxy-api/src/main/java/com/andrei1058/bedwars/proxy/api/BedWars.java

File renamed without changes.

bwp-api/src/main/java/com/andrei1058/bedwars/proxy/api/CachedArena.java renamed to proxy-api/src/main/java/com/andrei1058/bedwars/proxy/api/CachedArena.java

File renamed without changes.

bwp-api/src/main/java/com/andrei1058/bedwars/proxy/api/Language.java renamed to proxy-api/src/main/java/com/andrei1058/bedwars/proxy/api/Language.java

File renamed without changes.

bwp-api/src/main/java/com/andrei1058/bedwars/proxy/api/Messages.java renamed to proxy-api/src/main/java/com/andrei1058/bedwars/proxy/api/Messages.java

File renamed without changes.

bwp-api/src/main/java/com/andrei1058/bedwars/proxy/api/RemoteReJoin.java renamed to proxy-api/src/main/java/com/andrei1058/bedwars/proxy/api/RemoteReJoin.java

File renamed without changes.

0 commit comments

Comments
 (0)