svn commit: r1913415 - in /cocoon/trunk: blocks/cocoon-xsp/cocoon-xsp-impl/pom.xml pom.xml

Author: cdutz
Date: Sun Oct 29 10:55:28 2023
New Revision: 1913415

URL: http://svn.apache.org/viewvc?rev=1913415&view=rev
Log:
fix: Made the build work on any non-mac and with Java 1.8 on all systems (Mac, Linux, Windows)

Modified:
    cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/pom.xml
    cocoon/trunk/pom.xml

Modified: cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/pom.xml?rev=1913415&r1=1913414&r2=1913415&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/pom.xml Sun Oct 29 10:55:28 2023
@@ -68,11 +68,9 @@
 
   <profiles>
     <profile>
-      <id>tools.jar</id>
+      <id>.Java-1.8</id>
       <activation>
-        <os>
-          <family>!mac</family>
-        </os>
+        <jdk>1.8</jdk>
       </activation>
       <dependencies>
         <dependency>

Modified: cocoon/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/pom.xml?rev=1913415&r1=1913414&r2=1913415&view=diff
==============================================================================
--- cocoon/trunk/pom.xml (original)
+++ cocoon/trunk/pom.xml Sun Oct 29 10:55:28 2023
@@ -1279,6 +1279,7 @@
     <!-- TODO: This is the latest Spring version that we support -->
     <spring.version>4.3.30.RELEASE</spring.version>
     <logback.version>1.4.5</logback.version>
+    <exlipse.jdt.version>3.33.0</exlipse.jdt.version>
   </properties>
 
   <modules>
@@ -2067,7 +2068,7 @@
       <dependency>
         <groupId>org.eclipse.jdt</groupId>
         <artifactId>org.eclipse.jdt.core</artifactId>
-        <version>3.33.0</version>
+        <version>${exlipse.jdt.version}</version>
       </dependency>
       <dependency>
         <groupId>net.sourceforge.jena</groupId>
@@ -2739,6 +2740,21 @@
   </reporting>
 
   <profiles>
+    <!--
+      Some dependencies in their latest version are no longer compatible with Jaca 1.8,
+      so if we're building with Java 1.8, we need to downgrade some of them.
+    -->
+    <profile>
+      <id>.Java-1.8</id>
+      <activation>
+        <jdk>1.8</jdk>
+      </activation>
+      <properties>
+        <logback.version>1.3.11</logback.version>
+        <exlipse.jdt.version>3.26.0</exlipse.jdt.version>
+      </properties>
+    </profile>
+
     <profile>
       <id>javadocs-script</id>
       <reporting>