hadoop 3.3.4漏洞修复

README.txt

@@ -5,3 +5,20 @@ For the latest information about Hadoop, please visit our website at:
 and our wiki, at:
 
    https://cwiki.apache.org/confluence/display/HADOOP/
+-----------------------------------------------------------------------------------
+dnsjava:dnsjava						2.1.7 				->3.6.0				已完成
+-----------------------------------------------------------------------------------
+org.eclipse.jetty:jetty-servlets	9.4.44.V20210927	->9.4.54
+-----------------------------------------------------------------------------------
+io.netty:netty-handler				4.1.101.Final		->4.1.118.Final		已完成
+-----------------------------------------------------------------------------------
+org.apache.kerby:kerber-server		1.0.1				->2.1.2				已完成
+-----------------------------------------------------------------------------------
+org.apache.avro:avro				1.7.7				->1.11.4			已完成
+-----------------------------------------------------------------------------------
+commons-beanutils:commons-beanutils	1.9.4				->1.11.0			已完成
+-----------------------------------------------------------------------------------
+org.jboss.xnio:xnio-api				3.8.7.Final			->3.8.14
+-----------------------------------------------------------------------------------
+org.eclipse.jetty:jetty-server		9.4.53.V20231009	->12.0.38
+-----------------------------------------------------------------------------------

hadoop-client-modules/hadoop-client-runtime/pom.xml

@@ -165,6 +165,7 @@
                       <exclude>org.xerial.snappy:*</exclude>
                     </excludes>
                   </artifactSet>
+                  <shadedArtifactAttached>true</shadedArtifactAttached>
                   <filters>
                     <!-- We need a filter that matches just those things that are included in the api jar -->
                     <filter>
