Skip to content

Commit ba0052e

Browse files
teverettteverett
committed
semantic versioning, plugin updates
1 parent 2465d53 commit ba0052e

File tree

11 files changed

+394
-101
lines changed

11 files changed

+394
-101
lines changed

‎examples/bottlesofbeer/pom.xml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.khubla.jvmbasic</groupId>
88
<artifactId>examples</artifactId>
9-
<version>2.3-SNAPSHOT</version>
9+
<version>2.3.0-SNAPSHOT</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212
<dependencies>
@@ -20,13 +20,6 @@
2020
</dependencies>
2121
<build>
2222
<plugins>
23-
<plugin>
24-
<artifactId>maven-compiler-plugin</artifactId>
25-
<configuration>
26-
<source>1.5</source>
27-
<target>1.5</target>
28-
</configuration>
29-
</plugin>
3023
<plugin>
3124
<groupId>com.khubla.jvmbasic</groupId>
3225
<artifactId>jvmbasic-maven-plugin</artifactId>
@@ -35,7 +28,7 @@
3528
<plugin>
3629
<groupId>org.apache.maven.plugins</groupId>
3730
<artifactId>maven-jar-plugin</artifactId>
38-
<version>2.4</version>
31+
<version>3.1.0</version>
3932
<configuration>
4033
<archive>
4134
<manifest>

‎examples/example1/pom.xml

Lines changed: 2 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.khubla.jvmbasic</groupId>
88
<artifactId>examples</artifactId>
9-
<version>2.3-SNAPSHOT</version>
9+
<version>2.3.0-SNAPSHOT</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212
<dependencies>
@@ -35,7 +35,7 @@
3535
<plugin>
3636
<groupId>org.apache.maven.plugins</groupId>
3737
<artifactId>maven-jar-plugin</artifactId>
38-
<version>2.4</version>
38+
<version>3.1.0</version>
3939
<configuration>
4040
<archive>
4141
<manifest>
@@ -46,35 +46,5 @@
4646
</configuration>
4747
</plugin>
4848
</plugins>
49-
<pluginManagement>
50-
<plugins>
51-
<!--This plugin's configuration is used to store Eclipse m2e settings
52-
only. It has no influence on the Maven build itself. -->
53-
<plugin>
54-
<groupId>org.eclipse.m2e</groupId>
55-
<artifactId>lifecycle-mapping</artifactId>
56-
<version>1.0.0</version>
57-
<configuration>
58-
<lifecycleMappingMetadata>
59-
<pluginExecutions>
60-
<pluginExecution>
61-
<pluginExecutionFilter>
62-
<groupId>com.khubla.jvmbasic</groupId>
63-
<artifactId>jvmbasic-maven-plugin</artifactId>
64-
<versionRange>[1.6-SNAPSHOT,)</versionRange>
65-
<goals>
66-
<goal>compile</goal>
67-
</goals>
68-
</pluginExecutionFilter>
69-
<action>
70-
<ignore />
71-
</action>
72-
</pluginExecution>
73-
</pluginExecutions>
74-
</lifecycleMappingMetadata>
75-
</configuration>
76-
</plugin>
77-
</plugins>
78-
</pluginManagement>
7949
</build>
8050
</project>

‎examples/helloworld/pom.xml

Lines changed: 2 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.khubla.jvmbasic</groupId>
88
<artifactId>examples</artifactId>
9-
<version>2.3-SNAPSHOT</version>
9+
<version>2.3.0-SNAPSHOT</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212
<dependencies>
@@ -33,7 +33,7 @@
3333
<plugin>
3434
<groupId>org.apache.maven.plugins</groupId>
3535
<artifactId>maven-jar-plugin</artifactId>
36-
<version>2.4</version>
36+
<version>3.1.0</version>
3737
<configuration>
3838
<archive>
3939
<manifest>
@@ -44,35 +44,5 @@
4444
</configuration>
4545
</plugin>
4646
</plugins>
47-
<pluginManagement>
48-
<plugins>
49-
<!--This plugin's configuration is used to store Eclipse m2e settings
50-
only. It has no influence on the Maven build itself. -->
51-
<plugin>
52-
<groupId>org.eclipse.m2e</groupId>
53-
<artifactId>lifecycle-mapping</artifactId>
54-
<version>1.0.0</version>
55-
<configuration>
56-
<lifecycleMappingMetadata>
57-
<pluginExecutions>
58-
<pluginExecution>
59-
<pluginExecutionFilter>
60-
<groupId>com.khubla.jvmbasic</groupId>
61-
<artifactId>jvmbasic-maven-plugin</artifactId>
62-
<versionRange>[1.6-SNAPSHOT,)</versionRange>
63-
<goals>
64-
<goal>compile</goal>
65-
</goals>
66-
</pluginExecutionFilter>
67-
<action>
68-
<ignore />
69-
</action>
70-
</pluginExecution>
71-
</pluginExecutions>
72-
</lifecycleMappingMetadata>
73-
</configuration>
74-
</plugin>
75-
</plugins>
76-
</pluginManagement>
7747
</build>
7848
</project>

