Skip to content

Commit

Permalink
Try get the build going again w/ Tycho 3, Groovy 4
Browse files Browse the repository at this point in the history
  • Loading branch information
@ultraq
ultraq committed Oct 20, 2023
1 parent fa8e640 commit cb16e93
Show file tree
Hide file tree
Showing 7 changed files with 40 additions and 104 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ jobs:
java-version: 17
cache: maven
- run: ./gradlew downloadDependencies
- run: mvn --batch-mode --update-snapshots verify
- run: mvn verify
7 changes: 7 additions & 0 deletions .mvn/extensions.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<extensions>
<extension>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-build</artifactId>
<version>3.0.5</version>
</extension>
</extensions>
1 change: 1 addition & 0 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ dependencies {
contentassist(
'javax.annotation:javax.annotation-api:1.3.2',
'javax.inject:javax.inject:1',
'nz.net.ultraq.jaxb:jaxb-utilities:3.0.0-SNAPSHOT',
'nz.net.ultraq.groovy:groovy-extensions:2.2.0',
'nz.net.ultraq.groovy:groovy-profiling-extensions:0.7.0',
'org.attoparser:attoparser:2.0.5.RELEASE',
Expand Down
4 changes: 2 additions & 2 deletions org.thymeleaf.extras.eclipse.contentassist/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ Bundle-ClassPath: .,
lib/javax.annotation-api-1.3.2.jar,
lib/javax.inject-1.jar,
lib/jaxb-impl-2.3.5.jar,
lib/jaxb-utilities-2.1.0.jar,
lib/jaxb-utilities-3.0.0-SNAPSHOT.jar,
lib/junit-jupiter-5.7.2.jar,
lib/junit-jupiter-api-5.7.2.jar,
lib/junit-jupiter-engine-5.7.2.jar,
Expand All @@ -54,7 +54,7 @@ Bundle-ClassPath: .,
lib/mockito-core-3.12.4.jar,
lib/objenesis-3.2.jar,
lib/opentest4j-1.2.0.jar,
lib/slf4j-api-1.7.32.jar,
lib/slf4j-api-1.7.36.jar,
lib/spring-aop-5.2.0.RELEASE.jar,
lib/spring-beans-5.2.0.RELEASE.jar,
lib/spring-context-5.2.0.RELEASE.jar,
Expand Down
8 changes: 6 additions & 2 deletions org.thymeleaf.extras.eclipse.contentassist/build.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,17 @@ bin.includes = .,\
lib/attoparser-2.0.5.RELEASE.jar,\
lib/byte-buddy-1.11.13.jar,\
lib/byte-buddy-agent-1.11.13.jar,\
lib/groovy-4.0.15.jar,\
lib/groovy-extensions-2.2.0.jar,\
lib/groovy-profiling-extensions-0.7.0.jar,\
lib/groovy-xml-4.0.15.jar,\
lib/jakarta.activation-1.2.2.jar,\
lib/jakarta.activation-api-1.2.2.jar,\
lib/jakarta.xml.bind-api-2.3.3.jar,\
lib/javax.annotation-api-1.3.2.jar,\
lib/javax.inject-1.jar,\
lib/jaxb-impl-2.3.5.jar,\
lib/jaxb-utilities-2.1.0.jar,\
lib/jaxb-utilities-3.0.0-SNAPSHOT.jar,\
lib/junit-jupiter-5.7.2.jar,\
lib/junit-jupiter-api-5.7.2.jar,\
lib/junit-jupiter-engine-5.7.2.jar,\
Expand All @@ -26,7 +30,7 @@ bin.includes = .,\
lib/mockito-core-3.12.4.jar,\
lib/objenesis-3.2.jar,\
lib/opentest4j-1.2.0.jar,\
lib/slf4j-api-1.7.32.jar,\
lib/slf4j-api-1.7.36.jar,\
lib/spring-aop-5.2.0.RELEASE.jar,\
lib/spring-beans-5.2.0.RELEASE.jar,\
lib/spring-context-5.2.0.RELEASE.jar,\
Expand Down
73 changes: 0 additions & 73 deletions org.thymeleaf.extras.eclipse.contentassist/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,77 +27,4 @@
</plugins>
</build>

<dependencies>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>1.3.2</version>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<version>1</version>
</dependency>
<dependency>
<groupId>nz.net.ultraq.jaxb</groupId>
<artifactId>jaxb-utilities</artifactId>
<version>2.1.0</version>
</dependency>
<dependency>
<groupId>nz.net.ultraq.extensions</groupId>
<artifactId>groovy-extensions</artifactId>
<version>1.1.0</version>
</dependency>
<dependency>
<groupId>nz.net.ultraq.extensions</groupId>
<artifactId>profiling-extensions</artifactId>
<version>0.6.1</version>
</dependency>
<dependency>
<groupId>org.attoparser</groupId>
<artifactId>attoparser</artifactId>
<version>2.0.5.RELEASE</version>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy</artifactId>
<version>3.0.9</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.7.32</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>5.2.0.RELEASE</version>
</dependency>

<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-xml</artifactId>
<version>3.0.9</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>5.7.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.12.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>5.2.0.RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies>

</project>
49 changes: 23 additions & 26 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,37 +67,26 @@
</repositories>

<properties>
<tycho.version>2.4.0</tycho.version>
<tycho.version>3.0.5</tycho.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format>
<thymeleaf.plugin-update-site>https://raw.githubusercontent.com/thymeleaf/thymeleaf-extras-eclipse-plugin/update-site/${project.version}/</thymeleaf.plugin-update-site>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<thymeleaf.plugin-update-site>https://raw.githubusercontent.com/thymeleaf/thymeleaf-extras-eclipse-plugin/update-site/${project.version}/</thymeleaf.plugin-update-site>
</properties>

<build>
<testSourceDirectory>src/test/groovy</testSourceDirectory>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-director-plugin</artifactId>
<version>${tycho.version}</version>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0</version>
<executions>
<execution>
<id>enforce-maven</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<requireMavenVersion>
<version>3.6.3</version>
</requireMavenVersion>
</rules>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-maven-plugin</artifactId>
Expand All @@ -109,6 +98,7 @@
<artifactId>target-platform-configuration</artifactId>
<version>${tycho.version}</version>
<configuration>
<executionEnvironment>JavaSE-17</executionEnvironment>
<environments>
<environment>
<os>win32</os>
Expand Down Expand Up @@ -145,7 +135,7 @@
<plugin>
<groupId>org.codehaus.gmavenplus</groupId>
<artifactId>gmavenplus-plugin</artifactId>
<version>1.12.1</version>
<version>3.0.2</version>
<executions>
<execution>
<goals>
Expand All @@ -161,13 +151,20 @@
</execution>
</executions>
</plugin>
<!--Enable the replacement of the SNAPSHOT version in the final product configuration-->
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-packaging-plugin</artifactId>
<version>${tycho.version}</version>
<configuration>
<archiveSite>true</archiveSite>
</configuration>
<executions>
<execution>
<phase>package</phase>
<id>package-feature</id>
<configuration>
<finalName>${project.artifactId}_${unqualifiedVersion}.${buildQualifier}</finalName>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
Expand Down

0 comments on commit cb16e93

Please sign in to comment.