@@ -179,6 +180,13 @@
                       <artifact>*:*</artifact>
                       <excludes>
                         <exclude>**/*.java</exclude>
+                        <exclude>META-INF/*.SF</exclude>
+                        <exclude>META-INF/*.DSA</exclude>
+                        <exclude>META-INF/*.RSA</exclude>
+                        <!-- 新增：丢掉 dnsjava 3.6 的 Multi-Release 条目 -->
+                        <exclude>META-INF/versions/**</exclude>
+                        <!-- 顺手丢掉 dnsjava 的 JDK18+ SPI 声明（JDK8 用不到，且 shade 不 relocate 路径会出问题）-->
+                        <exclude>META-INF/services/java.net.spi.InetAddressResolverProvider</exclude>
                       </excludes>
                     </filter>
                     <!-- We only want one copy of the Localizer class. So long as we keep jasper compiler and runtime on the same version, which one doesn't matter -->

hadoop-common-project/hadoop-common/pom.xml

@@ -372,6 +372,11 @@
       <artifactId>lz4-java</artifactId>
       <scope>provided</scope>
     </dependency>
+     <!-- <dependency>
+          <groupId>org.apache.hadoop</groupId>
+          <artifactId>hadoop-common</artifactId>
+          <scope>test</scope>
+      </dependency>-->
   </dependencies>
 
   <build>

hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SecurityUtil.java

@@ -608,7 +608,7 @@ protected static class QualifiedHostResolver implements HostResolver {
     private List<String> searchDomains = new ArrayList<>();
     {
       ResolverConfig resolverConfig = ResolverConfig.getCurrentConfig();
-      Name[] names = resolverConfig.searchPath();
+      List<Name> names = resolverConfig.searchPath();
       if (names != null) {
         for (Name name : names) {
           searchDomains.add(name.toString());

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/ClientBaseWithFixes.java

@@ -41,7 +41,6 @@
 import org.apache.zookeeper.ZKTestCase;
 import org.apache.zookeeper.ZooKeeper;
 import org.apache.zookeeper.server.ServerCnxnFactory;
-import org.apache.zookeeper.server.ServerCnxnFactoryAccessor;
 import org.apache.zookeeper.server.ZKDatabase;
 import org.apache.zookeeper.server.ZooKeeperServer;
 import org.apache.zookeeper.server.persistence.FileTxnLog;
@@ -437,9 +436,13 @@ protected void stopServer() throws Exception {
 
 
     protected static ZooKeeperServer getServer(ServerCnxnFactory fac) {
-        ZooKeeperServer zs = ServerCnxnFactoryAccessor.getZkServer(fac);
-
-        return zs;
+        try {
+            java.lang.reflect.Field f = ServerCnxnFactory.class.getDeclaredField("zkServer");
+            f.setAccessible(true);
+            return (ZooKeeperServer) f.get(fac);
+        } catch (Exception e) {
+            throw new RuntimeException("Failed to get ZooKeeperServer from ServerCnxnFactory", e);
+        }
     }
 
     protected void tearDownAll() throws Exception {

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestZKFailoverControllerStress.java

@@ -131,7 +131,7 @@ public void testRandomHealthAndDisconnects() throws Exception {
     long st = Time.now();
     while (Time.now() - st < runFor) {
       cluster.getTestContext().checkException();
-      serverFactory.closeAll();
+      serverFactory.closeAll(org.apache.zookeeper.server.ServerCnxn.DisconnectReason.CLEAN_UP);
       Thread.sleep(50);
     }
   }

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/serializer/avro/TestAvroSerialization.java

@@ -33,7 +33,7 @@ public class TestAvroSerialization {
   @Test
   public void testSpecific() throws Exception {
     AvroRecord before = new AvroRecord();
-    before.intField = 5;
+    before.setIntField(5);
     AvroRecord after = SerializationTestUtil.testSerialization(conf, before);
     assertEquals(before, after);
   }

hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/server/dns/RegistryDNS.java

@@ -233,13 +233,8 @@
       }
       ResolverConfig.refresh();
       ExtendedResolver resolver;
-      try {
         resolver = new ExtendedResolver();
-      } catch (UnknownHostException e) {
-        LOG.error("Can not resolve DNS servers: ", e);
-        return;
-      }
-      for (Resolver check : resolver.getResolvers()) {
+        for (Resolver check : resolver.getResolvers()) {
         if (check instanceof SimpleResolver) {
           InetAddress address = ((SimpleResolver) check).getAddress()
               .getAddress();
@@ -247,7 +242,7 @@
             resolver.deleteResolver(check);
             continue;
           } else {
             check.setTimeout(30);
           }
         } else {
           LOG.error("Not simple resolver!!!?" + check);
@@ -260,9 +255,9 @@
       }
       StringBuilder message = new StringBuilder();
       message.append("DNS servers: ");
-      if (ResolverConfig.getCurrentConfig().servers() != null) {
-        for (String server : ResolverConfig.getCurrentConfig()
-            .servers()) {
+      List<InetSocketAddress> servers = ResolverConfig.getCurrentConfig().servers();
+      if (servers  != null) {
+        for (InetSocketAddress  server : servers) {
           message.append(server);
           message.append(" ");
         }
@@ -334,8 +329,8 @@
         Iterator itor = zone.iterator();
         while (itor.hasNext()) {
           RRset rRset = (RRset) itor.next();
-          Iterator sigs = rRset.sigs();
-          if (!sigs.hasNext()) {
+          List<RRSIGRecord> sigs = rRset.sigs();
+          if (!sigs.isEmpty()) {
             try {
               signSiteRecord(zone, rRset.first());
             } catch (DNSSEC.DNSSECException e) {
@@ -697,7 +692,7 @@
     cal.add(Calendar.YEAR, 1);
     Date expiration = cal.getTime();
     RRSIGRecord rrsigRecord =
         DNSSEC.sign(rrset, dnsKeyRecs.get(zone.getOrigin()),
             privateKey, inception, expiration);
     LOG.info("Adding {}", record);
     rrset.addRR(rrsigRecord);
@@ -1159,7 +1154,7 @@
           }
         }
         if (r.getType() == Type.CNAME) {
           Name cname = ((CNAMERecord) r).getAlias();
           if (iterations < 6) {
             remoteLookup(response, cname, type, iterations + 1);
           }
@@ -1255,7 +1250,7 @@
    * @param flags the flags.
    */
   private void addAdditional2(Message response, int section, int flags) {
     Record[] records = response.getSectionArray(section);
     for (int i = 0; i < records.length; i++) {
       Record r = records[i];
       Name glueName = r.getAdditionalName();
@@ -1403,11 +1398,10 @@
           response.getHeader().setFlag(Flags.AA);
         }
       } else if (sr.isSuccessful()) {
-        RRset[] rrsets = sr.answers();
+        List<RRset> rrsets = sr.answers();
         LOG.info("found answers {}", rrsets);
-        for (int i = 0; i < rrsets.length; i++) {
-          addRRset(name, response, rrsets[i],
-              Section.ANSWER, flags);
+        for (int i = 0; i < rrsets.size(); i++) {
+          addRRset(name, response, rrsets.get(i), Section.ANSWER, flags);
         }
         addNS(response, zone, flags);
         if (iterations == 0) {
@@ -1456,7 +1450,7 @@
   private void addNXT(Message response, int flags)
       throws DNSSEC.DNSSECException, IOException {
     Record nxtRecord = getNXTRecord(
         response.getSectionArray(Section.QUESTION)[0]);
     Zone zone = findBestZone(nxtRecord.getName());
     addRecordCommand.exec(zone, nxtRecord);
     RRset nxtRR = zone.findExactMatch(nxtRecord.getName(), Type.NXT);
@@ -1515,19 +1509,17 @@
       }
     }
     if ((flags & FLAG_SIGONLY) == 0) {
-      Iterator it = rrset.rrs();
-      while (it.hasNext()) {
-        Record r = (Record) it.next();
+      List<Record> records = rrset.rrs();
+      for (Record r : records) {             // foreach 遍历
         if (r.getName().isWild() && !name.isWild()) {
           r = r.withName(name);
         }
         response.addRecord(r, section);
       }
     }
     if ((flags & (FLAG_SIGONLY | FLAG_DNSSECOK)) != 0) {
-      Iterator it = rrset.sigs();
-      while (it.hasNext()) {
-        Record r = (Record) it.next();
+      List<RRSIGRecord> sigs = rrset.sigs();
+      for (Record r : sigs) {                   // foreach 遍历
         if (r.getName().isWild() && !name.isWild()) {
           r = r.withName(name);
         }
@@ -1568,7 +1560,7 @@
         addRRset(rrset.getName(), response, rrset,
             Section.ANSWER, FLAG_DNSSECOK);
         if (tsig != null) {
           tsig.applyStream(response, qtsig, first);
           qtsig = response.getTSIG();
         }
         first = false;
@@ -1697,7 +1689,7 @@
             try {
               DNSKEYRecord dnskeyRecord = dnsKeyRecs.get(zone.getOrigin());
               RRSIGRecord rrsigRecord =
                   DNSSEC.sign(rRset, dnskeyRecord, privateKey,
                       inception, expiration);
               LOG.info("Adding {}", rrsigRecord);
               rRset.addRR(rrsigRecord);
@@ -1734,13 +1726,13 @@
 
       DNSKEYRecord dnskeyRecord = dnsKeyRecs.get(zone.getOrigin());
       DSRecord dsRecord = new DSRecord(name, dClass,
           dsTtl, DSRecord.Digest.SHA1,
           dnskeyRecord);
       zone.addRecord(dsRecord);
       LOG.info("Adding {}", dsRecord);
       rRset = zone.findExactMatch(dsRecord.getName(), dsRecord.getType());
 
       rrsigRecord = DNSSEC.sign(rRset, dnskeyRecord, privateKey,
           inception, expiration);
       rRset.addRR(rrsigRecord);
     }

hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/server/dns/SecureableZone.java

@@ -138,7 +138,7 @@ public Record getNXTRecord(Record queryRecord, Zone zone) {
     SetResponse sr = zone.findRecords(base.getName(), Type.ANY);
     BitSet bitMap = new BitSet();
     bitMap.set(Type.NXT);
-    RRset[] rRsets = sr.answers();
+    List<RRset> rRsets = sr.answers();
     for (RRset rRset : rRsets) {
       int typeCode = rRset.getType();
       if (typeCode > 0 && typeCode < 128) {

hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/server/services/MicroZookeeperService.java

@@ -229,7 +229,7 @@ protected void serviceStart() throws Exception {
     setupSecurity();
 
     FileTxnSnapLog ftxn = new FileTxnSnapLog(dataDir, dataDir);
-    ZooKeeperServer zkServer = new ZooKeeperServer(ftxn, tickTime);
+    ZooKeeperServer zkServer = new ZooKeeperServer();
 
     LOG.info("Starting Local Zookeeper service");
     factory = ServerCnxnFactory.createFactory();

hadoop-common-project/hadoop-registry/src/test/java/org/apache/hadoop/registry/server/dns/TestRegistryDNS.java

@@ -31,6 +31,7 @@
 import org.xbill.DNS.DClass;
 import org.xbill.DNS.DNSKEYRecord;
 import org.xbill.DNS.DNSSEC;
+import org.xbill.DNS.EDNSOption;
 import org.xbill.DNS.Flags;
 import org.xbill.DNS.Message;
 import org.xbill.DNS.Name;
@@ -344,7 +345,7 @@
     Name name = Name.fromString("19.1.17.172.in-addr.arpa.");
     Record question = Record.newRecord(name, Type.PTR, DClass.IN);
     Message query = Message.newQuery(question);
-    OPTRecord optRecord = new OPTRecord(4096, 0, 0, Flags.DO, null);
+    OPTRecord optRecord = new OPTRecord(4096, 0, 0, Flags.DO, new EDNSOption[0]);
     query.addRecord(optRecord, Section.ADDITIONAL);
     byte[] responseBytes = getRegistryDNS().generateReply(query, null);
     Message response = new Message(responseBytes);
@@ -386,7 +387,7 @@
     Name name = Name.fromString(lookup);
     Record question = Record.newRecord(name, type, DClass.IN);
     Message query = Message.newQuery(question);
-    OPTRecord optRecord = new OPTRecord(4096, 0, 0, Flags.DO, null);
+    OPTRecord optRecord = new OPTRecord(4096, 0, 0, Flags.DO, new EDNSOption[0]);
     query.addRecord(optRecord, Section.ADDITIONAL);
     byte[] responseBytes = getRegistryDNS().generateReply(query, null);
     Message response = new Message(responseBytes);
@@ -394,7 +395,7 @@
     assertNotNull("Null response", response);
     assertEquals("Questions do not match", query.getQuestion(),
         response.getQuestion());
     Record[] recs = response.getSectionArray(Section.ANSWER);
     assertEquals("wrong number of answer records",
         isSecure() ? numRecs * 2 : numRecs, recs.length);
     if (isSecure()) {
@@ -415,7 +416,7 @@
     Name name = Name.fromString(lookup);
     Record question = Record.newRecord(name, type, DClass.IN);
     Message query = Message.newQuery(question);
-    OPTRecord optRecord = new OPTRecord(4096, 0, 0, Flags.DO, null);
+    OPTRecord optRecord = new OPTRecord(4096, 0, 0, Flags.DO, new EDNSOption[0]);
     query.addRecord(optRecord, Section.ADDITIONAL);
     byte[] responseBytes = getRegistryDNS().generateReply(query, null);
     Message response = new Message(responseBytes);
@@ -423,7 +424,7 @@
     assertNotNull("Null response", response);
     assertEquals("Questions do not match", query.getQuestion(),
         response.getQuestion());
     Record[] recs = response.getSectionArray(Section.ANSWER);
     assertEquals(answerCount, recs.length);
     assertEquals(recs[0].getType(), type);
     return recs;
@@ -466,7 +467,7 @@
     cal.add(Calendar.YEAR, 1);
     Date expiration = cal.getTime();
     RRset rrset = new RRset(aRecord);
     RRSIGRecord rrsigRecord = DNSSEC.sign(rrset,
         dnskeyRecord,
         priv,
         inception,
@@ -524,7 +525,7 @@
     assertNotNull("Null response", response);
     assertEquals("Questions do not match", query.getQuestion(),
         response.getQuestion());
     Record[] sectionArray = response.getSectionArray(Section.AUTHORITY);
     assertEquals("Wrong number of recs in AUTHORITY", isSecure() ? 2 : 1,
         sectionArray.length);
     boolean soaFound = false;
@@ -588,11 +589,11 @@
     Name name = Name.fromString("5.0.17.172.in-addr.arpa.");
     Record question = Record.newRecord(name, Type.PTR, DClass.IN);
     Message query = Message.newQuery(question);
-    OPTRecord optRecord = new OPTRecord(4096, 0, 0, Flags.DO, null);
+    OPTRecord optRecord = new OPTRecord(4096, 0, 0, Flags.DO, new EDNSOption[0]);
     query.addRecord(optRecord, Section.ADDITIONAL);
     byte[] responseBytes = getRegistryDNS().generateReply(query, null);
     Message response = new Message(responseBytes);
     recs = response.getSectionArray(Section.ANSWER);
     assertEquals("wrong result", "cn005.dev.test.",
         ((PTRRecord) recs[0]).getTarget().toString());
   }

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/jobhistory/JobQueueChangeEvent.java

@@ -31,8 +31,8 @@ public class JobQueueChangeEvent implements HistoryEvent {
   private JobQueueChange datum = new JobQueueChange();
 
   public JobQueueChangeEvent(JobID id, String queueName) {
-    datum.jobid = new Utf8(id.toString());
-    datum.jobQueueName = new Utf8(queueName);
+    datum.setJobid(new Utf8(id.toString()));
+    datum.setJobQueueName(new Utf8(queueName));
   }
 
   JobQueueChangeEvent() { }
@@ -54,13 +54,13 @@ public void setDatum(Object datum) {
 
   /** Get the Job ID */
   public JobID getJobId() {
-    return JobID.forName(datum.jobid.toString());
+    return JobID.forName(datum.getJobid().toString());
   }
 
   /** Get the new Job queue name */
   public String getJobQueueName() {
-    if (datum.jobQueueName != null) {
-      return datum.jobQueueName.toString();
+    if (datum.getJobQueueName() != null) {
+      return datum.getJobQueueName().toString();
     }
     return null;
   }

hadoop-project/pom.xml

@@ -63,7 +63,7 @@
     <java.security.egd>file:///dev/urandom</java.security.egd>
 
     <!-- avro version -->
-    <avro.version>1.7.7</avro.version>
+    <avro.version>1.11.4</avro.version>
 
     <!-- jersey version -->
     <jersey.version>1.19</jersey.version>
@@ -97,10 +97,10 @@
     <hadoop-thirdparty-shaded-protobuf-prefix>${hadoop-thirdparty-shaded-prefix}.protobuf</hadoop-thirdparty-shaded-protobuf-prefix>
     <hadoop-thirdparty-shaded-guava-prefix>${hadoop-thirdparty-shaded-prefix}.com.google.common</hadoop-thirdparty-shaded-guava-prefix>
 
-    <zookeeper.version>3.5.6</zookeeper.version>
+    <zookeeper.version>3.7.2</zookeeper.version>
     <curator.version>4.2.0</curator.version>
     <findbugs.version>3.0.5</findbugs.version>
-    <dnsjava.version>2.1.7</dnsjava.version>
+    <dnsjava.version>3.6.0</dnsjava.version>
 
     <guava.version>27.0-jre</guava.version>
     <guice.version>4.0</guice.version>
@@ -113,7 +113,7 @@
     <ldap-api.version>1.0.0-M33</ldap-api.version>
 
     <!-- Apache Commons dependencies -->
-    <commons-beanutils.version>1.9.4</commons-beanutils.version>
+    <commons-beanutils.version>1.11.0</commons-beanutils.version>
     <commons-cli.version>1.2</commons-cli.version>
     <commons-codec.version>1.15</commons-codec.version>
     <commons-collections.version>3.2.2</commons-collections.version>
@@ -127,7 +127,7 @@
     <commons-net.version>3.6</commons-net.version>
     <commons-text.version>1.4</commons-text.version>
 
-    <kerby.version>1.0.1</kerby.version>
+    <kerby.version>2.1.2</kerby.version>
     <jcache.version>1.0-alpha-1</jcache.version>
     <ehcache.version>3.3.1</ehcache.version>
     <hikari.version>2.4.12</hikari.version>
@@ -141,7 +141,7 @@
     <gson.version>2.8.9</gson.version>
     <metrics.version>3.2.4</metrics.version>
     <netty3.version>3.10.6.Final</netty3.version>
-    <netty4.version>4.1.77.Final</netty4.version>
+    <netty4.version>4.1.118.Final</netty4.version>
     <snappy-java.version>1.1.8.2</snappy-java.version>
     <lz4-java.version>1.7.1</lz4-java.version>
 

hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobBuilder.java

@@ -460,7 +460,7 @@ private void processTaskFinishedEvent(TaskFinishedEvent event) {
     }
     task.setFinishTime(event.getFinishTime());
     task.setTaskStatus(getPre21Value(event.getTaskStatus()));
-    task.incorporateCounters(((TaskFinished) event.getDatum()).counters);
+    task.incorporateCounters(((TaskFinished) event.getDatum()).getCounters());
   }
 
   private void processTaskFailedEvent(TaskFailedEvent event) {
@@ -472,7 +472,7 @@ private void processTaskFailedEvent(TaskFailedEvent event) {
     task.setFinishTime(event.getFinishTime());
     task.setTaskStatus(getPre21Value(event.getTaskStatus()));
     TaskFailed t = (TaskFailed)(event.getDatum());
-    task.putDiagnosticInfo(t.error.toString());
+    task.putDiagnosticInfo(t.getError().toString());
     // killed task wouldn't have failed attempt.
     if (t.getFailedDueToAttempt() != null) {
       task.putFailedDueToAttemptId(t.getFailedDueToAttempt().toString());
@@ -542,7 +542,7 @@ private void processTaskAttemptFinishedEvent(TaskAttemptFinishedEvent event) {
     }
     attempt.setFinishTime(event.getFinishTime());
     attempt
-        .incorporateCounters(((TaskAttemptFinished) event.getDatum()).counters);
+        .incorporateCounters(((TaskAttemptFinished) event.getDatum()).getCounters());
   }
 
   private void processReduceAttemptFinishedEvent(
@@ -568,7 +568,7 @@ private void processReduceAttemptFinishedEvent(
     attempt.setShuffleFinished(event.getShuffleFinishTime());
     attempt.setSortFinished(event.getSortFinishTime());
     attempt
-        .incorporateCounters(((ReduceAttemptFinished) event.getDatum()).counters);
+        .incorporateCounters(((ReduceAttemptFinished) event.getDatum()).getCounters());
     attempt.arraySetClockSplits(event.getClockSplits());
     attempt.arraySetCpuUsages(event.getCpuUsages());
     attempt.arraySetVMemKbytes(event.getVMemKbytes());
@@ -596,7 +596,7 @@ private void processMapAttemptFinishedEvent(MapAttemptFinishedEvent event) {
     // is redundant, but making this will add future-proofing.
     attempt.setFinishTime(event.getFinishTime());
     attempt
-      .incorporateCounters(((MapAttemptFinished) event.getDatum()).counters);
+      .incorporateCounters(((MapAttemptFinished) event.getDatum()).getCounters());
     attempt.arraySetClockSplits(event.getClockSplits());
     attempt.arraySetCpuUsages(event.getCpuUsages());
     attempt.arraySetVMemKbytes(event.getVMemKbytes());
@@ -661,11 +661,11 @@ private void processJobFinishedEvent(JobFinishedEvent event) {
 
     JobFinished job = (JobFinished)event.getDatum();
     Map<String, Long> countersMap =
-        JobHistoryUtils.extractCounters(job.totalCounters);
+        JobHistoryUtils.extractCounters(job.getTotalCounters());
     result.putTotalCounters(countersMap);
-    countersMap = JobHistoryUtils.extractCounters(job.mapCounters);
+    countersMap = JobHistoryUtils.extractCounters(job.getMapCounters());
     result.putMapCounters(countersMap);
-    countersMap = JobHistoryUtils.extractCounters(job.reduceCounters);
+    countersMap = JobHistoryUtils.extractCounters(job.getReduceCounters());
     result.putReduceCounters(countersMap);
   }
 

hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobHistoryUtils.java

@@ -157,9 +157,9 @@ static boolean isJobConfXml(String fileName) {
   static Map<String, Long> extractCounters(JhCounters counters) {
     Map<String, Long> countersMap = new HashMap<String, Long>();
     if (counters != null) {
-      for (JhCounterGroup group : counters.groups) {
-        for (JhCounter counter : group.counts) {
-          countersMap.put(counter.name.toString(), counter.value);
+      for (JhCounterGroup group : counters.getGroups()) {
+        for (JhCounter counter : group.getCounts()) {
+          countersMap.put(counter.getName().toString(), counter.getValue());
         }
       }
     }