‎examples/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.khubla.jvmbasic</groupId>
88
<artifactId>jvmBasic</artifactId>
9-
<version>2.3-SNAPSHOT</version>
9+
<version>2.3.0-SNAPSHOT</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212
<modules>

‎format.eclipse.xml

Lines changed: 322 additions & 0 deletions
Large diffs are not rendered by default.

‎format.importorder

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#Organize Import Order
2+
#Fri Apr 24 02:36:28 PDT 2015
3+
4=
4+
3=com
5+
2=org
6+
1=javax
7+
0=java

‎jvmbasicc/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
<parent>
77
<groupId>com.khubla.jvmbasic</groupId>
88
<artifactId>jvmBasic</artifactId>
9-
<version>2.3-SNAPSHOT</version>
9+
<version>2.3.0-SNAPSHOT</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212
<properties>
1313
<asm.version>5.0.4</asm.version>
14-
<antlr.version>4.5.3</antlr.version>
14+
<antlr.version>4.7.1</antlr.version>
1515
</properties>
1616
<dependencies>
1717
<dependency>
@@ -84,7 +84,7 @@
8484
<plugin>
8585
<groupId>org.apache.maven.plugins</groupId>
8686
<artifactId>maven-jar-plugin</artifactId>
87-
<version>2.4</version>
87+
<version>3.1.0</version>
8888
<configuration>
8989
<archive>
9090
<manifest>
@@ -96,7 +96,7 @@
9696
</plugin>
9797
<plugin>
9898
<artifactId>maven-assembly-plugin</artifactId>
99-
<version>2.2</version>
99+
<version>3.1.0</version>
100100
<executions>
101101
<execution>
102102
<id>make-my-jar-with-dependencies</id>

‎jvmbasicmojo/pom.xml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.khubla.jvmbasic</groupId>
99
<artifactId>jvmBasic</artifactId>
10-
<version>2.3-SNAPSHOT</version>
10+
<version>2.3.0-SNAPSHOT</version>
1111
<relativePath>../pom.xml</relativePath>
1212
</parent>
1313
<properties>
@@ -54,18 +54,10 @@
5454
</dependencies>
5555
<build>
5656
<plugins>
57-
<plugin>
58-
<artifactId>maven-compiler-plugin</artifactId>
59-
<version>3.1</version>
60-
<configuration>
61-
<source>1.6</source>
62-
<target>1.6</target>
63-
</configuration>
64-
</plugin>
6557
<plugin>
6658
<groupId>org.apache.maven.plugins</groupId>
6759
<artifactId>maven-plugin-plugin</artifactId>
68-
<version>3.2</version>
60+
<version>3.6.0</version>
6961
<configuration>
7062
<goalPrefix>jvmbasic</goalPrefix>
7163
</configuration>

‎jvmbasicrt/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.khubla.jvmbasic</groupId>
88
<artifactId>jvmBasic</artifactId>
9-
<version>2.3-SNAPSHOT</version>
9+
<version>2.3.0-SNAPSHOT</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212
<dependencies>
@@ -27,7 +27,7 @@
2727
<plugins>
2828
<plugin>
2929
<artifactId>maven-assembly-plugin</artifactId>
30-
<version>2.2</version>
30+
<version>3.1.0</version>
3131
<executions>
3232
<execution>
3333
<id>make-my-jar-with-dependencies</id>

‎jvmbasicwww/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.khubla.jvmbasic</groupId>
88
<artifactId>jvmBasic</artifactId>
9-
<version>2.3-SNAPSHOT</version>
9+
<version>2.3.0-SNAPSHOT</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212
<dependencies>
@@ -48,7 +48,7 @@
4848
<plugins>
4949
<plugin>
5050
<artifactId>maven-assembly-plugin</artifactId>
51-
<version>2.2</version>
51+
<version>3.1.0</version>
5252
<executions>
5353
<execution>
5454
<id>make-my-jar-with-dependencies</id>

‎pom.xml

Lines changed: 48 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,10 @@
33
<groupId>com.khubla.jvmbasic</groupId>
44
<artifactId>jvmBasic</artifactId>
55
<packaging>pom</packaging>
6-
<version>2.3-SNAPSHOT</version>
6+
<version>2.3.0-SNAPSHOT</version>
77
<name>khubla.com jvmbasic</name>
88
<description>BASIC to bytecode compiler</description>
99
<url>https://github.com/teverett/jvmBASIC</url>
10-
<prerequisites>
11-
<maven>3.1.0</maven>
12-
</prerequisites>
1310
<developers>
1411
<developer>
1512
<id>teverett</id>
@@ -30,14 +27,17 @@
3027
</licenses>
3128
<scm>
3229
<connection>scm:git:https://github.com/teverett/jvmBASIC.git</connection>
33-
<tag>HEAD</tag>
34-
</scm>
30+
<tag>HEAD</tag>
31+
</scm>
3532
<properties>
3633
<commons-cli.version>1.3.1</commons-cli.version>
3734
<commons-io.version>2.5</commons-io.version>
3835
<testng.version>6.9.10</testng.version>
3936
<target.jvm>1.6</target.jvm>
4037
<logback.version>1.1.7</logback.version>
38+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
39+
<spotless.version>1.17.0</spotless.version>
40+
<required-maven-version>3.3.1</required-maven-version>
4141
</properties>
4242
<modules>
4343
<module>jvmbasicrt</module>
@@ -51,7 +51,7 @@
5151
<plugin>
5252
<groupId>org.apache.maven.plugins</groupId>
5353
<artifactId>maven-compiler-plugin</artifactId>
54-
<version>3.1</version>
54+
<version>3.8.0</version>
5555
<configuration>
5656
<source>${target.jvm}</source>
5757
<target>${target.jvm}</target>
@@ -60,15 +60,54 @@
6060
<plugin>
6161
<groupId>org.apache.maven.plugins</groupId>
6262
<artifactId>maven-javadoc-plugin</artifactId>
63-
<version>2.9</version>
63+
<version>3.0.1</version>
6464
<configuration>
6565
<aggregate>true</aggregate>
6666
</configuration>
6767
</plugin>
6868
<plugin>
6969
<groupId>org.apache.maven.plugins</groupId>
7070
<artifactId>maven-site-plugin</artifactId>
71-
<version>3.2</version>
71+
<version>3.7.1</version>
72+
</plugin>
73+
<plugin>
74+
<groupId>com.diffplug.spotless</groupId>
75+
<artifactId>spotless-maven-plugin</artifactId>
76+
<version>${spotless.version}</version>
77+
<configuration>
78+
<lineEndings>UNIX</lineEndings>
79+
<encoding>UTF-8</encoding>
80+
<java>
81+
<eclipse>
82+
<file>${maven.multiModuleProjectDirectory}/format.eclipse.xml</file>
83+
<version>4.7.1</version>
84+
</eclipse>
85+
<removeUnusedImports />
86+
<importOrder>
87+
<file>${maven.multiModuleProjectDirectory}/format.importorder</file>
88+
</importOrder>
89+
</java>
90+
</configuration>
91+
</plugin>
92+
<plugin>
93+
<groupId>org.apache.maven.plugins</groupId>
94+
<artifactId>maven-enforcer-plugin</artifactId>
95+
<version>3.0.0-M2</version>
96+
<executions>
97+
<execution>
98+
<id>enforce-maven</id>
99+
<goals>
100+
<goal>enforce</goal>
101+
</goals>
102+
<configuration>
103+
<rules>
104+
<requireMavenVersion>
105+
<version>${required-maven-version}</version>
106+
</requireMavenVersion>
107+
</rules>
108+
</configuration>
109+
</execution>
110+
</executions>
72111
</plugin>
73112
</plugins>
74113
</build>

0 commit comments

Comments
 (0)